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

why is this not working?

Browse Source
This commit is contained in:
hal9000PR
2021-04-01 21:04:24 +01:00
parent 976b4cec0c
commit fa4c5ba070
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/sleeping_carp.dm
-9
View File
@@ -23,16 +23,7 @@
D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>",
"<span class='userdanger'>[A] [atk_verb] you!</span>")
D.apply_damage(rand(10,15), BRUTE)
<<<<<<< HEAD
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
=======
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1)
if(prob(50))
A.say(pick("HUAH!", "HYA!", "CHOO!", "WUO!", "KYA!", "HUH!", "HIYOH!", "CARP STRIKE!", "CARP BITE!"))
if(prob(D.getBruteLoss()) && !D.lying)
D.visible_message("<span class='warning'>[D] stumbles and falls!</span>", "<span class='userdanger'>The blow sends you to the ground!</span>")
D.Weaken(4)
>>>>>>> upstream/master
add_attack_logs(A, D, "Melee attacked with martial-art [src] : Punched", ATKLOG_ALL)
return TRUE