From 3fac6440bdde8e91c7a5ae6bba5e95a20a3cae79 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sat, 14 Oct 2017 23:18:07 +0300 Subject: [PATCH] Allows mobs to get shocked when they smash things (#31677) also fixes an unrelated runtime involving magillitis --- code/game/machinery/doors/airlock.dm | 5 +++++ code/game/objects/structures/grille.dm | 4 ++++ code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c71de0f3123..ae8b359c5c1 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -756,6 +756,11 @@ if(user) src.attack_ai(user) +/obj/machinery/door/airlock/attack_animal(mob/user) + . = ..() + if(isElectrified()) + shock(user, 100) + /obj/machinery/door/airlock/attack_paw(mob/user) return src.attack_hand(user) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index cea59fbd3a4..308a759929c 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -67,6 +67,10 @@ var/mob/M = AM shock(M, 70) +/obj/structure/grille/attack_animal(mob/user) + . = ..() + if(!shock(user, 70)) + take_damage(rand(5,10), BRUTE, "melee", 1) /obj/structure/grille/attack_paw(mob/user) attack_hand(user) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index d602554752f..dc5d55e3362 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1585,7 +1585,7 @@ /datum/reagent/magillitis/on_mob_life(mob/living/carbon/M) ..() if((ismonkey(M) || ishuman(M)) && current_cycle >= 10) - return M.gorillize() + M.gorillize() /datum/reagent/growthserum name = "Growth Serum"