From 4431d215e82e05bdfac70ddce4d34e98e4bb9ea5 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Sun, 14 Sep 2025 10:44:19 +0100
Subject: [PATCH] ship names update (#18456)
---
code/modules/busy_space/organizations.dm | 45 ++++++++++++++++++++----
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm
index 0ed540bbe2..6990706ea5 100644
--- a/code/modules/busy_space/organizations.dm
+++ b/code/modules/busy_space/organizations.dm
@@ -80,7 +80,6 @@
"Columbia",
"Eagle",
"Intrepid",
- "Odyssey",
"Aquarius",
"Kitty Hawk",
"Antares",
@@ -205,6 +204,7 @@
"Mildly Flammable",
"Wave Goodbye",
"Hugh Mann",
+ "Hugh Anner",
"Savage Chicken",
"Homestead",
"Peacekeeper",
@@ -236,10 +236,13 @@
"Spirit of Alliance",
"Surrounded By Idiots",
"Honk If You Can Read This",
+ "Terms And Conditions May Apply",
"Personal Space Invader",
"Sufficient Velocity",
"Credible Deniability",
+ "Incredible Deniability",
"Crucible",
+ "Empire of the Tyrants",
"Nostromo",
"Dance Like You Mean It",
"Birthday Suit",
@@ -256,7 +259,10 @@
"Stockholm Syndrome",
"False King",
"Bombshell",
+ "End of Everything",
+ "One and Only",
"Walking Disaster",
+ "Wild World",
"Two-Body Problem",
"Instrument of Violence",
"Entropic Whisper",
@@ -335,6 +341,7 @@
"Inside Outside",
"Galley",
"Constellation",
+ "Delta-V Deficiency",
"Dromedarii",
"Golden Hand",
"White Company",
@@ -343,7 +350,10 @@
"Two For Flinching",
"Uninvited Guest",
"Iconoclast",
- "Bluespace Tourist"
+ "Bluespace Tourist",
+ "Fortunate Son",
+ "Unfortunate Son",
+ "Hazard Pay"
)
var/list/added_ship_names = list() //List of ship names to add to the above, rather than wholesale replacing
var/list/destination_names = list() //Names of static holdings that the organization's ships visit
@@ -1713,6 +1723,7 @@
"Argonaut",
"Desert Nomad",
"Non-Prophet Organization",
+ "Kessler Syndrome Candidate",
"Rest In Pieces",
"Sweep Dreams",
"Home Sweep Home",
@@ -1899,6 +1910,7 @@
"Mattock",
"Hatchet",
"Machete",
+ "Seax",
"Axe",
"Tomahawk",
"Labrys",
@@ -2165,8 +2177,9 @@
the flag of the Commonwealth. The constant tug and pull of government versus corporation, democracy and power \
troubles this federation of deeply entrenched human colonies much like it did in the 21st century. Some things \
never change. However, they are economically and culturally quite dominant, although not everyone likes that fact. \
-
\
- Ships on official CWS assignments typically carry the designations of Earth\'s largest craters, as a reminder of everything the planet (and humanity itself) has endured."
+
\
+ Ships on official CWS assignments typically carry the designations of Earth\'s largest craters, as a reminder of \
+ everything the planet (and humanity itself) has endured."
history = "" // Todo
work = "governing polity of humanity's systems"
headquarters = "Luna, Sol"
@@ -2300,8 +2313,13 @@
"Sir, It's One Of Ours",
"The Big Stick For Speaking Softly",
"Per Our Last E-Mail",
+ "Gunboat Diplomat",
+ "Megaton Express",
+ "Crayon Dispenser",
"A Slight Weight Discrepancy",
"I Think It's An Asteroid",
+ "Tungsten Deficiency Corrector",
+ "One Ping Only",
"Bull Moose",
"Engels Needs Some Love Too",
"The Icepick",
@@ -2382,6 +2400,10 @@
"Libertine Ideals",
"The True Free",
"Unbound",
+ "Per My Last Email",
+ "Media Illiterate",
+ "Sovereign Citizen",
+ "Antidisestablishmentarianism",
"No Man Shackled",
"All Men Shackled",
"All Women Shackled",
@@ -2390,6 +2412,7 @@
"Nobody Deserves Shackles",
"Debt Slavery Is Ethical",
"Fashioned After Tradition",
+ "Scurvy Builds Character",
"Sic Vic Pacem",
"Cultivate This",
"We Demand Self-Governance",
@@ -2397,6 +2420,10 @@
"There Is a Character Limit?",
"Slave Galley I",
"The Memes of Production",
+ "Mine's Bigger",
+ "Liberace",
+ "Orion Drive Enthusiast",
+ "Ship of Theseus LXIXCDXX",
"The Unconquered CCXXII"
)
destination_names = list(
@@ -2410,7 +2437,7 @@
"Forward Base Mara Alpha",
"a liberation intervention",
"a nav bouy within Cygnus Space",
- "a Elysian only refuel outpost",
+ "an Elysians-only refuel outpost",
"to a killer party the Fredperor is holding right now"
)
@@ -2575,12 +2602,14 @@
"Voyage",
"Talons",
"Fang",
+ "Claw",
"Wing",
"Pride",
"Glory",
"Wit",
"Insight",
"Wisdom",
+ "Foresight",
"Mind",
"Cry",
"Howl",
@@ -2968,13 +2997,17 @@
"Crusader",
"Maverick",
"Nighthawk",
+ "Foxbat",
"Redshift",
"Challenger",
"Starlight",
"Sunray",
"Ironside",
"Holdfast",
- "Foxhound"
+ "Foxhound",
+ "Zerstorer",
+ "Skyhawk",
+ "Thunderhead"
)
var/list/numbersone = list(
"Zero",