cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 15:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5769 from comma/dev

Browse Source 
Enables logging of people beating monkey
This commit is contained in:
Mloc
2014-07-27 12:02:26 +01:00
parent 4e96420e49 1e1d5a6d01
commit d6caf74e56
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/mob/living/carbon/monkey/monkey.dm
View File

@@ -246,10 +246,9 @@
help_shake_act(M)
else
if (M.a_intent == "hurt")
var/datum/unarmed_attack/attack = M.species.unarmed
if ((prob(75) && health > 0))
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched [name]!</B>", M), 1)
visible_message("\red <B>[M] [pick(attack.attack_verb)]ed [src]!</B>")
playsound(loc, "punch", 25, 1, -1)
var/damage = rand(5, 10)
@@ -257,18 +256,18 @@
damage = rand(10, 15)
if (paralysis < 5)
Paralyse(rand(10, 15))
spawn( 0 )
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has knocked out [name]!</B>", M), 1)
return
visible_message("\red <B>[M] has knocked out [src]!</B>")
adjustBruteLoss(damage)
M.attack_log += text("\[[time_stamp()]\] <font color='red'>[pick(attack.attack_verb)]ed [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [pick(attack.attack_verb)]ed by [M.name] ([M.ckey])</font>")
msg_admin_attack("[key_name(M)] [pick(attack.attack_verb)]ed [key_name(src)]")
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has attempted to punch [name]!</B>", M), 1)
visible_message("\red <B>[M] tried to [pick(attack.attack_verb)] [src]!</B>")
else
if (M.a_intent == "grab")
if (M == src || anchored)