From 0f263ca8b39f4702af693561626ffe3fb0b69b07 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 10 Sep 2020 04:51:43 +0200
Subject: [PATCH] [MIRROR] Hulks now are able to attack monkeys (#726)
* Hulks now are able to attack monkeys (#53548)
* Hulks now are able to attack monkeys
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
---
.../mob/living/carbon/monkey/monkey_defense.dm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
index eae689588f9..1c7230081cf 100644
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
@@ -144,6 +144,18 @@
affecting = get_bodypart(BODY_ZONE_CHEST)
apply_damage(damage, BRUTE, affecting)
+/mob/living/carbon/monkey/attack_hulk(mob/living/carbon/human/user)
+ . = ..()
+ if(!.)
+ return
+ var/hulk_verb = pick("smash", "pummel")
+ playsound(loc, user.dna.species.attack_sound, 25, TRUE, -1)
+ visible_message("[user] [hulk_verb]ed [src]!", \
+ "[user] [hulk_verb]ed [src]!", "You hear a sickening sound of flesh hitting flesh!", null, user)
+ to_chat(user, "You [hulk_verb] [src]!")
+ apply_damage(15, BRUTE, wound_bonus=10)
+ retaliate(user)
+
/mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit)
. = TRUE
if(!bodyzone_hit || bodyzone_hit == BODY_ZONE_HEAD)
@@ -161,7 +173,6 @@
return
take_bodypart_damage(acidpwr * min(0.6, acid_volume*0.1))
-
/mob/living/carbon/monkey/ex_act(severity, target, origin)
if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
return