From bf34b97b1e88595641d41c66242632be328a5d6b Mon Sep 17 00:00:00 2001 From: Incoming Date: Fri, 13 Nov 2015 01:13:05 -0500 Subject: [PATCH] Gives supermatter swords a better check for adjacency, and moves the parent code below the dust code to be extra sure nothing escapes. I started up a test server and was smacking people to dust like a pro, armor or not. --- code/game/objects/items/weapons/melee/misc.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index d9eb46202fc..450bd40f01c 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -157,12 +157,12 @@ if(!istype(T,/turf/space)) consume_turf(T) -/obj/item/weapon/melee/supermatter_sword/afterattack(target, mob/user) - ..() +/obj/item/weapon/melee/supermatter_sword/afterattack(target, mob/user, proximity_flag) if(user && target == user) user.drop_item() - if(Adjacent(target)) + if(proximity_flag) consume_everything(target) + ..() /obj/item/weapon/melee/supermatter_sword/throw_impact(target) ..()