cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10288 from datlo/basicsofCQC

Browse Source 
Snake, try to remember some of the basics of CQC.
This commit is contained in:
variableundefined
2018-11-22 08:53:26 +08:00
committed by GitHub
parent 97c695aee2 12f6413417
commit 214cf7b12e
13 changed files with 260 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/stunbaton.dm
+2
View File
@@ -166,6 +166,8 @@
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(check_martial_counter(L, user))
return
if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
return