diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 4e897b129f0..cd4c7482f6d 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -24997,12 +24997,12 @@ "bnp" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle, -/obj/item/clothing/suit/armor/laserproof, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/item/clothing/suit/hooded/ablative, /turf/simulated/floor/plasteel, /area/security/securearmoury) "bnr" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1ad262e510e..4a5a7252dcf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -94022,7 +94022,7 @@ /area/hallway/primary/central) "xKQ" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/hooded/ablative, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 0b9ab297353..9d77f21db81 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1914,7 +1914,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/clothing/suit/armor/laserproof, +/obj/item/clothing/suit/hooded/ablative, /obj/item/gun/energy/ionrifle, /turf/simulated/floor/plasteel{ dir = 8; diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 227397b1697..e02efa2b97b 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -131,8 +131,8 @@ location_override = "the Chief Medical Officer's Office" /datum/theft_objective/ablative - name = "an ablative armor vest" - typepath = /obj/item/clothing/suit/armor/laserproof + name = "an ablative trenchcoat" + typepath = /obj/item/clothing/suit/hooded/ablative protected_jobs = list("Head of Security", "Warden") location_override = "the Armory" diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 9768ad988ef..ab0dfb7ddd3 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -19,6 +19,7 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/suit/armor/reactive, /obj/item/clothing/suit/armor/laserproof, + /obj/item/clothing/suit/hooded/ablative, /obj/item/clothing/gloves/color/black/krav_maga, ) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index ee2314beb3d..ff42ff5fb8a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -71,9 +71,9 @@ /obj/item/clothing/head/helmet/alt name = "bulletproof helmet" desc = "A bulletproof helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." - icon_state = "swat" - item_state = "swat-alt" - armor = list(MELEE = 10, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 45, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) + icon_state = "bulletproof" + item_state = "bulletproof" + armor = list(MELEE = 10, BULLET = 50, LASER = 5, ENERGY = 5, BOMB = 45, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) dog_fashion = null /obj/item/clothing/head/helmet/riot diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7d2ca9a3c67..ee91ff98d6e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -228,9 +228,14 @@ icon_state = "bulletproof" item_state = "armor" blood_overlay_type = "armor" - armor = list(MELEE = 10, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 35, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) - strip_delay = 70 - put_on_delay = 50 + body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + heat_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + 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') /obj/item/clothing/suit/armor/laserproof name = "ablative armor vest" @@ -239,7 +244,6 @@ item_state = "armor_reflec" blood_overlay_type = "armor" armor = list(MELEE = 5, BULLET = 5, LASER = 75, ENERGY = 50, BOMB = 0, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY) - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/hit_reflect_chance = 40 /obj/item/clothing/suit/armor/laserproof/IsReflect() diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 024044548ab..40ff8ffab80 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -494,6 +494,38 @@ /obj/item/clothing/head/hooded/winterhood/miner icon_state = "winterhood_miner" +/obj/item/clothing/head/hooded/ablative + name = "ablative hood" + desc = "Hood hopefully belonging to an ablative trenchcoat. Includes a flash proof visor." + icon_state = "ablativehood" + flash_protect = FLASH_PROTECTION_FLASH + armor = list(MELEE = 5, BULLET = 5, LASER = 50, ENERGY = 50, BOMB = 0, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY) + strip_delay = 3 SECONDS + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi') + +/obj/item/clothing/suit/hooded/ablative + name = "ablative trenchcoat" + desc = "Experimental trenchcoat specially crafted to reflect and absorb laser and disabler shots. Don't expect it to do all that much against an axe or a shotgun, however." + icon_state = "ablativecoat" + w_class = WEIGHT_CLASS_NORMAL + item_state = "ablativecoat" + body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + heat_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + armor = list(MELEE = 5, BULLET = 5, LASER = 50, ENERGY = 50, BOMB = 0, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY) + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + hoodtype = /obj/item/clothing/head/hooded/ablative + strip_delay = 3 SECONDS + put_on_delay = 4 SECONDS + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi') + var/hit_reflect_chance = 50 + +/obj/item/clothing/suit/hooded/ablative/IsReflect() + var/mob/living/carbon/human/user = loc + if(prob(hit_reflect_chance) && (user.wear_suit == src)) + return 1 /* * Misc diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index d52d6573de2..48d9248efae 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/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi index e3d224469e0..40459c0c3a4 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/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index c059a3bff9d..4f794a9f5d0 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 fad52462023..e32c7f7e80e 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 8bf33015a45..ad2089725e6 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 7da58e37ac4..4f1417a3e52 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 9b849277c3e..0122bc437e0 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 b3f32472734..aaf28dafd5d 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 9954d15014d..91aa75a33e9 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 09d00127e10..3c51ae974c2 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 8daf5ba3b97..3ea4e27933f 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ