cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10248 from optimumtact/patch-6

Browse Source 
log simple animal attacks to attack log
This commit is contained in:
Cheridan
2015-06-29 23:03:12 -05:00
parent 99b38caf9f efcd5f3f75
commit 3fe48e2f26
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/simple_animal.dm
+3 -3
View File
@@ -278,7 +278,7 @@
visible_message("<span class='danger'>[M] [response_harm] [src]!</span>")
playsound(loc, "punch", 25, 1, -1)
attack_threshold_check(harm_intent_damage)
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=1)
updatehealth()
return 1
@@ -301,13 +301,13 @@
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
visible_message("<span class='danger'>[M] [response_disarm] [name]!</span>", \
"<span class='userdanger'>[M] [response_disarm] [name]!</span>")
add_logs(M, src, "disarmed", admin=0)
add_logs(M, src, "disarmed", admin=1)
else
var/damage = rand(15, 30)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
"<span class='userdanger'>[M] has slashed at [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=1)
attack_threshold_check(damage)
return 1