From 1989e3d5ea683e38464139c0d95d6ba8aa4f7ba0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 21 May 2017 22:27:54 -0500 Subject: [PATCH] properly fixes quickgrab exploit --- code/_onclick/click.dm.rej | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 code/_onclick/click.dm.rej diff --git a/code/_onclick/click.dm.rej b/code/_onclick/click.dm.rej new file mode 100644 index 0000000000..cf73a2b45a --- /dev/null +++ b/code/_onclick/click.dm.rej @@ -0,0 +1,13 @@ +diff a/code/_onclick/click.dm b/code/_onclick/click.dm (rejected hunks) +@@ -324,9 +324,9 @@ + ML.pulled(src) + + /mob/living/carbon/human/CtrlClick(mob/user) +- if(world.time < user.next_move) +- return FALSE + if(ishuman(user) && Adjacent(user)) ++ if(world.time < user.next_move) ++ return FALSE + var/mob/living/carbon/human/H = user + H.dna.species.grab(H, src, H.martial_art) + H.changeNext_move(CLICK_CD_MELEE)