shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kevinz000
2020-04-11 08:37:30 -07:00
parent bcf77458dd ab1d7c29ad
commit de296c8879
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/shields.dm
+1
View File
@@ -141,6 +141,7 @@
playsound(src, harmful? "swing_hit" : 'sound/weapons/thudswoosh.ogg', 75, 1) playsound(src, harmful? "swing_hit" : 'sound/weapons/thudswoosh.ogg', 75, 1)
else else
playsound(src, 'sound/weapons/punchmiss.ogg', 75, 1) playsound(src, 'sound/weapons/punchmiss.ogg', 75, 1)
step(user, bashdir) //lunge
return length(victims) return length(victims)
/obj/effect/temp_visual/dir_setting/shield_bash /obj/effect/temp_visual/dir_setting/shield_bash