From 83dbe874c52b4ddf4081c0cbe102d687fdf9a4bd Mon Sep 17 00:00:00 2001 From: Quardbreak Date: Tue, 21 Feb 2017 11:05:48 +0300 Subject: [PATCH] Fixes touch hand qdel loop runtime (#24290) * Fix touch hand loop runtime * Fix #2 --- code/modules/spells/spell_types/godhand.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 74174112ade..6d4b248bc5b 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" item_state = null - flags = ABSTRACT | NODROP + flags = ABSTRACT | NODROP | DROPDEL w_class = WEIGHT_CLASS_HUGE force = 0 throwforce = 0 @@ -33,10 +33,10 @@ attached_spell.attached_hand = null qdel(src) -/obj/item/weapon/melee/touch_attack/dropped() +/obj/item/weapon/melee/touch_attack/Destroy() if(attached_spell) attached_spell.attached_hand = null - qdel(src) + return ..() /obj/item/weapon/melee/touch_attack/disintegrate name = "\improper disintegrating touch"