diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index c5a093dacca..61c2e51e4da 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -32,6 +32,7 @@ /obj/item/clothing/mask/gas/sechailer/swat = 2, /obj/item/clothing/suit/jacket/secbomber = 2, /obj/item/clothing/suit/armor/secjacket = 4, + /obj/item/clothing/suit/armor/secponcho = 4, /obj/item/clothing/suit/hooded/wintercoat/security = 4, /obj/item/clothing/shoes/jackboots = 4, /obj/item/clothing/shoes/jackboots/jacksandals = 4, @@ -67,6 +68,7 @@ /obj/item/clothing/mask/gas/sechailer/swat = 60, /obj/item/clothing/suit/jacket/secbomber = 75, /obj/item/clothing/suit/armor/secjacket = 75, + /obj/item/clothing/suit/armor/secponcho = 75, /obj/item/clothing/suit/hooded/wintercoat/security = 75, /obj/item/clothing/shoes/jackboots = 20, /obj/item/clothing/shoes/jackboots/jacksandals = 20, diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index a6368408e15..18e88569691 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -200,6 +200,11 @@ display_name = "Poncho, red" path = /obj/item/clothing/suit/poncho/red +/datum/gear/suit/secponcho + display_name = "Poncho, security" + path = /obj/item/clothing/suit/armor/secponcho + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + /datum/gear/suit/tphoodie display_name = "Hoodie, Tharsis Polytech" path = /obj/item/clothing/suit/hooded/hoodie/tp diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index e4b0d2432e6..a2853fbe952 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -121,6 +121,21 @@ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) +/obj/item/clothing/suit/armor/secponcho + name = "security poncho" + desc = "A stylish black and red poncho made with reinforced fabric." + icon_state = "security_poncho" + item_state = "security_poncho" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20) + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' + ) + /obj/item/clothing/suit/armor/hos name = "armored coat" diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 1c32c32e0e1..d321eca14ed 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index c9ab81aab83..2b2c0fd9991 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 501021282a9..e3a62a2c190 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index ee47448f320..a0c8e148e31 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 548378435f3..71c13db926a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/tools/loadout_converter/loadout_converter.json b/tools/loadout_converter/loadout_converter.json index 30c72b07196..055841f3c71 100644 --- a/tools/loadout_converter/loadout_converter.json +++ b/tools/loadout_converter/loadout_converter.json @@ -231,6 +231,7 @@ "military+jacket%2c+white": "/datum/gear/suit/wh_miljacket", "security+jacket": "/datum/gear/suit/secjacket", "security+bomber+jacket": "/datum/gear/suit/secbomberjacket", + "security+poncho": "/datum/gear/suit/secponcho", "Ian+Shirt": "/datum/gear/suit/ianshirt", "poncho%2c+classic": "/datum/gear/suit/poncho", "poncho%2c+green": "/datum/gear/suit/grponcho",