From 46d09185a1705d0b78634455e4792f33d852b9c6 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Wed, 14 Aug 2024 14:35:15 +0300 Subject: [PATCH] Soulscythe now deletes the soul mob when destroyed (#85580) ## About The Pull Request Mob remains alive when it is metalgenned into glass and then shattered currently, here's a preview of what it causes ![image](https://github.com/user-attachments/assets/8d6671dd-1b77-4f0c-a263-31a84f8791f0) Reported on discord ## Changelog :cl: fix: Soulscythe now deletes the soul mob when destroyed /:cl: --------- Co-authored-by: Jack Edge --- code/modules/mining/lavaland/megafauna_loot.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 0bbf1535231..f0270b66d37 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -601,6 +601,10 @@ animate(src) SpinAnimation(15) +/obj/item/soulscythe/Destroy(force) + soul.ghostize() + QDEL_NULL(soul) + . = ..() /mob/living/simple_animal/soulscythe name = "mysterious spirit" maxHealth = 200