From 1831bc8ea946b958ce3992baa4f0fa40dd1e619a Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sat, 14 Oct 2017 23:18:07 +0300 Subject: [PATCH 1/2] 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 74edf9e00e..fac414d5a0 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 841d142930..aa4416ba51 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -66,6 +66,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 8ce843e26b..b4ff0e870b 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1583,7 +1583,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"