diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 87f69ae69a3..4ca2f6503e8 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -50,6 +50,7 @@ "Corporate Reporter" = /obj/outfit/job/journalist/hephaestus, "Corporate Liaison" = /obj/outfit/job/representative/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, "Engineering Personnel" = /obj/outfit/job/engineer/event/hephaestus, "Operations Personnel" = /obj/outfit/job/hangar_tech/event/hephaestus @@ -171,11 +172,24 @@ /obj/outfit/job/assistant/hephaestus name = "Assistant - Hephaestus" + id = /obj/item/card/id/hephaestus + 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/assistant/tech_assistant/hephaestus + name = "Technical Assistant - Hephaestus" + + id = /obj/item/card/id/hephaestus + + 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/visitor/hephaestus name = "Off-Duty Crew Member - Hephaestus" diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index b919eb6ccbc..439107900e6 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -63,6 +63,7 @@ "Chaplain" = /obj/outfit/job/chaplain/idris, "Corporate Liaison" = /obj/outfit/job/representative/idris, "Assistant" = /obj/outfit/job/assistant/idris, + "Wait Staff" = /obj/outfit/job/assistant/waiter/idris, "Off-Duty Crew Member" = /obj/outfit/job/visitor/idris, "Security Personnel" = /obj/outfit/job/officer/event/idris, "Service Personnel" = /obj/outfit/job/bartender/idris @@ -250,6 +251,18 @@ /obj/outfit/job/assistant/idris name = "Assistant - Idris" + id = /obj/item/card/id/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/waiter/idris + name = "Wait Staff - Idris" + + id = /obj/item/card/id/idris + backpack_faction = /obj/item/storage/backpack/idris satchel_faction = /obj/item/storage/backpack/satchel/idris dufflebag_faction = /obj/item/storage/backpack/duffel/idris diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index abba7973176..45fed6c07f1 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -52,6 +52,7 @@ "Chaplain" = /obj/outfit/job/chaplain/orion, "Corporate Liaison" = /obj/outfit/job/representative/orion, "Assistant" = /obj/outfit/job/assistant/orion, + "Wait Staff" = /obj/outfit/job/assistant/waiter/orion, "Off-Duty Crew Member" = /obj/outfit/job/visitor/orion, "Operations Personnel" = /obj/outfit/job/hangar_tech/event/orion, "Service Personnel" = /obj/outfit/job/bartender/orion @@ -207,6 +208,18 @@ /obj/outfit/job/assistant/orion name = "Assistant - Orion" + id = /obj/item/card/id/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/assistant/waiter/orion + name = "Wait Staff - Orion" + + id = /obj/item/card/id/orion + backpack_faction = /obj/item/storage/backpack/orion satchel_faction = /obj/item/storage/backpack/satchel/orion dufflebag_faction = /obj/item/storage/backpack/duffel/orion diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 96f825e4ee8..e71936070dc 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -51,6 +51,7 @@ "Corporate Reporter" = /obj/outfit/job/journalist/pmc, "Corporate Liaison" = /obj/outfit/job/representative/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, "Security Personnel" = /obj/outfit/job/officer/event/pmc, "Medical Personnel" = /obj/outfit/job/med_tech/event/pmc @@ -224,6 +225,18 @@ /obj/outfit/job/assistant/pmc name = "Assistant - PMC" + id = /obj/item/card/id/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/assistant/med_assistant/pmc + name = "Medical Orderly - PMC" + + id = /obj/item/card/id/pmc + backpack_faction = /obj/item/storage/backpack/pmcg satchel_faction = /obj/item/storage/backpack/satchel/pmcg dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 244fc4dcfc6..140eb9aa38a 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -66,6 +66,8 @@ "Corporate Reporter" = /obj/outfit/job/journalist/zavodskoi, "Corporate Liaison" = /obj/outfit/job/representative/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, "Off-Duty Crew Member" = /obj/outfit/job/visitor/zavodskoi, "Security Personnel" = /obj/outfit/job/officer/event/zavodskoi, "Engineering Personnel" = /obj/outfit/job/engineer/event/zavodskoi, @@ -286,6 +288,28 @@ /obj/outfit/job/assistant/zavodskoi name = "Assistant - Zavodskoi Interstellar" + id = /obj/item/card/id/zavodskoi + + 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/assistant/tech_assistant/zavodskoi + name = "Technical Assistant - Zavodskoi Interstellar" + + id = /obj/item/card/id/zavodskoi + + 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/assistant/lab_assistant/zavodskoi + name = "Lab Assistant - Zavodskoi Interstellar" + + id = /obj/item/card/id/zavodskoi + backpack_faction = /obj/item/storage/backpack/zavod satchel_faction = /obj/item/storage/backpack/satchel/zavod dufflebag_faction = /obj/item/storage/backpack/duffel/zavod diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 516116199b6..df29540738f 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -58,6 +58,8 @@ "Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu, "Corporate Liaison" = /obj/outfit/job/representative/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, "Off-Duty Crew Member" = /obj/outfit/job/visitor/zeng_hu, "Science Personnel" = /obj/outfit/job/scientist/event/zeng_hu, "Medical Personnel" = /obj/outfit/job/med_tech/event/zeng_hu @@ -262,6 +264,26 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng +/obj/outfit/job/assistant/med_assistant/zeng_hu + name = "Medical Orderly - Zeng-Hu" + + id = /obj/item/card/id/zeng_hu + + 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/assistant/lab_assistant/zeng_hu + name = "Lab Assistant - Zeng-Hu" + + id = /obj/item/card/id/zeng_hu + + 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/visitor/zeng_hu name = "Off-Duty Crew Member - Zeng-Hu" diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm index 337633c4ec3..4f49660da6b 100644 --- a/code/game/jobs/job/ship_crew.dm +++ b/code/game/jobs/job/ship_crew.dm @@ -74,6 +74,7 @@ /obj/outfit/job/assistant/waiter name = "Wait Staff" uniform = /obj/item/clothing/under/waiter + /datum/job/visitor title = "Off-Duty Crew Member" flag = VISITOR diff --git a/html/changelogs/flaminglily-assistantfix.yml b/html/changelogs/flaminglily-assistantfix.yml new file mode 100644 index 00000000000..0d1b0054b4f --- /dev/null +++ b/html/changelogs/flaminglily-assistantfix.yml @@ -0,0 +1,58 @@ +################################ +# 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: FlamingLily + +# 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: "Fixes the Assistant Alt title custom outfits"