diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 4ca2f6503e8..e0ec679eb6d 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -49,6 +49,7 @@ "Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/hephaestus, "Corporate Reporter" = /obj/outfit/job/journalist/hephaestus, "Corporate Liaison" = /obj/outfit/job/representative/hephaestus, + "Corporate Aide" = /obj/outfit/job/corporate_aide/hephaestus, "Assistant" = /obj/outfit/job/assistant/hephaestus, "Technical Assistant" = /obj/outfit/job/assistant/tech_assistant/hephaestus, "Off-Duty Crew Member" = /obj/outfit/job/visitor/hephaestus, @@ -158,6 +159,18 @@ /obj/item/stamp/hephaestus = 1 ) +/obj/outfit/job/corporate_aide/hephaestus + name = "Hephaestus Corporate Aide" + id = /obj/item/card/id/hephaestus + + head = /obj/item/clothing/head/beret/corporate/heph + suit = /obj/item/clothing/suit/storage/toggle/corp/heph + + backpack_faction = /obj/item/storage/backpack/heph + satchel_faction = /obj/item/storage/backpack/satchel/heph + dufflebag_faction = /obj/item/storage/backpack/duffel/heph + messengerbag_faction = /obj/item/storage/backpack/messenger/heph + /obj/outfit/job/journalist/hephaestus name = "Corporate Reporter - Hephaestus" diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index 439107900e6..717916262d6 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -62,6 +62,7 @@ "Corporate Reporter" = /obj/outfit/job/journalist/idris, "Chaplain" = /obj/outfit/job/chaplain/idris, "Corporate Liaison" = /obj/outfit/job/representative/idris, + "Corporate Aide" = /obj/outfit/job/corporate_aide/idris, "Assistant" = /obj/outfit/job/assistant/idris, "Wait Staff" = /obj/outfit/job/assistant/waiter/idris, "Off-Duty Crew Member" = /obj/outfit/job/visitor/idris, @@ -248,6 +249,19 @@ /obj/item/stamp/idris = 1 ) +/obj/outfit/job/corporate_aide/idris + name = "Idris Corporate Aide" + + id = /obj/item/card/id/idris + + head = /obj/item/clothing/head/beret/corporate/idris + suit = /obj/item/clothing/suit/storage/toggle/corp/idris + + backpack_faction = /obj/item/storage/backpack/idris + satchel_faction = /obj/item/storage/backpack/satchel/idris + dufflebag_faction = /obj/item/storage/backpack/duffel/idris + messengerbag_faction = /obj/item/storage/backpack/messenger/idris + /obj/outfit/job/assistant/idris name = "Assistant - Idris" diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index 82ee6cf615d..59a6f07c035 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -51,6 +51,7 @@ "Corporate Reporter" = /obj/outfit/job/journalist/orion, "Chaplain" = /obj/outfit/job/chaplain/orion, "Corporate Liaison" = /obj/outfit/job/representative/orion, + "Corporate Aide" = /obj/outfit/job/corporate_aide/orion, "Assistant" = /obj/outfit/job/assistant/orion, "Wait Staff" = /obj/outfit/job/assistant/waiter/orion, "Off-Duty Crew Member" = /obj/outfit/job/visitor/orion, @@ -106,6 +107,18 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion +/obj/outfit/job/corporate_aide/orion + name = "Orion Express Corporate Aide" + + id = /obj/item/card/id/orion + head = /obj/item/clothing/head/beret/corporate/orion + suit = /obj/item/clothing/suit/storage/toggle/corp/orion + + backpack_faction = /obj/item/storage/backpack/orion + satchel_faction = /obj/item/storage/backpack/satchel/orion + dufflebag_faction = /obj/item/storage/backpack/duffel/orion + messengerbag_faction = /obj/item/storage/backpack/messenger/orion + /obj/outfit/job/bartender/orion name = "Bartender - Orion Express" diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 3110169f540..e43db29e4b4 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -50,6 +50,7 @@ "Medical Intern" = /obj/outfit/job/intern_med/pmc, "Corporate Reporter" = /obj/outfit/job/journalist/pmc, "Corporate Liaison" = /obj/outfit/job/representative/pmc, + "Corporate Aide" = /obj/outfit/job/corporate_aide/pmc, "Assistant" = /obj/outfit/job/assistant/pmc, "Medical Orderly" = /obj/outfit/job/assistant/med_assistant/pmc, "Off-Duty Crew Member" = /obj/outfit/job/visitor/pmc, @@ -211,6 +212,18 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg +/obj/outfit/job/corporate_aide/pmc + name = "PMC Corporate Aide" + + id = /obj/item/card/id/pmc + head = /obj/item/clothing/head/beret/corporate/pmc + suit = /obj/item/clothing/suit/storage/toggle/corp/pmc + + backpack_faction = /obj/item/storage/backpack/pmcg + satchel_faction = /obj/item/storage/backpack/satchel/pmcg + dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg + messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg + /obj/outfit/job/journalist/pmc name = "Corporate Reporter - PMC" diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 140eb9aa38a..ce374354795 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -65,6 +65,7 @@ "Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/zavodskoi, "Corporate Reporter" = /obj/outfit/job/journalist/zavodskoi, "Corporate Liaison" = /obj/outfit/job/representative/zavodskoi, + "Corporate Aide" = /obj/outfit/job/corporate_aide/zavodskoi, "Assistant" = /obj/outfit/job/assistant/zavodskoi, "Technical Assistant" = /obj/outfit/job/assistant/tech_assistant/zavodskoi, "Lab Assistant" = /obj/outfit/job/assistant/lab_assistant/zavodskoi, @@ -274,6 +275,18 @@ /obj/item/stamp/zavodskoi = 1 ) +/obj/outfit/job/corporate_aide/zavodskoi + name = "Zavodskoi Interstellar Corporate Aide" + + id = /obj/item/card/id/zavodskoi + head = /obj/item/clothing/head/beret/corporate/zavod + suit = /obj/item/clothing/suit/storage/toggle/corp/zavod + + backpack_faction = /obj/item/storage/backpack/zavod + satchel_faction = /obj/item/storage/backpack/satchel/zavod + dufflebag_faction = /obj/item/storage/backpack/duffel/zavod + messengerbag_faction = /obj/item/storage/backpack/messenger/zavod + /obj/outfit/job/journalist/zavodskoi name = "Corporate Reporter - Zavodskoi Interstellar" diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index db079f3fe3c..cf9f6cb5d08 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -57,6 +57,7 @@ "Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zeng_hu, "Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu, "Corporate Liaison" = /obj/outfit/job/representative/zeng_hu, + "Corporate Aide" = /obj/outfit/job/corporate_aide/zeng_hu, "Assistant" = /obj/outfit/job/assistant/zeng_hu, "Medical Orderly" = /obj/outfit/job/assistant/med_assistant/zeng_hu, "Lab Assistant" = /obj/outfit/job/assistant/lab_assistant/zeng_hu, @@ -243,6 +244,19 @@ /obj/item/gun/energy/pistol = 1, /obj/item/stamp/zeng_hu = 1 ) + +/obj/outfit/job/corporate_aide/zeng_hu + name = "Zeng-Hu Corporate Aide" + + id = /obj/item/card/id/zeng_hu + head = /obj/item/clothing/head/beret/corporate/zeng + suit = /obj/item/clothing/suit/storage/toggle/corp/zeng + + backpack_faction = /obj/item/storage/backpack/zeng + satchel_faction = /obj/item/storage/backpack/satchel/zeng + dufflebag_faction = /obj/item/storage/backpack/duffel/zeng + messengerbag_faction = /obj/item/storage/backpack/messenger/zeng + /obj/outfit/job/journalist/zeng_hu name = "Corporate Reporter - Zeng-Hu" diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index 092b85a4036..a88c5a51cf0 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -364,7 +364,7 @@ access = list(ACCESS_CONSULAR, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_CONSULAR) - outfit = /obj/outfit/job/diplomatic_aide + outfit = /obj/outfit/job/diplomatic_bodyguard blacklisted_citizenship = ALL_CITIZENSHIPS //removed based on consular citizensihp /datum/job/diplomatic_bodyguard/get_outfit(mob/living/carbon/human/H, alt_title = null) @@ -410,23 +410,21 @@ access = list(ACCESS_LAWYER, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_LAWYER) - outfit = /obj/outfit/job/diplomatic_aide - -/datum/job/corporate_aide/get_outfit(mob/living/carbon/human/H, alt_title = null) - var/datum/faction/aide_faction = SSjobs.name_factions[H.employer_faction] - if(aide_faction) - return aide_faction.titles_to_loadout["Off-Duty Crew Member"] + outfit = /obj/outfit/job/corporate_aide /obj/outfit/job/corporate_aide - name = "Corporate Aide" + name = "NanoTrasen Corporate Aide" jobtype = /datum/job/corporate_aide - uniform = /obj/item/clothing/under/suit_jacket/navy + head = /obj/item/clothing/head/beret/corporate + uniform = /obj/item/clothing/under/dressshirt + suit = /obj/item/clothing/suit/storage/toggle/corp/nt + pants = /obj/item/clothing/pants/khaki + 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 diff --git a/html/changelogs/Ben10083 - Aide_Huds.yml b/html/changelogs/Ben10083 - Aide_Huds.yml new file mode 100644 index 00000000000..830e63655f6 --- /dev/null +++ b/html/changelogs/Ben10083 - Aide_Huds.yml @@ -0,0 +1,60 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Corporate Aide outfits for each megacorporation." + - imageadd: "Adds missing job HUD sprites for consular and liason aide/bodyguards." + - spellcheck: "Fixes typo of corporate liason HUD sprite." diff --git a/icons/hud/hud_security.dmi b/icons/hud/hud_security.dmi index 2e01e8359c3..2fb0d76868a 100644 Binary files a/icons/hud/hud_security.dmi and b/icons/hud/hud_security.dmi differ