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

5580 Commits

Author SHA1 Message Date
Velcroboy
4e883d90b1 Increases Blast Door dmg resistance. (#20177) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-09-14 22:14:11 -04:00
c4llv07e
649cd34edc Fix hud theme selection (#19106) 
* Fix hud theme selection

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Remove iterator indexing in the theme configuration

Signed-off-by: c4llv07e <kseandi@gmail.com>

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
 2023-09-14 22:05:55 -04:00
LankLTE
0e9d804ca2 canCreateVacuum (#20118) 2023-09-14 16:51:47 -07:00
Nairod
58373ccc18 Add HoloBarrier To SecFab (#20128) 2023-09-14 16:34:43 -07:00
Psychpsyo
11972a0066 Make Shark Plush Janitor-Bucketable (#20123) 2023-09-14 00:17:44 -07:00
chromiumboy
3753fed920 Fix adding/removing airlock protections via welding (#19926) 2023-09-13 21:54:49 -08:00
Doru991
3f51795cc7 Add plant species mutations (#19960) 2023-09-13 20:56:24 -08:00
Whisper
1b3f4c3d7b Guardians (Holo and holoclown) have syndicate faction ai (#19816) 2023-09-13 20:51:10 -07:00
Kevin Zheng
e54a62bca9 Add cryogenic gas tanks (#19864) 2023-09-13 19:37:13 -08: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
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
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
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
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
Nairod
6a26771d5e Orderable Security Barriers (#20103) 2023-09-13 18:56:15 +10: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
deltanedas
486bba4565 prevent mice going under secret doors (#20057) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 18:20:47 -07: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
Morb
f9144496f7 Stair decals (#20080) 
* wip

* done
 2023-09-12 14:54:28 -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
JoeHammad1844
3401709e84 Nukies get free microbomb (#20012) 2023-09-12 08:09:32 -07:00
Aru Moon
f614029f64 remove useless file from prototypes (#20066) 2023-09-12 09:21:38 -05: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
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
metalgearsloth
d5bd1c6f86 Predict StorageComponent (#19682) 2023-09-11 21:20:46 +10:00
drteaspoon420
a7ac4a83c4 Changed produce spills into dynamic from hardcoded. (#19980) 2023-09-11 01:16:26 -07:00
metalgearsloth
28bf3a6240 Remove SharedEye (but content) (#19481) 2023-09-11 16:15:23 +10:00
Kara
64a29f0d8a InAir tweaks & chasm fixes (#19707) 2023-09-11 16:03:16 +10:00
Morb
2a143c873c SSD Indicator (#19701) 2023-09-11 15:52:56 +10:00
Vasilis
1a7d3d945e Nerf paramed PDA scanning speed and buff all others to be the same (#19983) 
* Match scantime with peramed for cmo

* Nerf, the webedit

* All pda times are same now uwu
 2023-09-10 16:01:05 -07:00
deltanedas
6953070d40 ninja bombing target whitelist warp point (#19977) 
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:04:00 -06:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:20:27 +10:00
Flareguy
8d69f7f2eb Cobwebs (#19623) 
* adds cobwebs

* like legit the most awesomest thing ever
 2023-09-09 23:37:56 -04:00
deltanedas
5dbf79f7da ian crafting (#19821) 2023-09-09 23:04:32 -04:00
deltanedas
152a1d1e75 Make monkeys better (#19407) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 12:51:51 +10:00
DrSmugleaf
09bce85f19 Fix actions not being usable, ordering, and containers (#19964) 2023-09-09 16:14:17 -07:00
JoeHammad1844
dc254a1308 Fingerless gloves in SecDrobe (#19932) 
* Fingerless gloves in sec drobe

* oopsies

* Add files via upload
 2023-09-09 12:59:03 -06:00
lzk
e1d54e360f ways to get a plush moth (#19843) 
* to arcades

* plushie toys crate

* hampter in arcade
 2023-09-09 12:58:42 -06:00
csqrb
e773d8c09f Increase crayon charges from 5 to 15 (#19922) 2023-09-09 10:45:38 -08:00
lzk
79b9ec8675 Update paper.yml (#19943) 2023-09-09 12:45:14 -06:00
deltanedas
2c72032c30 Buff gauze (#19909) 2023-09-09 10:32:00 -08:00
Vasilis
16943ff857 Aghost have syndicate access (#19948) 2023-09-10 03:58:37 +10:00