From 68a9d0938f903c6b2a6e722612ba12dc79354995 Mon Sep 17 00:00:00 2001
From: Dip <gabriel.spm002@gmail.com>
Date: Thu, 8 Oct 2020 00:38:42 -0300
Subject: [PATCH] pool mini fixes

---
 code/modules/pool/pool_controller.dm | 7 ++++---
 code/modules/pool/pool_main.dm       | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm
index 681adb0e..fda2477d 100644
--- a/code/modules/pool/pool_controller.dm
+++ b/code/modules/pool/pool_controller.dm
@@ -79,6 +79,7 @@
 	linked_filter = null
 	linked_turfs.Cut()
 	mobs_in_pool.Cut()
+	mist_off()
 	return ..()
 
 /obj/machinery/pool/controller/proc/scan_things()
@@ -207,7 +208,7 @@
 			for(var/datum/reagent/R in reagents.reagent_list)
 				if(R.reagent_state == SOLID)
 					R.reagent_state = LIQUID
-				if(!swimee.reagents.has_reagent(POOL_NO_OVERDOSE_MEDICINE_MAX))
+				if(!swimee.reagents.has_reagent(R.type,POOL_NO_OVERDOSE_MEDICINE_MAX))
 					swimee.reagents.add_reagent(R.type, 0.5) //osmosis
 			reagents.reaction(swimee, VAPOR, 0.03) //3 percent. Need to find a way to prevent this from stacking chems at some point like the above.
 		for(var/obj/objects in W)
@@ -409,6 +410,7 @@
 /obj/machinery/pool/controller/proc/mist_on() //Spawn /obj/effect/mist (from the shower) on all linked pool tiles
 	if(mist_state)
 		return
+	mist_off()			//make sure it cycles and deletes everything
 	mist_state = TRUE
 	for(var/X in linked_turfs)
 		var/turf/open/pool/W = X
@@ -417,6 +419,5 @@
 			linked_mist += M
 
 /obj/machinery/pool/controller/proc/mist_off() //Delete all /obj/effect/mist from all linked pool tiles.
-	for(var/M in linked_mist)
-		qdel(M)
+	QDEL_LIST(linked_mist)
 	mist_state = FALSE
diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
index 02261266..c5ec7147 100644
--- a/code/modules/pool/pool_main.dm
+++ b/code/modules/pool/pool_main.dm
@@ -51,6 +51,8 @@
 
 // Mousedrop hook to normal turfs to get out of pools.
 /turf/open/MouseDrop_T(atom/from, mob/user)
+	if(!istype(user))
+		return ..()
 	// I could make this /open/floor and not have the !istype but ehh - kev
 	if(isliving(from) && HAS_TRAIT(from, TRAIT_SWIMMING) && isliving(user) && ((user == from) || user.CanReach(from)) && !user.IsStun() && !user.IsKnockdown() && !user.incapacitated() && !istype(src, /turf/open/pool))
 		var/mob/living/L = from
@@ -171,7 +173,7 @@
 	if(istype(W, /obj/item/mop) && filled)
 		W.reagents.add_reagent("water", 5)
 		to_chat(user, "<span class='notice'>You wet [W] in [src].</span>")
-		playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+		playsound(src, 'sound/effects/slosh.ogg', 25, TRUE)
 	else
 		return ..()