From 4b4b4b4971fa46b8d0b3be35396b4575d7b1b67e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:00:01 +0200 Subject: [PATCH] [MIRROR] Fixes runtime with eye of god on destroy [MDB IGNORE] (#17017) * Fixes runtime with eye of god on destroy (#70636) * Fixes runtime with eye of god on destroy Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/mining/lavaland/tendril_loot.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 3975619974c..8d9ab69633d 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -764,7 +764,9 @@ // Behead someone, their "glasses" drop on the floor // and thus, the god eye should no longer be sticky REMOVE_TRAIT(src, TRAIT_NODROP, EYE_OF_GOD_TRAIT) - scan_ability.Remove(user) + // And remove the scan ability, note that if we're being called from Destroy + // that this may already be nulled and removed + scan_ability?.Remove(user) /obj/item/clothing/glasses/godeye/proc/pain(mob/living/victim) to_chat(victim, span_userdanger("You experience blinding pain, as [src] burrows into your skull."))