From 2363af252b3c6cab2ee138f58795cd3930467040 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Wed, 16 Mar 2011 01:14:34 +0000 Subject: [PATCH] Using wirecutters on grille remains will now remove them (So use wirecutters twice to completely remove a grille). Also fixed some bugs related to grille destruction. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1192 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/grille.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index b1259ca3bef..59a9b2e0ffc 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -41,6 +41,7 @@ O << text("\red [] kicks the grille.", usr) playsound(src.loc, 'grillehit.ogg', 80, 1) src.health -= 3 + healthcheck() /obj/grille/attack_paw(var/obj/M) if ((usr.mutations & 8)) @@ -85,9 +86,14 @@ /obj/grille/attackby(obj/item/weapon/W, mob/user) if (istype(W, /obj/item/weapon/wirecutters)) - if(!shock(user, 100)) + if(!(destroyed)) + if(!shock(user, 100)) + playsound(src.loc, 'Wirecutter.ogg', 100, 1) + src.health = 0 + else playsound(src.loc, 'Wirecutter.ogg', 100, 1) - src.health = 0 + src.health = -100 + else if ((istype(W, /obj/item/weapon/screwdriver) && (istype(src.loc, /turf/simulated) || src.anchored))) if(!shock(user, 90)) playsound(src.loc, 'Screwdriver.ogg', 100, 1)