From eb7f3f286d7afc93a1253e232ce6436fd94ee7e0 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Fri, 12 Sep 2014 06:39:31 -0300 Subject: [PATCH] Fixes two runtimes related to the grab object. --- code/modules/mob/mob_grab.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index aff402b6bc9..66d7ea2edec 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -40,7 +40,8 @@ affecting.grabbed_by -= src affecting = null if(assailant) - assailant.client.screen -= hud + if(assailant.client) + assailant.client.screen -= hud assailant = null qdel(hud) ..() @@ -171,9 +172,10 @@ assailant.changeNext_move(10) affecting.losebreath += 1 else - assailant.visible_message("[assailant] was unable to tighten \his grip on [affecting]'s neck!") - hud.icon_state = "disarm/kill" - state = GRAB_NECK + if(assailant) + assailant.visible_message("[assailant] was unable to tighten \his grip on [affecting]'s neck!") + hud.icon_state = "disarm/kill" + state = GRAB_NECK //This is used to make sure the victim hasn't managed to yackety sax away before using the grab.