Merge branch 'shield_bashing' of github.com-kevinz000:kevinz000/Citadel-Station-13 into shield_bashing

2020-04-11 08:37:30 -07:00
parent bcf77458dd ab1d7c29ad
commit de296c8879
1 changed files with 1 additions and 0 deletions
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -141,6 +141,7 @@
 		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