From 5b3051cad96ca77e99a77ae39abd953dac45d361 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 20 Jul 2018 17:49:29 -0400 Subject: [PATCH] icon generation fixes --- code/modules/mob/living/carbon/human/human.dm | 1 + code/modules/surgery/organs/organ_external.dm | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index dc1fb19019a..1cf1a8bb942 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -120,6 +120,7 @@ qdel(E) for(var/obj/item/organ/O in internal_organs) qdel(O) + regenerate_icons() death() /mob/living/carbon/human/shadow/Initialize(mapload) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index cefe9554d41..04ce880d5f5 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -449,7 +449,7 @@ Note that amputating the affected organ does in fact remove the infection from t ****************************************************/ //Handles dismemberment -/obj/item/organ/external/proc/droplimb(var/clean, var/disintegrate, var/ignore_children, var/nodamage) +/obj/item/organ/external/proc/droplimb(clean, disintegrate, ignore_children, nodamage) if(cannot_amputate || !owner) return @@ -494,12 +494,13 @@ Note that amputating the affected organ does in fact remove the infection from t parent.receive_damage(total_brute, total_burn, ignore_resists = TRUE) //Transfer the full damage to the parent, bypass limb damage reduction. parent = null - spawn(1) - if(victim) - victim.updatehealth() - victim.UpdateDamageIcon() - victim.regenerate_icons() dir = 2 + + if(victim) + victim.updatehealth() + victim.UpdateDamageIcon() + victim.regenerate_icons() + switch(disintegrate) if(DROPLIMB_SHARP) compile_icon() @@ -513,7 +514,7 @@ Note that amputating the affected organ does in fact remove the infection from t dropped_part.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30) dir = 2 brute_dam = 0 - burn_dam = 0 //Reset the damage on the limb; the damage should have transferred to the parent; we don't want extra damage being re-applie when then limb is re-attached + burn_dam = 0 //Reset the damage on the limb; the damage should have transferred to the parent; we don't want extra damage being re-applied when then limb is re-attached return dropped_part else qdel(src) // If you flashed away to ashes, YOU FLASHED AWAY TO ASHES