Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574

# Conflicts: # code/controllers/subsystem/idlenpcpool.dm
2018-01-02 04:37:36 -06:00
parent e395cded9d c9482653f1
commit f786a90bad
29 changed files with 136 additions and 105 deletions
@@ -41,3 +41,4 @@ SUBSYSTEM_DEF(idlenpcpool)
 				SA.consider_wakeup()
 		if (MC_TICK_CHECK)
 			return
+