Allows mobs to get shocked when they smash things (#31677)
also fixes an unrelated runtime involving magillitis
This commit is contained in:
committed by
CitadelStationBot
parent
0c663a6a9c
commit
1831bc8ea9
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user