diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1a8ff2bd4ca..6c501175ed3 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -343,6 +343,6 @@ new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet/sec(src) new /obj/item/clothing/under/rank/security/officer(src) - //new /obj/item/clothing/under/rank/security/officer/skirt(src) SKYRAT EDIT REMOVAL + new /obj/item/clothing/under/rank/security/officer/skirt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/flashlight/seclite(src) diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi index fa9c4889689..2b69e02fd83 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi index add8e585c4e..ea98435846f 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi index eb335d34503..c9b5e383fea 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi differ diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index f38a497050b..86eef5406a0 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -548,6 +548,15 @@ /obj/item/clothing/under/rank/security/officer/formal unique_reskin = null // prevents you from losing the unique sprite +/obj/item/clothing/under/rank/security/officer/skirt + name = "security battle dress" + desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt." + worn_icon_state = "security_skirt" + icon_state = "security_skirt" + uses_advanced_reskins = FALSE + unique_reskin = null + alt_covers_chest = FALSE + //Warden /obj/item/clothing/under/rank/security/warden icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' @@ -606,21 +615,16 @@ // // This code overrides security's jumpskirt preference, as we're not going to be giving them jumpskirts // -/datum/outfit/job/security/pre_equip(mob/living/carbon/human/affected_mob) - if(affected_mob.jumpsuit_style == PREF_SKIRT) - to_chat(affected_mob, span_alertwarning("Lopland Peacekeeper uniforms don't include a skirt variant! You've been equipped with a jumpsuit instead.")) - affected_mob.jumpsuit_style = PREF_SUIT - . = ..() /datum/outfit/job/hos/pre_equip(mob/living/carbon/human/affected_mob) if(affected_mob.jumpsuit_style == PREF_SKIRT) - to_chat(affected_mob, span_alertwarning("Lopland Peacekeeper uniforms don't include a skirt variant! You've been equipped with a jumpsuit instead.")) + to_chat(affected_mob, span_alertwarning("Lopland Head of Security uniforms don't include a skirt variant! You've been equipped with a jumpsuit instead.")) affected_mob.jumpsuit_style = PREF_SUIT . = ..() /datum/outfit/job/warden/pre_equip(mob/living/carbon/human/affected_mob) if(affected_mob.jumpsuit_style == PREF_SKIRT) - to_chat(affected_mob, span_alertwarning("Lopland Peacekeeper uniforms don't include a skirt variant! You've been equipped with a jumpsuit instead.")) + to_chat(affected_mob, span_alertwarning("Lopland Warden uniforms don't include a skirt variant! You've been equipped with a jumpsuit instead.")) affected_mob.jumpsuit_style = PREF_SUIT . = ..() diff --git a/modular_skyrat/modules/sec_haul/code/misc/vending.dm b/modular_skyrat/modules/sec_haul/code/misc/vending.dm index 7d0f8660139..6ec68e4a407 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm @@ -45,6 +45,7 @@ /obj/item/storage/backpack/satchel/sec = 5, /obj/item/storage/backpack/duffelbag/sec = 5, /obj/item/clothing/under/rank/security/officer = 10, + /obj/item/clothing/under/rank/security/officer/skirt = 10, /obj/item/clothing/under/rank/security/peacekeeper/tactical = 4, /obj/item/clothing/under/rank/security/peacekeeper/sol/cadet = 3, /obj/item/clothing/under/rank/security/peacekeeper/sol = 3,