diff --git a/code/__DEFINES/~ff_defines/flavor_misc.dm b/code/__DEFINES/~ff_defines/flavor_misc.dm new file mode 100644 index 00000000000..ade411e38ff --- /dev/null +++ b/code/__DEFINES/~ff_defines/flavor_misc.dm @@ -0,0 +1,2 @@ +#define GWAISTBAG "Grey Waisbag" +#define DWAISTBAG "Department Waisbag" diff --git a/tff_modular/master_files/code/modules/client/preferences/clothing.dm b/tff_modular/master_files/code/modules/client/preferences/clothing.dm new file mode 100644 index 00000000000..5d93b6aa565 --- /dev/null +++ b/tff_modular/master_files/code/modules/client/preferences/clothing.dm @@ -0,0 +1,23 @@ +/datum/preference/choiced/backpack/icon_for(value) + . = ..() + switch (value) + if (GWAISTBAG) + return /obj/item/storage/backpack/waistbag + if (DWAISTBAG) + return /obj/item/storage/backpack/waistbag/med + +/datum/preference/choiced/backpack/init_possible_values() + . = ..() + . += list( + GWAISTBAG, + DWAISTBAG, + ) + +/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(ispath(back, /obj/item/storage/backpack)) + switch(H.backpack) + if(GWAISTBAG) + back = /obj/item/storage/backpack/waistbag + if(DWAISTBAG) + back = waistbag diff --git a/tff_modular/master_files/code/modules/job/job_outfit.dm b/tff_modular/master_files/code/modules/job/job_outfit.dm new file mode 100644 index 00000000000..9c659fa8efb --- /dev/null +++ b/tff_modular/master_files/code/modules/job/job_outfit.dm @@ -0,0 +1,95 @@ +/datum/outfit/job + var/waistbag = /obj/item/storage/backpack/waistbag + +/datum/outfit/job/atmos + waistbag = /obj/item/storage/backpack/waistbag/eng + +/datum/outfit/job/botanist + waistbag = /obj/item/storage/backpack/waistbag/srv + +/datum/outfit/job/chaplain + waistbag = /obj/item/storage/backpack/waistbag/srv + +/datum/outfit/job/chemist + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/ce + waistbag = /obj/item/storage/backpack/waistbag/eng + +/datum/outfit/job/cmo + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/clown + waistbag = /obj/item/storage/backpack/waistbag/srv + +/datum/outfit/job/coroner + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/geneticist + waistbag = /obj/item/storage/backpack/waistbag/sci + +/datum/outfit/job/hos + waistbag = /obj/item/storage/backpack/waistbag/redsec + +/datum/outfit/job/doctor + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/mime + waistbag = /obj/item/storage/backpack/waistbag/srv + +/datum/outfit/job/paramedic + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/psychologist + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/rd + waistbag = /obj/item/storage/backpack/waistbag/sci + +/datum/outfit/job/scientist + waistbag = /obj/item/storage/backpack/waistbag/sci + +/datum/outfit/job/security + waistbag = /obj/item/storage/backpack/waistbag/bluesec + +/datum/outfit/job/miner + waistbag = /obj/item/storage/backpack/waistbag/cargo + +/datum/outfit/job/engineer + waistbag = /obj/item/storage/backpack/waistbag/eng + +/datum/outfit/job/warden + waistbag = /obj/item/storage/backpack/waistbag/bluesec + +/datum/outfit/job/roboticist + waistbag = /obj/item/storage/backpack/waistbag/sci + +/datum/outfit/job/virologist + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/blueshield + waistbag = /obj/item/storage/backpack/waistbag/camo + +/datum/outfit/job/science_guard + waistbag = /obj/item/storage/backpack/waistbag/sci + +/datum/outfit/job/orderly + waistbag = /obj/item/storage/backpack/waistbag/med + +/datum/outfit/job/engineering_guard + waistbag = /obj/item/storage/backpack/waistbag/eng + +/datum/outfit/job/customs_agent + waistbag = /obj/item/storage/backpack/waistbag/cargo + +/datum/outfit/job/bouncer + waistbag = /obj/item/storage/backpack/waistbag/srv + +/datum/outfit/job/nanotrasen_consultant + waistbag = /obj/item/storage/backpack/waistbag/camo + +/datum/outfit/job/corrections_officer + waistbag = /obj/item/storage/backpack/waistbag/redsec + +/datum/outfit/job/telecomms_specialist + waistbag = /obj/item/storage/backpack/waistbag/eng diff --git a/tgstation.dme b/tgstation.dme index 5e3ba8fec2c..61cab8f8cee 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -397,6 +397,7 @@ #include "code\__DEFINES\traits\sources.dm" #include "code\__DEFINES\~ff_defines\barsigns.dm" #include "code\__DEFINES\~ff_defines\DNA.dm" +#include "code\__DEFINES\~ff_defines\flavor_misc.dm" #include "code\__DEFINES\~ff_defines\nabber_clothes_pathes.dm" #include "code\__DEFINES\~ff_defines\say.dm" #include "code\__DEFINES\~ff_defines\text.dm" @@ -8756,7 +8757,9 @@ #include "tff_modular\master_files\code\_HELPERS\global_lists.dm" #include "tff_modular\master_files\code\datum\quirks\neutral_quirks\burr.dm" #include "tff_modular\master_files\code\game\objects\items\tools\weldingtool.dm" +#include "tff_modular\master_files\code\modules\client\preferences\clothing.dm" #include "tff_modular\master_files\code\modules\job\job_blacklist.dm" +#include "tff_modular\master_files\code\modules\job\job_outfit.dm" #include "tff_modular\master_files\code\modules\mapping\space_ruins.dm" #include "tff_modular\master_files\code\modules\power\cable.dm" #include "tff_modular\master_files\code\modules\reagents\recipe\coagulant_recipe.dm"