Merge pull request #698 from Citadel-Station-13/upstream-merge-25743

[MIRROR] Holocalls
2017-05-05 10:19:28 -05:00
parent f7572e62cf 20f3280c96
commit caaf0fc2ee
7 changed files with 620 additions and 75 deletions
@@ -0,0 +1,9 @@
+diff a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm	(rejected hunks)
+@@ -725,7 +725,6 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage
+ 	SearchVar(multiverse)
+ 	SearchVar(announcement_systems)
+ 	SearchVar(doppler_arrays)
+-	SearchVar(HOLOPAD_MODE)
+ 	SearchVar(holopads)
+ 	SearchVar(news_network)
+ 	SearchVar(allCasters)