From 09d7556bd691b0a9c0d48df28a424de81f1cd009 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Mon, 18 Mar 2024 12:11:14 +1300 Subject: [PATCH] You Tell 'Em, Boss: The Diplomatic Aide (#18289) * midnight commits make me want to die * driplomatic aide * la fixe * changelog * obj outfits --------- Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> --- code/__DEFINES/background.dm | 5 + code/__DEFINES/jobs.dm | 3 +- code/game/jobs/job/outsider/representative.dm | 71 ++++++++++++++ code/game/jobs/jobs.dm | 4 +- .../background/citizenship/citizenship.dm | 2 + code/modules/background/citizenship/dionae.dm | 20 ++++ code/modules/background/citizenship/human.dm | 70 ++++++++++++- code/modules/background/citizenship/ipc.dm | 16 +++ code/modules/background/citizenship/skrell.dm | 21 ++++ code/modules/background/citizenship/tajara.dm | 98 +++++++++++++++++++ code/modules/background/citizenship/unathi.dm | 25 +++++ code/modules/background/citizenship/vaurca.dm | 12 ++- .../loadout/items/accessories.dm | 2 +- html/changelog.html | 16 +-- html/changelogs/.all_changelog.yml | 2 +- .../RustingWithYou - backonmybullshit.yml | 41 ++++++++ 16 files changed, 391 insertions(+), 17 deletions(-) create mode 100644 html/changelogs/RustingWithYou - backonmybullshit.yml diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm index bde41d93726..6ab73023b99 100644 --- a/code/__DEFINES/background.dm +++ b/code/__DEFINES/background.dm @@ -222,3 +222,8 @@ #define CITIZENSHIPS_DOMINIA list(CITIZENSHIP_DOMINIA, CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL) #define RELIGIONS_UNATHI list(RELIGION_THAKH, RELIGION_AUTAKH, RELIGION_SKAKH, RELIGION_SIAKH) + +#define ALL_CITIZENSHIPS list(CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ELYRA,\ +CITIZENSHIP_ELYRA_NCP, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM,\ +CITIZENSHIP_PRA, CITIZENSHIP_DPRA, CITIZENSHIP_NKA, CITIZENSHIP_FREE_COUNCIL, CITIZENSHIP_ZORA, CITIZENSHIP_KLAX, CITIZENSHIP_CTHUR,\ +CITIZENSHIP_NONE, CITIZENSHIP_GOLDEN) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 4ae3cf33702..d5ad8fabc97 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -8,6 +8,7 @@ #define CONSULAR_ROLE /datum/job/consular #define JOURNALIST_ROLE /datum/job/journalist #define CHAPLAIN_ROLE /datum/job/chaplain +#define CONSULAR_AIDE_ROLE /datum/job/consular_assistant //Event Roles //Used for generic department jobs for off-ship events @@ -47,4 +48,4 @@ #define ZENG_ROLES list(SCIENCE_ROLES, MEDICAL_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) #define HEPH_ROLES list(OPERATIONS_ROLES, ENGINEERING_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) #define ORION_ROLES list(OPERATIONS_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE, SERVICE_ROLES) -#define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE, JOURNALIST_ROLE) +#define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, JOURNALIST_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE, JOURNALIST_ROLE, CONSULAR_AIDE_ROLE) diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index 80245641e04..7e3990c8dd8 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -230,7 +230,78 @@ /datum/job/consular/after_spawn(mob/living/carbon/human/H) var/datum/citizenship/citizenship = SSrecords.citizenships[H.citizenship] LAZYDISTINCTADD(blacklisted_citizenship, citizenship.name) + add_verb(H, /mob/living/carbon/human/proc/summon_goon) /datum/job/consular/on_despawn(mob/living/carbon/human/H) var/datum/citizenship/citizenship = SSrecords.citizenships[H.citizenship] LAZYREMOVE(blacklisted_citizenship, citizenship.name) + var/datum/job/J = SSjobs.GetJob("Diplomatic Aide") + if(citizenship.linked_citizenship) + LAZYDISTINCTADD(J.blacklisted_citizenship, citizenship.linked_citizenship) + else + LAZYDISTINCTADD(J.blacklisted_citizenship, H.citizenship) + if(J.total_positions > 0) + J.total_positions-- + +/mob/living/carbon/human/proc/summon_goon() + set name = "Open Aide Slot" + set desc = "Allows a diplomatic aide to join you as an assistant, companion, or bodyguard." + set category = "Consular" + + if(alert(src, "Are you sure you want to open an assistant slot? This can only be used once", "Open Aide Slot", "No", "Yes") != "Yes") + return + var/datum/job/J = SSjobs.GetJob("Diplomatic Aide") + var/datum/citizenship/citizenship = SSrecords.citizenships[src.citizenship] + if(citizenship.linked_citizenship) //if there's a secondary citizenship that this one should allow - e.g zo'ra and biesel + LAZYREMOVE(J.blacklisted_citizenship, citizenship.linked_citizenship) + else + LAZYREMOVE(J.blacklisted_citizenship, src.citizenship) + J.total_positions++ + to_chat(src, SPAN_NOTICE("A slot for a diplomatic aide has been opened.")) + remove_verb(src, /mob/living/carbon/human/proc/summon_goon) + +/datum/job/consular_assistant + title = "Diplomatic Aide" + flag = CONSULAR_ASST + departments = SIMPLEDEPT(DEPARTMENT_COMMAND_SUPPORT) + department_flag = ENGSEC + faction = "Station" + total_positions = 0 //manually opened by consular + spawn_positions = 0 + supervisors = "the Consular Officer" + selection_color = "#6186cf" + economic_modifier = 5 + + minimum_character_age = list( + SPECIES_HUMAN = 18, + SPECIES_SKRELL = 50, + SPECIES_SKRELL_AXIORI = 50 + ) + + access = list(ACCESS_CONSULAR, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_CONSULAR) + outfit = /obj/outfit/job/consular_assistant + blacklisted_citizenship = ALL_CITIZENSHIPS //removed based on consular citizensihp + +/datum/job/consular_assistant/get_outfit(mob/living/carbon/human/H, alt_title = null) + var/datum/citizenship/citizenship = SSrecords.citizenships[H.citizenship] + if(citizenship) + return citizenship.assistant_outfit + +/obj/outfit/job/consular_assistant + name = "Diplomatic Aide" + jobtype = /datum/job/consular_assistant + + uniform = /obj/item/clothing/under/suit_jacket/navy + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/lawyer + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/lawyer + tablet = /obj/item/modular_computer/handheld/preset/civilian/lawyer + shoes = /obj/item/clothing/shoes/laceup + glasses = /obj/item/clothing/glasses/sunglasses/big + headset = /obj/item/device/radio/headset/representative + bowman = /obj/item/device/radio/headset/representative/alt + double_headset = /obj/item/device/radio/headset/alt/double/command/representative + wrist_radio = /obj/item/device/radio/headset/wrist/command/representative + +/datum/job/consular_assistant/after_spawn(mob/living/carbon/human/H) + LAZYDISTINCTADD(blacklisted_citizenship, H.citizenship) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 120dcad0126..6e9d0f5165f 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -18,6 +18,7 @@ var/const/INTERN_ENG =(1<<11) var/const/BRIDGE_CREW =(1<<12) var/const/OPERATIONS_MANAGER =(1<<13) var/const/HRA =(1<<14) +var/const/CONSULAR_ASST =(1<<15) // MEDSCI var/const/MEDSCI =(1<<1) @@ -84,7 +85,8 @@ var/list/command_support_positions = list( "Human Resources Assistant", "Corporate Liaison", "Consular Officer", - "Bridge Crew" + "Bridge Crew", + "Diplomatic Aide" ) var/list/engineering_positions = list( diff --git a/code/modules/background/citizenship/citizenship.dm b/code/modules/background/citizenship/citizenship.dm index 26c5863fbdd..04d4f9ee9f0 100644 --- a/code/modules/background/citizenship/citizenship.dm +++ b/code/modules/background/citizenship/citizenship.dm @@ -2,8 +2,10 @@ var/name var/description var/obj/outfit/consular_outfit = /obj/outfit/job/representative/consular + var/obj/outfit/assistant_outfit = /obj/outfit/job/consular_assistant var/demonym var/list/job_species_blacklist = list() + var/linked_citizenship //a secondary citizenship tied to this one. only used for vaurca snowflake code. /datum/citizenship/proc/get_objectives(mission_level, var/mob/living/carbon/human/H) var/rep_objectives diff --git a/code/modules/background/citizenship/dionae.dm b/code/modules/background/citizenship/dionae.dm index 272eef4bf88..79d5644eba3 100644 --- a/code/modules/background/citizenship/dionae.dm +++ b/code/modules/background/citizenship/dionae.dm @@ -25,5 +25,25 @@ SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK + ), + "Diplomatic Aide" = list( + SPECIES_HUMAN, + SPECIES_HUMAN_OFFWORLD, + SPECIES_SKRELL, + SPECIES_IPC, + SPECIES_IPC_BISHOP, + SPECIES_IPC_G1, + SPECIES_IPC_G2, + SPECIES_IPC_SHELL, + SPECIES_IPC_UNBRANDED, + SPECIES_IPC_XION, + SPECIES_IPC_ZENGHU, + SPECIES_TAJARA, + SPECIES_TAJARA_MSAI, + SPECIES_TAJARA_ZHAN, + SPECIES_UNATHI, + SPECIES_VAURCA_WORKER, + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK ) ) diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 51431228d9b..5657e9a9271 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -5,12 +5,17 @@ its large xeno population which enjoys various privileges compared to other space powers. With a very lax migration policy, virtually everyone is welcome to live here. However, \ unrest and gridlock undermine the government, and the aggressive attitude of the Sol Alliance against its former system has made many worried for the future of the Republic." consular_outfit = /obj/outfit/job/representative/consular/ceti + consular_outfit = /obj/outfit/job/representative/consular/ceti + assistant_outfit = /obj/outfit/job/consular_assistant/ceti job_species_blacklist = list( "Consular Officer" = list( SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK + ), + "Diplomatic Aide" = list( + SPECIES_VAURCA_BREEDER ) ) @@ -59,6 +64,10 @@ /obj/item/stamp/biesel = 1, ) +/obj/outfit/job/consular_assistant/ceti + name = "Tau Ceti Diplomatic Aide" + accessory = /obj/item/clothing/accessory/tc_pin + /obj/outfit/job/representative/consular/ceti/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H) if(isvaurca(H)) @@ -83,7 +92,7 @@ Presently ruled by a military junta that is gradually giving way to civilian control, the Alliance is also generally xenophobic, and most non-humans find themselves discriminated against in Solarian territory. \ Though much of its former possessions are now occupied by warlord statelets and other interstellar powers, the Alliance still maintains a revanchist outlook, refusing to relinquish its claims to its lost territories." consular_outfit = /obj/outfit/job/representative/consular/sol - + assistant_outfit = /obj/outfit/job/consular_assistant/sol job_species_blacklist = list( "Consular Officer" = list( SPECIES_HUMAN, @@ -108,6 +117,28 @@ SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER + ), + "Diplomatic Aide" = list( + 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 ) ) @@ -139,6 +170,11 @@ /obj/item/gun/projectile/pistol/sol = 1 ) +/obj/outfit/job/consular_assistant/sol + name = "Sol Consular Officer" + + accessory = /obj/item/clothing/accessory/sol_pin + /datum/citizenship/sol_alliance/eridani name = CITIZENSHIP_ERIDANI description = "Eridani, or the Eridani Corporate Federation, is a dystopian oligarchic republic in the Epsilon Eridani system, dominated entirely by a council of mega-corporations \ @@ -147,7 +183,8 @@ workplace of various contractors on-board." job_species_blacklist = list( - "Consular Officer" = ALL_SPECIES + "Consular Officer" = ALL_SPECIES, + "Diplomatic Aide" = ALL_SPECIES ) /datum/citizenship/coalition @@ -168,6 +205,16 @@ SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER + ), + "Diplomatic Aide" = list( + SPECIES_TAJARA, + SPECIES_TAJARA_MSAI, + SPECIES_TAJARA_ZHAN, + SPECIES_UNATHI, + SPECIES_VAURCA_WORKER, + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK, + SPECIES_VAURCA_BREEDER ) ) @@ -259,6 +306,25 @@ SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER + ), + "Diplomatic Aide" = list( + SPECIES_IPC, + SPECIES_IPC_BISHOP, + SPECIES_IPC_G1, + SPECIES_IPC_G2, + SPECIES_IPC_SHELL, + SPECIES_IPC_UNBRANDED, + SPECIES_IPC_XION, + SPECIES_IPC_ZENGHU, + SPECIES_SKRELL, + SPECIES_SKRELL_AXIORI, + SPECIES_TAJARA, + SPECIES_TAJARA_MSAI, + SPECIES_TAJARA_ZHAN, + SPECIES_VAURCA_WORKER, + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK, + SPECIES_VAURCA_BREEDER ) ) diff --git a/code/modules/background/citizenship/ipc.dm b/code/modules/background/citizenship/ipc.dm index 5f551fbdcb7..eef7798979b 100644 --- a/code/modules/background/citizenship/ipc.dm +++ b/code/modules/background/citizenship/ipc.dm @@ -28,6 +28,22 @@ SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER + ), + "Diplomatic Aide" = list( + SPECIES_HUMAN, + SPECIES_HUMAN_OFFWORLD, + 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 ) ) diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 6dc3e0fb9f8..5c1dc262217 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -7,6 +7,7 @@ A rogue artificial intelligence, Glorsh-Omega, has traumatized this nation for centuries to come. The Federation is very wary of humanity, who has acquired AI technology \ after a Federation tech leak provided them with the research required to create their own AI, as well as allowing them to create IPCs." consular_outfit = /obj/outfit/job/representative/consular/nralakk + assistant_outfit = /obj/outfit/job/consular_assistant/nralakk job_species_blacklist = list( "Consular Officer" = list( @@ -28,6 +29,23 @@ SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK + ), + "Diplomatic Aide" = 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_TAJARA, + SPECIES_TAJARA_MSAI, + SPECIES_TAJARA_ZHAN, + SPECIES_UNATHI, + SPECIES_VAURCA_BREEDER ) ) @@ -92,3 +110,6 @@ if(!visualsOnly) addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES) return TRUE + +/obj/outfit/job/consular_assistant/nralakk + uniform = /obj/item/clothing/under/skrell diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index e7a544362a6..963aff73176 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -6,6 +6,7 @@ revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \ struggling to hold true to its radical ideals while an entrenched upper party stubbornly tries to hold onto power." consular_outfit = /obj/outfit/job/representative/consular/pra + assistant_outfit = /obj/outfit/job/consular_assistant/dpra job_species_blacklist = list( "Consular Officer" = list( @@ -30,6 +31,28 @@ SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI + ), + "Diplomatic Aide" = 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_UNATHI, + SPECIES_VAURCA_WORKER, + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK, + SPECIES_VAURCA_BREEDER, + SPECIES_TAJARA_ZHAN ) ) @@ -53,6 +76,16 @@ ) accessory = /obj/item/clothing/accessory/hadii_pin +/obj/outfit/job/consular_assistant/pra + glasses = null + uniform = /obj/item/clothing/under/tajaran/smart + backpack_contents = list( + /obj/item/storage/box/hadii_card = 1, + /obj/item/storage/box/hadii_manifesto = 1, + /obj/item/storage/field_ration = 1 + ) + accessory = /obj/item/clothing/accessory/hadii_pin + /datum/citizenship/dpra name = CITIZENSHIP_DPRA description = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Liberation Army, a group made up of Tajara from almost every walk of life. \ @@ -62,6 +95,7 @@ insurgency movement, then an organized military, into a modern, democratic nation. With the help of Nated as a government minister going out to negotiate with ruling Juntas to \ voluntarily turn over power to civilian governments, the DPRA's future faces many fundamental changes." consular_outfit = /obj/outfit/job/representative/consular/dpra + assistant_outfit = /obj/outfit/job/consular_assistant/dpra job_species_blacklist = list( "Consular Officer" = list( @@ -86,6 +120,28 @@ SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI + ), + "Diplomatic Aide" = 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_UNATHI, + SPECIES_VAURCA_WORKER, + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK, + SPECIES_VAURCA_BREEDER, + SPECIES_TAJARA_ZHAN ) ) @@ -108,6 +164,15 @@ ) accessory = /obj/item/clothing/accessory/dpra_pin +/obj/outfit/job/consular_assistant/dpra + glasses = null + uniform = /obj/item/clothing/under/tajaran/smart + backpack_contents = list( + /obj/item/storage/box/dpra_manifesto = 1, + /obj/item/storage/field_ration/dpra = 1 + ) + accessory = /obj/item/clothing/accessory/dpra_pin + /datum/citizenship/nka name = CITIZENSHIP_NKA description = "The last major faction is the rebellious New Kingdom of Adhomai, which seceded and declared itself a nation in 2450. The New Kingdom is ruled by a Njarir'Akhran noble \ @@ -119,6 +184,7 @@ The lofty titles of the nobles disguise the fact that most of the nobility of this new kingdom remain in squalor only marginally better than the peasants. Life is difficult, and \ the Azunja dynasty finds itself struggling to function with their limited constitutional powers and factional in-fighting between the military and the civilian government." consular_outfit = /obj/outfit/job/representative/consular/nka + assistant_outfit = /obj/outfit/job/consular_assistant/nka job_species_blacklist = list( "Consular Officer" = list( @@ -143,6 +209,28 @@ SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI + ), + "Diplomatic Aide" = 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_UNATHI, + SPECIES_VAURCA_WORKER, + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK, + SPECIES_VAURCA_BREEDER, + SPECIES_TAJARA_ZHAN ) ) @@ -166,6 +254,16 @@ ) accessory = /obj/item/clothing/accessory/nka_pin +/obj/outfit/job/consular_assistant/nka + glasses = null + uniform = /obj/item/clothing/under/tajaran/fancy + backpack_contents = list( + /obj/item/folder/blue/nka = 1, + /obj/item/storage/box/nka_manifesto = 1, + /obj/item/storage/field_ration/nka = 1 + ) + accessory = /obj/item/clothing/accessory/nka_pin + /datum/citizenship/free_council name = CITIZENSHIP_FREE_COUNCIL description = "The Free Tajaran Council is the largest Tajaran community in Himeo. Its origins can be traced back to the First Revolution-era revolutionaries that fled Adhomai. Built upon \ diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index d45eaeb6176..69d0de8222d 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -5,6 +5,7 @@ with everything else revolving around it. It forms a major part of their code of honor, which stresses the importance of martial abilities and loyalty to the Clan. Despite an \ apocalyptic world war that nearly plunged the species into ruin, the Izweski Hegemony has rebounded and is currently working on making the Hegemony a galactic power." consular_outfit = /obj/outfit/job/representative/consular/izweski + assistant_outfit = /obj/outfit/job/consular_assistant/izweski job_species_blacklist = list( "Consular Officer" = list( @@ -28,6 +29,26 @@ SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, + ), + "Diplomatic Aide" = 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_VAURCA_BREEDER ) ) @@ -85,3 +106,7 @@ if(!visualsOnly) addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES) return TRUE + +/obj/outfit/job/consular_assistant/izweski + uniform = /obj/item/clothing/under/unathi + suit = /obj/item/clothing/accessory/poncho/unathimantle diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index 827f586b846..b6d42e6dd8a 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -6,6 +6,7 @@ Tau Ceti, this has lead to confrontations between them and other Hives arriving in the system. The Zo'ra are the most politically developed Hive, recently helping in the funding of \ the Tau Ceti Foreign Legion, and making active progress to spread their influence." consular_outfit = /obj/outfit/job/representative/consular/zora + linked_citizenship = CITIZENSHIP_BIESEL job_species_blacklist = list( "Consular Officer" = list( @@ -30,7 +31,8 @@ SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK - ) + ), + "Diplomatic Aide" = ALL_SPECIES ) /datum/citizenship/zora/get_objectives(mission_level, var/mob/living/carbon/human/H) @@ -80,6 +82,7 @@ They maintain subtly warm, if terse relations with the Hegemony as a whole, and have committed to its terraforming agenda, being instrumental in the implementation of such a monumental undertaking. \ The K'lax are the most technologically developed Hive, and are leading the way in reconstructing the species' superior technology." consular_outfit = /obj/outfit/job/representative/consular/klax + linked_citizenship = CITIZENSHIP_IZWESKI job_species_blacklist = list( "Consular Officer" = list( @@ -103,7 +106,8 @@ SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK - ) + ), + "Diplomatic Aide" = ALL_SPECIES ) /datum/citizenship/klax/get_objectives(mission_level, var/mob/living/carbon/human/H) @@ -150,6 +154,7 @@ In this effort, the Hive has begun dealing with the multitude of governments and corporations of the galaxy, all under the auspices of their Skrellian saviors. \ The C'thur are the most economically developed Hive, having stakes in Einstein Engines and Zeng-Hu Pharmaceuticals." consular_outfit = /obj/outfit/job/representative/consular/cthur + linked_citizenship = CITIZENSHIP_NRALAKK job_species_blacklist = list( "Consular Officer" = list( @@ -173,7 +178,8 @@ SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK - ) + ), + "Diplomatic Aide" = ALL_SPECIES ) /datum/citizenship/cthur/get_objectives(mission_level, var/mob/living/carbon/human/H) diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index 263f1c0ba44..c1a1e29f960 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -63,7 +63,7 @@ display_name = "holster selection" path = /obj/item/clothing/accessory/holster/armpit allowed_roles = list("Captain", "Executive Officer", "Bridge Crew", "Security Officer", "Warden", "Head of Security","Investigator", "Security Cadet", "Corporate Liaison", "Consular Officer", - "Chief Engineer", "Chief Medical Officer", "Research Director", "Operations Manager", "Security Personnel") + "Chief Engineer", "Chief Medical Officer", "Research Director", "Operations Manager", "Diplomatic Aide", "Security Personnel") /datum/gear/accessory/holster/New() ..() diff --git a/html/changelog.html b/html/changelog.html index d7dcf45a05b..df220e1a1e7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -3,7 +3,7 @@
Space Station 13
- +

Wiki | Source code

Code licensed under AGPLv3. Content licensed under CC BY-SA 3.0.

@@ -27,11 +27,11 @@
@@ -159,7 +159,7 @@

DreamySkrell updated:

FluffyGhost updated:

@@ -39798,7 +39798,7 @@

09 March 2013

Cael Aislinn updated:

@@ -39975,4 +39975,4 @@

Creative Commons License
Except where otherwise noted, Goon Station 13 is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
Rights are currently extended to SomethingAwful Goons only.

Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 License.

- \ No newline at end of file + diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 48272cf6fb6..6c311587f47 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -34227,7 +34227,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Point Verdant Police now spawn with headsets instead of bounced radios, as the role had too much soul. DreamySkrell: - - rscadd: Refactored `/datum/outfit` to `/obj/outfit`. + - rscadd: Refactored `/obj/outfit` to `/obj/outfit`. - rscadd: Outfits can be mapped in or spawned manually, to spill all their items on the floor. FluffyGhost: diff --git a/html/changelogs/RustingWithYou - backonmybullshit.yml b/html/changelogs/RustingWithYou - backonmybullshit.yml new file mode 100644 index 00000000000..80c359e0b00 --- /dev/null +++ b/html/changelogs/RustingWithYou - backonmybullshit.yml @@ -0,0 +1,41 @@ +################################ +# 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: RustingWithYou + +# 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: "Adds a new job, the Diplomatic Aide."