From 671772035688969fba7bffe184aff9efc7ec698f Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 22 Sep 2017 23:34:41 -0500 Subject: [PATCH] copypasta fails again --- .../simple_animal/hostile/gorilla/gorilla.dm | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index e472927fc9..2cf1dba0c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -22,7 +22,7 @@ melee_damage_upper = 18 damage_coeff = list(BRUTE = 1, BURN = 1.5, TOX = 1.5, CLONE = 0, STAMINA = 0, OXY = 1.5) obj_damage = 20 - environment_smash = 2 + environment_smash = ENVIRONMENT_SMASH_WALLS attacktext = "pummels" attack_sound = 'sound/weapons/punch1.ogg' dextrous = TRUE @@ -32,7 +32,9 @@ stat_attack = UNCONSCIOUS minbodytemp = 270 maxbodytemp = 350 + unique_name = TRUE var/list/gorilla_overlays[GORILLA_TOTAL_LAYERS] + var/oogas = 0 devourable = TRUE no_vore = FALSE @@ -51,6 +53,8 @@ return parts /mob/living/simple_animal/hostile/gorilla/AttackingTarget() + if(client) + oogaooga() var/list/parts = target_bodyparts(target) if(parts) if(!parts.len) @@ -72,8 +76,30 @@ var/list/parts = target_bodyparts(target) return ..() && !istype(the_target, /mob/living/carbon/monkey) && (!parts || parts.len > 3) +/mob/living/simple_animal/hostile/gorilla/CanSmashTurfs(turf/T) + return iswallturf(T) + +/mob/living/simple_animal/hostile/gorilla/gib(no_brain) + if(!no_brain) + var/mob/living/brain/B = new(drop_location()) + B.name = real_name + B.real_name = real_name + if(mind) + mind.transfer_to(B) + ..() + /mob/living/simple_animal/hostile/gorilla/handle_automated_speech(override) if(speak_chance && (override || prob(speak_chance))) playsound(src, "sound/creatures/gorilla.ogg", 200) ..() +/mob/living/simple_animal/hostile/gorilla/can_use_guns(obj/item/G) + to_chat(src, "Your meaty finger is much too large for the trigger guard!") + return FALSE + + +/mob/living/simple_animal/hostile/gorilla/proc/oogaooga() + oogas++ + if(oogas >= rand(2,6)) + playsound(src, "sound/creatures/gorilla.ogg", 200) + oogas = 0