From 7bc62acb6eb832491af8835d49aa843e54c32fae Mon Sep 17 00:00:00 2001
From: Lohikar <lohikar@protonmail.com>
Date: Sat, 4 Mar 2017 18:05:14 -0600
Subject: [PATCH] Pooling fixes (#1866)

Fixes some bad arguments on getFromPool calls that were causing things to not work correctly.
Fixes #1800.

Damn you butterfly effect.
---
 code/game/machinery/doors/door.dm                             | 2 +-
 code/game/objects/effects/chem/chemsmoke.dm                   | 2 +-
 code/game/objects/effects/chem/foam.dm                        | 4 ++--
 code/game/objects/effects/spiders.dm                          | 2 +-
 code/game/objects/structures/grille.dm                        | 2 +-
 code/game/objects/structures/windoor_assembly.dm              | 2 +-
 code/modules/mob/living/simple_animal/hostile/giant_spider.dm | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 16f96f844b7..b4118abd48a 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -228,7 +228,7 @@
 			switch (Proj.damage_type)
 				if(BRUTE)
 					new /obj/item/stack/material/steel(src.loc, 2)
-					getFromPool(/obj/item/stack/rods, list(src.loc, 3))
+					getFromPool(/obj/item/stack/rods, src.loc, 3)
 				if(BURN)
 					new /obj/effect/decal/cleanable/ash(src.loc) // Turn it to ashes!
 			qdel(src)
diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm
index 1e06328564c..d95d9966b29 100644
--- a/code/game/objects/effects/chem/chemsmoke.dm
+++ b/code/game/objects/effects/chem/chemsmoke.dm
@@ -250,7 +250,7 @@
 	if(passed_smoke)
 		smoke = passed_smoke
 	else
-		smoke = getFromPool(/obj/effect/effect/smoke/chem, list(location, smoke_duration + rand(smoke_duration*-0.25, smoke_duration*0.25), T, I))
+		smoke = getFromPool(/obj/effect/effect/smoke/chem, location, smoke_duration + rand(smoke_duration*-0.25, smoke_duration*0.25), T, I)
 
 	if(chemholder.reagents.reagent_list.len)
 		chemholder.reagents.trans_to_obj(smoke, chemholder.reagents.total_volume / dist, copy = 1) //copy reagents to the smoke so mob/breathe() can handle inhaling the reagents
diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm
index 73ea7cf3c67..b7d2acc5411 100644
--- a/code/game/objects/effects/chem/foam.dm
+++ b/code/game/objects/effects/chem/foam.dm
@@ -108,7 +108,7 @@
 			F.amount += amount
 			return
 
-		F = getFromPool(/obj/effect/effect/foam, list(location, metal))
+		F = getFromPool(/obj/effect/effect/foam, location, metal)
 		F.amount = amount
 
 		if(!metal) // don't carry other chemicals if a metal foam
@@ -180,4 +180,4 @@
 /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
 	if(air_group)
 		return 0
-	return !density
\ No newline at end of file
+	return !density
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 5265e05531a..02d66ed114d 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -101,7 +101,7 @@
 			O = loc
 
 		for(var/i=0, i<num, i++)
-			var/spiderling = getFromPool(/obj/effect/spider/spiderling, list(src.loc, src))
+			var/spiderling = getFromPool(/obj/effect/spider/spiderling, src.loc, src)
 			if(O)
 				O.implants += spiderling
 		qdel(src)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 07555a7d568..2463cd48b4b 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -96,7 +96,7 @@
 	if(iswirecutter(W))
 		if(!shock(user, 100))
 			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
-			getFromPool(/obj/item/stack/rods, list(get_turf(src), destroyed ? 1 : 2))
+			getFromPool(/obj/item/stack/rods, get_turf(src), destroyed ? 1 : 2)
 			qdel(src)
 	else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
 		if(!shock(user, 90))
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index dbf92c1b11c..3748a37dfaa 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -79,7 +79,7 @@ obj/structure/windoor_assembly/Destroy()
 						user << "<span class='notice'>You dissasembled the windoor assembly!</span>"
 						new /obj/item/stack/material/glass/reinforced(get_turf(src), 5)
 						if(secure)
-							getFromPool(/obj/item/stack/rods, list(get_turf(src), 4))
+							getFromPool(/obj/item/stack/rods, get_turf(src), 4)
 						qdel(src)
 				else
 					user << "<span class='notice'>You need more welding fuel to dissassemble the windoor assembly.</span>"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 043b912a588..dbacbd9ca34 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -151,7 +151,7 @@
 							if(busy == LAYING_EGGS)
 								E = locate() in get_turf(src)
 								if(!E)
-									getFromPool(/obj/effect/spider/eggcluster, list(loc, src))
+									getFromPool(/obj/effect/spider/eggcluster, loc, src)
 									fed--
 								busy = 0
 								stop_automated_movement = 0