From fb0fb4eb03774c1f96d2e925dd61443987d7f034 Mon Sep 17 00:00:00 2001 From: XDTM Date: Sun, 26 Mar 2017 19:06:54 +0200 Subject: [PATCH] Fixes damage overlay bugs (#25494) --- code/modules/mob/living/carbon/damage_procs.dm | 4 ++-- code/modules/mob/living/carbon/human/species_types/golems.dm | 1 + .../mob/living/carbon/human/species_types/jellypeople.dm | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index c4584d01dd8..3f97d92e628 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -145,8 +145,8 @@ parts -= picked if(updating_health) updatehealth() - if(update) - update_damage_overlays() + if(update) + update_damage_overlays() // damage MANY bodyparts, in random order /mob/living/carbon/take_overall_damage(brute, burn, updating_health = 1) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index d224de8b838..1fe33f1ce1d 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -12,6 +12,7 @@ no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform) nojumpsuit = 1 sexes = 1 + damage_overlay_type = "" meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem // To prevent golem subtypes from overwhelming the odds when random species // changes, only the Random Golem type can be chosen diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index b9c2f68e3af..4dc34402dd3 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -7,6 +7,7 @@ species_traits = list(MUTCOLORS,EYECOLOR,NOBLOOD,VIRUSIMMUNE,TOXINLOVER) meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime exotic_blood = "slimejelly" + damage_overlay_type = "" var/datum/action/innate/regenerate_limbs/regenerate_limbs /datum/species/jelly/on_species_loss(mob/living/carbon/C)