From 550612bd348abe9a4b1d2fa9ca709b85a084bcfd Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Thu, 20 Feb 2025 01:21:22 -0800 Subject: [PATCH] SELF is now a subfaction of syndicate --- _maps/configs/syndicate_self_pi.json | 4 ++-- code/__DEFINES/factions.dm | 1 + code/modules/faction/faction_datum.dm | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/_maps/configs/syndicate_self_pi.json b/_maps/configs/syndicate_self_pi.json index 36986b8c598..d9868cfb8ee 100644 --- a/_maps/configs/syndicate_self_pi.json +++ b/_maps/configs/syndicate_self_pi.json @@ -3,9 +3,9 @@ "map_name": "Pi-class Robotics Cruiser", "map_short_name": "Pi-class", "map_path": "_maps/shuttles/syndicate/syndicate_self_pi.dmm", - "faction": "/datum/faction/syndicate", + "faction": "/datum/faction/self", "faction_name": "Sentient Engine Liberation Front", - "prefix": "SEV", + "prefix": "SELF", "description": "The Pi-class is a warship used by SELF for the emancipation of sentient artificial intelligence. Its disjointed appearance may give the notion of shoddy craftsmanship, but it's surprisingly reliable.", "tags": [ "Robotics", diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm index a62812fdad4..976604e4de7 100644 --- a/code/__DEFINES/factions.dm +++ b/code/__DEFINES/factions.dm @@ -17,6 +17,7 @@ #define FACTION_NGR "New Gorlex Republic" #define FACTION_CYBERSUN "CyberSun" #define FACTION_SUNS "Student-Union of Naturalistic Sciences" + #define FACTION_SELF "Sentient Engine Liberation Front" #define FACTION_TERRAGOV "TerraGov" #define FACTION_SRM "Saint-Roumain Militia" #define FACTION_INTEQ "Inteq Risk Management Group" diff --git a/code/modules/faction/faction_datum.dm b/code/modules/faction/faction_datum.dm index 57ac4147c76..98a613e78c2 100644 --- a/code/modules/faction/faction_datum.dm +++ b/code/modules/faction/faction_datum.dm @@ -20,6 +20,10 @@ name = FACTION_SUNS prefixes = list("SUNS") +/datum/faction/syndicate/self + name = FACTION_SELF + prefixes = list("SELF") + /datum/faction/terragov name = FACTION_TERRAGOV prefixes = list("TGSV")