Commit Graph

2118 Commits

Author SHA1 Message Date
Lin
2379a2a342 Merge pull request #15370 from Putnam3145/genericized-plasma-trit
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
2022-01-03 22:31:40 +00:00
Putnam3145
97051cad80 Fixes chem gases being added twice 2021-12-22 01:27:53 -08:00
silicons
555477a075 Update chem_synthesizer.dm 2021-12-18 09:18:23 -07:00
silicons
cc11cae967 Update chem_synthesizer.dm 2021-12-18 09:17:18 -07:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
2021-12-01 00:39:02 +00:00
Putnam3145
0bb3301535 A couple more boiling points I forgot 2021-11-26 23:04:57 -08:00
Putnam3145
7f61d2b56a hydrogen is also a chem gas 2021-11-26 23:01:08 -08:00
DeltaFire
cf767252f6 effect multipler 2021-11-16 02:57:00 +01:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
DeltaFire
6224da71a3 contents_explosion
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
Putnam3145
b91fb21234 Merge branch 'chem-gases' into genericized-plasma-trit 2021-11-14 11:51:22 -08:00
DeltaFire
8ca1015510 reagent_all_process macro 2021-11-13 03:23:11 +01:00
DeltaFire
b4e6b0785d chemscan
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
2021-11-12 19:38:10 +01:00
DeltaFire
4f8848cfb8 more info
chem master and chem analyzer now state who can actually process a chem
2021-11-12 19:09:14 +01:00
Putnam3145
0b0a7192f9 removes the "REM" macro 2021-11-09 16:35:32 -08:00
DeltaFire
1277df1013 typod 2021-11-04 22:02:51 +01:00
DeltaFire
5cd49dcfd1 preservahyde 2021-11-04 21:20:27 +01:00
DeltaFire
5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
qweq12yt
0bb9b23537 restore spray bottle sounds 2021-09-27 17:32:07 -03:00
zerothebigboy
4c82eeeb2a soup 2021-09-18 18:18:04 -04:00
silicons
e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
zerothebigboy
f077f374bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why 2021-09-11 23:04:48 -04:00
zerothebigboy
ba72e3d8f0 why 2021-09-11 23:04:21 -04:00
silicons
149d149dff Merge pull request #15102 from timothyteakettle/icecream
allows custom taste text and color on the custom ice cream setting in the ice cream vat
2021-09-10 22:17:25 -07:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
Timothy Teakettle
ccebece42e icecream 2021-09-08 18:18:27 +01:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
30134a0d2f cool 2021-09-01 06:32:33 -04:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
6b5bdae184 salglu works like normal now again and adds more sanity 2021-07-29 23:55:27 +03:00
Artur
2fec997e1f No longer neccesary 2021-07-29 20:12:38 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
silicons
4fa81ba13c Merge pull request #14878 from Putnam3145/remove-sleeps
Hopefully fixes whatever requires SHOULD_NOT_SLEEP to be commented out in processing
2021-07-01 21:57:19 -07:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
d59ced8f28 changes 2021-06-28 19:15:29 -07:00
silicons
5ef742ffc1 logic 2021-06-28 18:46:25 -07:00
silicons
e690cea147 fix 2021-06-28 18:33:14 -07:00
silicons
55608737fa more.. 2021-06-28 14:51:55 -07:00
silicons
833a7b958f fix 2021-06-28 13:24:12 -07:00