Commit Graph

20090 Commits

Author SHA1 Message Date
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
Lin 9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
Timothy Teakettle cd04aed49e Update synthliz.dm 2021-09-02 18:35:52 +01:00
zerothebigboy 5206524dd4 gommit 2021-09-02 07:38:48 -04:00
zerothebigboy 9f4f099880 gommit 2021-09-02 03:05:23 -04:00
zeroisthebiggay f2becdcf8a Update snacks_bread.dm 2021-09-02 02:14:14 -04:00
Hatterhat f93722cc85 gentlemen i've done it. 2021-09-01 17:49:19 -05:00
timothyteakettle a33a7ed249 fix 2021-09-01 17:54:14 +01:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
zerothebigboy d831a84195 cool 2021-09-01 05:15:22 -04:00
Putnam3145 7f838ab9cd Fixes duplicate traitor listing in traitor panel 2021-08-31 18:03:52 -07:00
DeltaFire 7db61cee86 Merge remote-tracking branch 'upstream/master' 2021-08-29 19:32:17 +02:00
keronshb d3eb47b5d0 Fixes VR sleeper 2021-08-28 23:33:54 -04:00
Cognition a03abc5658 forgot unscrew updating, adds appearance updating to stabilized yellow slime extract 2021-08-28 20:25:43 -07:00
Cognition fc2e101402 Fixes updates for rechargers & energy guns, ports finish recharging msg 2021-08-28 19:24:29 -07:00
keronshb ad52cb8072 Merge pull request #3 from SandPoot/master
Adds a pref to it (on the right branch)
2021-08-28 17:25:36 -04:00
silicons d427c43b7b Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
silicons 3cae7df6c8 Merge pull request #15002 from keronshb/plaguerats
Plague Rats
2021-08-26 21:41:07 -07:00
silicons 13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
silicons 6de44f794e Merge pull request #15010 from Putnam3145/atmos-funnies
Supermatter surge rework: consequential for N2, won't explode immediately for CO2
2021-08-26 21:39:33 -07:00
silicons 841ff4f81c Merge pull request #15011 from Putnam3145/lavaland-random-atmos
Port of randomized planet atmos
2021-08-26 21:39:23 -07:00
silicons 24aedb891e Merge pull request #15012 from Putnam3145/miasma-tweak
Miasma now sterilizes into methane instead of oxygen
2021-08-26 21:39:15 -07:00
silicons b6688c84bb Merge pull request #15014 from Putnam3145/fix-supermatter-heat
Made supermatter respect heat capacity
2021-08-26 21:39:05 -07:00
silicons 2c69193337 Merge pull request #15037 from DeltaFire15/corpse-fix
Fixes demons scattering dropped bodies all over the station, plus space dragon content ejection
2021-08-26 21:38:29 -07:00
zerothebigboy dec2ea645e nuts 2021-08-26 22:57:22 -04:00
SandPoot b2ef076043 Upload files 2021-08-26 16:44:36 -03:00
keronshb 47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
DeltaFire e87bd464ff sigh 2021-08-26 04:21:52 +02:00
DeltaFire c713dbdef1 carprift armor 2021-08-26 04:20:23 +02:00
DeltaFire 38aa220e6a no nullijng allowed 2021-08-26 04:02:22 +02:00
DeltaFire 167b9ef331 ae 2021-08-26 03:45:44 +02:00
DeltaFire 6df932c959 *laugh 2021-08-26 03:40:20 +02:00
DeltaFire f8866774aa no scattering 2021-08-26 03:30:51 +02:00
keronshb 7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
Lin ab7bcd5f4d Merge pull request #15007 from LetterN/revert-14988-openthegates
Old Gateway animation return: now includes less icons
2021-08-21 13:06:22 -05:00
keronshb 0b8221c9ac Change to 20 minutes 2021-08-19 22:49:19 -04:00
zerothebigboy 06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
Lin 4ae7b63c22 Merge pull request #15019 from WanderingFox95/WanderingFox95-BlankBottles
[Ready] Blank Bottles
2021-08-19 13:22:31 -05:00
Lin 81a41a384c Merge pull request #15008 from WanderingFox95/WanderingFox95-MoreJaggedSharkTails
[Ready] Shark Tails, dodododododo
2021-08-19 12:32:37 -05:00
WanderingFox95 34422662b1 Nerfed the Capacities. 2021-08-18 21:00:56 +02:00
WanderingFox95 6c111d89c5 It's back in bottling research, also renamed. 2021-08-17 21:35:30 +02:00
Putnam3145 1d0ca33ca7 fixed ashwalkers still not breathing 2021-08-17 08:48:08 -07:00
WanderingFox95 4691397d03 Adds UNIQUE_RENAME to the bottles.
Thanks Teak!
2021-08-17 16:41:27 +02:00
WanderingFox95 c1f173d8e6 Decided against locking them behind research 2021-08-17 15:10:33 +02:00
keronshb 1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
WanderingFox95 631f8dfda5 Clarifies that there are now blank bottles in the research node too. 2021-08-17 14:52:09 +02:00
WanderingFox95 56246d9b56 Adds the bottles to the bottling research tech 2021-08-17 14:28:55 +02:00
WanderingFox95 dc5c107adc Bottles for the service lathe (Equipment) 2021-08-17 14:27:50 +02:00
WanderingFox95 c8889dee36 Bottles. 2021-08-17 14:21:55 +02:00
WanderingFox95 95b63a823b Bottles! 2021-08-17 14:21:11 +02:00