From e7dff5d3e25f735fe7ba7c5f995043d2aba2fed0 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 30 Jan 2017 15:24:22 -0500 Subject: [PATCH] Fixes cyborg proselytizers (#23443) * Fixes cyborg proselytizers * wow fuck i'm an idiot --- code/_onclick/cyborg.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index b0c110cddc5..da3f8fcd2e5 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -69,9 +69,10 @@ // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents) if(A == loc || (A in loc) || (A in contents)) // No adjacency checks - var/resolved = A.attackby(W,src, params) - if(!resolved && A && W) - W.afterattack(A,src,1,params) + if(W.pre_attackby(A,src,params)) + var/resolved = A.attackby(W,src, params) + if(!resolved && A && W) + W.afterattack(A,src,1,params) return if(!isturf(loc)) @@ -80,9 +81,10 @@ // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc)) if(isturf(A) || isturf(A.loc)) if(A.Adjacent(src)) // see adjacent.dm - var/resolved = A.attackby(W, src, params) - if(!resolved && A && W) - W.afterattack(A, src, 1, params) + if(W.pre_attackby(A,src,params)) + var/resolved = A.attackby(W, src, params) + if(!resolved && A && W) + W.afterattack(A, src, 1, params) return else W.afterattack(A, src, 0, params)