Skip to content

Commit

Permalink
fix(human): fixes bloody feet
Browse files Browse the repository at this point in the history
  • Loading branch information
TobyThorne authored Dec 20, 2023
1 parent e07a501 commit 1567eb2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/Cleanable/humans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var/global/list/image/splatter_cache=list()

else if(hasfeet)//Or feet
perp.feet_blood_color = basecolor
perp.track_blood = max(amount,perp.track_blood)
perp.track_blood = max(amount, perp.track_blood)
if(!perp.feet_blood_DNA)
perp.feet_blood_DNA = list()
perp.feet_blood_DNA |= blood_DNA.Copy()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
// shoes
if(shoes && !skipshoes)
msg += "[T.He] [T.is] wearing [shoes.get_examine_line()] on [T.his] feet.\n"
else if(feet_blood_DNA)
else if(feet_blood_color)
msg += SPAN("warning", "[T.He] [T.has] [(feet_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained feet!\n")

// mask
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,7 @@
gunshot_residue = null

if(clean_feet && !shoes)
track_blood = 0
feet_blood_color = null
feet_blood_DNA = null
update_inv_shoes(1)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ var/global/list/damage_icon_parts = list()
if(shoes && !((wear_suit && wear_suit.flags_inv & HIDESHOES) || (w_uniform && w_uniform.flags_inv & HIDESHOES)))
overlays_standing[HO_SHOES_LAYER] = shoes.get_mob_overlay(src,slot_shoes_str)
else
if(feet_blood_DNA && body_build.blood_icon)
var/image/bloodsies = overlay_image(body_build.blood_icon, "shoeblood", hand_blood_color, DEFAULT_APPEARANCE_FLAGS | RESET_COLOR)
if(feet_blood_color && body_build.blood_icon)
var/image/bloodsies = overlay_image(body_build.blood_icon, "shoeblood", feet_blood_color, DEFAULT_APPEARANCE_FLAGS | RESET_COLOR)
overlays_standing[HO_SHOES_LAYER] = bloodsies
else
overlays_standing[HO_SHOES_LAYER] = null
Expand Down

0 comments on commit 1567eb2

Please sign in to comment.