diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 539191f8f63..0fff4ca2ad5 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -26644,9 +26644,9 @@ /area/quartermaster/storage) "brf" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof/sec, +/obj/item/clothing/suit/armor/bulletproof/sec, +/obj/item/clothing/suit/armor/bulletproof/sec, /obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt, @@ -91091,9 +91091,9 @@ /area/crew_quarters/fitness) "kkM" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot/sec, +/obj/item/clothing/suit/armor/riot/sec, +/obj/item/clothing/suit/armor/riot/sec, /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index bb18f5dd346..79fb19b563f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -84128,25 +84128,25 @@ /area/toxins/xenobiology) "sDr" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/riot{ +/obj/item/clothing/suit/armor/riot/sec{ pixel_x = 3; pixel_y = 7 }, -/obj/item/clothing/suit/armor/riot{ +/obj/item/clothing/suit/armor/riot/sec{ pixel_y = 6 }, -/obj/item/clothing/suit/armor/riot{ +/obj/item/clothing/suit/armor/riot/sec{ pixel_x = -3; pixel_y = 5 }, -/obj/item/clothing/suit/armor/bulletproof{ +/obj/item/clothing/suit/armor/bulletproof/sec{ pixel_x = 3; pixel_y = -1 }, -/obj/item/clothing/suit/armor/bulletproof{ +/obj/item/clothing/suit/armor/bulletproof/sec{ pixel_y = -2 }, -/obj/item/clothing/suit/armor/bulletproof{ +/obj/item/clothing/suit/armor/bulletproof/sec{ pixel_x = -3; pixel_y = -3 }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 32407514379..2ddbca659b5 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2230,11 +2230,11 @@ /area/security/brig) "ajq" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof/sec, /obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof/sec, /obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof/sec, /obj/item/clothing/head/helmet/alt, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2625,9 +2625,9 @@ /area/security/brig) "akt" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, +/obj/item/clothing/suit/armor/riot/sec, +/obj/item/clothing/suit/armor/riot/sec, +/obj/item/clothing/suit/armor/riot/sec, /obj/structure/window/reinforced{ dir = 4 }, diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index ea2fe3cdc17..e61ffc9ae31 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -72,7 +72,7 @@ jobtype = /datum/job/warden uniform = /obj/item/clothing/under/rank/security/warden - suit = /obj/item/clothing/suit/armor/vest/warden + suit = /obj/item/clothing/suit/armor/vest/warden/alt gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/warden diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 2a82e4aaf0f..2c6bf8fdcf8 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -56,7 +56,7 @@ /obj/item/clothing/head/collectable/police name = "collectable police officer's hat" desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW." - icon_state = "policehelm" + icon_state = "policehat" dog_fashion = /datum/dog_fashion/head/warden /obj/item/clothing/head/collectable/beret @@ -128,7 +128,7 @@ /obj/item/clothing/head/collectable/HoS name = "collectable HoS hat" desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!" - icon_state = "hoscap" + icon_state = "hos_cap" /obj/item/clothing/head/collectable/HoP name = "collectable HoP hat" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index d253d4fef0a..ca3e1d34b71 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -129,7 +129,7 @@ /obj/item/clothing/head/HoS name = "head of security's cap" desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge." - icon_state = "hoscap" + icon_state = "hos_cap" armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, BIO = 5, RAD = 0, FIRE = 50, ACID = 75) strip_delay = 80 dog_fashion = /datum/dog_fashion/head/HoS @@ -147,18 +147,25 @@ /obj/item/clothing/head/warden name = "warden's police hat" desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts." - icon_state = "policehelm" + icon_state = "policehat" armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = 20, ACID = 75) strip_delay = 60 dog_fashion = /datum/dog_fashion/head/warden + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) + /obj/item/clothing/head/officer name = "officer's cap" desc = "A red cap with an old-fashioned badge on the front for establishing that you are, in fact, the law." - icon_state = "customshelm" - item_state = "customshelm" + icon_state = "sechat" + item_state = "sechat" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 50) strip_delay = 60 + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/head/drillsgt name = "security campaign hat" @@ -167,7 +174,9 @@ item_state = "drillsgthat" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 50) strip_delay = 60 - + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/head/beret/sec name = "security beret" desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 1e6309f1adf..d8626b71505 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -106,6 +106,12 @@ suit_adjusted = 1 actions_types = list(/datum/action/item_action/openclose) adjust_flavour = "unzip" + 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" @@ -118,6 +124,11 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS strip_delay = 80 + 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/alt name = "armored trenchcoat" @@ -149,6 +160,11 @@ strip_delay = 70 resistance_flags = FLAMMABLE dog_fashion = null + 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/vest/warden/alt name = "warden's jacket" @@ -217,7 +233,17 @@ flags_inv = HIDEJUMPSUIT strip_delay = 80 put_on_delay = 60 - hide_tail_by_species = list("Vox") + 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/riot/sec + name = "security riot suit" + desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement. This one has security markings on it." + icon_state = "riot-sec" + item_state = "swat_suit" /obj/item/clothing/suit/armor/riot/knight name = "plate armour" @@ -225,6 +251,7 @@ icon_state = "knight_green" item_state = "knight_green" slowdown = 1 + sprite_sheets = list() /obj/item/clothing/suit/armor/riot/knight/yellow icon_state = "knight_yellow" @@ -268,8 +295,18 @@ armor = list(MELEE = 10, BULLET = 50, LASER = 5, ENERGY = 5, BOMB = 35, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) strip_delay = 8 SECONDS put_on_delay = 6 SECONDS - sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi', - "Grey" = 'icons/mob/clothing/species/grey/suit.dmi') + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' + ) + + +/obj/item/clothing/suit/armor/bulletproof/sec + name = "security bulletproof vest" + desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. This one has security markings on it." + icon_state = "bulletproof-sec" + item_state = "armor" + blood_overlay_type = "armor" /obj/item/clothing/suit/armor/laserproof name = "ablative armor vest" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a9cc977f998..50550990dcf 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -417,9 +417,19 @@ armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 20) allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) hoodtype = /obj/item/clothing/head/hooded/winterhood/security + 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/head/hooded/winterhood/security icon_state = "winterhood_sec" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/medical name = "medical winter coat" @@ -822,6 +832,11 @@ put_on_delay = 40 armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 20) //End of inheritance from Security armour. + 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/jacket/engibomber name = "engineering bomber jacket" diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index a6a07c61088..b6af4c1de23 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 9de627f3ee3..91890dfa64f 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 6d83a331e82..3c9c7e11002 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi index 40459c0c3a4..c932396e249 100644 Binary files a/icons/mob/clothing/species/drask/helmet.dmi and b/icons/mob/clothing/species/drask/helmet.dmi differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 5d1f4292220..1524f365190 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/head.dmi b/icons/mob/clothing/species/grey/head.dmi index d2f607ae293..439cb13120f 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/helmet.dmi b/icons/mob/clothing/species/grey/helmet.dmi index e32c7f7e80e..55de0b07be3 100644 Binary files a/icons/mob/clothing/species/grey/helmet.dmi and b/icons/mob/clothing/species/grey/helmet.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index e7a87adabc1..734e0f83442 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/head.dmi b/icons/mob/clothing/species/vox/head.dmi index dceab0f7712..edd86726ad5 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi index 0122bc437e0..9b1cb2fa5ef 100644 Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index d71b748bbe0..a8c6b23f540 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 910034d19bb..21db1922040 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 7e969029887..7aae7bdc9a3 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 525c70ca856..f538c56205f 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 442b4a6468c..32b5e9ec792 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 50aa79c398d..29e9756812e 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ