juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,416 Commits 57 Branches 0 Tags
d0a0434ee40478641e96903ef87fe574eb6824e9
Commit Graph

12051 Commits

Author SHA1 Message Date
PJBot
d0a0434ee4 Automatic changelog update 2023-09-13 21:04:16 -04:00
Nim
afd30c5c75 Telescopic shield (#20048) 
* telescopic shield

* research

* removed the shield from the locker

* sound

* eh

* fix
 2023-09-13 18:03:12 -07:00
PJBot
7b27d71246 Automatic changelog update 2023-09-13 20:28:02 -04:00
Flareguy
7d02c4af0f Miscellaneous syndicate bomb tweaks & fixes (#20068) 
* syndicate bomb tweaks & ss13 parity

* 100s

* 90s timer

* fuck. my furniture

* timer back to 120s, no more wire mirroring
 2023-09-13 17:26:58 -07:00
PJBot
b12fea5297 Automatic changelog update 2023-09-13 20:22:37 -04:00
deltanedas
d790e79f9c er (#20119) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-13 17:21:32 -07:00
RIKELOLDABOSS
8d0f80231d Add new words to zombie, mouse, and cat accent (#20115) 2023-09-14 01:55:17 +02:00
Emisse
dd8db5822d Revert "Nukies will be able to buy carp (#20051)" (#20114) 
This reverts commit 8084a69ae4.
 2023-09-13 18:12:56 -04:00
PJBot
cdd3b40f0f Automatic changelog update 2023-09-13 18:04:48 -04:00
PJBot
dea266ea8b Automatic changelog update 2023-09-13 18:03:36 -04:00
deltanedas
c3e8be7ce8 ninja can spawn earlier, 1h reoccurence (#20091) 
* ninja can spawn earlier, 1h reoccurence

* need 40p

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-13 16:02:29 -06:00
daerSeebaer
4759b1b739 Add names for HV&MV power infrastrucutre on Aspid (#20106) 
* add names for power infrastructureon aspid

* added missing SMES names on Aspid
 2023-09-13 16:01:12 -06:00
TsjipTsjip
1fa34f4033 Add training bomb to kettle.yml (#20110) 2023-09-13 15:17:40 -06:00
PJBot
4c17062505 Automatic changelog update 2023-09-13 12:55:54 -04:00
deltanedas
bcce439746 add training bombs to cargo (#20072) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-13 09:54:47 -07:00
Ubaser
9c2f11d0eb Add map "Europa" (#19930) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-13 22:22:21 +10:00
PJBot
0618874fa6 Automatic changelog update 2023-09-13 08:07:19 -04:00
PJBot
427a48d67d Automatic changelog update 2023-09-13 04:57:19 -04:00
Nairod
6a26771d5e Orderable Security Barriers (#20103) 2023-09-13 18:56:15 +10:00
PJBot
760c1d965a Automatic changelog update 2023-09-13 04:02:26 -04:00
deltanedas
89b670d0c0 run fixgridatmos on dev (#20099) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-13 00:52:12 -06:00
DrSmugleaf
f23228bda9 Update dragon devour action icon (#20020) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-12 22:05:04 -07:00
PJBot
b0e8af46ce Automatic changelog update 2023-09-13 00:36:08 -04:00
PJBot
3b4aebf9e0 Automatic changelog update 2023-09-13 00:26:39 -04:00
deltanedas
486bba4565 prevent mice going under secret doors (#20057) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 18:20:47 -07:00
PJBot
7ea0537551 Automatic changelog update 2023-09-12 17:51:06 -04:00
AndrewEyeke
8084a69ae4 Nukies will be able to buy carp (#20051) 
* Nukies will be able to buy carp

* Limited fish to 10 stock

* Limited fish to 10 stock

* Limited fish to 10 stock
 2023-09-12 14:50:03 -07:00
PJBot
be7be13f54 Automatic changelog update 2023-09-12 16:55:22 -04:00
Morb
f9144496f7 Stair decals (#20080) 
* wip

* done
 2023-09-12 14:54:28 -06:00
deltanedas
ef869b1cff saltern updat (#20075) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 14:25:59 -06:00
deltanedas
1986ca86f4 make hardbombs indestructible (#20073) 
* make hardbombs not explode when destroyed

* actually just remove it entirely

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 11:29:50 -07:00
PJBot
5354f0c931 Automatic changelog update 2023-09-12 11:10:38 -04:00
JoeHammad1844
3401709e84 Nukies get free microbomb (#20012) 2023-09-12 08:09:32 -07:00
PJBot
70cdb07fbb Automatic changelog update 2023-09-12 10:36:12 -04:00
Aru Moon
f614029f64 remove useless file from prototypes (#20066) 2023-09-12 09:21:38 -05:00
PJBot
cf6377643b Automatic changelog update 2023-09-12 08:35:08 -04:00
metalgearsloth
7064f262b4 Add ore bag area pickups (#19358) 2023-09-12 22:34:04 +10:00
deltanedas
7d9550bc55 remove sus codewords (#20060) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 00:37:43 -05:00
eclips_e
133ca98655 Hardbombs & Defusables (#15380) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
 2023-09-11 18:42:38 -07:00
PJBot
effd307e64 Automatic changelog update 2023-09-11 18:58:31 -04:00
PJBot
22886efb71 Automatic changelog update 2023-09-11 15:59:30 -04:00
chromiumboy
c853f0bfb7 Artifact containers can safely store radioactive objects (version 2) (#19652) 
* Artifact containers suppress the radioactive of artifacts inside them

* Updated to reflect changes to RobustToolbox

* Made necessary changes after updating RT

* Removed test code

* Made requested change

* Updated due to changes to RobustToolbox

* Renamed function

* Updated to accommodate changes to RobustToolbox

* Actually resolve merge conflict?

* Removed unnecessary change

* Made requested changes

* retrigger checks

* Retrigger checks

---------

Co-authored-by: root <root@DESKTOP-HJPF29C>
 2023-09-11 15:58:25 -04:00
lzk
5ca34e5578 crayon.yml cleaning (#20029) 2023-09-11 15:52:54 -04:00
metalgearsloth
a75745491d Make some more machines snapCardinals (#19781) 2023-09-11 22:56:53 +10:00
DrSmugleaf
a272cd4439 Remove manual localization from action entity prototypes (#20023) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-11 22:34:41 +10:00
PJBot
313be95cb2 Automatic changelog update 2023-09-11 07:21:51 -04:00
metalgearsloth
d5bd1c6f86 Predict StorageComponent (#19682) 2023-09-11 21:20:46 +10:00
PJBot
d315ce3c8c Automatic changelog update 2023-09-11 05:05:08 -04:00
PJBot
28e9df0fba Automatic changelog update 2023-09-11 04:17:31 -04:00
drteaspoon420
a7ac4a83c4 Changed produce spills into dynamic from hardcoded. (#19980) 2023-09-11 01:16:26 -07:00