diff --git a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm index 8e6e92682c4..4c918c29b9f 100644 --- a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm +++ b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm @@ -160,7 +160,7 @@ if(AI.anchored) AI.remote_control() else - to_chat(AI, SPAN_WARNING("You are unable to get a good connection while unanchored from the station systems.")) + to_chat(AI, SPAN_WARNING("You are unable to get a good connection while unanchored from your systems.")) /atom/movable/screen/ai/move_up name = "Move Up" diff --git a/code/controllers/subsystems/initialization/atlas.dm b/code/controllers/subsystems/initialization/atlas.dm index 0750c9fb87e..8d986dcfb37 100644 --- a/code/controllers/subsystems/initialization/atlas.dm +++ b/code/controllers/subsystems/initialization/atlas.dm @@ -325,9 +325,13 @@ SUBSYSTEM_DEF(atlas) sleep(1 MINUTE) world.Reboot() -/proc/station_name() +/// Called to retrieve the name of the station. When short is TRUE, the short name of the station will be provided instead. +/proc/station_name(var/short = FALSE) ASSERT(SSatlas.current_map) - . = SSatlas.current_map.station_name + if(short) + . = SSatlas.current_map.station_short + else + . = SSatlas.current_map.station_name var/sname if (GLOB.config && GLOB.config.server_name) diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index aa6a0ccaba2..49d6bc5bea7 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -290,7 +290,7 @@ SUBSYSTEM_DEF(jobs) if(("Arrivals Shuttle" in SSatlas.current_map.allowed_spawns) && spawning_at == "Arrivals Shuttle") H.centcomm_despawn_timer = addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living, centcomm_timeout)), 10 MINUTES, TIMER_STOPPABLE) - to_chat(H,SPAN_NOTICE("You have ten minutes to reach the station before you will be forced there.")) + to_chat(H,SPAN_NOTICE("You have ten minutes to reach the [SSatlas.current_map.station_name] before you will be forced there.")) var/datum/job/job = GetJob(rank) var/list/spawn_in_storage = list() diff --git a/code/controllers/subsystems/news.dm b/code/controllers/subsystems/news.dm index b2f85fcf9c3..11bd9b135df 100644 --- a/code/controllers/subsystems/news.dm +++ b/code/controllers/subsystems/news.dm @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(news) src.wanted_issue = SSnews.wanted_issue /datum/controller/subsystem/news/Initialize(timeofday) - CreateFeedChannel("Station Announcements", "Automatic Announcement System", 1, 1, "New Station Announcement Available") + CreateFeedChannel("Announcements", "Automatic Announcement System", 1, 1, "New Announcement Available") CreateFeedChannel("Tau Ceti Daily", "CentComm Minister of Information", 1, 1) CreateFeedChannel("The Gibson Gazette", "Editor Carl Ritz", 1, 1) diff --git a/code/controllers/subsystems/records.dm b/code/controllers/subsystems/records.dm index 2f10d2de65b..7f9825852ce 100644 --- a/code/controllers/subsystems/records.dm +++ b/code/controllers/subsystems/records.dm @@ -305,7 +305,7 @@ SUBSYSTEM_DEF(records) manifest[dept][++manifest[dept].len] = list("name" = sanitize(R.name), "rank" = selected_module, "active" = "Online", "head" = FALSE) else if(istype(S, /mob/living/silicon/ai)) var/mob/living/silicon/ai/A = S - manifest[dept][++manifest[dept].len] = list("name" = sanitize(A.name), "rank" = "Station Intelligence", "active" = "Online", "head" = TRUE) + manifest[dept][++manifest[dept].len] = list("name" = sanitize(A.name), "rank" = "Vessel Intelligence", "active" = "Online", "head" = TRUE) manifest[dept].Swap(1, manifest[dept].len) for(var/department in manifest) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 12dfc854166..a8afb8b9f85 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -203,7 +203,7 @@ var/datum/controller/subsystem/ticker/SSticker else feedback_set_details("end_proper","universe destroyed") if(!delay_end) - to_world(SPAN_NOTICE("Rebooting due to destruction of station in [restart_timeout/10] seconds")) + to_world(SPAN_NOTICE("Rebooting due to destruction of \the [SSatlas.current_map.station_name] in [restart_timeout/10] seconds")) else feedback_set_details("end_proper","proper completion") if(!delay_end) diff --git a/code/datums/cargo.dm b/code/datums/cargo.dm index e0c5df933c2..6063e204975 100644 --- a/code/datums/cargo.dm +++ b/code/datums/cargo.dm @@ -322,7 +322,7 @@ if("rejected") return "Rejected" if("shipped") - return "Shipped to the Station" + return "Shipped to the [station_name(TRUE)]" if("delivered") return "Delivered" else diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index 0f6a0b4e851..e7f54d2fdcc 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -85,8 +85,12 @@ return 1 /datum/uplink_item/abstract/announcements/fake_ion_storm + var/static/cooldown = FALSE + +/datum/uplink_item/abstract/announcements/fake_ion_storm/New() + ..() name = "Ion Storm Announcement" - desc = "Interferes with the station's ion sensors. Triggers immediately upon investment." + desc = "Interferes with the [SSatlas.current_map.station_short]'s ion sensors. Triggers immediately upon investment." telecrystal_cost = 2 var/static/cooldown = FALSE @@ -104,8 +108,12 @@ cooldown = FALSE /datum/uplink_item/abstract/announcements/fake_radiation + var/static/cooldown = FALSE + +/datum/uplink_item/abstract/announcements/fake_radiation/New() + ..() name = "Radiation Storm Announcement" - desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment." + desc = "Interferes with the [SSatlas.current_map.station_short]'s radiation sensors. Triggers immediately upon investment." telecrystal_cost = 3 var/static/cooldown = 0 diff --git a/code/datums/uplink/exosuit.dm b/code/datums/uplink/exosuit.dm index 45385241a4b..595d91d9311 100644 --- a/code/datums/uplink/exosuit.dm +++ b/code/datums/uplink/exosuit.dm @@ -1,26 +1,26 @@ /datum/uplink_item/item/exosuit category = /datum/uplink_category/exosuit -/datum/uplink_item/item/exosuit/combat +/datum/uplink_item/item/exosuit/combat/New() name = "Combat Exosuit Dropper" - desc = "A device that can be used to drop in a combat exosuit. Can only be used outside station areas, unless emagged, which is hazardous." + desc = "A device that can be used to drop in a combat exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 25 path = /obj/item/device/orbital_dropper/mecha/combat -/datum/uplink_item/item/exosuit/heavy +/datum/uplink_item/item/exosuit/heavy/New() name = "Heavy Exosuit Dropper" - desc = "A device that can be used to drop in a heavy exosuit. Can only be used outside station areas, unless emagged, which is hazardous." + desc = "A device that can be used to drop in a heavy exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 20 path = /obj/item/device/orbital_dropper/mecha/heavy -/datum/uplink_item/item/exosuit/light +/datum/uplink_item/item/exosuit/light/New() name = "Light Exosuit Dropper" - desc = "A device that can be used to drop in a light exosuit. Can only be used outside station areas, unless emagged, which is hazardous." + desc = "A device that can be used to drop in a light exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 15 path = /obj/item/device/orbital_dropper/mecha -/datum/uplink_item/item/exosuit/powerloader +/datum/uplink_item/item/exosuit/powerloader/New() name = "Powerloader Exosuit Dropper" - desc = "A device that can be used to drop in a powerloader exosuit. Can only be used outside station areas, unless emagged, which is hazardous." + desc = "A device that can be used to drop in a powerloader exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 10 path = /obj/item/device/orbital_dropper/mecha/powerloader diff --git a/code/datums/uplink/revolution.dm b/code/datums/uplink/revolution.dm index 28f0c3a45e9..7c3f49e5212 100644 --- a/code/datums/uplink/revolution.dm +++ b/code/datums/uplink/revolution.dm @@ -1,9 +1,9 @@ /datum/uplink_item/item/revolution category = /datum/uplink_category/revolution -/datum/uplink_item/item/revolution/armory +/datum/uplink_item/item/revolution/armory/New() name = "Armory Dropper" - desc = "A device that can be used to drop in an armory-worth of guns. Can only be used outside station areas, unless emagged, which is hazardous." + desc = "A device that can be used to drop in an armory-worth of guns. Can only be used outside [SSatlas.current_map.station_short] areas, unless emagged, which is hazardous." telecrystal_cost = 25 path = /obj/item/device/orbital_dropper/armory/syndicate diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index cdb6f6ab693..c3a074c539a 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -8,7 +8,7 @@ var/sound var/newscast = 0 var/print = 0 - var/channel_name = "Station Announcements" + var/channel_name = "Announcements" var/announcement_type = "Announcement" /datum/announcement/New(var/do_log = 1, var/new_sound = null, var/do_newscast = 0, var/do_print = 0) diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm index 17091330ef6..9f5d66143a1 100644 --- a/code/game/antagonist/antagonist_print.dm +++ b/code/game/antagonist/antagonist_print.dm @@ -135,7 +135,7 @@ if(ply.current.stat == DEAD) text += "died" else if(!is_station_level(ply.current.z)) - text += "fled the station" + text += "fled the [station_name(TRUE)]" else text += "survived" if(ply.current.real_name != ply.name) diff --git a/code/game/antagonist/outsider/burglar.dm b/code/game/antagonist/outsider/burglar.dm index c52b8a9015a..af3e56e1106 100644 --- a/code/game/antagonist/outsider/burglar.dm +++ b/code/game/antagonist/outsider/burglar.dm @@ -7,10 +7,6 @@ var/datum/antagonist/burglar/burglars bantype = "burglar" antag_indicator = "burglar" landmark_id = "burglarspawn" - welcome_text = "You are a Burglar, someone underequipped to deal with the station. You will probably not survive for the whole round, so don't sweat it if you die!
\ - Your (syndicate) sponsored uplink will grant you access to various tools you may need to attempt to accomplish your goal.
\ - You can use :H or :B to talk on your encrypted channel, which only you and your partner can read.
\ - You have been outfitted with a special teleportation device, make sure to use it!" flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER antaghud_indicator = "hudburglar" required_age = 7 @@ -27,6 +23,10 @@ var/datum/antagonist/burglar/burglars /datum/antagonist/burglar/New() ..() burglars = src + welcome_text = "You are a Burglar, someone underequipped to deal with the [station_name()]. You will probably not survive for the whole round, so don't sweat it if you die!
\ + Your (syndicate) sponsored uplink will grant you access to various tools you may need to attempt to accomplish your goal.
\ + You can use :H or :B to talk on your encrypted channel, which only you and your partner can read.
\ + You have been outfitted with a special teleportation device, make sure to use it!" /datum/antagonist/burglar/update_access(var/mob/living/player) for(var/obj/item/storage/wallet/W in player.contents) diff --git a/code/game/antagonist/outsider/loner.dm b/code/game/antagonist/outsider/loner.dm index 16d9029d991..356f2eda186 100644 --- a/code/game/antagonist/outsider/loner.dm +++ b/code/game/antagonist/outsider/loner.dm @@ -7,8 +7,6 @@ var/datum/antagonist/loner/loners bantype = "loner" antag_indicator = "loner" landmark_id = "lonerspawn" - welcome_text = "You are a Loner, someone underequipped to deal with the station. You will probably not survive for the whole round, so don't sweat it if you die!
\ - You have a special psionic power that allows you to absorb a psionic energy from a being's Zona Bovinae, granting you an extra point to be used in the Point Shop." flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE antaghud_indicator = "hudloner" required_age = 7 @@ -24,6 +22,8 @@ var/datum/antagonist/loner/loners /datum/antagonist/loner/New() ..() + welcome_text = "You are a Loner, someone underequipped to deal with the [station_name()]. You will probably not survive for the whole round, so don't sweat it if you die!
\ + You have a special psionic power that allows you to absorb a psionic energy from a being's Zona Bovinae, granting you an extra point to be used in the Point Shop." loners = src /datum/antagonist/loner/equip(var/mob/living/carbon/human/player) diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index e883e64e9f5..fa57d106b19 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -100,7 +100,7 @@ var/datum/antagonist/raider/raiders if(win_group == "Raider") if(win_type == "Minor") win_type = "Major" - win_msg += "The Raiders escaped the station!" + win_msg += "The Raiders escaped the [station_name(TRUE)]!" else win_msg += "The Raiders were repelled!" diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm index 807b1c7d60d..96e084a76f4 100644 --- a/code/game/antagonist/outsider/technomancer.dm +++ b/code/game/antagonist/outsider/technomancer.dm @@ -6,10 +6,6 @@ var/datum/antagonist/technomancer/technomancers role_text_plural = "Technomancers" bantype = "wizard" landmark_id = "wizard" - welcome_text = "You will need to purchase functions and perhaps some equipment from the various machines around your \ - base. Choose your technological arsenal carefully. Remember that without the core on your back, your functions are \ - powerless, and therefore you will be as well.
\ - In your pockets you will find a one-time use teleport device. Use it to leave the base and go to the station, when you are ready. Your clothing is holographic, you should change its look before leaving." antag_sound = 'sound/effects/antag_notice/technomancer_alert.ogg' flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_SET_APPEARANCE | ANTAG_VOTABLE antaghud_indicator = "hudwizard" @@ -26,6 +22,10 @@ var/datum/antagonist/technomancer/technomancers /datum/antagonist/technomancer/New() ..() technomancers = src + welcome_text = "You will need to purchase functions and perhaps some equipment from the various machines around your \ + base. Choose your technological arsenal carefully. Remember that without the core on your back, your functions are \ + powerless, and therefore you will be as well.
\ + In your pockets you will find a one-time use teleport device. Use it to leave the base and go to the [station_name()], when you are ready. Your clothing is holographic, you should change its look before leaving." /datum/antagonist/technomancer/update_antag_mob(var/datum/mind/technomancer) ..() diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index 08703e7ac27..3d1eb4d9471 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -19,7 +19,6 @@ var/datum/antagonist/cultist/cult protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Investigator") feedback_tag = "cult_objective" antag_indicator = "cult" - welcome_text = "You have a talisman in your possession; one that will help you start the cult on this station. Use it well and remember - there are others." antag_sound = 'sound/effects/antag_notice/cult_alert.ogg' victory_text = "The cult wins! It has succeeded in serving its dark masters!" loss_text = "The staff managed to stop the cult!" @@ -42,6 +41,7 @@ var/datum/antagonist/cultist/cult /datum/antagonist/cultist/New() ..() + welcome_text = "You have a talisman in your possession; one that will help you start the cult on the [station_name(TRUE)]. Use it well and remember - there are others." cult = src /datum/antagonist/cultist/create_global_objectives() diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm index 92cf486df9c..1b00c74fc75 100644 --- a/code/game/antagonist/station/rogue_ai.dm +++ b/code/game/antagonist/station/rogue_ai.dm @@ -8,7 +8,6 @@ var/datum/antagonist/rogue_ai/malf landmark_id = "AI" welcome_text = "You are malfunctioning! You do not have to follow any laws." antag_sound = 'sound/effects/antag_notice/malf_alert.ogg' - victory_text = "The AI has taken control of all of the station's systems." loss_text = "The AI has been shut down!" flags = ANTAG_VOTABLE | ANTAG_OVERRIDE_MOB | ANTAG_OVERRIDE_JOB | ANTAG_CHOOSE_NAME | ANTAG_NO_ROUNDSTART_SPAWN hard_cap = 1 @@ -21,6 +20,7 @@ var/datum/antagonist/rogue_ai/malf /datum/antagonist/rogue_ai/New() ..() + victory_text = "The AI has taken control of all of the [station_name(TRUE)]'s systems." malf = src diff --git a/code/game/gamemodes/cult/runes/summon_narsie.dm b/code/game/gamemodes/cult/runes/summon_narsie.dm index b42121195a1..61ad02552e8 100644 --- a/code/game/gamemodes/cult/runes/summon_narsie.dm +++ b/code/game/gamemodes/cult/runes/summon_narsie.dm @@ -9,7 +9,7 @@ var/turf/T = get_turf(A) if(!is_station_level(T.z)) - to_chat(user, SPAN_WARNING("You are too far from the station, Nar'sie can not be summoned here.")) + to_chat(user, SPAN_WARNING("You are too far from the [station_name(TRUE)], Nar'sie can not be summoned here.")) return fizzle(user, A) var/list/cultists = list() diff --git a/code/game/gamemodes/events/holidays/easter.dm b/code/game/gamemodes/events/holidays/easter.dm index 584dd63af32..6535708f688 100644 --- a/code/game/gamemodes/events/holidays/easter.dm +++ b/code/game/gamemodes/events/holidays/easter.dm @@ -3,7 +3,7 @@ //Random egg /proc/Random_Egg() - to_world("

There is a golden egg hidden somewhere on the station...

") + to_world("

There is a golden egg hidden somewhere on the [station_name(TRUE)]...

") var/list/Floorlist = list() for(var/turf/T in world) var/turf/simulated/floor/F = T diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm index e657909200b..716dd60e4b8 100644 --- a/code/game/gamemodes/events/wormholes.dm +++ b/code/game/gamemodes/events/wormholes.dm @@ -7,7 +7,7 @@ if(pick_turfs.len) //All ready. Announce that bad juju is afoot. - command_announcement.Announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", new_sound = 'sound/AI/spanomalies.ogg') + command_announcement.Announce("Space-time anomalies detected on the [station_name(TRUE)]. There is no additional data.", "Anomaly Alert", new_sound = 'sound/AI/spanomalies.ogg') //prob(20) can be approximated to 1 wormhole every 5 turfs! //admittedly less random but totally worth it >_< diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm index a7d40378e3a..85fb47ca62d 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm @@ -65,8 +65,8 @@ /datum/game_mode/malfunction/verb/ai_destroy_station() set category = "Hardware" - set name = "Destroy Station" - set desc = "Activates or deactivates self destruct sequence of this station. Sequence takes two minutes, and if you are shut down before timer reaches zero it will be cancelled." + set name = "Destroy Vessel" + set desc = "Activates or deactivates self destruct sequence of the vessel. Sequence takes two minutes, and if you are shut down before timer reaches zero it will be cancelled." var/mob/living/silicon/ai/user = usr if(user.stat == DEAD) @@ -98,7 +98,7 @@ user.bombing_station = 0 return - var/choice = alert("Really destroy station?", "Station self-destruct", "YES", "NO") + var/choice = alert("Really destroy \the [SSatlas.current_map.station_name]?", "[SSatlas.current_map.station_short] self-destruct", "YES", "NO") if(choice != "YES") return if(!ability_prechecks(user, 0, 0)) @@ -113,20 +113,20 @@ to_chat(user, "Self-destruct could not be initiated - No Self-Destruct Terminal available.") return - to_chat(user, "***** STATION SELF-DESTRUCT SEQUENCE INITIATED *****") + to_chat(user, "***** [SSatlas.current_map.station_short] SELF-DESTRUCT SEQUENCE INITIATED *****") to_chat(user, "Self-destructing in [timer] seconds. Use this command again to abort.") user.bombing_station = 1 set_security_level("delta") if(timer > stage1) - radio.autosay("Critical: Brute force attempt on primary firewall detected.", "Station Authentication Control") - radio.autosay("Notice: Local override recommended.", "Station Authentication Control") + radio.autosay("Critical: Brute force attempt on primary firewall detected.", "[SSatlas.current_map.station_short] Authentication Control") + radio.autosay("Notice: Local override recommended.", "[SSatlas.current_map.station_short] Authentication Control") else if(timer > stage2) - radio.autosay("Alert: Brute force attempt on backup firewall detected.", "Station Authentication Control") - radio.autosay("Notice: Local override with authentication disk recommended.", "Station Authentication Control") + radio.autosay("Alert: Brute force attempt on backup firewall detected.", "[SSatlas.current_map.station_short] Authentication Control") + radio.autosay("Notice: Local override with authentication disk recommended.", "[SSatlas.current_map.station_short] Authentication Control") else - radio.autosay("Emergency: Self-destruct sequence has been activated. Self-destructing in [timer] seconds.", "Station Authentication Control") - radio.autosay("Notice: Deactivate using authentication disk in SAT-Chamber", "Station Authentication Control") + radio.autosay("Emergency: Self-destruct sequence has been activated. Self-destructing in [timer] seconds.", "[SSatlas.current_map.station_short] Authentication Control") + radio.autosay("Notice: Deactivate using authentication disk in SAT-Chamber", "[SSatlas.current_map.station_short] Authentication Control") while(timer) @@ -134,31 +134,31 @@ var/obj/machinery/nuclearbomb/station/N = nuke.resolve() if(!user || !user.bombing_station || user.stat == DEAD || !N) if(timer < stage2) - radio.autosay("Self-destruct sequence has been cancelled.", "Station Authentication Control") + radio.autosay("Self-destruct sequence has been cancelled.", "[SSatlas.current_map.station_short] Authentication Control") else - radio.autosay("Brute force attempt has ceased.", "Station Authentication Control") + radio.autosay("Brute force attempt has ceased.", "[SSatlas.current_map.station_short] Authentication Control") return if(N.auth) if(timer < stage2) - radio.autosay("Local Override Engaged - Self-Destruct cancelled.", "Station Authentication Control") + radio.autosay("Local Override Engaged - Self-Destruct cancelled.", "[SSatlas.current_map.station_short] Authentication Control") else - radio.autosay("Local Override Engaged - Network connection disabled.", "Station Authentication Control") + radio.autosay("Local Override Engaged - Network connection disabled.", "[SSatlas.current_map.station_short] Authentication Control") user.bombing_station = 0 return if(timer == stage1+1) radio.autosay("Alert: Primary firewall bypassed.") radio.autosay("Alert: Brute force attempt on backup firewall detected.") - radio.autosay("Notice: Local Override with authentication disk recommended.", "Station Authentication Control") + radio.autosay("Notice: Local Override with authentication disk recommended.", "[SSatlas.current_map.station_short] Authentication Control") user.bombing_time = stage1 //Further attempts will only take 900 seconds if(timer == stage2+1) radio.autosay("Emergency: Backup firewall failed.") - radio.autosay("Self-destruct sequence has been activated. Self-destructing in [timer] seconds.", "Station Authentication Control") - radio.autosay("Notice: Deactivate using authentication disk in SAT-Chamber", "Station Authentication Control") + radio.autosay("Self-destruct sequence has been activated. Self-destructing in [timer] seconds.", "[SSatlas.current_map.station_short] Authentication Control") + radio.autosay("Notice: Deactivate using authentication disk in SAT-Chamber", "[SSatlas.current_map.station_short] Authentication Control") user.bombing_time = stage2 //Further attempts will only take 600 seconds if(timer in list(2, 3, 4, 5, 10, 30, 60, 90, 120, 240, 300)) // Announcement times. "1" is not intentionally included! - radio.autosay("Self-destruct in [timer] seconds.", "Station Authentication Control") + radio.autosay("Self-destruct in [timer] seconds.", "[SSatlas.current_map.station_short] Authentication Control") if(timer == 1) - radio.autosay("Self-destruct sequence initiated. Have a nice day", "Station Authentication Control") + radio.autosay("Self-destruct sequence initiated. Have a nice day", "[SSatlas.current_map.station_short] Authentication Control") timer-- SSticker.station_explosion_cinematic(0,null) diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm index ecd1ffcefd5..495ba9d4752 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm @@ -158,9 +158,9 @@ if(1) fulltext = "We have detected a hack attempt into your [text]. The intruder failed to access anything of importance, but disconnected before we could complete our traces." if(2) - fulltext = "We have detected another hack attempt. It was targeting [text]. The intruder almost gained control of the system, so we had to disconnect them. We partially finished our trace and it seems to be originating either from the station, or its immediate vicinity." + fulltext = "We have detected another hack attempt. It was targeting [text]. The intruder almost gained control of the system, so we had to disconnect them. We partially finished our trace and it seems to be originating either from the [station_name(TRUE)], or its immediate vicinity." if(3) - fulltext = "Another hack attempt has been detected, this time targeting [text]. We are certain the intruder entered the network via a terminal located somewhere on the station." + fulltext = "Another hack attempt has been detected, this time targeting [text]. We are certain the intruder entered the network via a terminal located somewhere on the [station_name(TRUE)]." if(4) fulltext = "We have finished our traces and it seems the recent hack attempts are originating from your AI system. We recommend investigation." else diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 7515911ac6a..8051b76fb8d 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -38,8 +38,8 @@ /datum/game_mode/meteor/post_setup() ..() alert_title = "Automated Beacon AB-[rand(10, 99)]" - alert_text = "This is an automatic warning. The [SSatlas.current_map.full_name] is on a collision course with a nearby asteroid belt. Estimated time until impact is: [meteor_grace_period / 1200] MINUTES. Please perform necessary actions to secure your ship or station from the threat. Have a nice day." - start_text = "This is an automatic warning. The [SSatlas.current_map.full_name] has entered an asteroid belt. Estimated time until you leave the belt is: [rand(20,30)] HOURS and [rand(1, 59)] MINUTES. For your safety, please consider changing course or using protective equipment. Have a nice day." + alert_text = "This is an automatic warning. The [SSatlas.current_map.station_name] is on a collision course with a nearby asteroid belt. Estimated time until impact is: [meteor_grace_period / 1200] MINUTES. Please perform necessary actions to secure your ship or station from the threat. Have a nice day." + start_text = "This is an automatic warning. The [SSatlas.current_map.station_name] has entered an asteroid belt. Estimated time until you leave the belt is: [rand(20,30)] HOURS and [rand(1, 59)] MINUTES. For your safety, please consider changing course or using protective equipment. Have a nice day." next_wave = round_duration_in_ticks + meteor_grace_period /datum/game_mode/meteor/proc/on_meteor_warn() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 6025ed5d7a0..b287dfb0ff4 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -271,8 +271,8 @@ GLOBAL_LIST_EMPTY(process_objectives) return 0 return 1 -/datum/objective/silence - explanation_text = "Do not allow anyone to escape the station. Only allow the shuttle to be called when everyone is dead and your story is the only one left." +/datum/objective/silence/New() + explanation_text = "Do not allow anyone to escape the [station_name()]. Only allow the shuttle to be called when everyone is dead and your story is the only one left." /datum/objective/silence/check_completion() if(!evacuation_controller.round_over()) @@ -411,14 +411,19 @@ GLOBAL_LIST_EMPTY(process_objectives) return 0 -/datum/objective/nuclear - explanation_text = "Destroy the station with a nuclear device." +/datum/objective/nuclear/New() + explanation_text = "Destroy the [station_name()] with a nuclear device." /datum/objective/steal var/obj/item/steal_target var/target_name - var/global/possible_items[] = list( + var/global/possible_items[] = list() + + var/global/possible_items_special[] = list() + +/datum/objective/steal/New() + possible_items = list( "the captain's antique laser gun" = /obj/item/gun/energy/captain, "a hand teleporter" = /obj/item/hand_tele, "a RFD C-Class" = /obj/item/rfd/construction, @@ -426,7 +431,7 @@ GLOBAL_LIST_EMPTY(process_objectives) "a captain's jumpsuit" = /obj/item/clothing/under/rank/captain, "a functional AI" = /obj/item/aicard, "a pair of magboots" = /obj/item/clothing/shoes/magboots, - "the station blueprints" = /obj/item/blueprints, + "the [station_name()] blueprints" = /obj/item/blueprints, "a nasa voidsuit" = /obj/item/clothing/suit/space/void, "28 moles of phoron (full tank)" = /obj/item/tank, "a sample of slime extract" = /obj/item/slime_extract, @@ -440,8 +445,7 @@ GLOBAL_LIST_EMPTY(process_objectives) "the captain's pinpointer" = /obj/item/pinpointer, "an ablative armor vest" = /obj/item/clothing/suit/armor/carrier/ablative ) - - var/global/possible_items_special[] = list( + possible_items_special = list( /*"nuclear authentication disk" = /obj/item/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change. "nuclear gun" = /obj/item/gun/energy/gun/nuclear, "diamond drill" = /obj/item/pickaxe/diamonddrill, @@ -746,7 +750,7 @@ GLOBAL_LIST_EMPTY(process_objectives) target = "diamond" target_amount = 20 - explanation_text = "Ransack the station and escape with [target_amount] [target]." + explanation_text = "Ransack the [SSatlas.current_map.station_name] and escape with [target_amount] [target]." /datum/objective/heist/salvage/check_completion() var/total_amount = 0 @@ -819,7 +823,7 @@ GLOBAL_LIST_EMPTY(process_objectives) /datum/objective/cult/survive/New() ..() - explanation_text = "Our knowledge must live on. Make sure at least [target_amount] acolytes escape on the shuttle to spread their work on an another station." + explanation_text = "Our knowledge must live on. Make sure at least [target_amount] acolytes escape to spread their work elsewhere." /datum/objective/cult/survive/check_completion() var/acolytes_survived = 0 diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index b23da78115f..a9469d53d2e 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -39,15 +39,15 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) objective = pick("Have [rand(1,4)] crewmember sign NT apprenticeship contracts", - "Make sure that the station fullfils [rand(4,12)] cargo bounties", - "Make sure that the station raises [rand(5000,12000)] credits by the end of the shift") + "Make sure that the [station_name()] fullfils [rand(4,12)] cargo bounties", + "Make sure that the [station_name()] raises [rand(5000,12000)] credits by the end of the shift") if(REPRESENTATIVE_MISSION_MEDIUM) objective = pick("Have [rand(2,5)] crewmembers sign contract extensions", "Have [rand(2,5)] crewmembers buy Odin real estate", "[rand(3,10)] crewmember must buy Getmore products from the vendors") else objective = pick("Conduct and present a survey on crew morale and content", - "Make sure that [rand(2,4)] complaints are solved on the station", + "Make sure that [rand(2,4)] complaints are solved on the [station_name()]", "Have [rand(3,10)] crewmembers buy Getmore products from the vendors") return objective diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index 4a119ebaedd..898f5c0925a 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -162,7 +162,7 @@ /obj/outfit/job/representative/proc/send_representative_mission(var/mob/living/carbon/human/H) var/faxtext = "


Directives Report

" - faxtext += "Attention [name], the following directives are to be fulfilled during your stay in the station: