Skip to content

Commit

Permalink
Fixes damage overlay bugs (tgstation#25494)
Browse files Browse the repository at this point in the history
  • Loading branch information
XDTM authored and lzimann committed Mar 26, 2017
1 parent cb40b0f commit fb0fb4e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/damage_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fb0fb4e

Please sign in to comment.