From 907971e8abfb27da716224d80cf7f043aecc4f35 Mon Sep 17 00:00:00 2001
From: ESwordTheCat <ESwordTheCat@plea.se>
Date: Mon, 7 Apr 2014 08:20:52 +0800
Subject: [PATCH] Grille complete pooling.

---
 code/__HELPERS/experimental.dm         | 4 ++++
 code/game/objects/items/stacks/rods.dm | 2 +-
 code/game/objects/structures/grille.dm | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/__HELPERS/experimental.dm b/code/__HELPERS/experimental.dm
index dbf370a5bd8..ad7cb358d26 100644
--- a/code/__HELPERS/experimental.dm
+++ b/code/__HELPERS/experimental.dm
@@ -108,4 +108,8 @@ var/list/grillePool
 
 			var /obj/structure/grille/Grille = A
 			Grille.loc = sekrit
+
+			Grille.icon_state = initial(Grille.icon_state)
+			Grille.destroyed = initial(Grille.destroyed)
+
 			grillePool = grillePool + Grille
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 8f1dccea28a..3372f610831 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -60,7 +60,7 @@
 		if (!do_after(usr, 10))
 			return
 		var /obj/structure/grille/Grille = getFromPool(/obj/structure/grille)
-		Grille.loc = loc
+		Grille.loc = usr.loc
 		usr << "\blue You assemble a grille"
 		Grille.add_fingerprint(usr)
 		use(2)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index bb2ccd408ac..c00cb38551f 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -40,13 +40,13 @@
 
 
 /obj/structure/grille/ex_act(severity)
-	qdel(src)
+	returnToPool(src)
 
 /obj/structure/grille/blob_act()
-	qdel(src)
+	returnToPool(src)
 
 /obj/structure/grille/meteorhit(var/obj/M)
-	qdel(src)
+	returnToPool(src)
 
 
 /obj/structure/grille/Bumped(atom/user)