cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7434 from VOREStation/upstream-merge-6994

Browse Source 
[MIRROR] [PORT] Refactor the gameticker controller into SSticker
This commit is contained in:
Aronai Sieyes
2020-04-26 11:33:02 -04:00
committed by GitHub
parent 5530d5f0ce d02a55920e
commit 37e5bd237e
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
code/controllers/subsystems/ticker.dm
View File

@@ -72,8 +72,8 @@ var/global/datum/controller/subsystem/ticker/ticker
post_game_tick() post_game_tick()
/datum/controller/subsystem/ticker/proc/pregame_welcome() /datum/controller/subsystem/ticker/proc/pregame_welcome()
to_chat(world, "<B><FONT color='blue'>Welcome to the pregame lobby!</FONT></B>") to_world("<span class='boldannounce notice'><em>Welcome to the pregame lobby!</em></span>")
to_chat(world, "Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") to_world("<span class='boldannounce notice'>Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.</span>")
// Called during GAME_STATE_PREGAME (RUNLEVEL_LOBBY) // Called during GAME_STATE_PREGAME (RUNLEVEL_LOBBY)
/datum/controller/subsystem/ticker/proc/pregame_tick() /datum/controller/subsystem/ticker/proc/pregame_tick()
@@ -120,7 +120,7 @@ var/global/datum/controller/subsystem/ticker/ticker
var/list/runnable_modes = config.get_runnable_modes() var/list/runnable_modes = config.get_runnable_modes()
if((master_mode == "random") || (master_mode == "secret")) if((master_mode == "random") || (master_mode == "secret"))
if(!runnable_modes.len) if(!runnable_modes.len)
to_chat(world, "<B>Unable to choose playable game mode.</B> Reverting to pregame lobby.") to_world("<span class='danger'><B>Unable to choose playable game mode.</B> Reverting to pregame lobby.</span>")
return 0 return 0
if(secret_force_mode != "secret") if(secret_force_mode != "secret")
src.mode = config.pick_mode(secret_force_mode) src.mode = config.pick_mode(secret_force_mode)
@@ -133,7 +133,7 @@ var/global/datum/controller/subsystem/ticker/ticker
src.mode = config.pick_mode(master_mode) src.mode = config.pick_mode(master_mode)
if(!src.mode) if(!src.mode)
to_chat(world, "<span class='danger'>Serious error in mode setup!</span> Reverting to pregame lobby.") //Uses setup instead of set up due to computational context. to_world("<span class='danger'>Serious error in mode setup! Reverting to pregame lobby.</span>") //Uses setup instead of set up due to computational context.
return 0 return 0
job_master.ResetOccupations() job_master.ResetOccupations()
@@ -142,21 +142,21 @@ var/global/datum/controller/subsystem/ticker/ticker
job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly. job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly.
if(!src.mode.can_start()) if(!src.mode.can_start())
to_world("<B>Unable to start [mode.name].</B> Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby.") to_world("<span class='danger'><B>Unable to start [mode.name].</B> Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby.</span>")
mode.fail_setup() mode.fail_setup()
mode = null mode = null
job_master.ResetOccupations() job_master.ResetOccupations()
return 0 return 0
if(hide_mode) if(hide_mode)
to_world("<B>The current game mode is - Secret!</B>") to_world("<span class='notice'><B>The current game mode is - Secret!</B></span>")
if(runnable_modes.len) if(runnable_modes.len)
var/list/tmpmodes = new var/list/tmpmodes = new
for (var/datum/game_mode/M in runnable_modes) for (var/datum/game_mode/M in runnable_modes)
tmpmodes+=M.name tmpmodes+=M.name
tmpmodes = sortList(tmpmodes) tmpmodes = sortList(tmpmodes)
if(tmpmodes.len) if(tmpmodes.len)
to_chat(world, "<B>Possibilities:</B> [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]") to_world("<span class='info'><B>Possibilities:</B> [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]</span>")
else else
src.mode.announce() src.mode.announce()
return 1 return 1
@@ -178,7 +178,7 @@ var/global/datum/controller/subsystem/ticker/ticker
//Deleting Startpoints but we need the ai point to AI-ize people later //Deleting Startpoints but we need the ai point to AI-ize people later
if (S.name != "AI") if (S.name != "AI")
qdel(S) qdel(S)
to_chat(world, "<FONT color='blue'><B>Enjoy the game!</B></FONT>") to_world("<span class='boldannounce notice'><em>Enjoy the game!</em></span>")
world << sound('sound/AI/welcome.ogg') // Skie world << sound('sound/AI/welcome.ogg') // Skie
//Holiday Round-start stuff ~Carn //Holiday Round-start stuff ~Carn
Holiday_Game_Start() Holiday_Game_Start()
@@ -227,7 +227,7 @@ var/global/datum/controller/subsystem/ticker/ticker
end_game_state = END_GAME_MODE_FINISHED // Only do this cleanup once! end_game_state = END_GAME_MODE_FINISHED // Only do this cleanup once!
mode.cleanup() mode.cleanup()
//call a transfer shuttle vote //call a transfer shuttle vote
to_chat(world, "<span class='danger'>The round has ended!</span>") to_world("<span class='danger'>The round has ended!</span>")
SSvote.autotransfer() SSvote.autotransfer()
// Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME) // Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME)
@@ -240,7 +240,7 @@ var/global/datum/controller/subsystem/ticker/ticker
feedback_set_details("end_proper", "nuke") feedback_set_details("end_proper", "nuke")
restart_timeleft = 1 MINUTE // No point waiting five minutes if everyone's dead. restart_timeleft = 1 MINUTE // No point waiting five minutes if everyone's dead.
if(!delay_end) if(!delay_end)
to_chat(world, "<span class='notice'><b>Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.</b></span>") to_world("<span class='notice'><b>Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.</b></span>")
last_restart_notify = world.time last_restart_notify = world.time
else else
feedback_set_details("end_proper", "proper completion") feedback_set_details("end_proper", "proper completion")
@@ -254,12 +254,12 @@ var/global/datum/controller/subsystem/ticker/ticker
if(END_GAME_ENDING) if(END_GAME_ENDING)
restart_timeleft -= (world.time - last_fire) restart_timeleft -= (world.time - last_fire)
if(delay_end) if(delay_end)
to_chat(world, "<span class='notice'><b>An admin has delayed the round end.</b></span>") to_world("<span class='notice'><b>An admin has delayed the round end.</b></span>")
end_game_state = END_GAME_DELAYED end_game_state = END_GAME_DELAYED
else if(restart_timeleft <= 0) else if(restart_timeleft <= 0)
world.Reboot() world.Reboot()
else if (world.time - last_restart_notify >= 1 MINUTE) else if (world.time - last_restart_notify >= 1 MINUTE)
to_chat(world, "<span class='notice'><b>Restarting in [round(restart_timeleft/600, 1)] minute\s.</b></span>") to_world("<span class='notice'><b>Restarting in [round(restart_timeleft/600, 1)] minute\s.</b></span>")
last_restart_notify = world.time last_restart_notify = world.time
return return
if(END_GAME_DELAYED) if(END_GAME_DELAYED)
@@ -430,47 +430,47 @@ var/global/datum/controller/subsystem/ticker/ticker
if(captainless) if(captainless)
for(var/mob/M in player_list) for(var/mob/M in player_list)
if(!istype(M,/mob/new_player)) if(!istype(M,/mob/new_player))
to_chat(M, "Colony Directorship not forced on anyone.") to_chat(M, "<span class='notice'>Colony Directorship not forced on anyone.</span>")
/datum/controller/subsystem/ticker/proc/declare_completion() /datum/controller/subsystem/ticker/proc/declare_completion()
to_world("<br><br><br><H1>A round of [mode.name] has ended!</H1>") to_world("<span class='filter_system'><br><br><br><H1>A round of [mode.name] has ended!</H1></span>")
for(var/mob/Player in player_list) for(var/mob/Player in player_list)
if(Player.mind && !isnewplayer(Player)) if(Player.mind && !isnewplayer(Player))
if(Player.stat != DEAD) if(Player.stat != DEAD)
var/turf/playerTurf = get_turf(Player) var/turf/playerTurf = get_turf(Player)
if(emergency_shuttle.departed && emergency_shuttle.evac) if(emergency_shuttle.departed && emergency_shuttle.evac)
if(isNotAdminLevel(playerTurf.z)) if(isNotAdminLevel(playerTurf.z))
to_chat(Player, "<font color='blue'><b>You survived the round, but remained on [station_name()] as [Player.real_name].</b></font>") to_chat(Player, "<span class='filter_system'><font color='blue'><b>You survived the round, but remained on [station_name()] as [Player.real_name].</b></font></span>")
else else
to_chat(Player, "<font color='green'><b>You managed to survive the events on [station_name()] as [Player.real_name].</b></font>") to_chat(Player, "<span class='filter_system'><font color='green'><b>You managed to survive the events on [station_name()] as [Player.real_name].</b></font></span>")
else if(isAdminLevel(playerTurf.z)) else if(isAdminLevel(playerTurf.z))
to_chat(Player, "<font color='green'><b>You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].</b></font>") to_chat(Player, "<span class='filter_system'><font color='green'><b>You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].</b></font></span>")
else if(issilicon(Player)) else if(issilicon(Player))
to_chat(Player, "<font color='green'><b>You remain operational after the events on [station_name()] as [Player.real_name].</b></font>") to_chat(Player, "<span class='filter_system'><font color='green'><b>You remain operational after the events on [station_name()] as [Player.real_name].</b></font></span>")
else else
to_chat(Player, "<font color='blue'><b>You missed the crew transfer after the events on [station_name()] as [Player.real_name].</b></font>") to_chat(Player, "<span class='filter_system'><font color='blue'><b>You missed the crew transfer after the events on [station_name()] as [Player.real_name].</b></font></span>")
else else
if(istype(Player,/mob/observer/dead)) if(istype(Player,/mob/observer/dead))
var/mob/observer/dead/O = Player var/mob/observer/dead/O = Player
if(!O.started_as_observer) if(!O.started_as_observer)
to_chat(Player, "<font color='red'><b>You did not survive the events on [station_name()]...</b></font>") to_chat(Player, "<span class='filter_system'><font color='red'><b>You did not survive the events on [station_name()]...</b></font></span>")
else else
to_chat(Player, "<font color='red'><b>You did not survive the events on [station_name()]...</b></font>") to_chat(Player, "<span class='filter_system'><font color='red'><b>You did not survive the events on [station_name()]...</b></font></span>")
to_world("<br>") to_world("<br>")
for (var/mob/living/silicon/ai/aiPlayer in mob_list) for (var/mob/living/silicon/ai/aiPlayer in mob_list)
if (aiPlayer.stat != 2) if (aiPlayer.stat != 2)
to_world("<b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:</b>") to_world("<span class='filter_system'><b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:</b></span>")
else else
to_world("<b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:</b>") to_world("<span class='filter_system'><b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:</b></span>")
aiPlayer.show_laws(1) aiPlayer.show_laws(1)
if (aiPlayer.connected_robots.len) if (aiPlayer.connected_robots.len)
var/robolist = "<b>The AI's loyal minions were:</b> " var/robolist = "<b>The AI's loyal minions were:</b> "
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]"
to_world("[robolist]") to_world("<span class='filter_system'>[robolist]</span>")
var/dronecount = 0 var/dronecount = 0
@@ -482,15 +482,15 @@ var/global/datum/controller/subsystem/ticker/ticker
if (!robo.connected_ai) if (!robo.connected_ai)
if (robo.stat != 2) if (robo.stat != 2)
to_world("<b>[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:</b>") to_world("<span class='filter_system'><b>[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:</b></span>")
else else
to_world("<b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b>") to_world("<span class='filter_system'><b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b></span>")
if(robo) //How the hell do we lose robo between here and the world messages directly above this? if(robo) //How the hell do we lose robo between here and the world messages directly above this?
robo.laws.show_laws(world) robo.laws.show_laws(world)
if(dronecount) if(dronecount)
to_world("<b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.</b>") to_world("<span class='filter_system'><b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.</b></span>")
mode.declare_completion()//To declare normal completion. mode.declare_completion()//To declare normal completion.

6
code/modules/admin/admin.dm
View File

@@ -877,7 +877,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if(!check_rights(R_SERVER|R_EVENT)) if(!check_rights(R_SERVER|R_EVENT))
return return
if(SSticker.current_state > GAME_STATE_PREGAME) if(SSticker.current_state > GAME_STATE_PREGAME)
to_chat(usr, "<font color='red'>Error: Start Now: Game has already started.</font>") to_chat(usr, "<span class='warning'>Error: Start Now: Game has already started.</span>")
return return
if(!SSticker.start_immediately) if(!SSticker.start_immediately)
SSticker.start_immediately = TRUE SSticker.start_immediately = TRUE
@@ -885,11 +885,11 @@ var/datum/announcement/minor/admin_min_announcer = new
if(SSticker.current_state == GAME_STATE_INIT) if(SSticker.current_state == GAME_STATE_INIT)
msg = " (The server is still setting up, but the round will be started as soon as possible.)" msg = " (The server is still setting up, but the round will be started as soon as possible.)"
log_admin("[key_name(usr)] has started the game.[msg]") log_admin("[key_name(usr)] has started the game.[msg]")
message_admins("<font color='blue'>[key_name_admin(usr)] has started the game.[msg]</font>") message_admins("<span class='notice'>[key_name_admin(usr)] has started the game.[msg]</span>")
feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
else else
SSticker.start_immediately = FALSE SSticker.start_immediately = FALSE
to_chat(world, "<b>Immediate game start canceled. Normal startup resumed.</b>") to_world("<span class='notice'>Immediate game start canceled. Normal startup resumed.</span>")
log_and_message_admins("cancelled immediate game start.") log_and_message_admins("cancelled immediate game start.")
/datum/admins/proc/toggleenter() /datum/admins/proc/toggleenter()