cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allows mobs to get shocked when they smash things (#31677)

Browse Source 
also fixes an unrelated runtime involving magillitis
This commit is contained in:
vuonojenmustaturska
2017-10-14 23:18:07 +03:00
committed by ShizCalev
parent f6bdaa039c
commit 3fac6440bd
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+4
View File
@@ -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)