cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9237 from VOREStation/upstream-merge-7728

Browse Source 
[MIRROR] Fixes suit blood overlays on mobs not displaying.
This commit is contained in:
Verkister
2020-10-18 15:57:26 +03:00
committed by Chompstation Bot
parent a3f9f88bea
commit b7fc7ac1bb
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/clothing/clothing.dm
View File

@@ -735,6 +735,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
slot_flags = SLOT_OCLOTHING slot_flags = SLOT_OCLOTHING
var/blood_overlay_type = "suit" 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 siemens_coefficient = 0.9
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
preserve_item = 1 preserve_item = 1

3
code/modules/clothing/clothing_icons.dm
View File

@@ -29,6 +29,7 @@
/obj/item/clothing/suit/apply_blood(var/image/standing) /obj/item/clothing/suit/apply_blood(var/image/standing)
if(blood_DNA && blood_sprite_state && ishuman(loc)) if(blood_DNA && blood_sprite_state && ishuman(loc))
var/mob/living/carbon/human/H = 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 bloodsies.color = blood_color
standing.add_overlay(bloodsies) standing.add_overlay(bloodsies)

3
code/modules/clothing/suits/armor.dm
View File

@@ -278,6 +278,7 @@
name = "armor vest" name = "armor vest"
desc = "A simple kevlar plate carrier." desc = "A simple kevlar plate carrier."
icon_state = "kvest" icon_state = "kvest"
blood_overlay_type = "armor"
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "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) 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) 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" name = "Warden's jacket"
desc = "An armoured jacket with silver rank pips and livery." desc = "An armoured jacket with silver rank pips and livery."
icon_state = "warden_jacket" icon_state = "warden_jacket"
blood_overlay_type = "suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
flags_inv = HIDETIE|HIDEHOLSTER flags_inv = HIDETIE|HIDEHOLSTER
@@ -332,6 +334,7 @@
name = "armored coat" name = "armored coat"
desc = "A greatcoat enhanced with a special alloy for some protection and style." desc = "A greatcoat enhanced with a special alloy for some protection and style."
icon_state = "hos" icon_state = "hos"
blood_overlay_type = "suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
flags_inv = HIDETIE|HIDEHOLSTER flags_inv = HIDETIE|HIDEHOLSTER