diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm index b0714838867..6cdda9a410d 100644 --- a/code/__defines/culture.dm +++ b/code/__defines/culture.dm @@ -13,6 +13,7 @@ // Cultural IDs. #define FACTION_SOL_CENTRAL "Sol Central Government" #define FACTION_TERRAGOV "Terran Government" +#define FACTION_ISC "Independent Space Confederation" #define FACTION_NANOTRASEN "NanoTrasen" #define FACTION_FREETRADE "Free Trade Union" #define FACTION_HEPHAESTUS "Hephaestus Industries" @@ -21,11 +22,11 @@ #define FACTION_EXPEDITIONARY "Expeditionary Corps" #define FACTION_PCRC "Proxima Centauri Risk Control" #define FACTION_SAARE "Strategic Assault and Asset Retention Enterprises" -#define FACTION_CORPORATE "Expeditionary Corps Organisation" +#define FACTION_CORPORATE "Expeditionary Corps Organisation" #define FACTION_DAIS "Deimos Advanced Information Systems" #define FACTION_OTHER "Other Faction" #define FACTION_TEST_SUBJECTS "Test Subjects" -#define FACTION_SPACECOPS "Sol Federal Police" +#define FACTION_SPACECOPS "Sol Federal Police" #define HOME_SYSTEM_EARTH "Earth" #define HOME_SYSTEM_LUNA "Luna" @@ -45,6 +46,7 @@ #define HOME_SYSTEM_KINGSTON "Kingston" #define HOME_SYSTEM_GAIA "Gaia" #define HOME_SYSTEM_MAGNITKA "Magnitka" +#define HOME_SYSTEM_TAUR "Taur" #define HOME_SYSTEM_STATELESS "Stateless" #define HOME_SYSTEM_OTHER "Other System" #define HOME_SYSTEM_DEEP_SPACE "Deep Space" diff --git a/code/modules/culture_descriptor/faction/factions_human.dm b/code/modules/culture_descriptor/faction/factions_human.dm index ecb067979e4..f749fe96bc1 100644 --- a/code/modules/culture_descriptor/faction/factions_human.dm +++ b/code/modules/culture_descriptor/faction/factions_human.dm @@ -3,7 +3,7 @@ description = "The Sol Central Government, commonly referred to as SolGov or the SCG, is a federal republic \ composed of numerous human member states spanning many systems.\ Based in the Sol System and with most seats of Government on Olympus, Mars,\ - the SCG governs the majority of human space. Currently engaged in a cold war with the Confederation of Gilgamesh \ + the SCG governs the majority of human space. Currently engaged in a cold civil war with the Terran Government and Independent Space Confederation. \ Its primary governing bodies are the Assemblies which are led by an Assembly-elected secretary general. \ Member states have a great degree of freedom in their actions, though the SCG manages sapient rights, \ domestic security, economic policy, and diplomacy for humanity as a whole. The SCG's population is diverse \ @@ -45,6 +45,16 @@ and each would rephrase 'progress of humanity' as they see fit, ranging from a more peaceful approach of co-existence with non-hostile alien \ civilizations to much more extreme sides of eternal war with everyone who isn't a part of TerraGov. Despite this, the senate is considered a stable \ entity due to every faction being somewhat restricted by the constitution. " + subversive_potential = 25 + +/decl/cultural_info/faction/isc + name = FACTION_ISC + description = "The Independent Space Confederation, commonly referred to as ISC, is the third most powerful human union in the universe. \ + ISC is not a united government, as the name implies, but rather a union of multiple independent states with a common goal of protecting \ + their independency from TerraGov and SolGov. Formed from a temporary military alliance during civil war age, the confederation \ + is a house to diverse caste of various planets and systems, ranging from most humane democracies all the way to militaristic dictatorships. \ + When people mention the Confederation as united force, it is more of than than not about its joint command. \ + Head quarters are located on lush planet Taur in Aontacht system, its founder and first member state." subversive_potential = 50 /decl/cultural_info/faction/remote diff --git a/code/modules/culture_descriptor/location/locations_human.dm b/code/modules/culture_descriptor/location/locations_human.dm index 21ec1dd6ac2..b1b1140963c 100644 --- a/code/modules/culture_descriptor/location/locations_human.dm +++ b/code/modules/culture_descriptor/location/locations_human.dm @@ -129,7 +129,7 @@ capital = "Ameranth" distance = "22 light years" economic_power = 1.2 - ruling_body = "Terran Government" + ruling_body = FACTION_TERRAGOV secondary_langs = list(LANGUAGE_SPACER) /decl/cultural_info/location/human/new_earth @@ -141,7 +141,7 @@ capital = "Liabon" distance = "25 light years" economic_power = 1.1 - ruling_body = "Terran Government" + ruling_body = FACTION_TERRAGOV secondary_langs = list(LANGUAGE_SPACER) /decl/cultural_info/location/human/tersten @@ -256,3 +256,16 @@ capital = "Labortown" economic_power = 0.8 ruling_body = "Magnitka" + +/decl/cultural_info/location/human/taur + name = HOME_SYSTEM_TAUR + distance = "64 light years" + description = "Taur is an independent planet within Independent Space Confederation in Aontacht star system. It is the only habitable planet within its system. \ + Taur is a lush planet with cold and rainy climate, focused on development of new technologies and heavy weaponry. \ + The history of the planet, and Aontacht system as a whole, is nearly a legend within the ISC; Being the founder and first member of the confederation, \ + it was governor of Aontacht star system that pushed for creating of then a temporary military alliance of independent states, which then became the confederation. \ + Relying heavily on what was employed during Imperial era, the government of Taur is composed of governor and the senate, both being chosen by the citizens of the star system, \ + though it is widely known that those elections may be less than perfect, with military playing large role in the political life of the planet." + capital = "Saoradh" + economic_power = 1.3 + ruling_body = FACTION_ISC