diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 984b4448c1f..397f32078cf 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -72,8 +72,8 @@ var/global/datum/controller/subsystem/ticker/ticker post_game_tick() /datum/controller/subsystem/ticker/proc/pregame_welcome() - to_chat(world, "Welcome to the pregame lobby!") - to_chat(world, "Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") + to_world("Welcome to the pregame lobby!") + to_world("Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") // Called during GAME_STATE_PREGAME (RUNLEVEL_LOBBY) /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() if((master_mode == "random") || (master_mode == "secret")) if(!runnable_modes.len) - to_chat(world, "Unable to choose playable game mode. Reverting to pregame lobby.") + to_world("Unable to choose playable game mode. Reverting to pregame lobby.") return 0 if(secret_force_mode != "secret") 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) if(!src.mode) - to_chat(world, "Serious error in mode setup! Reverting to pregame lobby.") //Uses setup instead of set up due to computational context. + to_world("Serious error in mode setup! Reverting to pregame lobby.") //Uses setup instead of set up due to computational context. return 0 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. if(!src.mode.can_start()) - to_world("Unable to start [mode.name]. Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby.") + to_world("Unable to start [mode.name]. Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby.") mode.fail_setup() mode = null job_master.ResetOccupations() return 0 if(hide_mode) - to_world("The current game mode is - Secret!") + to_world("The current game mode is - Secret!") if(runnable_modes.len) var/list/tmpmodes = new for (var/datum/game_mode/M in runnable_modes) tmpmodes+=M.name tmpmodes = sortList(tmpmodes) if(tmpmodes.len) - to_chat(world, "Possibilities: [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]") + to_world("Possibilities: [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]") else src.mode.announce() 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 if (S.name != "AI") qdel(S) - to_chat(world, "Enjoy the game!") + to_world("Enjoy the game!") world << sound('sound/AI/welcome.ogg') // Skie //Holiday Round-start stuff ~Carn 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! mode.cleanup() //call a transfer shuttle vote - to_chat(world, "The round has ended!") + to_world("The round has ended!") SSvote.autotransfer() // Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME) @@ -240,7 +240,7 @@ var/global/datum/controller/subsystem/ticker/ticker feedback_set_details("end_proper", "nuke") restart_timeleft = 1 MINUTE // No point waiting five minutes if everyone's dead. if(!delay_end) - to_chat(world, "Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.") + to_world("Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.") last_restart_notify = world.time else feedback_set_details("end_proper", "proper completion") @@ -254,12 +254,12 @@ var/global/datum/controller/subsystem/ticker/ticker if(END_GAME_ENDING) restart_timeleft -= (world.time - last_fire) if(delay_end) - to_chat(world, "An admin has delayed the round end.") + to_world("An admin has delayed the round end.") end_game_state = END_GAME_DELAYED else if(restart_timeleft <= 0) world.Reboot() else if (world.time - last_restart_notify >= 1 MINUTE) - to_chat(world, "Restarting in [round(restart_timeleft/600, 1)] minute\s.") + to_world("Restarting in [round(restart_timeleft/600, 1)] minute\s.") last_restart_notify = world.time return if(END_GAME_DELAYED) @@ -430,47 +430,47 @@ var/global/datum/controller/subsystem/ticker/ticker if(captainless) for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) - to_chat(M, "Colony Directorship not forced on anyone.") + to_chat(M, "Colony Directorship not forced on anyone.") /datum/controller/subsystem/ticker/proc/declare_completion() - to_world("


A round of [mode.name] has ended!

") + to_world("


A round of [mode.name] has ended!

") for(var/mob/Player in player_list) if(Player.mind && !isnewplayer(Player)) if(Player.stat != DEAD) var/turf/playerTurf = get_turf(Player) if(emergency_shuttle.departed && emergency_shuttle.evac) if(isNotAdminLevel(playerTurf.z)) - to_chat(Player, "You survived the round, but remained on [station_name()] as [Player.real_name].") + to_chat(Player, "You survived the round, but remained on [station_name()] as [Player.real_name].") else - to_chat(Player, "You managed to survive the events on [station_name()] as [Player.real_name].") + to_chat(Player, "You managed to survive the events on [station_name()] as [Player.real_name].") else if(isAdminLevel(playerTurf.z)) - to_chat(Player, "You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].") + to_chat(Player, "You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].") else if(issilicon(Player)) - to_chat(Player, "You remain operational after the events on [station_name()] as [Player.real_name].") + to_chat(Player, "You remain operational after the events on [station_name()] as [Player.real_name].") else - to_chat(Player, "You missed the crew transfer after the events on [station_name()] as [Player.real_name].") + to_chat(Player, "You missed the crew transfer after the events on [station_name()] as [Player.real_name].") else if(istype(Player,/mob/observer/dead)) var/mob/observer/dead/O = Player if(!O.started_as_observer) - to_chat(Player, "You did not survive the events on [station_name()]...") + to_chat(Player, "You did not survive the events on [station_name()]...") else - to_chat(Player, "You did not survive the events on [station_name()]...") + to_chat(Player, "You did not survive the events on [station_name()]...") to_world("
") for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:") + to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:") else - to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") + to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " 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]), "]" - to_world("[robolist]") + to_world("[robolist]") var/dronecount = 0 @@ -482,15 +482,15 @@ var/global/datum/controller/subsystem/ticker/ticker if (!robo.connected_ai) if (robo.stat != 2) - to_world("[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:") + to_world("[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:") else - to_world("[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") + to_world("[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) if(dronecount) - to_world("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.") + to_world("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.") mode.declare_completion()//To declare normal completion. diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a122f576a51..ccf0b4ef94c 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -877,7 +877,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(!check_rights(R_SERVER|R_EVENT)) return if(SSticker.current_state > GAME_STATE_PREGAME) - to_chat(usr, "Error: Start Now: Game has already started.") + to_chat(usr, "Error: Start Now: Game has already started.") return if(!SSticker.start_immediately) SSticker.start_immediately = TRUE @@ -885,11 +885,11 @@ var/datum/announcement/minor/admin_min_announcer = new if(SSticker.current_state == GAME_STATE_INIT) 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]") - message_admins("[key_name_admin(usr)] has started the game.[msg]") + message_admins("[key_name_admin(usr)] has started the game.[msg]") feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else SSticker.start_immediately = FALSE - to_chat(world, "Immediate game start canceled. Normal startup resumed.") + to_world("Immediate game start canceled. Normal startup resumed.") log_and_message_admins("cancelled immediate game start.") /datum/admins/proc/toggleenter()