From cd7ffd058b0ac33498881df916df14fd8feff2b4 Mon Sep 17 00:00:00 2001 From: Twinmold Date: Fri, 8 Jul 2016 03:29:16 -0500 Subject: [PATCH] Grille Inconsistency Fix This fixes an inconsistency when you use wirecutters on a destroyed grille. Instead of giving 1 like it should, it gives two. :cl: Twinmold Fix: Fixes the inconsistency of getting 2 metal rods when you wirecutter a destroyed grille down to 1. /:cl: --- code/game/objects/structures/grille.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 6c3bcb4a3e7..4cb2b20f99e 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -142,7 +142,10 @@ if(iswirecutter(W)) if(!shock(user, 100)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) - new /obj/item/stack/rods(loc, 2) + if(!destroyed) + new /obj/item/stack/rods(loc, 2) + else + new /obj/item/stack/rods(loc) qdel(src) else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored)) if(!shock(user, 90))