From 4c38a8b1e2c655450fa96cb41a8008395497d818 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 4 Oct 2017 20:51:37 -0500 Subject: [PATCH] Update energy_katana.dm --- code/modules/ninja/energy_katana.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index b2f01212f5..853cca2057 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -85,8 +85,6 @@ playsound(user, 'sound/weapons/blade1.ogg', 50, 1) target.emag_act(user) -<<<<<<< HEAD -======= /obj/item/energy_katana/pickup(mob/living/user) . = ..() jaunt.Grant(user, src) @@ -97,7 +95,6 @@ . = ..() jaunt.Remove(user) user.update_icons() ->>>>>>> 4ffb1cd... Merge pull request #31289 from ShizCalev/hacknslash //If we hit the Ninja who owns this Katana, they catch it. //Works for if the Ninja throws it or it throws itself or someone tries