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

Merge pull request #9832 from Ty-Omaha/boxing-logs

Browse Source 
Moves Boxing logs to the ALL preference
This commit is contained in:
Mark Mak
2018-10-13 11:41:32 +08:00
committed by GitHub
parent 28b85924b2 216f03ddca
commit ae0f6b28bd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/brawling.dm
+3 -3
View File
@@ -14,12 +14,12 @@
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
var/atk_verb = pick("left hook","right hook","straight punch")
var/damage = rand(5, 8) + A.dna.species.punchdamagelow
if(!damage)
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
D.visible_message("<span class='warning'>[A] has attempted to hit [D] with a [atk_verb]!</span>")
add_attack_logs(A, D, "Melee attacked with [src] (miss/block)")
add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL)
return 0
@@ -32,7 +32,7 @@
"<span class='userdanger'>[A] has hit [D] with a [atk_verb]!</span>")
D.apply_damage(damage, STAMINA, affecting, armor_block)
add_attack_logs(A, D, "Melee attacked with [src]")
add_attack_logs(A, D, "Melee attacked with [src]", ATKLOG_ALL)
if(D.getStaminaLoss() > 50)
var/knockout_prob = D.getStaminaLoss() + rand(-15,15)
if((D.stat != DEAD) && prob(knockout_prob))