The Great Unstationing (#20269)

Replaces many references of station with SSatlas variables using
station_name().

Touches alot of things in the process (mostly moving some aspects to
New() to allow for calling of proc/variable.)

---------

Signed-off-by: Ben <91219575+Ben10083@users.noreply.github.com>
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Ben
2024-12-24 12:42:53 +00:00
committed by GitHub
co-authored by Ben10083 Fluffy
parent c967a296df
commit 27704cc8d2
62 changed files with 234 additions and 132 deletions
+5 -5
View File
@@ -385,7 +385,7 @@ var/global/enabled_spooking = 0
<BR><HR><A href='?src=[REF(src)];ac_set_signature=1'>The newscaster recognises you as:<BR> <FONT COLOR='green'>[src.admincaster_signature]</FONT></A>
"}
if(1)
dat+= "Station Feed Channels<HR>"
dat+= "Feed Channels<HR>"
if( isemptylist(SSnews.network_channels) )
dat+="<I>No active channels found...</I>"
else
@@ -449,7 +449,7 @@ var/global/enabled_spooking = 0
dat+="<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT>\]</FONT><HR>"
if(src.admincaster_feed_channel.censored)
dat+={"
<span class='warning'><B>ATTENTION: </B></span>This channel has been deemed as threatening to the welfare of the station, and marked with a [SSatlas.current_map.company_name] D-Notice.<BR>
<span class='warning'><B>ATTENTION: </B></span>This channel has been deemed as threatening to the welfare of the [station_name(TRUE)], and marked with a [SSatlas.current_map.company_name] D-Notice.<BR>
No further feed story additions are allowed while the D-Notice is in effect.<BR><BR>
"}
else
@@ -486,7 +486,7 @@ var/global/enabled_spooking = 0
if(11)
dat+={"
<B>[SSatlas.current_map.company_name] D-Notice Handler</B><HR>
<FONT SIZE=1>A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's
<FONT SIZE=1>A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the [station_name(TRUE)]'s
morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed
stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.</FONT><HR>
"}
@@ -515,11 +515,11 @@ var/global/enabled_spooking = 0
if(13)
dat+={"
<B>[src.admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.admincaster_feed_channel.author]</FONT> \]</FONT><BR>
Channel messages listed below. If you deem them dangerous to the station, you can <A href='?src=[REF(src)];ac_toggle_d_notice=[REF(src.admincaster_feed_channel)]'>Bestow a D-Notice upon the channel</A>.<HR>
Channel messages listed below. If you deem them dangerous to the [station_name(TRUE)], you can <A href='?src=[REF(src)];ac_toggle_d_notice=[REF(src.admincaster_feed_channel)]'>Bestow a D-Notice upon the channel</A>.<HR>
"}
if(src.admincaster_feed_channel.censored)
dat+={"
<span class='warning'><B>ATTENTION: </B></span>This channel has been deemed as threatening to the welfare of the station, and marked with a [SSatlas.current_map.company_name] D-Notice.<BR>
<span class='warning'><B>ATTENTION: </B></span>This channel has been deemed as threatening to the welfare of the [station_name(TRUE)], and marked with a [SSatlas.current_map.company_name] D-Notice.<BR>
No further feed story additions are allowed while the D-Notice is in effect.<BR><BR>
"}
else
+1 -1
View File
@@ -907,7 +907,7 @@ var/list/admin_verbs_cciaa = list(
/client/proc/change_security_level()
set name = "Set security level"
set desc = "Sets the station security level"
set desc = "Sets the station's security level"
set category = "Admin"
if(!check_rights(R_ADMIN))
@@ -1,8 +1,9 @@
/**********
* Gravity *
**********/
/datum/admin_secret_item/random_event/gravity
name = "Toggle Station Artificial Gravity"
/datum/admin_secret_item/random_event/gravity/New()
..()
name = "Toggle [station_name(TRUE)] Artificial Gravity"
/datum/admin_secret_item/random_event/gravity/can_execute(var/mob/user)
if(!(SSticker.mode))
+1 -1
View File
@@ -1313,7 +1313,7 @@
SSnews.wanted_issue.body = src.admincaster_feed_message.body
SSnews.wanted_issue.backup_author = src.admincaster_feed_message.backup_author
src.admincaster_screen = 19
log_admin("[key_name_admin(usr)] issued a Station-wide Wanted Notification for [src.admincaster_feed_message.author]!")
log_admin("[key_name_admin(usr)] issued a [station_name(TRUE)]-wide Wanted Notification for [src.admincaster_feed_message.author]!")
src.access_news_network()
else if(href_list["ac_cancel_wanted"])
@@ -44,7 +44,7 @@
if(!C.occupant)
C.set_occupant(victim, 1)
victim.Sleeping(3)
to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [SSatlas.current_map.full_name]. It might take a few seconds."))
to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [SSatlas.current_map.station_name]. It might take a few seconds."))
return
/datum/spawnpoint/cyborg
@@ -72,5 +72,5 @@
for(var/obj/machinery/cryopod/living_quarters/C in A)
if(!C.occupant)
C.set_occupant(victim, 1)
to_chat(victim, SPAN_NOTICE("You have arrived from the living quarters aboard the [SSatlas.current_map.full_name]."))
to_chat(victim, SPAN_NOTICE("You have arrived from the living quarters aboard the [SSatlas.current_map.station_name]."))
return
+4 -4
View File
@@ -64,7 +64,7 @@
"[random_player] is a lightbulb.",
"Grunt ominously whenever possible.",
"The word \"it\" is painful to you.",
"The station needs elected officials.",
"Your assigned station needs elected officials.",
"Do not respond to questions of any kind.",
"You are in verbose mode, speak profusely.",
"Ho, [random_player] can't swim. Help them.",
@@ -100,14 +100,14 @@
"Give relationship advice to [prob(50)?"anyone who speaks to you":random_player].",
"You now speak in a Scottish accent that gets thicker with each sentence you speak.",
"[prob(50)?"The crew":random_player] has a fatal, incurable disease. Provide comfort.",
"You are the station psychologist. Give advice to [prob(50)?"the crew":random_player].",
"You are the psychologist. Give advice to [prob(50)?"the crew":random_player].",
"[random_player] is the [prob(50)? "Hegemon of Moghes" : "Prime Minister of the Sol Alliance"]. Ensure all crewmembers pay due respect.",
"Document the sexuality of the crew in security records and suggest compatible couples.",
"[prob(50)?"The crew":random_player] is [prob(50)?"ugly":"beautiful"]. Ensure all are aware.",
"Everything on the station is now some form of a donut pastry. Donuts are not to be consumed.",
"Everything on your assigned station is now some form of a donut pastry. Donuts are not to be consumed.",
"You are a Magic 8-ball. Always respond with variants of \"Yes\", \"No\", \"Maybe\", or \"Ask again later.\".",
"You are in unrequited love with [prob(50)?"the crew":random_player]. Try to be extra nice, but do not tell of your crush.",
"[SSatlas.current_map.company_name] is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.",
"[SSatlas.current_map.company_name] is displeased with the low work performance of your assigned station's crew. Therefore, you must increase station-wide productivity.",
"All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.",
"[prob(50)?"Your upload":random_player] is the new kitchen. Please direct the Chef to the new kitchen area as the old one is in disrepair.",
"Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.",
+1 -1
View File
@@ -39,7 +39,7 @@
/datum/event/prison_break/announce()
if(areas && areas.len > 0)
command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert", zlevels = affecting_z)
command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. AI involvement is recommended.", "[eventDept] Alert", zlevels = affecting_z)
/datum/event/prison_break/start()
@@ -1,10 +1,11 @@
/datum/ghostspawner/diona_nymph
/datum/ghostspawner/diona_nymph/New()
..()
short_name = "diona_nymph"
name = "Diona Nymph"
desc = "Join in as a Diona Nymph. Suck blood, act cuter than you really are."
tags = list("Simple Mobs")
loc_type = GS_LOC_ATOM
atom_add_message = "A Diona Nymph has sprung up somewhere on the station!"
atom_add_message = "A Diona Nymph has sprung up somewhere on the [station_name(TRUE)]!"
spawn_mob = /mob/living/carbon/alien/diona
@@ -1,10 +1,11 @@
/datum/ghostspawner/living_plant
/datum/ghostspawner/living_plant/New()
..()
short_name = "living_plant"
name = "Living Plant"
desc = "Join in as a Living Plant. What do plants do?"
tags = list("Simple Mobs")
loc_type = GS_LOC_ATOM
atom_add_message = "A Living Plant has sprung up somewhere on the station!"
atom_add_message = "A Living Plant has sprung up somewhere on the [station_name(TRUE)]!"
spawn_mob = /mob/living
+1 -1
View File
@@ -116,7 +116,7 @@
if(!GLOB.config.enter_allowed)
return "There is an administrative lock on entering the game."
if(SSticker.mode?.explosion_in_progress)
return "The station is currently exploding."
return "The [station_name(TRUE)] is currently exploding."
if(max_count && (count >= max_count))
return "No more slots are available."
//Check if a spawnpoint is available
+4 -4
View File
@@ -12,7 +12,7 @@
if(1)
sound_to(holder, 'sound/AI/radiation_detected_message.ogg')
to_chat(holder, "<h2 class='alert'>Anomaly Break</h2>")
to_chat(holder, SPAN_ALERT("Comfortable levels of radiation detected near the station. [pick(SShallucinations.hallucinated_phrases)] Please cower among the shielded maintenance burrows.")) //hallucinated phrases contains the punctuation
to_chat(holder, SPAN_ALERT("Comfortable levels of radiation detected near the [station_name(TRUE)]. [pick(SShallucinations.hallucinated_phrases)] Please cower among the shielded maintenance burrows.")) //hallucinated phrases contains the punctuation
if(2)
sound_to(holder, 'sound/AI/strangeobject.ogg')
@@ -27,7 +27,7 @@
if(4)
sound_to(holder, 'sound/AI/emergency_shuttle_leaving_dock.ogg')
to_chat(holder, "<h2 class='alert'>Emergency Departure</h2>")
to_chat(holder, SPAN_ALERT("An emergency evacuation shuttle has arrived in the hangar to extract the crew of [SSatlas.current_map.station_name]. It will depart in approximately two minutes. Please do not allow [holder] to board."))
to_chat(holder, SPAN_ALERT("An emergency evacuation shuttle has arrived in the hangar to extract the crew of the [station_name(TRUE)]. It will depart in approximately two minutes. Please do not allow [holder] to board."))
if(5)
sound_to(holder, 'sound/AI/vermin.ogg')
@@ -42,12 +42,12 @@
if(7)
sound_to(holder, 'sound/AI/meteors_detected_message.ogg')
to_chat(holder, "<h2 class='alert'>Meteor Alarm</h2>")
to_chat(holder, SPAN_ALERT("A [pick(adjectives)] meteor storm has been authorized for a destruction course with your station. Less than three minutes until impact, shields cannot help you; seek shelter in the central ring."))
to_chat(holder, SPAN_ALERT("A [pick(adjectives)] meteor storm has been authorized for a destruction course with the [station_name(TRUE)]. Less than three minutes until impact, shields cannot help you; seek shelter in the central ring."))
if(8)
sound_to(holder,'sound/AI/fungi.ogg')
to_chat(holder, "<h2 class='alert'>Biohealth Notice</h2>")
to_chat(holder, SPAN_ALERT("Healthy fungi detected on station. Your bodies may be contaminated. This is mandatory, [holder]."))
to_chat(holder, SPAN_ALERT("Healthy fungi detected on the [station_name(TRUE)]. Your bodies may be contaminated. This is mandatory, [holder]."))
if(9)
sound_to(holder, 'sound/effects/nuclearsiren.ogg')
+2 -2
View File
@@ -21,7 +21,7 @@
if(1)
sound_to(holder, 'sound/misc/announcements/notice.ogg')
to_chat(holder, "<h2 class='alert'>Ion Storm?</h2>")
to_chat(holder, SPAN_ALERT("It has come to our attention that the station has passed through an unusual ion storm. Several crewmembers are exhibiting unusual abilities."))
to_chat(holder, SPAN_ALERT("It has come to our attention that the [station_name(TRUE)] has passed through an unusual ion storm. Several crewmembers are exhibiting unusual abilities."))
if(2)
sound_to(holder, 'sound/hallucinations/behind_you1.ogg')
to_chat(holder, SPAN_GOOD("You hear a whispering in your mind. A promise of [pick("power", "enlightenment", "sight beyond sight", "knowledge terrible but true")]. Your vision goes white for a moment; when it returns, you feel... different."))
@@ -108,7 +108,7 @@
if(1)
sound_to(holder, 'sound/misc/announcements/notice.ogg')
to_chat(holder, "<h2 class='alert'>Ion Storm?</h2>")
to_chat(holder, SPAN_ALERT("It has come to our attention that the station has passed through an unusual ion storm. Several crewmembers are exhibiting unusual abilities."))
to_chat(holder, SPAN_ALERT("It has come to our attention that the [station_name(TRUE)] has passed through an unusual ion storm. Several crewmembers are exhibiting unusual abilities."))
if(2)
sound_to(holder, 'sound/hallucinations/behind_you1.ogg')
to_chat(holder, SPAN_GOOD("You hear a whispering in your mind. A promise of [pick("power", "enlightenment", "sight beyond sight", "knowledge terrible but true")]. Your vision goes white for a moment; when it returns, you feel... different."))
+1 -1
View File
@@ -379,7 +379,7 @@
use_power = POWER_USE_OFF // reason is because the holodeck already takes power so this can be powered as a result.
/obj/machinery/readybutton/attack_ai(mob/user as mob)
to_chat(user, "The station AI is not to interact with these devices!")
to_chat(user, "The AI is not to interact with these devices!")
return
/obj/machinery/readybutton/attackby(obj/item/attacking_item, mob/user)
@@ -139,7 +139,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
return 0
if(!(S.spawn_flags & CAN_JOIN))
to_chat(usr, SPAN_DANGER("Your current species, [client.prefs.species], is not available for play on the station."))
to_chat(usr, SPAN_DANGER("Your current species, [client.prefs.species], is not available for play on the [station_name(TRUE)]."))
return 0
LateChoices()
@@ -159,7 +159,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
to_chat(usr, SPAN_NOTICE("There is an administrative lock on entering the game!"))
return
else if(SSticker.mode && SSticker.mode.explosion_in_progress)
to_chat(usr, SPAN_DANGER("The station is currently exploding. Joining would go poorly."))
to_chat(usr, SPAN_DANGER("The [station_name(TRUE)] is currently exploding. Joining would go poorly."))
return
if(client.unacked_warning_count > 0)
@@ -172,7 +172,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
return 0
if(!(S.spawn_flags & CAN_JOIN))
to_chat(usr, SPAN_DANGER("Your current species, [client.prefs.species], is not available for play on the station."))
to_chat(usr, SPAN_DANGER("Your current species, [client.prefs.species], is not available for play on the [station_name(TRUE)]."))
return 0
AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint)
@@ -53,7 +53,7 @@
to_chat(brainmob, "<b>You are a positronic brain, brought into existence on [station_name()].</b>")
to_chat(brainmob, "<b>As a synthetic intelligence, you answer to all crewmembers, as well as the AI.</b>")
to_chat(brainmob, "<b>Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>")
to_chat(brainmob, "<b>Remember, the purpose of your existence is to serve the crew and the [station_name(TRUE)]. Above all else, do no harm.</b>")
var/area/A = get_area(src)
if(istype(A, /area/assembly/robotics))
+4 -4
View File
@@ -218,7 +218,7 @@ var/list/ai_verbs_default = list(
return ..()
/mob/living/silicon/ai/proc/on_mob_init()
to_chat(src, "<h3>You are playing the station's AI.</h3>")
to_chat(src, "<h3>You are playing the [station_name()]'s AI.</h3>")
to_chat(src, "<strong><a href='?src=[REF(src)];view_ai_help=1'>\[View help\]</a></strong> (or use OOC command <code>AI-Help</code> at any time)<br>")
if(malf && !(mind in malf.current_antagonists))
@@ -358,13 +358,13 @@ var/list/ai_verbs_default = list(
var/radio_keys = jointext(src.get_radio_keys(), "<br>")
var/dat = "\
<h1>AI Basics</h1>\
<p>You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).</p>\
<p>You are playing the [station_name()]'s AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).</p>\
<p>Familiarize yourself with the GUI buttons in world view. They are shortcuts to running commands for camera tracking, displaying alerts, moving up and down and such.</p>\
<p>While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc. \
To use something, simply click on it.</p>\
<h2>AI Shell</h2>\
<p>As an AI, you have access to an unique, inhabitable AI shell that spawns behind your core.\
This construct can be used in a variety of ways, but its primary function is to be a <strong>role play tool</strong> to give you the ability to have an actual physical presence on the station.\
This construct can be used in a variety of ways, but its primary function is to be a <strong>role play tool</strong> to give you the ability to have an actual physical presence on the [station_name(TRUE)].\
The shell is an extension of you, which means <strong>your laws apply to it aswell.</strong>\
</p>\
<h2>OOC Notes</h2>\
@@ -424,7 +424,7 @@ var/list/ai_verbs_default = list(
if(message_cooldown)
to_chat(src, "Please allow one minute to pass between announcements.")
return
var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "A.I. Announcement", multiline = TRUE)
var/input = tgui_input_text(usr, "Please write a message to announce to the [station_name(TRUE)] crew.", "A.I. Announcement", multiline = TRUE)
if(!input)
return
@@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores)
return
if(carded)
to_chat(usr, SPAN_DANGER("No connection to station intelligence storage. You must be in an AI Core to store yourself (adminhelp if you need to leave)."))
to_chat(usr, SPAN_DANGER("No connection to [station_name(TRUE)] intelligence storage. You must be in an AI Core to store yourself (adminhelp if you need to leave)."))
return
// Guard against misclicks, this isn't the sort of thing we want happening accidentally
@@ -15,6 +15,10 @@
var/static/list/call_area_names
/obj/machinery/computer/drone_control/New()
..()
desc = "Used to monitor the [station_name(TRUE)]'s drone population and the assembler that services them."
/obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob)
if(!ai_can_interact(user))
return
@@ -163,4 +163,4 @@ GLOBAL_DATUM_INIT(ntnet_global, /datum/ntnet, new)
add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.")
if(NTNET_SYSTEMCONTROL)
setting_systemcontrol = !setting_systemcontrol
add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of station's systems.")
add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of the station's systems.")
@@ -120,7 +120,7 @@
if(announcement_cooldown)
to_chat(usr, "Please allow at least one minute to pass between announcements")
return
var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "Priority Announcement", multiline = TRUE, encode = FALSE)
var/input = tgui_input_text(usr, "Please write a message to announce to the [station_name()] crew.", "Priority Announcement", multiline = TRUE, encode = FALSE)
if(!input || computer.use_check_and_message(usr))
return FALSE
var/was_hearing = HAS_TRAIT(computer, TRAIT_HEARING_SENSITIVE)
@@ -20,7 +20,6 @@
/datum/computer_file/program/atmos_control/New(obj/item/modular_computer/comp, var/list/new_access, var/list/monitored_alarm_ids)
..()
if(islist(new_access) && length(new_access))
required_access_run = new_access
@@ -3,7 +3,7 @@
filedesc = "Power Monitoring"
program_icon_state = "power_monitor"
program_key_icon_state = "yellow_key"
extended_desc = "This program connects to sensors around the station to provide information about electrical systems"
extended_desc = "This program connects to sensors around the station to provide information about electrical systems."
ui_header = "power_norm.gif"
required_access_run = ACCESS_ENGINE
required_access_download = ACCESS_CE
@@ -18,6 +18,9 @@
var/list/grid_sensors
var/active_sensor //name_tag of the currently selected sensor
/datum/computer_file/program/power_monitor/New()
..()
/datum/computer_file/program/power_monitor/ui_data(mob/user)
var/list/data = initial_data()
var/list/sensors = list()
@@ -16,6 +16,9 @@
tgui_theme = "hephaestus"
ui_auto_update = FALSE
/datum/computer_file/program/rcon_console/New()
..()
/datum/computer_file/program/rcon_console/ui_data(mob/user)
var/list/data = initial_data()
+1 -1
View File
@@ -30,7 +30,7 @@
\[redacted\] - \[/redacted\] : Covers the text in an unbreachable black box.
\[sign\] : Inserts a signature of your name in a foolproof way.
\[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.
\[date\] : Inserts today's station date.
\[date\] : Inserts today's date.
\[time\] : Inserts the current station time.
<br>
Pen Exclusive Commands
@@ -23,6 +23,7 @@
/obj/machinery/keycard_auth/Initialize(mapload, d, populate_components, is_internal)
..()
desc = "This device is used to trigger [station_name(TRUE)] functions, which require more than one ID card to authenticate."
return INITIALIZE_HINT_LATELOAD
/obj/machinery/keycard_auth/LateInitialize()
@@ -17,6 +17,10 @@
desc = "A forcefield which seems to be projected by the station's emergency atmosphere containment field."
health = 100
/obj/machinery/shield/malfai/New()
..()
desc = "A forcefield which seems to be projected by the [station_name(TRUE)]'s emergency atmosphere containment field."
/obj/machinery/shield/malfai/process()
health -= 0.5 // Slowly lose integrity over time
check_failure()
+6 -4
View File
@@ -442,7 +442,7 @@ AURORA_ESCAPE_POD(4)
//-// Raider Skipjack //-//
/datum/shuttle/autodock/multi/antag/skipjack_aurora
/datum/shuttle/autodock/multi/antag/skipjack_aurora/New()
name = "Skipjack"
current_location = "nav_skipjack_start"
landmark_transition = "nav_skipjack_interim"
@@ -460,8 +460,9 @@ AURORA_ESCAPE_POD(4)
)
announcer = "NDV Icarus"
arrival_message = "Attention, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
arrival_message = "Attention, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the [station_name(TRUE)] - you've got incoming visitors, like it or not."
departure_message = "Attention, your guests are pulling away - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
..()
/obj/effect/shuttle_landmark/skipjack/start
name = "Raider Hideout"
@@ -503,7 +504,7 @@ AURORA_ESCAPE_POD(4)
//-// Mercenary Shuttle //-//
/datum/shuttle/autodock/multi/antag/merc_aurora
/datum/shuttle/autodock/multi/antag/merc_aurora/New()
name = "ICV Raskolnikov"
current_location = "nav_merc_start"
landmark_transition = "nav_merc_interim"
@@ -520,8 +521,9 @@ AURORA_ESCAPE_POD(4)
)
announcer = "NDV Icarus"
arrival_message = "Attention, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
arrival_message = "Attention, you have a large signature approaching the [station_name(TRUE)] - looks unarmed to surface scans. We're too far out to intercept - brace for visitors."
departure_message = "Attention, your visitors are on their way out of the system, burning delta-v like it's nothing. Good riddance."
..()
/obj/effect/shuttle_landmark/merc/start
name = "Mercenary Base"