From 93e0f90479373c9edffe3c9b0aad742a67af191f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 1 Aug 2020 21:20:37 -0700 Subject: [PATCH 1/2] Merge pull request #7401 from Verkister/patch-44 Fixes null grab runtime breaking mob movement --- code/modules/mob/mob_movement.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index d364706513..3de17ee8ef 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -295,7 +295,7 @@ // It's just us and another person if(grablist.len == 1) var/mob/M = grablist[1] - if(!my_mob.Adjacent(M)) //Oh no, we moved away + if(M && !my_mob.Adjacent(M)) //Oh no, we moved away M.Move(pre_move_loc, get_dir(M, pre_move_loc), total_delay) //Have them step towards where we were // It's a grab chain