From 5e29e77f377b1b97a0fca4f4e86f81dadc6d5dc6 Mon Sep 17 00:00:00 2001 From: Jittai Date: Mon, 19 Feb 2018 15:41:44 -0500 Subject: [PATCH 1/2] Ctrl-clicking mobs is consistent in that it upgrades grabs (#35547) cl Jittai tweak: Ctrl+Clicking progresses through grab cycle on living mobs (not just humans) /cl --- code/game/atoms_movable.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0e28f12fcc..8ef9534881 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -74,9 +74,12 @@ if(gs==0) stop_pulling() return FALSE - // Are we trying to pull something we are already pulling? Then just stop here, no need to continue. + // Are we trying to pull something we are already pulling? Then enter grab cycle and end. if(AM == pulling) grab_state = gs + if(istype(AM,/mob/living)) + var/mob/living/AMob = AM + AMob.grabbedby(src) return TRUE stop_pulling() if(AM.pulledby)