Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
This commit is contained in:
Poojawa
2018-03-14 16:49:40 -05:00
committed by GitHub
parent be23070f67
commit 6c7da493d9
122 changed files with 12848 additions and 12563 deletions
+1 -1
View File
@@ -405,7 +405,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if (SS_flags & SS_NO_FIRE)
subsystemstocheck -= SS
continue
if (!(SS_flags & SS_TICKER) && (SS_flags & SS_KEEP_TIMING) && SS.last_fire + (SS.wait * 0.75) > world.time)
if ((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time)
continue
SS.enqueue()
. = 1
+1
View File
@@ -649,6 +649,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/Shutdown()
gather_newscaster() //called here so we ensure the log is created even upon admin reboot
save_admin_data()
if(!round_end_sound)
round_end_sound = pick(\
'sound/roundend/newroundsexy.ogg',