From 830c63fcf53cc4364af84272bfdde102d936808d Mon Sep 17 00:00:00 2001 From: MrPerson Date: Sun, 20 Apr 2014 09:14:16 -0700 Subject: [PATCH] Make grabs GC, fix a grab related runtime The following runtime has occured 104 time(s). runtime error: Cannot execute null.s click(). proc name: Click (/obj/screen/grab/Click) source file: screen_objects.dm,73 usr: Reece Eliza (/mob/living/carbon/human) src: the reinforce grab (/obj/screen/grab) --- code/modules/mob/mob_grab.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 48b279a587d..aff402b6bc9 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -38,6 +38,10 @@ /obj/item/weapon/grab/Destroy() if(affecting) affecting.grabbed_by -= src + affecting = null + if(assailant) + assailant.client.screen -= hud + assailant = null qdel(hud) ..() @@ -61,7 +65,8 @@ /obj/item/weapon/grab/process() - confirm() + if(!confirm()) + return 0 if(assailant.client) assailant.client.screen -= hud