From b7cb63f165328c742b900fdbc97e71288fe56ffe Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Sat, 18 Nov 2017 14:24:24 -0500
Subject: [PATCH] Some more grammar fixes for my dudes.
---
code/game/gamemodes/gameticker.dm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index f415542ece1..0885cdef60f 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -48,8 +48,8 @@ var/global/datum/controller/gameticker/ticker
do
pregame_timeleft = 180
- to_chat(world, "Welcome to the pre-game lobby!")
- to_chat(world, "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds.")
+ 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.")
while(current_state == GAME_STATE_PREGAME)
for(var/i=0, i<10, i++)
sleep(1)
@@ -79,7 +79,7 @@ var/global/datum/controller/gameticker/ticker
if(!runnable_modes.len)
current_state = GAME_STATE_PREGAME
Master.SetRunLevel(RUNLEVEL_LOBBY)
- to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.")
+ to_chat(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)
@@ -94,7 +94,7 @@ var/global/datum/controller/gameticker/ticker
if(!src.mode)
current_state = GAME_STATE_PREGAME
Master.SetRunLevel(RUNLEVEL_LOBBY)
- to_chat(world, "Serious error in mode setup! Reverting to pre-game lobby.")
+ to_chat(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()
@@ -103,7 +103,7 @@ var/global/datum/controller/gameticker/ticker
job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly.
if(!src.mode.can_start())
- world << "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby."
+ world << "Unable to start [mode.name]. Not enough players readied, [mode.required_players] players needed. Reverting to pregame lobby."
current_state = GAME_STATE_PREGAME
Master.SetRunLevel(RUNLEVEL_LOBBY)
mode.fail_setup()
@@ -125,7 +125,7 @@ var/global/datum/controller/gameticker/ticker
setup_economy()
current_state = GAME_STATE_PLAYING
- create_characters() //Create player characters and transfer them
+ create_characters() //Create player characters and transfer them.
collect_minds()
equip_characters()
data_core.manifest()
@@ -155,7 +155,7 @@ var/global/datum/controller/gameticker/ticker
if(C.holder)
admins_number++
if(admins_number == 0)
- send2adminirc("Round has started with no admins online.")
+ send2adminirc("A round has started with no admins online.")
/* supply_controller.process() //Start the supply shuttle regenerating points -- TLE // handled in scheduler
master_controller.process() //Start master_controller.process()
@@ -307,7 +307,7 @@ var/global/datum/controller/gameticker/ticker
if(captainless)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player))
- M << "Colony Directorship not forced on anyone."
+ to_chat(M, "Colony Directorship not forced on anyone.")
proc/process()
@@ -343,7 +343,7 @@ var/global/datum/controller/gameticker/ticker
feedback_set_details("end_proper","nuke")
time_left = 1 MINUTE //No point waiting five minutes if everyone's dead.
if(!delay_end)
- world << "Rebooting due to destruction of station in [round(time_left/600)] minutes."
+ to_chat(world, "Rebooting due to destruction of station in [round(time_left/600)] minutes.")
else
feedback_set_details("end_proper","proper completion")
time_left = round(restart_timeout)
@@ -356,15 +356,15 @@ var/global/datum/controller/gameticker/ticker
while(time_left > 0)
if(delay_end)
break
- world << "Restarting in [round(time_left/600)] minute\s."
+ to_chat(world, "Restarting in [round(time_left/600)] minute\s.")
time_left -= 1 MINUTES
sleep(600)
if(!delay_end)
world.Reboot()
else
- world << "An admin has delayed the round end."
+ to_chat(world, "An admin has delayed the round end.")
else
- world << "An admin has delayed the round end."
+ to_chat(world, "An admin has delayed the round end.")
else if (mode_finished)
post_game = 1
@@ -388,7 +388,7 @@ var/global/datum/controller/gameticker/ticker
var/turf/playerTurf = get_turf(Player)
if(emergency_shuttle.departed && emergency_shuttle.evac)
if(isNotAdminLevel(playerTurf.z))
- Player << "You managed to survive, but were marooned on [station_name()] as [Player.real_name]..."
+ Player << "You survived the round, but remained on [station_name()] as [Player.real_name]."
else
Player << "You managed to survive the events on [station_name()] as [Player.real_name]."
else if(isAdminLevel(playerTurf.z))
@@ -429,9 +429,9 @@ var/global/datum/controller/gameticker/ticker
if (!robo.connected_ai)
if (robo.stat != 2)
- world << "[robo.name] (Played by: [robo.key]) survived as an AI-less synthetic! Its laws were:"
+ world << "[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:"
else
- world << "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a synthetic without an AI. Its laws were:"
+ 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)