From e09fce105bd5dcdfed18e4f2533733b5aa0e3c9e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 26 Nov 2023 20:12:06 +0100 Subject: [PATCH] [MIRROR] Dismemberment moodlet now properly clears for regenerated limbs [MDB IGNORE] (#25259) * Dismemberment moodlet now properly clears for regenerated limbs (#79822) ## About The Pull Request That's a mouthful. Upon being resurrected by a crystal, dismembered ethereals now lose the dismemberment negative moodlet. Fixes: #79812 ## Changelog :cl: fix: the dismemberment moodlet will now properly clear for ethereals who regrew a limb in their resurrection crystals /:cl: --------- Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * Dismemberment moodlet now properly clears for regenerated limbs --------- Co-authored-by: wesoda25 <37246588+wesoda25@users.noreply.github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> --- code/modules/surgery/bodyparts/dismemberment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index e863341eb43..6e9143ea630 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -361,7 +361,7 @@ scar.victim = new_limb_owner LAZYADD(new_limb_owner.all_scars, scar) - if(!special && new_limb_owner.mob_mood.has_mood_of_category("dismembered_[body_zone]")) + if(new_limb_owner.mob_mood?.has_mood_of_category("dismembered_[body_zone]")) new_limb_owner.clear_mood_event("dismembered_[body_zone]") new_limb_owner.add_mood_event("phantom_pain_[body_zone]", /datum/mood_event/reattachment, src)