Commit Graph

10345 Commits

Author SHA1 Message Date
Poojawa
93ad7f1066 Corrects a missing tail state 2019-10-07 04:30:23 -05:00
Putnam
caf9bc56da Make replacement update icon 2019-10-07 01:34:22 -07:00
Putnam
b452de12ff Made PanD.E.M.I.C beaker stuff more like ChemMaster 2019-10-07 01:23:17 -07:00
kevinz000
dd46509597 Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
2019-10-06 21:37:50 -07:00
Ghommie
8228e52f43 Ports "Makes the illegal tech node harder to unlock" 2019-10-07 06:19:48 +02:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Ghommie
7dfd6005d9 I hate nerfing things :( 2019-10-06 19:24:31 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Ghommie
a9e30720ec key, ckey, key, ckey 2019-10-06 18:40:24 +02:00
Fermi
ea031d6d40 Slowly getting there 2019-10-06 11:09:54 +01:00
Poojawa
ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Ghommie
f01f00710f Porting some spraycan fixes. 2019-10-06 05:30:16 +02:00
Linzolle
e009a4cc3d Revert "pooj fixed this anyway"
This reverts commit 6ce8db8d7b.
2019-10-05 22:15:48 -05:00
Fermi
d023d58b2c Changes 2019-10-06 02:10:46 +01:00
Fermi
63647b58ba Merge branch 'Spookytime' of https://github.com/Thalpy/Citadel-Station-13 into Spookytime 2019-10-06 00:37:01 +01:00
Fermi
aff7f808ec oops 2019-10-06 00:36:57 +01:00
Thalpy
3f21c0af5b Text 2019-10-06 00:32:42 +01:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Linzolle
caa61fa0b4 hide your ass 2019-10-05 12:24:10 -05:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Trilbyspaceclone
0b2c743f72 readds 2019-10-05 11:53:14 -04:00
Trilbyspaceclone
f43bd91072 Merge branch 'master' into A_Tailer's_art 2019-10-05 11:50:12 -04:00
Linzolle
4fc9385e44 oops 2019-10-05 10:40:31 -05:00
Linzolle
6ce8db8d7b pooj fixed this anyway 2019-10-05 10:38:17 -05:00
kevinz000
356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
2019-10-05 08:26:40 -07:00
kevinz000
22f9c9f711 Merge pull request #9401 from Poojawa/patch-2
APC UI autoupdates properly
2019-10-05 08:23:22 -07:00
kevinz000
b691da0bca Merge pull request #9407 from Poojawa/cryo-qol
Adds Cryo QoL with hotkeys
2019-10-05 08:22:01 -07:00
Ghommie
367789fda4 yes 2019-10-05 07:16:17 +02:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
kevinz000
b0a6624d73 Update Hallucination.dm 2019-10-04 22:12:35 -07:00
Ghommie
52fb4b03ac we are only keeping track of the number of singu beacons, var more efficient. 2019-10-05 05:29:57 +02:00
Ghommie
d706944e20 The niche singularity beacon now also moderately buffs meteor waves. 2019-10-05 04:37:01 +02:00
Ghommie
34bef911b2 macro arguments 2019-10-05 03:49:06 +02:00
Ghommie
b6cc81d097 flooring. 2019-10-05 03:13:51 +02:00
Ghommie
e4705ae5c0 Actually... let's do some scaling. 2019-10-05 02:57:50 +02:00
Ghommie
2b8fe43ef1 Removes the minimum player cap for the war ops. 2019-10-05 02:31:02 +02:00
Poojawa
4edfbd1dfa clarifying grammar 2019-10-04 17:23:41 -05:00
Poojawa
0c574fb62a Update medicine_reagents.dm 2019-10-04 16:53:32 -05:00
Poojawa
26c7a0ddb7 Promotes more chemical variety 2019-10-04 16:45:25 -05:00
Poojawa
9f88a72142 Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
2019-10-04 16:06:07 -05:00
Ghommie
1c2f2617d8 Ports "Makes supermatter melt walls if it finds itself in one" 2019-10-04 22:44:40 +02:00
kevinz000
266d7adfa6 Update adminhelp.dm 2019-10-03 22:11:46 -07:00
Poojawa
e52652f8c8 Differing carpet reactions 2019-10-03 23:19:52 -05:00
Poojawa
9c4a808e7e Adds Cryo QoL with hotkeys
Ctrl click to swap power, Alt click to close/open machine. This is how you do a "QoL" PR.
2019-10-03 23:14:46 -05:00
Fermi
7f74a98372 .9 2019-10-04 04:55:36 +01:00
Fermi
62737884f0 lye was 13 oops 2019-10-04 04:55:16 +01:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
Fermi
10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00