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 e8c5499bff2..c1e3303206e 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -49,8 +49,7 @@ new /obj/item/clothing/head/hopcap(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/parade(src) //SKYRAT EDIT ADDITION START - HOP PARADE UNIFORMS new /obj/item/clothing/under/rank/civilian/head_of_personnel/parade/female(src) - new /obj/item/clothing/suit/armor/hop_parade(src) - new /obj/item/clothing/suit/armor/hop_parade/female(src) //SKYRAT EDIT ADDITION END + new /obj/item/clothing/suit/toggle/hop_parade(src) //SKYRAT EDIT ADDITION END new /obj/item/cartridge/hop(src) new /obj/item/radio/headset/heads/hop(src) new /obj/item/clothing/shoes/sneakers/brown(src) diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi index 436ed955bfa..bdf4adbc760 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi index b21d1100644..effa19ddf98 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm b/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm index 34a72fef765..d41513b3e2b 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm @@ -69,18 +69,19 @@ inhand_icon_state = "by_suit" // HEAD OF PERSONNEL (Lowered the armor values, but technically they'd be giving up their vest for this so they deserve some armor) -/obj/item/clothing/suit/armor/hop_parade - name = "head of personnel's male parade jacket" +/obj/item/clothing/suit/toggle/hop_parade + name = "head of personnel's parade jacket" desc = "A luxurious deep blue jacket for the Head of Personnel, woven with a red trim. It smells of bureaucracy." icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - icon_state = "hop_parade_male" - inhand_icon_state = "by_suit" - armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 8) + icon_state = "hopformal" + inhand_icon_state = "capspacesuit" body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS heat_protection = CHEST|GROIN|ARMS + armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 8) + togglename = "buttons" -/obj/item/clothing/suit/armor/hop_parade/female - name = "head of personnel's female parade jacket" - icon_state = "hop_parade_female" +/obj/item/clothing/suit/toggle/hop_parade/Initialize() + . = ..() + allowed = GLOB.security_wintercoat_allowed