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

Merge pull request #11605 from necromanceranne/ONLY_TRUST_YOUR_FISTS

Browse Source 
PUNCHING: YOU SHOULD BE SCREAMING EDITION
This commit is contained in:
kevinz000
2020-03-25 12:23:08 -07:00
committed by GitHub
parent c3194d0238 2b66eadc5e
commit 4d43f2bdf9
6 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/boxing.dm
+1 -1
View File
@@ -37,7 +37,7 @@
D.apply_damage(damage, STAMINA, affecting, armor_block)
log_combat(A, D, "punched (boxing) ")
if(D.getStaminaLoss() > 100)
if(D.getStaminaLoss() > 100 && istype(D.mind?.martial_art, /datum/martial_art/boxing))
var/knockout_prob = (D.getStaminaLoss() + rand(-15,15))*0.75
if((D.stat != DEAD) && prob(knockout_prob))
D.visible_message("<span class='danger'>[A] has knocked [D] out with a haymaker!</span>", \