From 6eac97524f07e5cdb4c46c228ffe95fea4041779 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 27 Jan 2020 22:42:48 -0700
Subject: [PATCH] compile

---
 code/__DEFINES/pool.dm               | 2 +-
 code/modules/pool/pool_main.dm       | 2 +-
 code/modules/pool/pool_structures.dm | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/code/__DEFINES/pool.dm b/code/__DEFINES/pool.dm
index 47345a80a6..1e66109dc7 100644
--- a/code/__DEFINES/pool.dm
+++ b/code/__DEFINES/pool.dm
@@ -9,5 +9,5 @@ GLOBAL_LIST_INIT(blacklisted_pool_reagents, list(
 	/datum/reagent/toxin/plasma, /datum/reagent/oxygen, /datum/reagent/nitrous_oxide, /datum/reagent/nitrogen,		//gases
 	/datum/reagent/fermi,		//blanket fermichem ban sorry. this also covers mkultra, genital enlargers, etc etc.
 	/datum/reagent/drug/aphrodisiac, /datum/reagent/drug/anaphrodisiac, /datum/reagent/drug/aphrodisiacplus, /datum/reagent/drug/anaphrodisiacplus,		//literally asking for prefbreaks
-	/datum/reagent/femcum, /datum/reagent/semen			//NO.
+	/datum/reagent/consumable/femcum, /datum/reagent/consumable/semen			//NO.
 	))
diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
index 00a399f4be..b7406606c9 100644
--- a/code/modules/pool/pool_main.dm
+++ b/code/modules/pool/pool_main.dm
@@ -108,7 +108,7 @@
 		if(!SEND_SIGNAL(victim, COMSIG_IS_SWIMMING))		//poor guy not swimming time to dunk them!
 			victim.AddElement(/datum/element/swimming)
 			controller.mobs_in_pool += victim
-			if(locate(/obj/structure/pool/ladder) in victim.loc)		//safe climbing
+			if(locate(/obj/structure/pool/ladder) in src)		//safe climbing
 				return
 			if(iscarbon(AM))		//FUN TIME!
 				var/mob/living/carbon/H = victim
diff --git a/code/modules/pool/pool_structures.dm b/code/modules/pool/pool_structures.dm
index 914b2db129..7788234b98 100644
--- a/code/modules/pool/pool_structures.dm
+++ b/code/modules/pool/pool_structures.dm
@@ -31,13 +31,6 @@
 	desc = "The less-loved portion of the jumping board."
 	dir = EAST
 
-/obj/structure/pool/Rboard/CheckExit(atom/movable/O as mob|obj, target as turf)
-	if(istype(O) && O.pass_flags & PASSGLASS)
-		return TRUE
-	if(get_dir(O.loc, target) == dir)
-		return FALSE
-	return TRUE
-
 /obj/structure/pool/Lboard
 	name = "JumpBoard"
 	icon_state = "boardleft"