From a2e940e33672ea2526728840b0b46cd5d41fa13a Mon Sep 17 00:00:00 2001 From: Return Date: Mon, 17 Feb 2025 09:36:17 -0600 Subject: [PATCH] Security multisec loadout update (#2998) ## About The Pull Request Part of a 20-part series where I move vendor items to the loadout. There are twenty vendors. Kill me. This adds most (but not all) of the cosmetics from the multisec vendor to the loadout, and updates some of their reskins. This doesn't add any new content, just makes it available through the loadout. ## Why It's Good For The Game Most of the Security cosmetics simply aren't available in the loadout for some reason. ## Proof Of Testing Compiles and has been meticulously tested for functioning! See images. ![image](https://github.com/user-attachments/assets/6c7e2ff2-822b-4ecf-af41-4f531e840362) ![image](https://github.com/user-attachments/assets/e6a24f85-f042-41c9-a6e8-0f5147e6e40c) ![image](https://github.com/user-attachments/assets/e3338ced-19b9-4d2f-af14-f846cb60a68e) ## Changelog :cl: ReturnToZender qol: Adds most of the Security cosmetics to the loadout spellcheck: Removes some spaces and spellchecks some things in the multisec vendor add: Adds a corrections tab to the multisec vendor so being a corrections officer is not inherently illegal add: Holobadges are accessories rather than neck items now /:cl: --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- .../loadout/categories/donator_personal.dm | 9 ++ .../code/modules/loadout/categories/heads.dm | 2 +- .../code/modules/loadout/categories/neck.dm | 10 -- .../code/modules/loadout/categories/shoes.dm | 16 ++++ .../code/modules/loadout/categories/suit.dm | 9 +- .../modules/loadout/categories/uniform.dm | 2 +- .../code/peacekeeper/armadyne_clothing.dm | 4 +- .../code/modules/clothing/head/helmet.dm | 2 +- .../code/modules/clothing/head/jobs.dm | 2 +- .../code/modules/clothing/suits/armor.dm | 8 +- .../code/modules/clothing_reskins/redsec.dm | 16 ---- .../modules/loadout/categories/accessories.dm | 7 ++ .../modules/loadout/categories/glasses.dm | 2 +- .../code/modules/loadout/categories/gloves.dm | 12 ++- .../code/modules/loadout/categories/heads.dm | 92 ++++++++++++++++++- .../modules/loadout/categories/inhands.dm | 3 +- .../code/modules/loadout/categories/masks.dm | 15 +++ .../code/modules/loadout/categories/neck.dm | 32 +++++++ .../code/modules/loadout/categories/pocket.dm | 12 +-- .../code/modules/loadout/categories/suit.dm | 65 ++++++++++++- .../code/modules/loadout/categories/under.dm | 65 ++++++++++++- .../categories/~donator/donator_personal.dm | 22 ++--- .../code/modules/loadout/~defines.dm | 7 ++ .../modules/security/secmed/secmed_clothes.dm | 5 +- .../modules/security/secmed/security_medic.dm | 2 +- .../code/modules/vending/multisec.dm | 32 ++++--- tgstation.dme | 1 + 27 files changed, 366 insertions(+), 88 deletions(-) create mode 100644 modular_zubbers/code/modules/loadout/~defines.dm diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm index 740e9346c69..333ad865506 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm @@ -139,16 +139,19 @@ /datum/loadout_item/head/caligram_cap_tan name = "Blacktide Tan Softcap" item_path = /obj/item/clothing/head/caligram_cap_tan + can_be_reskinned = TRUE // ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4") /datum/loadout_item/uniform/caligram_fatigues_tan name = "Blacktide Tan Fatigues" item_path = /obj/item/clothing/under/jumpsuit/caligram_fatigues_tan + can_be_reskinned = TRUE // ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4") /datum/loadout_item/suit/caligram_parka_tan name = "Blacktide Tan Coat" item_path = /obj/item/clothing/suit/jacket/caligram_parka_tan + can_be_reskinned = TRUE // ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4") /datum/loadout_item/suit/caligram_parka_vest_tan @@ -156,6 +159,7 @@ item_path = /obj/item/clothing/suit/armor/vest/caligram_parka_vest_tan // ckeywhitelist = list("farsightednightlight", "raxraus", "1ceres", "marcoalbaredaa", "itzshift_yt", "drifter7371", "AvianAviator", "Katty Kat", "Investigator77", "Dalao Azure", "Socialistion", "ChillyLobster", "Sylvara", "AmZee", "Tf4", "rb303", "Kay_Nite", "whataboutism", "taac", "Halkyon", "Lupo_di_rosa", "Merek2", "lowpowermia", "RyeanBread", "Jesterz7", "Saund_Minah", "Ruediger4") restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) + can_be_reskinned = TRUE /datum/loadout_item/suit/brasspriest name = "Brasspriest Coat" @@ -587,21 +591,25 @@ item_path = /obj/item/clothing/suit/armor/hos/elofy // ckeywhitelist = list("october23") restricted_roles = list(JOB_HEAD_OF_SECURITY) + can_be_reskinned = TRUE /datum/loadout_item/head/elofy name = "Solar Admiral Hat" item_path = /obj/item/clothing/head/hats/hos/elofy ckeywhitelist = list("october23") restricted_roles = list(JOB_HEAD_OF_SECURITY) + can_be_reskinned = TRUE /datum/loadout_item/gloves/elofy name = "Solar Admiral Gloves" item_path = /obj/item/clothing/gloves/elofy + can_be_reskinned = TRUE // ckeywhitelist = list("october23") /datum/loadout_item/shoes/elofy name = "Solar Admiral Boots" item_path = /obj/item/clothing/shoes/jackboots/elofy + can_be_reskinned = TRUE // ckeywhitelist = list("october23") /datum/loadout_item/pocket_items/transponder @@ -754,6 +762,7 @@ name = "Graceful Trenchcoat" item_path = /obj/item/clothing/neck/trenchcoat ckeywhitelist = list("Smol42", "Awers855") + can_be_reskinned = TRUE /datum/loadout_item/uniform/old_qm_jumpskirt name = "Old Quartermaster's Jumpskirt" diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm index cee4b07c4a2..527223fd95c 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm @@ -482,7 +482,7 @@ /datum/loadout_item/head/navyblueofficerberet name = "Security Officer's Navy Blue beret" item_path = /obj/item/clothing/head/beret/sec/navyofficer - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) /datum/loadout_item/head/navybluewardenberet name = "Warden's Navy Blue beret" diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/neck.dm b/modular_skyrat/master_files/code/modules/loadout/categories/neck.dm index 73317bf3ed3..d609c85b0f4 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/neck.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/neck.dm @@ -253,16 +253,6 @@ name = "Maid Neck Cover" item_path = /obj/item/clothing/neck/maid -/datum/loadout_item/neck/holobadge - name = "Holobadge" - item_path = /obj/item/clothing/accessory/badge/holo - restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) - -/datum/loadout_item/neck/holobadge_cord - name = "Holobadge with Lanyard" - item_path = /obj/item/clothing/accessory/badge/holo/cord - restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) - /* * DONATOR */ diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm b/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm index 2dc0c1ff29d..38241d1cfb2 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/shoes.dm @@ -33,6 +33,22 @@ name = "Recolorable Jackboots" item_path = /obj/item/clothing/shoes/jackboots/recolorable +/datum/loadout_item/shoes/jackboots/sec + name = "security jackboots" + item_path = /obj/item/clothing/shoes/jackboots/sec + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) + + +/datum/loadout_item/shoes/jackboots/peacekeeper + name = "Armadyne combat boots" + item_path = /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) + +/datum/loadout_item/shoes/jackboots/gogo_boots + name = "Tactical Go-Go boots" + item_path = /obj/item/clothing/shoes/jackboots/gogo_boots + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) + /* * MISC BOOTS */ diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm b/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm index f84aab46e69..fb989688528 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm @@ -584,7 +584,7 @@ /datum/loadout_item/suit/navybluejacketofficer name = "Security Officer's Navy Blue Formal Jacket" item_path = /obj/item/clothing/suit/jacket/officer/blue - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) /datum/loadout_item/suit/navybluejacketwarden name = "Warden's Navy Blue Formal Jacket" @@ -609,7 +609,7 @@ /datum/loadout_item/suit/british_jacket name = "Peacekeeper Officer Coat" item_path = /obj/item/clothing/suit/british_officer - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) /datum/loadout_item/suit/offdep_jacket name = "Off-Department Jacket" @@ -638,6 +638,11 @@ item_path = /obj/item/clothing/suit/toggle/jacket/sec/medical restricted_roles = list (JOB_ORDERLY, JOB_SECURITY_MEDIC, JOB_CHIEF_MEDICAL_OFFICER) +/datum/loadout_item/suit/labcoat/doctor_tailcoat + name = "Brig Physician's tailcoat" + item_path = /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec + restricted_roles = list(JOB_SECURITY_MEDIC) + /datum/loadout_item/suit/supply_jacket name = "Supply Jacket" item_path = /obj/item/clothing/suit/toggle/jacket/supply diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm b/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm index 33c3fb4ac83..35ac4042f75 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm @@ -153,7 +153,7 @@ /datum/loadout_item/uniform/jumpsuit/imperial_police_uniform name = "Imperial Police Uniform" item_path = /obj/item/clothing/under/colonial/nri_police - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) /datum/loadout_item/uniform/jumpsuit/disco name = "Superstar Cop Uniform" diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm index 40110bc3820..4315719c24a 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/armadyne_clothing.dm @@ -1,10 +1,10 @@ /obj/item/clothing/under/rank/security/peacekeeper/armadyne name = "armadyne corporate uniform" desc = "A sleek uniform worn by Armadyne corporate. Its metallic red belt buckle is made in the shape of the Armadyne logo." + icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi'//This can probably be moved to centcom.dm when the suits are sorted icon_state = "armadyne_shirt" - worn_icon_state = "armadyne_shirt" - icon = 'modular_skyrat/master_files/icons/obj/clothing/under/centcom.dmi' //This can probably be moved to centcom.dm when the suits are sorted worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/centcom.dmi' + worn_icon_state = "armadyne_shirt" //This can probably be moved to centcom.dm when the suits are sorted /obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical name = "armadyne tactical uniform" diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index 8a9c1346bae..48708880692 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -567,4 +567,4 @@ ), ) -// END HATS ADDED BY APRIL \ No newline at end of file +// END HATS ADDED BY APRIL diff --git a/modular_zubbers/code/modules/clothing/head/jobs.dm b/modular_zubbers/code/modules/clothing/head/jobs.dm index 6a896c13d5f..484bec20fd1 100644 --- a/modular_zubbers/code/modules/clothing/head/jobs.dm +++ b/modular_zubbers/code/modules/clothing/head/jobs.dm @@ -38,7 +38,7 @@ greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#3E3E48#FFFFFF" -/obj/item/clothing/head/beaniesec +/obj/item/clothing/head/security_beanie name = "security beanie" desc = "A robust beanie with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection." icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' diff --git a/modular_zubbers/code/modules/clothing/suits/armor.dm b/modular_zubbers/code/modules/clothing/suits/armor.dm index 08c6cb19be8..972e2d0b757 100644 --- a/modular_zubbers/code/modules/clothing/suits/armor.dm +++ b/modular_zubbers/code/modules/clothing/suits/armor.dm @@ -11,7 +11,7 @@ icon_state = "hardsuit-metrocop" inhand_icon_state = null blood_overlay_type = "hardsuit-metrocop" - armor_type =/datum/armor/suit_armor + armor_type = /datum/armor/suit_armor /obj/item/clothing/suit/armor/metrocopriot //Sprite done by Gat1Day#2892 name = "Riot Civil Protection Suit" @@ -34,21 +34,15 @@ uses_advanced_reskins = TRUE unique_reskin = list( "Red Pattern" = list( - RESKIN_ICON = 'modular_zubbers/icons/obj/clothing/suits/collared_vest.dmi', RESKIN_ICON_STATE = "vest_worn_red", - RESKIN_WORN_ICON = 'modular_zubbers/icons/obj/clothing/suits/collared_vest.dmi', RESKIN_WORN_ICON_STATE = "vest_worn_red" ), "Neutral Pattern" = list( - RESKIN_ICON = 'modular_zubbers/icons/obj/clothing/suits/collared_vest.dmi', RESKIN_ICON_STATE = "vest_worn", - RESKIN_WORN_ICON = 'modular_zubbers/icons/obj/clothing/suits/collared_vest.dmi', RESKIN_WORN_ICON_STATE = "vest_worn", ), "Blue Pattern" = list( - RESKIN_ICON = 'modular_zubbers/icons/obj/clothing/suits/collared_vest.dmi', RESKIN_ICON_STATE = "vest_worn_blue", - RESKIN_WORN_ICON = 'modular_zubbers/icons/obj/clothing/suits/collared_vest.dmi', RESKIN_WORN_ICON_STATE = "vest_worn_blue", RESKIN_SUPPORTS_VARIATIONS_FLAGS = NONE ) diff --git a/modular_zubbers/code/modules/clothing_reskins/redsec.dm b/modular_zubbers/code/modules/clothing_reskins/redsec.dm index 42f0a2412df..8b0d4e564e6 100644 --- a/modular_zubbers/code/modules/clothing_reskins/redsec.dm +++ b/modular_zubbers/code/modules/clothing_reskins/redsec.dm @@ -34,22 +34,6 @@ ) . = ..() -/obj/item/clothing/head/security_cap/Initialize(mapload) - unique_reskin["RedSec Variant"] = list( - RESKIN_ICON = 'icons/obj/clothing/head/hats.dmi', - RESKIN_ICON_STATE = "secsoft", - RESKIN_WORN_ICON = 'icons/mob/clothing/head/hats.dmi' - ) - . = ..() - -/obj/item/clothing/gloves/color/black/security/Initialize(mapload) - unique_reskin["RedSec Variant"] = list( - RESKIN_ICON = 'modular_zubbers/icons/obj/clothing/gloves.dmi', - RESKIN_ICON_STATE = "redsec", - RESKIN_WORN_ICON_STATE = "maagloves", - ) - . = ..() - /obj/item/clothing/under/rank/security/officer/Initialize(mapload) if (!unique_reskin) . = ..() diff --git a/modular_zubbers/code/modules/loadout/categories/accessories.dm b/modular_zubbers/code/modules/loadout/categories/accessories.dm index a0244e68e0d..c7449cf7072 100644 --- a/modular_zubbers/code/modules/loadout/categories/accessories.dm +++ b/modular_zubbers/code/modules/loadout/categories/accessories.dm @@ -2,3 +2,10 @@ name = "Fake Medal" item_path = /obj/item/clothing/accessory/fake/medal +/datum/loadout_item/accessory/holobadge + name = "Holobadge" + item_path = /obj/item/clothing/accessory/badge/holo + +/datum/loadout_item/accessory/holobadge_cord + name = "Holobadge with Lanyard" + item_path = /obj/item/clothing/accessory/badge/holo/cord diff --git a/modular_zubbers/code/modules/loadout/categories/glasses.dm b/modular_zubbers/code/modules/loadout/categories/glasses.dm index 2a0ac81123f..cfe7b0df377 100644 --- a/modular_zubbers/code/modules/loadout/categories/glasses.dm +++ b/modular_zubbers/code/modules/loadout/categories/glasses.dm @@ -5,7 +5,7 @@ /datum/loadout_item/glasses/surgerygoggles/med name = "Surgery Goggles" item_path = /obj/item/clothing/glasses/hud/health/surgerygoggles - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(ALL_JOBS_MEDICAL, JOB_GENETICIST) /datum/loadout_item/glasses/salesman name = "Colored Glasses" diff --git a/modular_zubbers/code/modules/loadout/categories/gloves.dm b/modular_zubbers/code/modules/loadout/categories/gloves.dm index 8d76c9a313d..07e0fe6c0b6 100644 --- a/modular_zubbers/code/modules/loadout/categories/gloves.dm +++ b/modular_zubbers/code/modules/loadout/categories/gloves.dm @@ -14,10 +14,20 @@ /datum/loadout_item/gloves/rubber_gloves/med name = "Long Rubber Medical Gloves" item_path = /obj/item/clothing/gloves/latex/nitrile/longrubbergloves - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(ALL_JOBS_MEDICAL, JOB_GENETICIST) /datum/loadout_item/gloves/tactical_maid //Donor item for skyefree name = "Tactical Maid Gloves" item_path = /obj/item/clothing/gloves/tactical_maid donator_only = TRUE +/datum/loadout_item/gloves/color/black/security + name = "Security gloves" + item_path = /obj/item/clothing/gloves/color/black/security + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/gloves/combat/peacekeeper/armadyne + name = "Armadyne combat gloves" + item_path = /obj/item/clothing/gloves/combat/peacekeeper/armadyne + restricted_roles = list(ALL_JOBS_SEC) diff --git a/modular_zubbers/code/modules/loadout/categories/heads.dm b/modular_zubbers/code/modules/loadout/categories/heads.dm index 142fad41ca1..e83efebed0c 100644 --- a/modular_zubbers/code/modules/loadout/categories/heads.dm +++ b/modular_zubbers/code/modules/loadout/categories/heads.dm @@ -27,12 +27,13 @@ /datum/loadout_item/head/hats/warden/police/patrol name = "police patrol cap" item_path = /obj/item/clothing/head/hats/warden/police/patrol - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE /datum/loadout_item/head/helmet/sec/futuristic name = "futuristic security helmet" item_path = /obj/item/clothing/head/helmet/sec/futuristic - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) + restricted_roles = list(ALL_JOBS_SEC) /datum/loadout_item/head/sombrero name = "Sombrero" @@ -62,6 +63,93 @@ donator_only = TRUE restricted_roles = list(JOB_NT_REP) +/datum/loadout_item/head/security_garrison + name = "Security garrison cap" + item_path = /obj/item/clothing/head/security_garrison + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/head/security_cap + name = "Security cap" + item_path = /obj/item/clothing/head/security_cap + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/head/security_cap/soft + name = "Security cap (soft)" + item_path = /obj/item/clothing/head/soft/sec + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = FALSE + +/datum/loadout_item/head/security_cap/veteran + name = "Veteran's security cap (soft)" + item_path = /obj/item/clothing/head/soft/veteran + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = FALSE + +/datum/loadout_item/head/security_cap/colonial + name = "Imperial police cap" + item_path = /obj/item/clothing/head/hats/colonial/nri_police + restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT) + can_be_reskinned = FALSE + +/datum/loadout_item/head/security_beanie + name = "Security beanie" + item_path = /obj/item/clothing/head/security_beanie + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/head/beret/sec/peacekeeper + name = "Peacekeeper beret" + item_path = /obj/item/clothing/head/beret/sec/peacekeeper + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/head/beret/sec/peacekeeper/white + name = "Peacekeeper beret (White)" + item_path = /obj/item/clothing/head/beret/sec/peacekeeper/white + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/head/helmet/sec/terra + name = "Sol police helmet" + item_path = /obj/item/clothing/head/helmet/sec/terra + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/head/hats/warden/police/patrol + name = "Warden's police cap" + item_path = /obj/item/clothing/head/hats/warden/police/patrol + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/head/helmet/sec/redsec + name = "Security helmet (Redsec)" + item_path = /obj/item/clothing/head/helmet/sec/redsec + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/head/helmet/nri_police + name = "Imperial police helmet" + item_path = /obj/item/clothing/head/helmet/nri_police + restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT) + +/datum/loadout_item/head/hats/security_kepi + name = "Security kepi" + item_path = /obj/item/clothing/head/security_kepi + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/head/beret/sec/peacekeeper/armadyne + name = "Armadyne corporate beret" + item_path = /obj/item/clothing/head/beret/sec/peacekeeper/armadyne + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/head/helmet/sec/peacekeeper/security_medic + name = "Security Medic helmet" + item_path = /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic + restricted_roles = list(JOB_SECURITY_MEDIC) + +/datum/loadout_item/head/beret/sec/peacekeeper/security_medic + name = "Security medic beret" + item_path = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic + restricted_roles = list(JOB_SECURITY_MEDIC) + /datum/loadout_item/head/lace_bow name = "Hair Bow" item_path = /obj/item/clothing/head/costume/hairbow diff --git a/modular_zubbers/code/modules/loadout/categories/inhands.dm b/modular_zubbers/code/modules/loadout/categories/inhands.dm index c594214ecf7..17b10dfdb19 100644 --- a/modular_zubbers/code/modules/loadout/categories/inhands.dm +++ b/modular_zubbers/code/modules/loadout/categories/inhands.dm @@ -22,5 +22,4 @@ /datum/loadout_item/inhand/saddle_peacekeeper name = "riding saddle (peacekeeper)" item_path = /obj/item/riding_saddle/leather/peacekeeper - - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER, JOB_HEAD_OF_SECURITY) + restricted_roles = list(ALL_JOBS_SEC) diff --git a/modular_zubbers/code/modules/loadout/categories/masks.dm b/modular_zubbers/code/modules/loadout/categories/masks.dm index fa97e6ab3fd..2ab63f5d965 100644 --- a/modular_zubbers/code/modules/loadout/categories/masks.dm +++ b/modular_zubbers/code/modules/loadout/categories/masks.dm @@ -1,3 +1,18 @@ /datum/loadout_item/mask/sechailer_half_mask name = "Tacticool Half-Mask" item_path = /obj/item/clothing/mask/gas/half_mask + +/datum/loadout_item/mask/gas/german + name = "Black gas mask" + item_path = /obj/item/clothing/mask/gas/german + restricted_roles = list(ALL_JOBS_SEC,) + +/datum/loadout_item/mask/gas/soviet + name = "Soviet gas mask" + item_path = /obj/item/clothing/mask/gas/soviet + restricted_roles = list(ALL_JOBS_SEC,) + +/datum/loadout_item/mask/gas/nri_police + name = "Colonial gas mask" + item_path = /obj/item/clothing/mask/gas/nri_police + restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT) diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm index 8da13630c17..f34718fe87d 100644 --- a/modular_zubbers/code/modules/loadout/categories/neck.dm +++ b/modular_zubbers/code/modules/loadout/categories/neck.dm @@ -15,6 +15,38 @@ name = "Crow Feather Cloak" item_path = /obj/item/clothing/neck/binary +/datum/loadout_item/neck/security_cape + name = "security cape" + item_path = /obj/item/clothing/neck/security_cape + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/neck/security_cape/armplate + name = "security gauntlet" + item_path = /obj/item/clothing/neck/security_cape/armplate + restricted_roles = list(ALL_JOBS_SEC) + can_be_reskinned = TRUE + +/datum/loadout_item/neck/pauldron + name = "lieutenant commander's pauldron" + item_path = /obj/item/clothing/neck/pauldron + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/neck/pauldron/captain + name = "commander's pauldron" + item_path = /obj/item/clothing/neck/pauldron/captain + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/neck/pauldron/commander + name = "captain's pauldron" + item_path = /obj/item/clothing/neck/pauldron/commander + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/neck/imperial_cloak + name = "Imperial Police Cloak" + item_path = /obj/item/clothing/neck/cloak/colonial/nri_police + restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT) + /datum/loadout_item/neck/bunnypendant name = "Rabbit Pendant" item_path = /obj/item/clothing/neck/bunny_pendant diff --git a/modular_zubbers/code/modules/loadout/categories/pocket.dm b/modular_zubbers/code/modules/loadout/categories/pocket.dm index 08576a60bad..470eb28b36d 100644 --- a/modular_zubbers/code/modules/loadout/categories/pocket.dm +++ b/modular_zubbers/code/modules/loadout/categories/pocket.dm @@ -118,32 +118,32 @@ /datum/loadout_item/pocket_items/nif_disk_med name = "Medical Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/med_hud - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(ALL_JOBS_MEDICAL, JOB_GENETICIST) /datum/loadout_item/pocket_items/nif_disk_diag name = "Diagnostic Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/diag_hud - restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST) + restricted_roles = list(ALL_JOBS_SCIENCE) /datum/loadout_item/pocket_items/nif_disk_sec name = "Security Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/sec_hud - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_BOUNCER, JOB_ORDERLY, JOB_SCIENCE_GUARD, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_BLUESHIELD) + restricted_roles = list(ALL_JOBS_SEC, ALL_JOBS_DEPT_GUARDS, JOB_BLUESHIELD) /datum/loadout_item/pocket_items/nif_disk_permit name = "Permit Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/permit_hud - restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_CUSTOMS_AGENT, JOB_SHAFT_MINER) + restricted_roles = list(ALL_JOBS_CARGO) /datum/loadout_item/pocket_items/nif_disk_sci name = "Science Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/sci_hud - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(ALL_JOBS_SCIENCE, JOB_CHEMIST) /datum/loadout_item/pocket_items/nif_disk_meson name = "Meson Scrying Lens Disk" item_path = /obj/item/disk/nifsoft_uploader/meson_hud - restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT, JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD) + restricted_roles = list(ALL_JOBS_CARGO, ALL_JOBS_ENGINEERING) /* * LUNCHBOX diff --git a/modular_zubbers/code/modules/loadout/categories/suit.dm b/modular_zubbers/code/modules/loadout/categories/suit.dm index 5d73cc301a4..9d1b622a14e 100644 --- a/modular_zubbers/code/modules/loadout/categories/suit.dm +++ b/modular_zubbers/code/modules/loadout/categories/suit.dm @@ -1,7 +1,7 @@ /datum/loadout_item/suit/secjacket name = "High-Vis Security Jacket" item_path = /obj/item/clothing/suit/armor/vest/secjacket/blue - restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(ALL_JOBS_SEC) /datum/loadout_item/suit/leather_apron name = "Leather Apron" @@ -27,6 +27,67 @@ name = "Pirate coat" item_path = /obj/item/clothing/suit/costume/pirate +/datum/loadout_item/suit/hooded/wintercoat/security + name = "Security winter jacket" + item_path = /obj/item/clothing/suit/hooded/wintercoat/security + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/hooded/wintercoat/security/redsec + name = "Security winter jacket (Redsec)" + item_path = /obj/item/clothing/suit/hooded/wintercoat/security/redsec + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/toggle/jacket/sec/old + name = "Security jacket (Redsec)" + item_path = /obj/item/clothing/suit/toggle/jacket/sec/old + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/jacket/officer/tan + name = "Formal security jacket (tan)" + item_path = /obj/item/clothing/suit/jacket/officer/tan + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/armor/vest/secjacket + name = "Security jacket" + item_path = /obj/item/clothing/suit/armor/vest/secjacket + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/armor/vest/peacekeeper/armadyne + name = "Armadyne Jacket" + item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/armor/vest/peacekeeper/armadyne/armor + name = "Armadyne Armor Vest" + item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/armor/vest/nri_police + name = "Imperial police vest" + item_path = /obj/item/clothing/suit/armor/vest/nri_police + restricted_roles = list(ALL_JOBS_SEC, JOB_CUSTOMS_AGENT) + +/datum/loadout_item/suit/jacket/fedsec + name = "Modern Security federation jacket" + item_path = /obj/item/clothing/suit/fedcoat/modern/sec + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/suit/jacket/corrections_officer + name = "Correction's officer's jacket" + item_path = /obj/item/clothing/suit/toggle/jacket/corrections_officer + restricted_roles = list(JOB_CORRECTIONS_OFFICER, JOB_WARDEN) + +/datum/loadout_item/suit/jacket/security_medic + name = "Security medic labcoat" + item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic + restricted_roles = list(JOB_SECURITY_MEDIC) + +/datum/loadout_item/suit/jacket/security_medic + name = "Security medic labcoat (Blue)" + item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue + restricted_roles = list(JOB_SECURITY_MEDIC) + + // Fancy crop-top jackets /datum/loadout_item/suit/crop_jacket @@ -68,7 +129,7 @@ /datum/loadout_item/suit/collared_vest name = "GLP-C 'Úlfur' Vest" item_path = /obj/item/clothing/suit/armor/vest/collared_vest - restricted_roles = list(JOB_NT_REP, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_BLUESHIELD) + restricted_roles = list(ALL_JOBS_SEC, ALL_JOBS_CENTRAL) donator_only = TRUE //Dono item for offwrldr /datum/loadout_item/suit/highvisjacket //sprites by Keila diff --git a/modular_zubbers/code/modules/loadout/categories/under.dm b/modular_zubbers/code/modules/loadout/categories/under.dm index be94b041f22..920e66c5ded 100644 --- a/modular_zubbers/code/modules/loadout/categories/under.dm +++ b/modular_zubbers/code/modules/loadout/categories/under.dm @@ -1,24 +1,79 @@ -/datum/loadout_item/under/jumpsuit/security/hecu +/datum/loadout_item/uniform/security/hecu name = "Urban Camouflage BDU" item_path = /obj/item/clothing/under/rank/security/officer/hecu donator_only = TRUE - restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(ALL_JOBS_SEC, JOB_BLUESHIELD) -/datum/loadout_item/uniform/miscellaneous/command/stripper //Sprites by SierraGenevese +/datum/loadout_item/uniform/command/stripper //Sprites by SierraGenevese name = "Command Stripper Uniform" item_path = /obj/item/clothing/under/rank/civilian/head_of_personnel/stripper restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_QUARTERMASTER, JOB_NT_REP) -/datum/loadout_item/uniform/miscellaneous/nanotrasen_consultant/stripper //Sprites by SierraGenevese +/datum/loadout_item/uniform/nanotrasen_consultant/stripper //Sprites by SierraGenevese name = "consultant stripper uniform" item_path = /obj/item/clothing/under/rank/nanotrasen_consultant/stripper restricted_roles = list(JOB_NT_REP) -/datum/loadout_item/uniform/miscellaneous/medrscrubs +/datum/loadout_item/uniform/medrscrubs name = "Security Medic's Scrubs" item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec restricted_roles = list(JOB_SECURITY_MEDIC) +/datum/loadout_item/uniform/security/officer/redsec + name = "Security uniform (Redsec)" + item_path = /obj/item/clothing/under/rank/security/officer/redsec + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/uniform/security/peacekeeper/armadyne + name = "Armadyne Corporate Uniform" + item_path =/obj/item/clothing/under/rank/security/peacekeeper/armadyne + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/uniform/security/utility/redsec + name = "Security utility uniform (Redsec)" + item_path = /obj/item/clothing/under/rank/security/skyrat/utility/redsec + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/uniform/security/officer/formal + name = "Security Officer's formal uniform" + item_path = /obj/item/clothing/under/rank/security/officer/formal + restricted_roles = list(ALL_JOBS_SEC) + +/datum/loadout_item/uniform/security/peacekeeper/security_medic + name = "Security medic turtleneck" + item_path =/obj/item/clothing/under/rank/security/peacekeeper/security_medic + restricted_roles = list(JOB_SECURITY_MEDIC) + +/datum/loadout_item/uniform/security/peacekeeper/security_medic/skirt + name = "Security medic skirtleneck" + item_path =/obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt + restricted_roles = list(JOB_SECURITY_MEDIC) + +/datum/loadout_item/uniform/security/peacekeeper/security_medic/alternate + name = "Security medic jumpsuit" + item_path = /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate + restricted_roles = list(JOB_SECURITY_MEDIC) + +/datum/loadout_item/uniform/security/corrections_officer + name = "Correction's Officer jumpsuit" + item_path = /obj/item/clothing/under/rank/security/corrections_officer + restricted_roles = list(JOB_CORRECTIONS_OFFICER, JOB_WARDEN) + +/datum/loadout_item/uniform/security/corrections_officer + name = "Correction's Officer jumpskirt" + item_path = /obj/item/clothing/under/rank/security/corrections_officer/skirt + restricted_roles = list(JOB_CORRECTIONS_OFFICER, JOB_WARDEN) + +/datum/loadout_item/uniform/security/corrections_officer + name = "Correction's Officer sweater" + item_path = /obj/item/clothing/under/rank/security/corrections_officer/sweater + restricted_roles = list(JOB_CORRECTIONS_OFFICER, JOB_WARDEN) + +/datum/loadout_item/uniform/security/corrections_officer + name = "Correction's Officer skirt with sweater" + item_path = /obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt + restricted_roles = list(JOB_CORRECTIONS_OFFICER, JOB_WARDEN) + /datum/loadout_item/uniform/miscellaneous/tactical_maid //Donor item for skyefree name = "Tactical Maid Costume" item_path = /obj/item/clothing/under/misc/maid/tactical diff --git a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm index e07dbdf9c24..88694b1635a 100644 --- a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm +++ b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm @@ -21,8 +21,8 @@ /datum/loadout_item/head/idmahelmet name = "IDMA Service Helmet" item_path = /obj/item/clothing/head/helmet/sec/sol/idma_helmet - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") - restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) + ckeywhitelist = list("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /* @@ -51,14 +51,14 @@ /datum/loadout_item/uniform/miscellaneous/idmasnowfatigue name = "IDMA Service Uniform" item_path = /obj/item/clothing/under/rank/security/idma_fatigue - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") - restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) + ckeywhitelist = list("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/uniform/miscellaneous/idmafatigue name = "IDMA Desert Service Uniform" item_path = /obj/item/clothing/under/rank/security/idma_fatigue/alt - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") - restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) + ckeywhitelist = list("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/uniform/miscellaneous/idmautility name = "IDMA Utility Uniform" @@ -72,23 +72,23 @@ name = "IDMA Combat Vest" item_path = /obj/item/clothing/suit/armor/vest/idma_vest ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") - restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/suit/idmarsuit name = "IDMA Service Jacket" item_path = /obj/item/clothing/suit/jacket/idma_jacket - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") + ckeywhitelist = list("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") /datum/loadout_item/suit/idmaarmouredjacket name = "IDMA Service Jacket" item_path = /obj/item/clothing/suit/armor/vest/idma_vest/idma_jacket ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "1Ceres", "Raxraus", "Tecktonic") - restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) /datum/loadout_item/suit/idmardjacket name = "Silicon Administrator Vest" item_path = /obj/item/clothing/suit/jacket/vera_jacket - restricted_roles = list (JOB_RESEARCH_DIRECTOR) // De whitelisted since I dont use it anymore + restricted_roles = list(JOB_RESEARCH_DIRECTOR) // De whitelisted since I dont use it anymore /datum/loadout_item/suit/runner_winter name = "Winter Runner Jacket" @@ -136,7 +136,7 @@ /datum/loadout_item/accessory/idmaarmbands name = "IDMA Armband" item_path = /obj/item/clothing/accessory/armband/idmaarmband - ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") + ckeywhitelist = list("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok", "Raxraus") /* * TOYS diff --git a/modular_zubbers/code/modules/loadout/~defines.dm b/modular_zubbers/code/modules/loadout/~defines.dm new file mode 100644 index 00000000000..37d675d0c00 --- /dev/null +++ b/modular_zubbers/code/modules/loadout/~defines.dm @@ -0,0 +1,7 @@ +#define ALL_JOBS_SEC JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC +#define ALL_JOBS_DEPT_GUARDS JOB_CORRECTIONS_OFFICER, JOB_ENGINEERING_GUARD, JOB_ORDERLY, JOB_SCIENCE_GUARD, JOB_CUSTOMS_AGENT, JOB_BOUNCER +#define ALL_JOBS_CENTRAL JOB_NT_REP, JOB_BLUESHIELD +#define ALL_JOBS_MEDICAL JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER +#define ALL_JOBS_SCIENCE JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD +#define ALL_JOBS_CARGO JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_CUSTOMS_AGENT, JOB_SHAFT_MINER, JOB_BITRUNNER +#define ALL_JOBS_ENGINEERING JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD diff --git a/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm index 37fcb1c3d17..fad82963e8e 100644 --- a/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm +++ b/modular_zubbers/code/modules/security/secmed/secmed_clothes.dm @@ -68,9 +68,10 @@ name = "security medic uniform" desc = "A lightly armored uniform worn by Nanotrasen's Asset Protection Medical Corps." icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' - worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' - worn_icon = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' icon_state = "security_medic_jumpsuit" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_state = "security_medic_jumpsuit" + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' /obj/item/clothing/under/rank/security/peacekeeper/security_medic name = "security medic turtleneck" diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm index 6921aef25d3..711bbc496cf 100644 --- a/modular_zubbers/code/modules/security/secmed/security_medic.dm +++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm @@ -117,8 +117,8 @@ /obj/item/storage/bag/garment/secmed/PopulateContents() . = ..() new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic(src) - new /obj/item/clothing/suit/hazardvest/security_medic(src) new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue(src) + new /obj/item/clothing/suit/hazardvest/security_medic(src) new /obj/item/clothing/suit/hazardvest/security_medic/blue(src) new /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic(src) new /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec(src) diff --git a/modular_zubbers/code/modules/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm index 789c2c9c9e4..05383a65f78 100644 --- a/modular_zubbers/code/modules/vending/multisec.dm +++ b/modular_zubbers/code/modules/vending/multisec.dm @@ -53,7 +53,6 @@ /obj/item/storage/backpack/duffelbag/sec/redsec = 6, /obj/item/clothing/under/rank/security/officer/redsec = 6, /obj/item/clothing/under/rank/security/peacekeeper/armadyne = 6, - /obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical = 6, /obj/item/clothing/shoes/jackboots = 6, /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6, /obj/item/clothing/shoes/jackboots/gogo_boots = 6, @@ -62,7 +61,7 @@ /obj/item/clothing/head/security_kepi = 6, /obj/item/clothing/head/beret/sec/peacekeeper/armadyne = 6, /obj/item/clothing/head/soft/sec = 6, - /obj/item/clothing/head/beaniesec = 6, + /obj/item/clothing/head/security_beanie = 6, /obj/item/clothing/head/playbunnyears/security = 6, /obj/item/clothing/under/rank/security/security_bunnysuit = 6, /obj/item/clothing/suit/armor/security_tailcoat = 6, @@ -92,8 +91,8 @@ "icon" = "notes-medical", "products" = list( /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic = 3, - /obj/item/clothing/suit/hazardvest/security_medic = 3, /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue = 3, + /obj/item/clothing/suit/hazardvest/security_medic = 3, /obj/item/clothing/suit/hazardvest/security_medic/blue = 3, /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic = 3, /obj/item/clothing/head/beret/sec/peacekeeper/security_medic = 3, @@ -106,13 +105,27 @@ /obj/item/clothing/under/rank/security/peacekeeper/security_medic = 3, /obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt = 3, ) - ) + ), + list( + "name" = "Corrections", + "icon" = "handcuffs", + "products" = list( + /obj/item/clothing/under/rank/security/corrections_officer = 2, //If, or more likely when the Brig Officers abandon them, you can now get 'em here! Yay! Wahoo! + /obj/item/clothing/under/rank/security/corrections_officer/skirt = 2, + /obj/item/clothing/under/rank/security/corrections_officer/sweater = 2, + /obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt = 2, + /obj/item/clothing/suit/toggle/jacket/corrections_officer = 2, + /obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners. + /obj/item/clothing/head/playbunnyears/prisoner = 6, + /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 6, + /obj/item/clothing/neck/tie/bunnytie/prisoner = 6, + ), + ), ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 6, /obj/item/clothing/suit/jacket/officer/blue = 6, /obj/item/clothing/head/beret/sec/navyofficer = 6, - /obj/item/clothing/under/rank/security/officer/formal = 6, /obj/item/clothing/suit/jacket/officer/tan = 6, /obj/item/clothing/head/helmet/metrocophelmet = 6, /obj/item/clothing/suit/armor/metrocop = 6, @@ -138,19 +151,10 @@ /obj/item/clothing/glasses/hud/ar/aviator/security = 3, //Printable, but you have to choose between HUD and flash protection. /obj/item/clothing/glasses/hud/ar/projector/security = 3, /obj/item/clothing/mask/gas/half_mask = 3, - /obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners. - /obj/item/clothing/head/playbunnyears/prisoner = 6, - /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 6, - /obj/item/clothing/neck/tie/bunnytie/prisoner = 6, /obj/item/clothing/head/hats/caphat/parade/fedcap/sec = 3, /obj/item/clothing/suit/fedcoat/modern/sec = 3, /obj/item/clothing/mask/gas/soviet = 3, /obj/item/clothing/mask/gas/german = 3, //As far as I can tell, this is nowhere else in the game. - /obj/item/clothing/under/rank/security/corrections_officer = 2, //If, or more likely when the Brig Officers abandon them, you can now get 'em here! Yay! Wahoo! - /obj/item/clothing/under/rank/security/corrections_officer/skirt = 2, - /obj/item/clothing/under/rank/security/corrections_officer/sweater = 2, - /obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt = 2, - /obj/item/clothing/suit/toggle/jacket/corrections_officer = 2, /obj/item/clothing/head/soft/veteran = 1, /obj/item/clothing/head/helmet/toggleable/justice = 1, //More than one of these in the Vendor and they'll get annoying fast. Hence why Justice2 isn't here. ) diff --git a/tgstation.dme b/tgstation.dme index d68a571bbee..9f6bdfb0b59 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9105,6 +9105,7 @@ #include "modular_zubbers\code\modules\lewd_machinery\sex_barrier.dm" #include "modular_zubbers\code\modules\limbgrowncorpses\limbgrowerblanks.dm" #include "modular_zubbers\code\modules\liquids\height_floors.dm" +#include "modular_zubbers\code\modules\loadout\~defines.dm" #include "modular_zubbers\code\modules\loadout\categories\accessories.dm" #include "modular_zubbers\code\modules\loadout\categories\ears.dm" #include "modular_zubbers\code\modules\loadout\categories\glasses.dm"