From 6f5c1bac08b17973b1c758f28668a814c7550666 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 11 Apr 2020 08:37:53 -0700
Subject: [PATCH] harmful

---
 code/game/objects/items/shields.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index c8365783e3..dc11e55754 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -40,7 +40,7 @@
 	user_shieldbash(user, target, user.a_intent != INTENT_HARM)
 	return TRUE
 
-/obj/item/shield/proc/do_shieldbash_effect(mob/living/user, dir)
+/obj/item/shield/proc/do_shieldbash_effect(mob/living/user, dir, harmful)
 	var/px = 0
 	var/py = 0
 	switch(dir)
@@ -141,7 +141,6 @@
 		playsound(src, harmful? "swing_hit" : 'sound/weapons/thudswoosh.ogg', 75, 1)
 	else
 		playsound(src, 'sound/weapons/punchmiss.ogg', 75, 1)
-	step(user, bashdir)		//lunge
 	return length(victims)
 
 /obj/effect/temp_visual/dir_setting/shield_bash