diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index d1290292ddda..13bad440adca 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -175,7 +175,7 @@ * * If visuals_only is true, you can omit any work that doesn't visually appear on the character sprite */ -/datum/outfit/proc/equip(mob/living/carbon/human/user, visuals_only = FALSE) +/datum/outfit/proc/equip(mob/living/carbon/human/user, visuals_only = FALSE, client/preference_source = null) pre_equip(user, visuals_only) //Start with uniform,suit,backpack for additional slots diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index cfb9c5d8c163..b08690fa30f2 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -324,7 +324,7 @@ /mob/living/carbon/human/toggle_externals(obj/item/tank) return toggle_internals(tank, TRUE) -/mob/living/carbon/human/proc/equipOutfit(outfit, visuals_only = FALSE) +/mob/living/carbon/human/proc/equipOutfit(outfit, visuals_only = FALSE, client/preference_source = null) var/datum/outfit/O = null if(ispath(outfit)) @@ -336,7 +336,7 @@ if(!O) return 0 - return O.equip(src, visuals_only) + return O.equip(src, visuals_only, preference_source) ///A version of equipOutfit that overrides passed in outfits with their entry on the species' outfit override registry diff --git a/modular_darkpack/modules/jobs/code/_alt_job_outfits.dm b/modular_darkpack/modules/jobs/code/_alt_job_outfits.dm new file mode 100644 index 000000000000..e3523ad78a03 --- /dev/null +++ b/modular_darkpack/modules/jobs/code/_alt_job_outfits.dm @@ -0,0 +1,61 @@ +// TOWER ROLES BEGIN HERE + +/datum/outfit/job/towerwork/towercleaner + name = "Tower Employee (Tower Cleaner)" + uniform = /obj/item/clothing/under/vampire/janitor + suit = null + shoes = /obj/item/clothing/shoes/vampire/jackboots/work + gloves = /obj/item/clothing/gloves/vampire/cleaning + r_pocket = /obj/item/vamp/keys/camarilla/ghoul + l_pocket = /obj/item/smartphone/tower_employee + backpack_contents = list(/obj/item/card/credit=1) + +/datum/outfit/job/towerwork/towerassistant + name = "Tower Employee (Tower Assistant)" + uniform = /obj/item/clothing/under/vampire/office + gloves = null + suit = null + r_pocket = /obj/item/vamp/keys/camarilla/ghoul + l_pocket = /obj/item/smartphone/tower_employee + backpack_contents = list(/obj/item/passport=1, /obj/item/watch=1, /obj/item/flashlight=1, /obj/item/card/credit=1, /obj/item/clipboard=1, /obj/item/pen=1, /obj/item/folder/blue=1) + +/datum/outfit/job/towerwork/towersecurityguard + name = "Tower Employee (Tower Security Guard)" + uniform = /obj/item/clothing/under/vampire/guard + shoes = /obj/item/clothing/shoes/vampire + gloves = null + suit = null + belt = /obj/item/gun/ballistic/automatic/pistol/darkpack/m1911 + r_pocket = /obj/item/vamp/keys/camarilla/ghoul + l_pocket = /obj/item/smartphone/tower_employee + backpack_contents = list(/obj/item/flashlight=1, /obj/item/card/credit=1,/obj/item/storage/fancy/donut_box=1, /obj/item/watch=1) + +/datum/outfit/job/towerwork/towerpersonaldriver + name = "Tower Employee (Tower Personal Driver)" + uniform = /obj/item/clothing/under/vampire/suit + suit = null + head = /obj/item/clothing/head/vampire/top + gloves = /obj/item/clothing/gloves/vampire/white + r_pocket = /obj/item/vamp/keys/camarilla/ghoul + l_pocket = /obj/item/smartphone/tower_employee + backpack_contents = list(/obj/item/passport=1, /obj/item/watch=1, /obj/item/flashlight=1, /obj/item/card/credit=1, /obj/item/clipboard=1, /obj/item/pen=1, /obj/item/folder/red=1) + +/datum/outfit/job/towerwork/towerpersonaldriver/pre_equip(mob/living/carbon/human/H) + ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/vampire/suit/female + +/datum/outfit/job/towerwork/towerpersonalattendant + name = "Tower Employee (Tower Personal Attendant)" + uniform = /obj/item/clothing/under/vampire/suit + r_pocket = /obj/item/vamp/keys/camarilla/ghoul + l_pocket = /obj/item/smartphone/tower_employee + backpack_contents = list(/obj/item/passport=1, /obj/item/watch=1, /obj/item/flashlight=1, /obj/item/card/credit=1, /obj/item/clipboard=1, /obj/item/pen=1, /obj/item/folder/red=1) + +/datum/outfit/job/towerwork/towerpersonalattendant/pre_equip(mob/living/carbon/human/H) + ..() + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/vampire/suit/female + shoes = /obj/item/clothing/shoes/vampire/heels + +// TOWER ROLES END HERE diff --git a/tgstation.dme b/tgstation.dme index faba54c4595b..7004c5efc4ad 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7370,6 +7370,7 @@ #include "modular_darkpack\modules\guestbook\code\persistent_guestbooks.dm" #include "modular_darkpack\modules\hair\code\sprite_accessories.dm" #include "modular_darkpack\modules\human_visuals\code\extra_human_sprites.dm" +#include "modular_darkpack\modules\jobs\code\_alt_job_outfits.dm" #include "modular_darkpack\modules\jobs\code\_departments.dm" #include "modular_darkpack\modules\jobs\code\_job_assignment.dm" #include "modular_darkpack\modules\jobs\code\_jobs.dm"