diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 333ede2934d..492aabc58cd 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -8,11 +8,14 @@ SUBSYSTEM_DEF(ticker) flags = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME - var/current_state = GAME_STATE_STARTUP //state of current round (used by process()) Use the defines GAME_STATE_* ! - var/force_ending = 0 //Round was ended by admin intervention - // If true, there is no lobby phase, the game starts immediately. + /// state of current round (used by process()) Use the defines GAME_STATE_* ! + var/current_state = GAME_STATE_STARTUP + /// Boolean to track if round was ended by admin intervention or a "round-ending" event, like summoning Nar'Sie, a blob victory, the nuke going off, etc. + var/force_ending = FALSE + /// If TRUE, there is no lobby phase, the game starts immediately. var/start_immediately = FALSE - var/setup_done = FALSE //All game setup done including mode post setup and + /// Boolean to track and check if our subsystem setup is done. + var/setup_done = FALSE var/datum/game_mode/mode = null diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 94ba7af49fb..1c0a2007684 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -162,7 +162,7 @@ if(tgui_alert(usr, "This will end the round, are you SURE you want to do this?", "Confirmation", list("Yes", "No")) == "Yes") if(tgui_alert(usr, "Final Confirmation: End the round NOW?", "Confirmation", list("Yes", "No")) == "Yes") message_admins(span_adminnotice("[key_name_admin(usr)] has ended the round.")) - SSticker.force_ending = 1 //Yeah there we go APC destroyed mission accomplished + SSticker.force_ending = TRUE //Yeah there we go APC destroyed mission accomplished return else message_admins(span_adminnotice("[key_name_admin(usr)] decided against ending the round.")) diff --git a/code/modules/admin/verbs/server.dm b/code/modules/admin/verbs/server.dm index 310f1c83f73..541c54f81a0 100644 --- a/code/modules/admin/verbs/server.dm +++ b/code/modules/admin/verbs/server.dm @@ -77,7 +77,7 @@ if(confirm == "Cancel") return if(confirm == "Yes") - SSticker.force_ending = 1 + SSticker.force_ending = TRUE SSblackbox.record_feedback("tally", "admin_verb", 1, "End Round") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleooc() diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index d9a26be372d..898089aa9e1 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) main_objective.completed = TRUE to_chat(world, "[real_name] consumed the station in an unstoppable tide!") SSticker.news_report = BLOB_WIN - SSticker.force_ending = 1 + SSticker.force_ending = TRUE /mob/camera/blob/Destroy() QDEL_NULL(blobstrain) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index b10ffd39bfa..734ac3c08bd 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -261,7 +261,7 @@ ///Helper to set the round to end asap. Current usage Cult round end code /proc/ending_helper() - SSticker.force_ending = 1 + SSticker.force_ending = TRUE /** * Selects cinematic to play as part of the cult end depending on the outcome then ends the round afterward