diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 1892128c291..7bb9af2a158 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -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 [] has punched [name]!", M), 1) + visible_message("\red [M] [pick(attack.attack_verb)]ed [src]!") 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 [] has knocked out [name]!", M), 1) - return + visible_message("\red [M] has knocked out [src]!") + adjustBruteLoss(damage) + + M.attack_log += text("\[[time_stamp()]\] [pick(attack.attack_verb)]ed [src.name] ([src.ckey])") + src.attack_log += text("\[[time_stamp()]\] Has been [pick(attack.attack_verb)]ed by [M.name] ([M.ckey])") + 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 [] has attempted to punch [name]!", M), 1) + visible_message("\red [M] tried to [pick(attack.attack_verb)] [src]!") else if (M.a_intent == "grab") if (M == src || anchored)