From 0283389df3cee428b6d14566ade4295e8d49ac4f Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 28 Nov 2017 13:54:31 -0500 Subject: [PATCH] Clean up shuttle references Edit some strings mentioning the shuttle instead of the tram. --- code/defines/procs/announce.dm | 2 +- code/game/jobs/job_controller.dm | 4 ++-- code/modules/busy_space/air_traffic.dm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index ff9e9df323..d6ab3edc0c 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -113,5 +113,5 @@ datum/announcement/proc/Log(message as text, message_title as text) rank = character.mind.role_alt_title AnnounceArrivalSimple(character.real_name, rank, join_message) -/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle") +/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly") //VOREStation Edit - Remove shuttle reference global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer") diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 94dabbcd2e..562069d1fe 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -641,10 +641,10 @@ var/global/datum/controller/occupations/job_master H.forceMove(spawnpos.get_spawn_position()) . = spawnpos.msg else - H << "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead." + H << "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the default arrivals location instead." //VOREStation Edit - Generic, not shuttle. var/spawning = pick(latejoin) H.forceMove(get_turf(spawning)) - . = "will arrive to the station shortly by shuttle" + . = "will arrive at the station shortly" //VOREStation Edit - Grammar but mostly 'shuttle' reference removal, and this also applies to notified spawn-character verb use else var/spawning = pick(latejoin) H.forceMove(get_turf(spawning)) diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index 7da2c6f73b..6d5a9114aa 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -43,9 +43,9 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller squelched = 0 /datum/lore/atc_controller/proc/shift_ending(var/evac = 0) - msg("Automated Shuttle departing [using_map.station_name] for [using_map.dock_name] on routine transfer route.","NT Automated Shuttle") + msg("Automated Tram departing [using_map.station_name] for [using_map.dock_name] on routine transfer route.","NT Automated Tram") //VOREStation Edit - Tram, tho. sleep(5 SECONDS) - msg("Automated Shuttle, cleared to complete routine transfer from [using_map.station_name] to [using_map.dock_name].") + msg("Automated Tram, cleared to complete routine transfer from [using_map.station_name] to [using_map.dock_name].") //VOREStation Edit - Tram, tho. /datum/lore/atc_controller/proc/random_convo() var/one = pick(loremaster.organizations) //These will pick an index, not an instance