cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some issues with blood on clothing (#13148)

Browse Source 
Co-authored-by: TGW <mc-casper@hotmail.dk>
This commit is contained in:
Casper3667
2022-02-11 21:40:50 +01:00
committed by GitHub
parent 3eff83733c
commit d28dd83b39
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+10 -6
View File
@@ -388,7 +388,7 @@
/obj/item/clothing/gloves/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
var/image/I = ..()
if(blood_DNA)
if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str)
var/image/bloodsies = image(H.species.blood_mask, "bloodyhands")
bloodsies.color = blood_color
I.add_overlay(bloodsies)
@@ -614,7 +614,7 @@
/obj/item/clothing/head/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
var/image/I = ..()
if(blood_DNA)
if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str)
var/image/bloodsies = image(H.species.blood_mask, icon_state = "helmetblood")
bloodsies.color = blood_color
bloodsies.appearance_flags = RESET_ALPHA
@@ -690,7 +690,7 @@
/obj/item/clothing/mask/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
var/image/I = ..()
if(blood_DNA && has_blood_overlay)
if(blood_DNA && has_blood_overlay && slot != slot_l_hand_str && slot != slot_r_hand_str)
var/image/bloodsies = image(H.species.blood_mask, "maskblood")
bloodsies.color = blood_color
bloodsies.appearance_flags = RESET_ALPHA
@@ -851,7 +851,7 @@
/obj/item/clothing/shoes/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot)
var/image/I = ..()
if(blood_DNA)
if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str)
for(var/limb_tag in list(BP_L_FOOT, BP_R_FOOT))
var/obj/item/organ/external/E = H.get_organ(limb_tag)
if(E && !E.is_stump())
@@ -888,6 +888,10 @@
/obj/item/clothing/shoes/clothing_class()
return "shoes"
/obj/item/clothing/shoes/clean_blood()
. = ..()
track_footprint = 0
///////////////////////////////////////////////////////////////////////
//Suit
/obj/item/clothing/suit
@@ -937,7 +941,7 @@
var/image/accessory_image = A.get_accessory_mob_overlay(H)
I.add_overlay(accessory_image)
if(blood_DNA)
if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str)
var/image/bloodsies = image(icon = H.species.blood_mask, icon_state = "[blood_overlay_type]blood")
bloodsies.color = blood_color
I.add_overlay(bloodsies)
@@ -1021,7 +1025,7 @@
var/image/accessory_image = A.get_accessory_mob_overlay(H)
I.add_overlay(accessory_image)
if(blood_DNA)
if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str)
var/image/bloodsies = image(icon = H.species.blood_mask, icon_state = "uniformblood")
bloodsies.color = blood_color
I.add_overlay(bloodsies)
code/modules/mob/living/carbon/human/human.dm
+1
View File
@@ -1295,6 +1295,7 @@
if(clean_feet && !shoes)
footprint_color = null
feet_blood_DNA = null
track_footprint = 0
update_inv_shoes(1)
if(blood_color)