From 25c677942abb7b0cc5cf408a41ddf6f4bef89066 Mon Sep 17 00:00:00 2001
From: Detective-Google <48196179+Detective-Google@users.noreply.github.com>
Date: Wed, 12 Feb 2020 23:43:10 -0600
Subject: [PATCH 1/2] Update code/modules/pool/pool_main.dm as per ghom
 suggestion

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/modules/pool/pool_main.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
index 9d37bd5fd5..e3965dd1e5 100644
--- a/code/modules/pool/pool_main.dm
+++ b/code/modules/pool/pool_main.dm
@@ -72,7 +72,7 @@
 /turf/open/pool/Exit(atom/movable/AM, atom/newloc)
 	if(!AM.has_gravity(src))
 		return ..()
-	if(isliving(AM) || istype(AM, /obj/structure))
+	if(isliving(AM) || isstructure(AM))
 		if(AM.throwing)
 			return ..()			//WHEEEEEEEEEEE
 		if(istype(AM, /obj/structure) && isliving(AM.pulledby))

From a8aa9ac24b1bb65243a93030a5781ef1eee70bfe Mon Sep 17 00:00:00 2001
From: Detective-Google <48196179+Detective-Google@users.noreply.github.com>
Date: Wed, 12 Feb 2020 23:43:32 -0600
Subject: [PATCH 2/2] Update code/modules/pool/pool_drain.dm as per ghom
 suggestion 2

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/modules/pool/pool_drain.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/pool/pool_drain.dm b/code/modules/pool/pool_drain.dm
index 2fa89742c0..ef6818e809 100644
--- a/code/modules/pool/pool_drain.dm
+++ b/code/modules/pool/pool_drain.dm
@@ -94,7 +94,7 @@
 								H.adjustBruteLoss(2)
 								to_chat(H, "<span class='danger'>You're caught in the drain!</span>")
 							else
-								H.apply_damage(2.5, BRUTE, pick("l_leg", "r_leg")) //drain should only target the legs
+								H.apply_damage(2.5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) //drain should only target the legs
 								to_chat(H, "<span class='danger'>Your legs are caught in the drain!</span>")
 			else
 				for(var/turf/open/pool/P in controller.linked_turfs)