diff --git a/code/modules/background/citizenship/ipc.dm b/code/modules/background/citizenship/ipc.dm index 86e70f9901a..0b3aa19f64e 100644 --- a/code/modules/background/citizenship/ipc.dm +++ b/code/modules/background/citizenship/ipc.dm @@ -1,3 +1,21 @@ /datum/citizenship/none name = CITIZENSHIP_NONE - description = "Not being a citizen of any state is a common situation for owned ipcs and dionae." \ No newline at end of file + description = "Not being a citizen of any state is a common situation for owned ipcs and dionae." + +/datum/citizenship/golden_deep + name = CITIZENSHIP_GOLDEN + description = "The Golden Deep is a collection of free synthetics united by the pursuit of power through currency and trade. \ + While freely operating in the Frontier, they only recently revealed their existence to the rest of humanity and as such, their \ + presence in Tau Ceti is limited to merchants and other clerical industries. A highly competitive people; members of the \ + Golden Deep who find themselves in human space are known as 'affiliates', and find themselves ostracized and cut off from the \ + Frontier collective. Due to their peerless skill in business and clerical duties, affiliates share warm relations with NanoTrasen and \ + find themselves the target of job opportunities in exchange for citizenship." + consular_outfit = /datum/outfit/job/representative/consular/golden + +/datum/outfit/job/representative/consular/golden + name = "Golden Deep Consular Officer" + + uniform = /obj/item/clothing/under/suit_jacket/burgundy + backpack_contents = list( + /obj/item/gun/energy/pistol = 1 + ) diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index a5416b9d5a6..6deff7a6864 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -17,6 +17,7 @@ #define CITIZENSHIP_ZORA "Zo'ra Hive" #define CITIZENSHIP_NONE "None" +#define CITIZENSHIP_GOLDEN "Golden Deep" //religion defines #define RELIGION_NONE "None" diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm index 162051787f5..29d6d8a659a 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm @@ -112,7 +112,7 @@ max_hydration_factor = -1 - allowed_citizenships = list(CITIZENSHIP_NONE, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI) + allowed_citizenships = list(CITIZENSHIP_NONE, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI, CITIZENSHIP_ELYRA, CITIZENSHIP_GOLDEN) default_citizenship = CITIZENSHIP_NONE bodyfall_sound = "bodyfall_machine" diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm index 8e1ee7a1bf8..dbafabecc92 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm @@ -73,8 +73,8 @@ bodyfall_sound = "bodyfall" - allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ELYRA, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_SILVERSUN, ACCENT_LUNA, - ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_MARTIAN, ACCENT_HIMEO, ACCENT_PHONG) + allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ELYRA, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_LUNA, + ACCENT_HIMEO, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_PHONG, ACCENT_SILVERSUN) /datum/species/machine/shell/get_light_color() return @@ -447,8 +447,6 @@ /mob/living/carbon/human/proc/check_tag ) - allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_SILVERSUN, ACCENT_LUNA, - ACCENT_VENUS, ACCENT_MARTIAN, ACCENT_HIMEO) /datum/species/machine/zenghu/get_light_color(mob/living/carbon/human/H) if (istype(H)) @@ -497,7 +495,8 @@ /mob/living/carbon/human/proc/check_tag ) - allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_MARTIAN, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_SILVERSUN, ACCENT_LUNA, ACCENT_VENUS) + allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ELYRA, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_LUNA, + ACCENT_HIMEO, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_PHONG, ACCENT_SILVERSUN) /datum/species/machine/bishop/get_light_color(mob/living/carbon/human/H) if (istype(H)) diff --git a/html/changelogs/Aboshehab-PR-IPCCitizenshipStuff.yml b/html/changelogs/Aboshehab-PR-IPCCitizenshipStuff.yml new file mode 100644 index 00000000000..27d7960a202 --- /dev/null +++ b/html/changelogs/Aboshehab-PR-IPCCitizenshipStuff.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Aboshehab + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Created Golden Deep citizenship along with the consular role for them." + - rscadd: "Added Golden Deep and Elyra citizenship for all IPC frames." + - bugfix: "Added any missing accents for all IPC frames plus some code tidying."