[MIRROR] 2ndFleet corrections + Ceti Expansion (#1179)

Co-authored-by: Ryan180602 <[email protected]
SierraBay · Nov 16, 2023 · 896c2a0 · 896c2a0
1 parent 60634d8
commit 896c2a0
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 17 deletions.
diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm
@@ -61,7 +61,9 @@
 #define CULTURE_HUMAN_BELTER   "Belter, Ceres"
 #define CULTURE_HUMAN_PLUTO    "Plutonian"
 #define CULTURE_HUMAN_EARTH    "Earther"
-#define CULTURE_HUMAN_CETI     "Cetite"
+#define CULTURE_HUMAN_CETIN    "Cetite, Northern"
+#define CULTURE_HUMAN_CETIS    "Cetite, Southern"
+#define CULTURE_HUMAN_CETII    "Cetite, Interstate"
 #define CULTURE_HUMAN_SPACER   "Spacer, Core Systems"
 #define CULTURE_HUMAN_SPAFRO   "Spacer, Frontier Systems"
 #define CULTURE_HUMAN_CONFED   "Terran"

diff --git a/code/modules/culture_descriptor/culture/cultures_human.dm b/code/modules/culture_descriptor/culture/cultures_human.dm
@@ -103,14 +103,28 @@
 	a content folk who see themselves as close to nature and keepers of the heritage of humanity."
 	economic_power = 1.1
 
-/singleton/cultural_info/culture/human/ceti
-	name = CULTURE_HUMAN_CETI
-	description = "You are from Ceti Epsilon, the technical hub of the SCG. As a Cetite you are no stranger to the cutting edge of technology present in Sol space. \
-	Putting education and the latest tech at the forefront of their priorities the people of Ceti are some of the brightest or tech savvy around. \
-	This has afforded those from the system or planet a reputation as being a cut above the rest in technical matters, with those who attended the Ceti Institute of Technology \
-	being considered some of the best qualified technical specialists in humanity. Recently there has been a rising transhumanist element in Ceti society resulting in a large \
-	cybernetics culture; it is not uncommon to see many Cetites sporting some chrome."
-	economic_power = 1.1
+/singleton/cultural_info/culture/human/ceti_north
+	name = CULTURE_HUMAN_CETIN
+	description = "You are from the northern pole of Ceti Epsilon. Likely living in one of the claustrophobic concrete jungles like the city of Icon, \
+	Solar citizens hailing from the North generally enjoy higher opportunities for better jobs, and lead a more comfortable lifestyle \
+	compared to those from the Interstates and South. \
+	Icon is also the technological capital of Ceti Epsilon, with education and the latest tech easily available to Northern Cetites."
+	economic_power = 1.3
+
+/singleton/cultural_info/culture/human/ceti_south
+	name = CULTURE_HUMAN_CETIS
+	description = "You are from the southern pole of Ceti Epsilon. Likely living in one of the smog-ridden cities like the region's capital, Scadde, or in one of the outer townships. \
+	Solar citizens hailing from the South live a less comfortable and connected lifestyle compared to those from the North, but still have plenty of opportunities to make something of their lives. \
+	Scadde is a hub for specialised and unspecialised blue collar labour, and the site for the Tau Ceti system's Hephaestus Industries headquarters."
+	economic_power = 1.2
+
+/singleton/cultural_info/culture/human/ceti_interstate
+	name = CULTURE_HUMAN_CETII
+	description = "The stretch between the north and south poles of Ceti Epsilon is collectively referred to as the Ceti Interstate Municipal Region. Those living across this sweltering desert usually do so out of necessity rather than choice. \
+	The majority of industry in the region is made up of mining operations, hydroponic farms, and independent businesses \
+	between the two poles. \
+	The region is sparsely populated both by hopeful entrepreneurs and those who benefit from the lack of coverage by settlement police authorities or planetary defense forces."
+	economic_power = 1.0
 
 /singleton/cultural_info/culture/human/spacer_core
 	name = CULTURE_HUMAN_SPACER

diff --git a/code/modules/culture_descriptor/location/locations_human.dm b/code/modules/culture_descriptor/location/locations_human.dm
@@ -98,8 +98,8 @@
 	all, although places are competitive and preference is given to natives to the Tau Ceti system.<br><br> Being from a \
 	near-Sol colony with a focus on the cutting edge, most Episoloners are tech-savvy at the very least and are usually \
 	well educated, with a focus on the sciences."
-	capital = "Verlize"
-	economic_power = 1.4
+	capital = "Icon"
+	economic_power = 1.2
 
 /singleton/cultural_info/location/human/eos
 	name = HOME_SYSTEM_HELIOS

diff --git a/code/modules/species/station/station.dm b/code/modules/species/station/station.dm
@@ -33,7 +33,9 @@
 			CULTURE_HUMAN_BELTER,
 			CULTURE_HUMAN_PLUTO,
 			CULTURE_HUMAN_EARTH,
-			CULTURE_HUMAN_CETI,
+			CULTURE_HUMAN_CETIN,
+			CULTURE_HUMAN_CETIS,
+			CULTURE_HUMAN_CETII,
 			CULTURE_HUMAN_SPACER,
 			CULTURE_HUMAN_SPAFRO,
 			CULTURE_HUMAN_CONFED,

diff --git a/maps/mapsystem/maps.dm b/maps/mapsystem/maps.dm
@@ -169,7 +169,9 @@ var/global/const/MAP_HAS_RANK = 2		//Rank system, also togglable
 			CULTURE_HUMAN_BELTER,
 			CULTURE_HUMAN_PLUTO,
 			CULTURE_HUMAN_EARTH,
-			CULTURE_HUMAN_CETI,
+			CULTURE_HUMAN_CETIN,
+			CULTURE_HUMAN_CETIS,
+			CULTURE_HUMAN_CETII,
 			CULTURE_HUMAN_SPACER,
 			CULTURE_HUMAN_SPAFRO,
 			CULTURE_HUMAN_CONFED,

diff --git a/maps/sierra/sierra_define.dm b/maps/sierra/sierra_define.dm
@@ -83,7 +83,9 @@
 			CULTURE_HUMAN_BELTER,
 			CULTURE_HUMAN_PLUTO,
 			CULTURE_HUMAN_EARTH,
-			CULTURE_HUMAN_CETI,
+			CULTURE_HUMAN_CETIN,
+			CULTURE_HUMAN_CETIS,
+			CULTURE_HUMAN_CETII,
 			CULTURE_HUMAN_SPACER,
 			CULTURE_HUMAN_SPAFRO,
 			CULTURE_HUMAN_CONFED,

diff --git a/maps/torch/items/clothing/solgov-accessory.dm b/maps/torch/items/clothing/solgov-accessory.dm
@@ -121,7 +121,7 @@ patches
 
 /obj/item/clothing/accessory/solgov/fleet_patch/second
 	name = "\improper Second Fleet patch"
-	desc = "A well-worn shoulder patch carrying insignia of Second Fleet, the Home Guard, tasked with defense of Sol territories."
+	desc = "A well-worn shoulder patch carrying insignia of Second Fleet, the Home Defense Group, tasked with defense of Sol territories."
 	icon_state = "fleetpatch2"
 
 /obj/item/clothing/accessory/solgov/fleet_patch/third

diff --git a/maps/torch/items/clothing/solgov-head.dm b/maps/torch/items/clothing/solgov-head.dm
@@ -290,7 +290,7 @@
 
 /obj/item/clothing/head/beret/solgov/fleet/branch/second
 	name = "second fleet beret"
-	desc = "An SCG Fleet beret carrying the insignia of the Second Fleet, the Home Guard, tasked with defense of Sol territories. For personnel that are more inclined towards style than safety."
+	desc = "An SCG Fleet beret carrying the insignia of the Second Fleet, the Home Defense Group, tasked with defense of Sol territories. For personnel that are more inclined towards style than safety."
 	icon_state = "beret_navy_second"
 
 /obj/item/clothing/head/beret/solgov/fleet/branch/third

diff --git a/mods/tajara/code/datum/species.dm b/mods/tajara/code/datum/species.dm
@@ -94,7 +94,9 @@
 			CULTURE_HUMAN_VENUSLOW,
 			CULTURE_HUMAN_BELTER,
 			CULTURE_HUMAN_EARTH,
-			CULTURE_HUMAN_CETI,
+			CULTURE_HUMAN_CETIN,
+			CULTURE_HUMAN_CETIS,
+			CULTURE_HUMAN_CETII,
 			CULTURE_HUMAN_SPACER,
 			CULTURE_HUMAN_SPAFRO,
 			CULTURE_HUMAN_OTHER