From 9f6c524482b3e59f7eec43e3f842091a18dde90f Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Wed, 19 Jan 2022 14:03:33 +0100 Subject: [PATCH] adds Epsilon Ursae Minoris as a new citizenship type for skrell and diona (#12898) --- code/__defines/species.dm | 8 +++++- code/modules/background/citizenship/human.dm | 25 +------------------ code/modules/background/citizenship/skrell.dm | 12 +++++++++ code/modules/background/defines.dm | 1 + .../human/species/station/diona/diona.dm | 2 +- .../human/species/station/skrell/skrell.dm | 2 +- html/changelogs/EUMCitizen.yml | 6 +++++ 7 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 html/changelogs/EUMCitizen.yml diff --git a/code/__defines/species.dm b/code/__defines/species.dm index 4b0044e1c6f..75815f857ff 100644 --- a/code/__defines/species.dm +++ b/code/__defines/species.dm @@ -95,4 +95,10 @@ #define BODYTYPE_MONKEY "Monkey" #define BODYTYPE_SKELETON "Skeleton" -#define BODYTYPE_CULTGHOST "Apparition" \ No newline at end of file +#define BODYTYPE_CULTGHOST "Apparition" + +#define ALL_SPECIES list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, \ + SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_UNBRANDED, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, \ + SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, \ + SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_VAURCA_WORKER, \ + SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) \ No newline at end of file diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index c2196d8891d..c9cf6b1aaa1 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -116,30 +116,7 @@ workplace of various contractors on board NSS Aurora." job_species_blacklist = list( - "Consular Officer" = list( - SPECIES_HUMAN, - SPECIES_HUMAN_OFFWORLD, - SPECIES_IPC, - SPECIES_IPC_BISHOP, - SPECIES_IPC_G1, - SPECIES_IPC_G2, - SPECIES_IPC_SHELL, - SPECIES_IPC_UNBRANDED, - SPECIES_IPC_XION, - SPECIES_IPC_ZENGHU, - SPECIES_DIONA, - SPECIES_DIONA_COEUS, - SPECIES_SKRELL, - SPECIES_SKRELL_AXIORI, - SPECIES_TAJARA, - SPECIES_TAJARA_MSAI, - SPECIES_TAJARA_ZHAN, - SPECIES_UNATHI, - SPECIES_VAURCA_WORKER, - SPECIES_VAURCA_WARRIOR, - SPECIES_VAURCA_BULWARK, - SPECIES_VAURCA_BREEDER - ) + "Consular Officer" = ALL_SPECIES ) /datum/citizenship/coalition diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 0e2359db91c..0247cda09cb 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -55,3 +55,15 @@ name = "Jargon Consular Officer" uniform = /obj/item/clothing/under/skrell + +/datum/citizenship/epsilon + name = CITIZENSHIP_EUM + description = "An independent nation on the edge of Skrell space, the Co-Operative Territories of Epsilon Ursae Minoris, \ + also known as the CT-EUM, is a nation primarily comprised of Dionae with a minority of skrell mostly situated \ + in the city of Nral'Daaq. The CT-EUM is compromised of a myriad of smaller nations and city-states that make up \ + the whole of the nation. While the nation is independent it does have heavy ties to the Jargon Federation, \ + being instrumental in the nations' founding and contact with the rest of the galaxy. " + + job_species_blacklist = list( + "Consular Officer" = ALL_SPECIES + ) \ No newline at end of file diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index cb7900f3b52..856a3cd0878 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -9,6 +9,7 @@ #define CITIZENSHIP_IZWESKI "Izweski Hegemony" #define CITIZENSHIP_JARGON "Jargon Federation" +#define CITIZENSHIP_EUM "Co-Operative Territories of EUM" #define CITIZENSHIP_PRA "People's Republic of Adhomai" #define CITIZENSHIP_DPRA "Democratic People's Republic of Adhomai" diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 4b12527638d..3d130c82d5f 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -110,7 +110,7 @@ max_hydration_factor = -1 - allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NONE) + allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_EUM, CITIZENSHIP_NONE) allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_NONE, RELIGION_OTHER) allowed_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) diff --git a/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm b/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm index b0d4f615800..a80d173e7b8 100644 --- a/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm +++ b/code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm @@ -83,7 +83,7 @@ default_h_style = "Skrell Short Tentacles" - allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI) + allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI, CITIZENSHIP_EUM) allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_NONE, RELIGION_OTHER) default_citizenship = CITIZENSHIP_JARGON diff --git a/html/changelogs/EUMCitizen.yml b/html/changelogs/EUMCitizen.yml new file mode 100644 index 00000000000..dd7869412e6 --- /dev/null +++ b/html/changelogs/EUMCitizen.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Skrell and diona now have a new possible citizenship, the Co-Operative Territories of Epsilon Ursae Minoris."