diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index caf6d395f1..4b230053d9 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -735,6 +735,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) slot_flags = SLOT_OCLOTHING var/blood_overlay_type = "suit" + blood_sprite_state = "suitblood" //Defaults to the suit's blood overlay, so that some blood renders instead of no blood. siemens_coefficient = 0.9 w_class = ITEMSIZE_NORMAL preserve_item = 1 diff --git a/code/modules/clothing/clothing_icons.dm b/code/modules/clothing/clothing_icons.dm index 33e1da6000..2d4f00c665 100644 --- a/code/modules/clothing/clothing_icons.dm +++ b/code/modules/clothing/clothing_icons.dm @@ -29,6 +29,7 @@ /obj/item/clothing/suit/apply_blood(var/image/standing) if(blood_DNA && blood_sprite_state && ishuman(loc)) var/mob/living/carbon/human/H = loc - var/image/bloodsies = image(icon = H.species.get_blood_mask(H), icon_state = "[blood_overlay_type]blood") + blood_sprite_state = "[blood_overlay_type]blood" + var/image/bloodsies = image(icon = H.species.get_blood_mask(H), icon_state = blood_sprite_state) bloodsies.color = blood_color standing.add_overlay(bloodsies) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7fb4df785e..20f33104ca 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -278,6 +278,7 @@ name = "armor vest" desc = "A simple kevlar plate carrier." icon_state = "kvest" + blood_overlay_type = "armor" item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor") armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0) allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet) @@ -311,6 +312,7 @@ name = "Warden's jacket" desc = "An armoured jacket with silver rank pips and livery." icon_state = "warden_jacket" + blood_overlay_type = "suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS flags_inv = HIDETIE|HIDEHOLSTER @@ -332,6 +334,7 @@ name = "armored coat" desc = "A greatcoat enhanced with a special alloy for some protection and style." icon_state = "hos" + blood_overlay_type = "suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS flags_inv = HIDETIE|HIDEHOLSTER