SSticker minor refactor (#15089)

* SSticker minor refactor

* Even the experienced make mistakes

* tiny lil bandaid

* Oops

* Update code/controllers/subsystem/ticker.dm

* Adds this
This commit is contained in:
AffectedArc07
2020-12-16 14:05:10 -05:00
committed by GitHub
parent 3b0d96a26a
commit a4bb84fc6d
10 changed files with 335 additions and 563 deletions
-44
View File
@@ -1,44 +0,0 @@
/area/dynamic // Do not use.
name = "dynamic area"
icon_state = "purple"
var/match_tag = "none"
var/match_width = -1
var/match_height = -1
var/enable_lights = 0
/area/dynamic/destination // Do not use.
name = "dynamic area destination"
/area/dynamic/destination/lobby
name = "Arrivals Lobby"
match_tag = "arrivals"
match_width = 5
match_height = 4
enable_lights = 1
/area/dynamic/source // Do not use.
name = "dynamic area source"
/area/dynamic/source/lobby_bar
name = "\improper Bar Lounge"
match_tag = "arrivals"
match_width = 5
match_height = 4
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/dynamic/source/lobby_russian
name = "\improper Russian Lounge"
match_tag = "arrivals"
match_width = 5
match_height = 4
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/dynamic/source/lobby_disco
name = "\improper Disco Lounge"
match_tag = "arrivals"
match_width = 5
match_height = 4
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+4 -2
View File
@@ -92,8 +92,8 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
return wth.invoke(input)
/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
TgsReboot()
if(reason == 1) //special reboot, do none of the normal stuff
//special reboot, do none of the normal stuff
if(reason == 1) // Do NOT change this to if(reason). You WILL break the entirety of world rebooting
if(usr)
if(!check_rights(R_SERVER))
message_admins("[key_name_admin(usr)] attempted to restart the server via the Profiler, without access.")
@@ -104,6 +104,7 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
spawn(0)
to_chat(world, "<span class='boldannounce'>Rebooting world immediately due to host request</span>")
rustg_log_close_all() // Past this point, no logging procs can be used, at risk of data loss.
TgsReboot()
if(config && config.shutdown_on_reboot)
sleep(0)
if(GLOB.shutdown_shell_command)
@@ -142,6 +143,7 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
Master.Shutdown() //run SS shutdowns
GLOB.dbcon.Disconnect() // DCs cleanly from the database
rustg_log_close_all() // Past this point, no logging procs can be used, at risk of data loss.
TgsReboot()
#ifdef UNIT_TESTS
FinishTestRun()