cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-24 05:38:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	code/controllers/subsystem/idlenpcpool.dm
This commit is contained in:
LetterJay
2018-01-02 04:37:36 -06:00
parent e395cded9d c9482653f1
commit f786a90bad
29 changed files with 136 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/idlenpcpool.dm
+1
View File
@@ -41,3 +41,4 @@ SUBSYSTEM_DEF(idlenpcpool)
SA.consider_wakeup()
if (MC_TICK_CHECK)
return