From e96590ff59bde77ad5bb77f698a2dfa23ecb5f85 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 1 Dec 2015 23:08:07 -0500 Subject: [PATCH] Make Ctrl-Click unpull work by using the verb Did not realize this didn't use the verb. --- code/_onclick/click.dm | 7 ++++--- code/modules/mob/living/living.dm | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 929bf722474..74d90a37576 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -224,9 +224,10 @@ /atom/proc/CtrlClick(mob/user) return -/atom/movable/CtrlClick(mob/user) - if(Adjacent(user)) - user.start_pulling(src) +/atom/movable/CtrlClick(mob/living/user) + var/mob/living/ML = user + if(istype(ML)) + ML.pulled(src) /* Alt click diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 898c1dcee9d..28dee2912aa 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -164,7 +164,6 @@ Sorry Giacom. Please don't be mad :( stop_pulling() else if(AM.Adjacent(src)) src.start_pulling(AM) - return //same as above /mob/living/pointed(atom/A as mob|obj|turf in view())