From 25a64db765fb98774a5d62b2d14c05ec796432a9 Mon Sep 17 00:00:00 2001
From: tf-4 <8881105+tf-4@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:10:13 +0100
Subject: [PATCH] more renames
---
code/datums/components/payment.dm | 3 +-
code/datums/sprite_accessories.dm | 2 +
code/datums/station_traits/neutral_traits.dm | 3 +-
code/game/gamemodes/objective.dm | 3 +-
.../game/machinery/computer/communications.dm | 3 +-
code/game/machinery/computer/telescreen.dm | 3 +-
code/game/machinery/incident_display.dm | 6 ++-
.../newscaster/newscaster_machine.dm | 3 +-
code/game/objects/effects/posters/official.dm | 5 ++-
code/game/objects/items/cards_ids.dm | 6 ++-
code/game/objects/items/charter.dm | 3 +-
code/game/objects/items/mail.dm | 4 +-
code/game/objects/items/manuals.dm | 16 ++++----
modular_doppler/cryosleep/code/admin.dm | 2 +-
.../lore/overrides/areas/away_content.dm | 5 +++
.../lore/overrides/areas/centcom.dm | 2 +
.../lore/overrides/areas/mining.dm | 2 +
modular_doppler/lore/overrides/crab17.dm | 2 +
modular_doppler/lore/overrides/ert.dm | 32 +++++++++++++++
.../lore/overrides/general_memories.dm | 17 ++++++++
.../lore/overrides/items/blueprints.dm | 5 +++
.../lore/overrides/items/bodybag.dm | 2 +
.../lore/overrides/items/charter.dm | 2 +
.../lore/overrides/items/clown_items.dm | 2 +
modular_doppler/lore/overrides/items/defib.dm | 5 +++
.../lore/overrides/items/hourglass.dm | 2 +
.../lore/overrides/items/religion.dm | 11 +++++
.../overrides/{ => items}/secret_documents.dm | 2 +-
.../lore/overrides/items/shields.dm | 3 ++
modular_doppler/lore/overrides/items/spear.dm | 2 +
.../lore/overrides/machinery/camera.dm | 2 +
.../machinery/computer/records/medical.dm | 2 +
.../machinery/computer/records/security.dm | 2 +
.../overrides/machinery/drone_dispenser.dm | 2 +
.../overrides/machinery/newscaster_machine.dm | 2 +
.../lore/overrides/machinery/newspaper.dm | 2 +
.../lore/overrides/machinery/sleepers.dm | 2 +
.../lore/overrides/machinery/syndicatebomb.dm | 2 +
.../lore/overrides/objective_items.dm | 5 +++
modular_doppler/lore/overrides/pod_style.dm | 16 ++++++++
.../lore/overrides/posters/contraband.dm | 17 ++++++++
.../lore/overrides/posters/official.dm | 31 ++++++++++++++
.../posters/poster_demotivational.dm | 21 ++++++++++
.../lore/overrides/ruins/icemoon.dm | 2 +
.../lore/overrides/ruins/lavaland.dm | 2 +
modular_doppler/lore/overrides/ruins/ruins.dm | 2 +
modular_doppler/lore/overrides/ruins/space.dm | 20 +++++++++
modular_doppler/lore/overrides/severe.dm | 2 +
.../lore/overrides/shuttles/emergency.dm | 18 ++++++++
.../lore/overrides/shuttles/whiteship.dm | 3 ++
.../overrides/station_traits/job_traits.dm | 2 +
.../station_traits/negative_traits.dm | 4 ++
.../station_traits/neutral_traits.dm | 6 +++
.../station_traits/positive_traits.dm | 2 +
.../sapper_gang/code/paper_premade.dm | 4 +-
.../species_types/android/android.dm | 2 +-
.../primitive_genemod/primitive_genemod.dm | 2 +-
modular_doppler/wargaming/code/projectors.dm | 6 +--
.../research/xenoarch/xenoarch_tool.dm | 2 +-
tgstation.dme | 41 ++++++++++++++++++-
60 files changed, 351 insertions(+), 33 deletions(-)
create mode 100644 modular_doppler/lore/overrides/areas/away_content.dm
create mode 100644 modular_doppler/lore/overrides/areas/centcom.dm
create mode 100644 modular_doppler/lore/overrides/areas/mining.dm
create mode 100644 modular_doppler/lore/overrides/crab17.dm
create mode 100644 modular_doppler/lore/overrides/ert.dm
create mode 100644 modular_doppler/lore/overrides/general_memories.dm
create mode 100644 modular_doppler/lore/overrides/items/blueprints.dm
create mode 100644 modular_doppler/lore/overrides/items/bodybag.dm
create mode 100644 modular_doppler/lore/overrides/items/charter.dm
create mode 100644 modular_doppler/lore/overrides/items/clown_items.dm
create mode 100644 modular_doppler/lore/overrides/items/defib.dm
create mode 100644 modular_doppler/lore/overrides/items/hourglass.dm
create mode 100644 modular_doppler/lore/overrides/items/religion.dm
rename modular_doppler/lore/overrides/{ => items}/secret_documents.dm (84%)
create mode 100644 modular_doppler/lore/overrides/items/shields.dm
create mode 100644 modular_doppler/lore/overrides/items/spear.dm
create mode 100644 modular_doppler/lore/overrides/machinery/camera.dm
create mode 100644 modular_doppler/lore/overrides/machinery/computer/records/medical.dm
create mode 100644 modular_doppler/lore/overrides/machinery/computer/records/security.dm
create mode 100644 modular_doppler/lore/overrides/machinery/drone_dispenser.dm
create mode 100644 modular_doppler/lore/overrides/machinery/newscaster_machine.dm
create mode 100644 modular_doppler/lore/overrides/machinery/newspaper.dm
create mode 100644 modular_doppler/lore/overrides/machinery/sleepers.dm
create mode 100644 modular_doppler/lore/overrides/machinery/syndicatebomb.dm
create mode 100644 modular_doppler/lore/overrides/objective_items.dm
create mode 100644 modular_doppler/lore/overrides/pod_style.dm
create mode 100644 modular_doppler/lore/overrides/posters/contraband.dm
create mode 100644 modular_doppler/lore/overrides/posters/official.dm
create mode 100644 modular_doppler/lore/overrides/posters/poster_demotivational.dm
create mode 100644 modular_doppler/lore/overrides/ruins/icemoon.dm
create mode 100644 modular_doppler/lore/overrides/ruins/lavaland.dm
create mode 100644 modular_doppler/lore/overrides/ruins/ruins.dm
create mode 100644 modular_doppler/lore/overrides/ruins/space.dm
create mode 100644 modular_doppler/lore/overrides/severe.dm
create mode 100644 modular_doppler/lore/overrides/shuttles/emergency.dm
create mode 100644 modular_doppler/lore/overrides/shuttles/whiteship.dm
create mode 100644 modular_doppler/lore/overrides/station_traits/job_traits.dm
create mode 100644 modular_doppler/lore/overrides/station_traits/negative_traits.dm
create mode 100644 modular_doppler/lore/overrides/station_traits/neutral_traits.dm
create mode 100644 modular_doppler/lore/overrides/station_traits/positive_traits.dm
diff --git a/code/datums/components/payment.dm b/code/datums/components/payment.dm
index 37839f1599c70..dad70b0d9c37c 100644
--- a/code/datums/components/payment.dm
+++ b/code/datums/components/payment.dm
@@ -164,7 +164,8 @@
to_chat(user, span_warning("You do not possess the funds to purchase that."))
atom_parent.balloon_alert(user, "needs [total_cost] credit\s!")
return FALSE
- target_acc.transfer_money(idcard.registered_account, total_cost, "Nanotrasen: Usage of Corporate Machinery")
+ //target_acc.transfer_money(idcard.registered_account, total_cost, "Nanotrasen: Usage of Corporate Machinery") // ORIGINAL
+ target_acc.transfer_money(idcard.registered_account, total_cost, "The Port Authority: Usage of Corporate Machinery") // DOPPLER EDIT - NT -> PA
log_econ("[total_cost] credits were spent on [parent] by [user] via [idcard.registered_account.account_holder]'s card.")
idcard.registered_account.bank_card_talk("[total_cost] credits deducted from your account.")
playsound(src, 'sound/effects/cashregister.ogg', 20, TRUE)
diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm
index 344ef6abfad0e..6bf66a346d743 100644
--- a/code/datums/sprite_accessories.dm
+++ b/code/datums/sprite_accessories.dm
@@ -1376,10 +1376,12 @@
icon_state = "shirt_meat"
gender = NEUTER
+/* DOPPLER EDIT REMOVAL - NT -> PA
/datum/sprite_accessory/undershirt/nano
name = "Shirt (Nanotrasen)"
icon_state = "shirt_nano"
gender = NEUTER
+*/
/datum/sprite_accessory/undershirt/peace
name = "Shirt (Peace)"
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index 7d83439b6d494..eb90a056889b1 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -302,7 +302,8 @@
/datum/station_trait/scarves/New()
. = ..()
report_message = pick(
- "Nanotrasen is experimenting with seeing if neck warmth improves employee morale.",
+ //"Nanotrasen is experimenting with seeing if neck warmth improves employee morale.", // ORIGINAL
+ "The Port Authority is experimenting with seeing if neck warmth improves employee morale.", // DOPPLER EDIT - NT -> PA
"After Space Fashion Week, scarves are the hot new accessory.",
"Everyone was simultaneously a little bit cold when they packed to go to the station.",
"The station is definitely not under attack by neck grappling aliens masquerading as wool. Definitely not.",
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index b2df8d7416dde..aea9e1a0f3b2b 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -400,7 +400,8 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
/datum/objective/jailbreak/detain/update_explanation_text()
..()
if(target?.current)
- explanation_text = "Ensure that [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role] is delivered to Nanotrasen alive and in custody."
+ //explanation_text = "Ensure that [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role] is delivered to Nanotrasen alive and in custody." // ORIGINAL
+ explanation_text = "Ensure that [target.name], the [!target_role_type ? target.assigned_role.title : target.special_role] is delivered to the Port Authority alive and in custody." // DOPPLER EDIT - NT -> PA
else
explanation_text = "Free objective."
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index abbfb055e1647..aac70dfc56dfa 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -872,7 +872,8 @@
if(HACK_THREAT) // Force an unfavorable situation on the crew
priority_announce(
- "Attention crew, the Nanotrasen Department of Intelligence has received intel suggesting increased enemy activity in your sector beyond that initially reported in today's threat advisory.",
+ //"Attention crew, the Nanotrasen Department of Intelligence has received intel suggesting increased enemy activity in your sector beyond that initially reported in today's threat advisory.", // ORIGINAL
+ "Attention crew, the Port Authority Department of Intelligence has received intel suggesting increased enemy activity in your sector beyond that initially reported in today's threat advisory.", // DOPPLER EDIT - NT -> PA
"[command_name()] High-Priority Update",
)
diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm
index 6021c954cabfc..07a782e0c412d 100644
--- a/code/game/machinery/computer/telescreen.dm
+++ b/code/game/machinery/computer/telescreen.dm
@@ -535,7 +535,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/deep_sto
"Thank you for tuning in to the slaughter!",
"What a show! And we guarantee next one will be bigger!",
"Celebrate the results with Thundermerch!",
- "This show was brought to you by Nanotrasen.",
+ //"This show was brought to you by Nanotrasen.", // ORIGINAL
+ "This show was brought to you by the Port Authority.", // DOPPLER EDIT - NT -> PA
)
/obj/item/assembly/control/showtime/activate()
diff --git a/code/game/machinery/incident_display.dm b/code/game/machinery/incident_display.dm
index 77194a26dd7ba..245dacd467ba5 100644
--- a/code/game/machinery/incident_display.dm
+++ b/code/game/machinery/incident_display.dm
@@ -369,7 +369,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32)
if(sign_features & DISPLAY_DELAM)
. += span_notice("It can be changed to display tram hits with a [EXAMINE_HINT("multitool")].")
if(last_delam >= 0)
- . += span_info("It has been [last_delam] shift\s since the last delamination event at this Nanotrasen facility.")
+ //. += span_info("It has been [last_delam] shift\s since the last delamination event at this Nanotrasen facility.") // ORIGINAL
+ . += span_info("It has been [last_delam] shift\s since the last delamination event at this Port Authority facility.") // DOPPLER EDIT - NT -> PA
switch(last_delam)
if(0)
. += span_info("Let's do better today.
")
@@ -395,7 +396,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32)
if(2 to 5)
. += span_info("There's room for improvement.
")
if(6 to 10)
- . += span_info("Good work! Nanotrasen's finest!
")
+ //. += span_info("Good work! Nanotrasen's finest!
") // ORIGINAL
+ . += span_info("Good work! The Port Authority's finest!
") // DOPPLER EDIT - NT -> PA
if(69)
. += span_info("Nice.
")
else
diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
index 18c3d9434d869..79a30fa6b9f92 100644
--- a/code/game/machinery/newscaster/newscaster_machine.dm
+++ b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -222,7 +222,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
data["channelAuthor"] = current_channel?.author
if(!current_channel)
- data["channelAuthor"] = "Nanotrasen Inc"
+ //data["channelAuthor"] = "Nanotrasen Inc" // ORIGINAL
+ data["channelAuthor"] = "The Port Authority" // DOPPLER EDIT - NT -> PA
data["channelDesc"] = "Welcome to Newscaster Net. Interface & News networks Operational."
data["channelLocked"] = TRUE
else
diff --git a/code/game/objects/effects/posters/official.dm b/code/game/objects/effects/posters/official.dm
index ed2a18b396b88..e39b0b17070cc 100644
--- a/code/game/objects/effects/posters/official.dm
+++ b/code/game/objects/effects/posters/official.dm
@@ -27,12 +27,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/random, 32)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/here_for_your_safety, 32)
+/* DOPPLER EDIT REMOVAL - NT -> PA
/obj/structure/sign/poster/official/nanotrasen_logo
name = "\improper Nanotrasen logo"
desc = "A poster depicting the Nanotrasen logo."
icon_state = "nanotrasen_logo"
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/nanotrasen_logo, 32)
+*/
/obj/structure/sign/poster/official/cleanliness
name = "Cleanliness"
@@ -301,7 +303,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/periodic_table,
. += "\t[span_info("In individuals with chronic exposure, severe effects have been noted. Further heightened aggression, long-term amnesia, Alzheimer's symptoms, schizophrenia, macular degeneration, aneurysms, heightened risk of stroke, and Parkinsons symptoms have all been noted.")]"
. += "\t[span_info("It is recommended that all individuals in unprotected contact with raw plasma regularly check with company health officials.")]"
. += "\t[span_info("For more information, please check with TerraGov's extranet site on Amenthium: www.terra.gov/health_and_safety/amenthium/, or our internal risk-assessment documents (document numbers #47582-b (Plasma safety data sheets) and #64210 through #64225 (PPE regulations for working with Plasma), available via NanoDoc to all employees).")]"
- . += "\t[span_info("Nanotrasen: Always looking after your health.")]"
+ //. += "\t[span_info("Nanotrasen: Always looking after your health.")]" // ORIGINAL
+ . += "\t[span_info("The Port Authority: Always looking after your health.")]" // DOPPLER EDIT - NT -> PA
return .
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/plasma_effects, 32)
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index ad9e517b11dd7..06c9b70e5c50f 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -1303,7 +1303,8 @@
/obj/item/card/id/advanced/debug/alt_click_can_use_id(mob/living/user)
. = ..()
if(!. || isnull(user.client?.holder)) // admins only as a safety so people don't steal all the dollars. spawn in a holochip if you want them to get some dosh
- registered_account.bank_card_talk(span_warning("Only authorized representatives of Nanotrasen may use this card."), force = TRUE)
+ //registered_account.bank_card_talk(span_warning("Only authorized representatives of Nanotrasen may use this card."), force = TRUE) // ORIGINAL
+ registered_account.bank_card_talk(span_warning("Only authorized representatives of the Port Authority may use this card."), force = TRUE) // DOPPLER EDIT - NT -> PA
return FALSE
return TRUE
@@ -1311,7 +1312,8 @@
/obj/item/card/id/advanced/debug/can_be_used_in_payment(mob/living/user)
. = ..()
if(!. || isnull(user.client?.holder))
- registered_account.bank_card_talk(span_warning("Only authorized representatives of Nanotrasen may use this card."), force = TRUE)
+ //registered_account.bank_card_talk(span_warning("Only authorized representatives of Nanotrasen may use this card."), force = TRUE) // ORIGINAL
+ registered_account.bank_card_talk(span_warning("Only authorized representatives of the Port Authority may use this card."), force = TRUE) // DOPPLER EDIT - NT -> PA
return FALSE
return TRUE
diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm
index 6b4ae0f918394..c91326afc97ff 100644
--- a/code/game/objects/items/charter.dm
+++ b/code/game/objects/items/charter.dm
@@ -113,7 +113,8 @@
minor_announce("[ureal_name] has designated the [name_type] as [html_decode(station_name())]", "Captain's Banner") //decode station_name to avoid minor_announce double encode
log_game("[ukey] has renamed the [name_type] as [station_name()].")
name = "banner of [station_name()]"
- desc = "The banner bears the official coat of arms of Nanotrasen, signifying that [station_name()] has been claimed by Captain [uname] in the name of the company."
+ //desc = "The banner bears the official coat of arms of Nanotrasen, signifying that [station_name()] has been claimed by Captain [uname] in the name of the company." // ORIGINAL
+ desc = "The banner bears the official coat of arms of the Port Authority, signifying that [station_name()] has been claimed by Captain [uname] in the name of the company." // DOPPLER EDIT - NT -> PA
SSblackbox.record_feedback("text", "station_renames", 1, "[station_name()]")
if(!unlimited_uses)
used = TRUE
diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index 6fdb864e40e2a..5f7c72eaa778f 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -223,9 +223,9 @@
/obj/item/paper/pamphlet/gateway = "[initial(name)] for [pick(GLOB.adjectives)] adventurers",
// DOPPLER EDIT START - NT -> PA
///obj/item/paper/pamphlet/violent_video_games = "[initial(name)] for the truth about the arcade centcom doesn't want to hear", // ORIGINAL
- /obj/item/paper/pamphlet/violent_video_games = "[initial(name)] for the truth about the arcade the port authority doesn't want to hear",
+ /obj/item/paper/pamphlet/violent_video_games = "[initial(name)] for the truth about the arcade the Port Authority doesn't want to hear",
///obj/item/paper/fluff/junkmail_redpill = "[initial(name)] for those feeling [pick(GLOB.adjectives)] working at Nanotrasen", // ORIGINAL
- /obj/item/paper/fluff/junkmail_redpill = "[initial(name)] for those feeling [pick(GLOB.adjectives)] working at Nanotrasen",
+ /obj/item/paper/fluff/junkmail_redpill = "[initial(name)] for those feeling [pick(GLOB.adjectives)] working at the Port Authority",
// DOPPLER EDIT END
/obj/effect/decal/cleanable/ash = "[initial(name)] with INCREDIBLY IMPORTANT ARTIFACT- DELIVER TO SCIENCE DIVISION. HANDLE WITH CARE.",
)
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index e89391f788727..60a800058c8ee 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -97,10 +97,10 @@