diff --git a/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm b/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm index 9cf46dbec20..bca1cc09d53 100644 --- a/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm +++ b/modular_nova/master_files/code/modules/clothing/under/jobs/security.dm @@ -40,7 +40,43 @@ icon_state = "workpants_blue" body_parts_covered = GROIN|LEGS can_adjust = FALSE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS + uses_advanced_reskins = TRUE + unique_reskin = list( + "Blue Variant" = list( + RESKIN_ICON_STATE = "workpants_blue", + RESKIN_WORN_ICON_STATE = "workpants_blue" + ), + "White Variant" = list( + RESKIN_ICON_STATE = "workpants_white", + RESKIN_WORN_ICON_STATE = "workpants_white" + ), + ) + +/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts + name = "security shorts" + desc = "Some Peacekeeper-blue combat shorts. Definitely should pair it with a vest for safety." + icon_state = "workshorts_blue" + uses_advanced_reskins = TRUE + unique_reskin = list( + "Blue Variant, Short" = list( + RESKIN_ICON_STATE = "workshorts_blue", + RESKIN_WORN_ICON_STATE = "workshorts_blue" + ), + "Blue Variant, Short Short" = list( + RESKIN_ICON_STATE = "workshorts_blue_short", + RESKIN_WORN_ICON_STATE = "workshorts_blue_short" + ), + "White Variant, Short" = list( + RESKIN_ICON_STATE = "workshorts_white", + RESKIN_WORN_ICON_STATE = "workshorts_white" + ), + "White Variant, Short Short" = list( + RESKIN_ICON_STATE = "workshorts_white_short", + RESKIN_WORN_ICON_STATE = "workshorts_white_short" + ), + ) /* * HEAD OF SECURITY diff --git a/modular_nova/master_files/icons/mob/clothing/under/security.dmi b/modular_nova/master_files/icons/mob/clothing/under/security.dmi index 0aeace1f82e..5ff32ef3482 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/under/security.dmi and b/modular_nova/master_files/icons/mob/clothing/under/security.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/under/security_digi.dmi b/modular_nova/master_files/icons/mob/clothing/under/security_digi.dmi index b7816d0ac6f..3eb22541a80 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/under/security_digi.dmi and b/modular_nova/master_files/icons/mob/clothing/under/security_digi.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/under/security.dmi b/modular_nova/master_files/icons/obj/clothing/under/security.dmi index ac3891c27c1..1144af107a2 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/under/security.dmi and b/modular_nova/master_files/icons/obj/clothing/under/security.dmi differ diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 9618f48a371..55539fa6f97 100644 --- a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -123,6 +123,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) +/datum/loadout_item/under/jumpsuit/security_shorts + name = "Security Shorts" + item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) + /datum/loadout_item/under/jumpsuit/security_peacekeeper name = "Security Peacekeeper Uniform" item_path = /obj/item/clothing/under/rank/security/peacekeeper diff --git a/modular_nova/modules/sec_haul/code/misc/vending.dm b/modular_nova/modules/sec_haul/code/misc/vending.dm index 9e73d3225ed..fbba4daba34 100644 --- a/modular_nova/modules/sec_haul/code/misc/vending.dm +++ b/modular_nova/modules/sec_haul/code/misc/vending.dm @@ -56,6 +56,8 @@ /obj/item/clothing/under/rank/security/officer/skirt = 10, /obj/item/clothing/under/rank/security/peacekeeper = 10, /obj/item/clothing/under/rank/security/nova/utility = 3, + /obj/item/clothing/under/rank/security/peacekeeper/trousers = 10, + /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts = 10, /obj/item/clothing/shoes/jackboots/sec = 10, /obj/item/clothing/head/security_garrison = 10, /obj/item/clothing/head/security_cap = 10,