+
Drain status: [(issilicon(user) || IsAdminGhost(user) || drainable) ? "
Enabled" : "
Disabled"]
+
Pool status: "})
+ if(!drained)
+ dat += "
Full"
+ else
+ dat += "
Drained"
+ if((issilicon(user) || IsAdminGhost(user) || drainable) && !linked_drain.active)
+ dat += "
[drained ? "Fill" : "Drain"] Pool"
+ popup.set_content(dat)
+ popup.open()
+
+/obj/machinery/pool/controller/proc/reset(wire)
+ switch(wire)
+ if(WIRE_SHOCK)
+ if(!wires.is_cut(wire))
+ shocked = FALSE
diff --git a/code/modules/pool/pool_drain.dm b/code/modules/pool/pool_drain.dm
new file mode 100644
index 0000000000..7739b7d0c1
--- /dev/null
+++ b/code/modules/pool/pool_drain.dm
@@ -0,0 +1,129 @@
+/obj/machinery/pool/drain
+ name = "drain"
+ icon_state = "drain"
+ desc = "A suction system to remove the contents of the pool, and sometimes small objects. Do not insert fingers."
+ anchored = TRUE
+ var/active = FALSE
+ var/status = FALSE //1 is drained, 0 is full.
+ var/srange = 6
+ var/timer = 0
+ var/cooldown
+ var/obj/machinery/pool/controller/pool_controller = null
+
+/obj/machinery/pool/drain/Initialize()
+ START_PROCESSING(SSprocessing, src)
+ . = ..()
+
+/obj/machinery/pool/drain/Destroy()
+ pool_controller.linked_drain = null
+ pool_controller = null
+ return ..()
+
+/obj/machinery/pool/drain/process()
+ if(!status) //don't pool/drain an empty pool.
+ for(var/obj/item/absorbo in orange(1,src))
+ if(absorbo.w_class == WEIGHT_CLASS_TINY)
+ step_towards(absorbo, src)
+ var/dist = get_dist(src, absorbo)
+ if(dist == 0)
+ absorbo.forceMove(pool_controller.linked_filter)
+ if(active)
+ if(status) //if filling up, get back to normal position
+ if(timer > 0)
+ playsound(src, 'sound/effects/fillingwatter.ogg', 100, TRUE)
+ timer--
+ for(var/obj/whirlo in orange(1,src))
+ if(!whirlo.anchored )
+ step_away(whirlo,src)
+ for(var/mob/living/carbon/human/whirlm in orange(2,src))
+ step_away(whirlm,src)
+ else if(!timer)
+ for(var/turf/open/pool/undrained in range(5,src))
+ undrained.filled = TRUE
+ undrained.update_icon()
+ for(var/obj/effect/waterspout/undrained3 in range(1,src))
+ qdel(undrained3)
+ pool_controller.drained = FALSE
+ if(pool_controller.bloody < 1000)
+ pool_controller.bloody /= 2
+ if(pool_controller.bloody > 1000)
+ pool_controller.bloody /= 4
+ pool_controller.changecolor()
+ status = FALSE
+ active = FALSE
+ return
+ if(!status) //if draining, change everything.
+ if(timer > 0)
+ playsound(src, 'sound/effects/pooldrain.ogg', 100, TRUE)
+ playsound(src, "water_wade", 60, TRUE)
+ timer--
+ for(var/obj/whirlo in orange(2,src))
+ if(!whirlo.anchored )
+ step_towards(whirlo,src)
+ for(var/mob/living/carbon/human/whirlm in orange(2,src))
+ step_towards(whirlm,src)
+ if(prob(20))
+ whirlm.Knockdown(40)
+ for(var/i in list(1,2,4,8,4,2,1)) //swirl!
+ whirlm.dir = i
+ sleep(1)
+ if(whirlm.forceMove(loc))
+ if(whirlm.health <= -50) //If very damaged, gib.
+ whirlm.gib()
+ if(whirlm.stat != CONSCIOUS || whirlm.lying) // If
+ whirlm.adjustBruteLoss(5)
+ playsound(src, pick('sound/misc/crack.ogg','sound/misc/crunch.ogg'), 50, TRUE)
+ to_chat(whirlm, "
You're caught in the drain!")
+ continue
+ else
+ playsound(src, pick('sound/misc/crack.ogg','sound/misc/crunch.ogg'), 50, TRUE)
+ whirlm.apply_damage(4, BRUTE, pick("l_leg", "r_leg")) //drain should only target the legs
+ to_chat(whirlm, "
Your legs are caught in the drain!")
+ continue
+
+ else if(!timer)
+ for(var/turf/open/pool/drained in range(5,src))
+ drained.filled = FALSE
+ drained.update_icon()
+ for(var/obj/effect/whirlpool/drained3 in range(1,src))
+ qdel(drained3)
+ for(var/obj/machinery/pool/controller/drained4 in range(5,src))
+ drained4.drained = TRUE
+ drained4.mistoff()
+ status = TRUE
+ active = FALSE
+
+/obj/machinery/pool/filter
+ name = "Filter"
+ icon_state = "filter"
+ desc = "The part of the pool where all the IDs, ATV keys, and pens, and other dangerous things get trapped."
+ var/obj/machinery/pool/controller/pool_controller = null
+
+/obj/machinery/pool/filter/Destroy()
+ pool_controller.linked_filter = null
+ pool_controller = null
+ return ..()
+
+/obj/machinery/pool/filter/emag_act(user as mob)
+ if(!(obj_flags & EMAGGED))
+ to_chat(user, "
You disable the [src]'s shark filter! Run!")
+ obj_flags |= EMAGGED
+ do_sparks(5, TRUE, src)
+ icon_state = "filter_b"
+ addtimer(CALLBACK(src, /obj/machinery/pool/filter/proc/spawn_shark), 50)
+ log_game("[key_name(user)] emagged the pool filter and spawned a shark")
+ message_admins("[key_name_admin(user)] emagged the pool filter and spawned a shark")
+
+/obj/machinery/pool/filter/proc/spawn_shark()
+ if(prob(50))
+ new /mob/living/simple_animal/hostile/shark(loc)
+ else
+ if(prob(50))
+ new /mob/living/simple_animal/hostile/shark/kawaii(loc)
+ else
+ new /mob/living/simple_animal/hostile/shark/laser(loc)
+
+/obj/machinery/pool/filter/attack_hand(mob/user)
+ to_chat(user, "You search the filter.")
+ for(var/obj/O in contents)
+ O.forceMove(loc)
diff --git a/code/modules/pool/pool_effects.dm b/code/modules/pool/pool_effects.dm
new file mode 100644
index 0000000000..8d5192cd30
--- /dev/null
+++ b/code/modules/pool/pool_effects.dm
@@ -0,0 +1,29 @@
+/obj/effect/splash
+ name = "splash"
+ desc = "Wataaa!."
+ icon = 'icons/turf/pool.dmi'
+ icon_state = "splash"
+ layer = ABOVE_ALL_MOB_LAYER
+
+/obj/effect/whirlpool
+ name = "Whirlpool"
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "whirlpool"
+ layer = 5
+ anchored = TRUE
+ mouse_opacity = 0
+ pixel_x = -32
+ pixel_y = -32
+ alpha = 90
+
+/obj/effect/waterspout
+ name = "Waterspout"
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "waterspout"
+ color = "#3399AA"
+ layer = 5
+ anchored = TRUE
+ mouse_opacity = 0
+ pixel_x = -32
+ pixel_y = -32
+ alpha = 120
diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
new file mode 100644
index 0000000000..5db9176223
--- /dev/null
+++ b/code/modules/pool/pool_main.dm
@@ -0,0 +1,201 @@
+/turf/open/pool
+ icon = 'icons/turf/pool.dmi'
+ name = "poolwater"
+ desc = "You're safer here than in the deep."
+ icon_state = "pool_tile"
+ heat_capacity = INFINITY
+ var/filled = TRUE
+ var/next_splash = 1
+ var/obj/effect/overlay/water/watereffect
+ var/obj/effect/overlay/water/top/watertop
+ var/obj/machinery/pool/controller/controller
+
+
+/turf/open/pool/Initialize()
+ watereffect = new /obj/effect/overlay/water(src)
+ watertop = new /obj/effect/overlay/water/top(src)
+ . = ..()
+
+/turf/open/pool/Destroy()
+ QDEL_NULL(watereffect)
+ QDEL_NULL(watertop)
+ controller = null
+ return ..()
+
+/turf/open/pool/proc/update_icon_pool()
+ if(!filled)
+ name = "drained pool"
+ desc = "No diving!"
+ QDEL_NULL(watereffect)
+ QDEL_NULL(watertop)
+ else
+ name = "poolwater"
+ desc = "You're safer here than in the deep."
+ watereffect = new /obj/effect/overlay/water(src)
+ watertop = new /obj/effect/overlay/water/top(src)
+
+/obj/effect/overlay/water
+ name = "water"
+ icon = 'icons/turf/pool.dmi'
+ icon_state = "bottom"
+ density = 0
+ mouse_opacity = 0
+ layer = ABOVE_MOB_LAYER
+ anchored = TRUE
+
+/obj/effect/overlay/water/top
+ icon_state = "top"
+ layer = BELOW_MOB_LAYER
+
+/mob/living
+ var/swimming = FALSE
+
+//Put people out of the water
+/turf/open/floor/MouseDrop_T(mob/living/M, mob/living/user)
+ if(user.stat || user.lying || !Adjacent(user) || !M.Adjacent(user)|| !iscarbon(M))
+ if(issilicon(M))
+ var/turf/T = get_turf(M)
+ if(istype(T, /turf/open/pool))
+ M.visible_message("
[M] begins to float.", \
+ "You start your emergency floaters.")
+ if(do_mob(user, M, 20))
+ M.forceMove(src)
+ to_chat(user, "You get out of the pool.")
+ return ..()
+ if(!M.swimming) //can't put yourself up if you are not swimming
+ return ..()
+ if(user == M)
+ M.visible_message("[user] is getting out the pool", \
+ "You start getting out of the pool.")
+ if(do_mob(user, M, 20))
+ M.swimming = FALSE
+ M.forceMove(src)
+ to_chat(user, "You get out of the pool.")
+ else
+ user.visible_message("[M] is being pulled to the poolborder by [user].", \
+ "You start getting [M] out of the pool.")
+ if(do_mob(user, M, 20))
+ M.swimming = FALSE
+ M.forceMove(src)
+ to_chat(user, "You get [M] out of the pool.")
+ return
+
+/turf/open/floor/CanPass(atom/movable/A, turf/T)
+ if(!has_gravity(src))
+ return ..()
+ else if(istype(A, /mob/living) || istype(A, /obj/structure)) //This check ensures that only specific types of objects cannot pass into the water. Items will be able to get tossed out.
+ if(istype(A, /mob/living/simple_animal) || istype(A, /mob/living/carbon/monkey))
+ return ..()
+ if (istype(A, /obj/structure) && istype(A.pulledby, /mob/living/carbon/human))
+ return ..()
+ if(istype(get_turf(A), /turf/open/pool) && !istype(T, /turf/open/pool)) //!(locate(/obj/structure/pool/ladder) in get_turf(A).loc)
+ return FALSE
+ return ..()
+
+//put people in water, including you
+/turf/open/pool/MouseDrop_T(mob/living/M, mob/living/user)
+ if(!has_gravity(src))
+ return
+ if(user.stat || user.lying || !Adjacent(user) || !M.Adjacent(user)|| !iscarbon(M))
+ return
+ if(!iscarbon(user)) // no silicons or drones in mechas.
+ return
+ if(M.swimming) //can't lower yourself again
+ return
+ else
+ if(user == M)
+ M.visible_message("[user] is descending in the pool", \
+ "You start lowering yourself in the pool.")
+ if(do_mob(user, M, 20))
+ M.swimming = TRUE
+ M.forceMove(src)
+ to_chat(user, "You lower yourself in the pool.")
+ else
+ user.visible_message("[M] is being put in the pool by [user].", \
+ "You start lowering [M] in the pool.")
+ if(do_mob(user, M, 20))
+ M.swimming = TRUE
+ M.forceMove(src)
+ to_chat(user, "You lower [M] in the pool.")
+ return
+
+//What happens if you don't drop in it like a good person would, you fool.
+/turf/open/pool/Exited(atom/A, turf/NL)
+ ..()
+ if(!istype(NL, /turf/open/pool) && isliving(A))
+ var/mob/living/M = A
+ M.swimming = FALSE
+ controller.mobs_in_pool.Remove(M)
+
+/turf/open/pool/Entered(atom/A, turf/OL)
+ ..()
+ if(isliving(A))
+ var/mob/living/M = A
+ if(!M.mob_has_gravity())
+ return
+ if(!M.swimming)
+ M.swimming = TRUE
+ controller.mobs_in_pool.Add(M)
+ if(locate(/obj/structure/pool/ladder) in M.loc)
+ return
+ if(iscarbon(M))
+ var/mob/living/carbon/H = M
+ if(filled)
+ if (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSMOUTH)
+ H.visible_message("[H] falls in the water!",
+ "You fall in the water!")
+ playsound(src, 'sound/effects/splash.ogg', 60, TRUE, 1)
+ H.Knockdown(20)
+ return
+ else
+ H.Knockdown(60)
+ H.adjustOxyLoss(5)
+ H.emote("cough")
+ H.visible_message("[H] falls in and takes a drink!",
+ "You fall in and swallow some water!")
+ playsound(src, 'sound/effects/splash.ogg', 60, TRUE, 1)
+ else if(!istype(H.head, /obj/item/clothing/head/helmet))
+ if(prob(75))
+ H.visible_message("[H] falls in the drained pool!",
+ "You fall in the drained pool!")
+ H.adjustBruteLoss(7)
+ H.Knockdown(80)
+ playsound(src, 'sound/effects/woodhit.ogg', 60, TRUE, 1)
+ else
+ H.visible_message("[H] falls in the drained pool, and cracks his skull!",
+ "You fall in the drained pool, and crack your skull!")
+ H.apply_damage(15, BRUTE, "head")
+ H.Knockdown(200) // This should hurt. And it does.
+ playsound(src, 'sound/effects/woodhit.ogg', 60, TRUE, 1)
+ playsound(src, 'sound/misc/crack.ogg', 100, TRUE)
+ else
+ H.visible_message("[H] falls in the drained pool, but had an helmet!",
+ "You fall in the drained pool, but you had an helmet!")
+ H.Knockdown(40)
+ playsound(src, 'sound/effects/woodhit.ogg', 60, TRUE, 1)
+ else if(filled)
+ M.adjustStaminaLoss(1)
+ playsound(src, "water_wade", 20, TRUE)
+ return
+
+/turf/open/pool/attack_hand(mob/living/user)
+ if(user.stat == CONSCIOUS && !(user.lying || user.resting) && Adjacent(user) && user.swimming && filled && next_splash < world.time) //not drained, user alive and close, and user in water.
+ if(user.x == x && user.y == y)
+ return
+ else
+ playsound(src, 'sound/effects/watersplash.ogg', 8, TRUE, 1)
+ next_splash = world.time + 25
+ var/obj/effect/splash/S = new /obj/effect/splash(user.loc)
+ animate(S, alpha = 0, time = 8)
+ S.Move(src)
+ QDEL_IN(S, 20)
+ for(var/mob/living/carbon/human/L in src)
+ if(!L.wear_mask && !user.stat) //Do not affect those underwater or dying.
+ L.emote("cough")
+ L.adjustStaminaLoss(4) //You need to give em a break!
+
+/turf/open/pool/attackby(obj/item/W, mob/living/user)
+ if(istype(W, /obj/item/mop) && filled)
+ W.reagents.add_reagent("water", 5)
+ to_chat(user, "You wet [W] in [src].")
+ playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
diff --git a/code/modules/pool/pool_noodles.dm b/code/modules/pool/pool_noodles.dm
new file mode 100644
index 0000000000..d40aa8eca4
--- /dev/null
+++ b/code/modules/pool/pool_noodles.dm
@@ -0,0 +1,44 @@
+//Pool noodles
+
+/obj/item/toy/poolnoodle
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "noodle"
+ name = "pool noodle"
+ desc = "A strange, bulky, bendable toy that can annoy people."
+ force = 0
+ color = "#000000"
+ w_class = WEIGHT_CLASS_SMALL
+ throwforce = 1
+ throw_speed = 10 //weeee
+ hitsound = 'sound/weapons/tap.ogg'
+ attack_verb = list("flogged", "poked", "jabbed", "slapped", "annoyed")
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+
+/obj/item/toy/poolnoodle/attack(target as mob, mob/living/user as mob)
+ ..()
+ if(prob(80))
+ user.emote("spin")
+ if(prob(5))
+ user.emote("spin")
+
+/obj/item/toy/poolnoodle/red
+ item_state = "noodlered"
+
+/obj/item/toy/poolnoodle/blue
+ item_state = "noodleblue"
+
+/obj/item/toy/poolnoodle/yellow
+ item_state = "noodleyellow"
+
+/obj/item/toy/poolnoodle/red/Initialize()
+ . = ..()
+ color = "#ff4c4c"
+
+/obj/item/toy/poolnoodle/blue/Initialize()
+ . = ..()
+ color = "#3232ff"
+
+/obj/item/toy/poolnoodle/yellow/Initialize()
+ . = ..()
+ color = "#ffff66"
diff --git a/code/modules/pool/pool_structures.dm b/code/modules/pool/pool_structures.dm
new file mode 100644
index 0000000000..9e89f39397
--- /dev/null
+++ b/code/modules/pool/pool_structures.dm
@@ -0,0 +1,149 @@
+/obj/structure/pool
+ name = "pool"
+ icon = 'icons/obj/machines/pool.dmi'
+ anchored = TRUE
+ resistance_flags = UNACIDABLE|INDESTRUCTIBLE
+
+/obj/structure/pool/ladder
+ name = "Ladder"
+ icon_state = "ladder"
+ desc = "Are you getting in or are you getting out?."
+ layer = ABOVE_MOB_LAYER
+ dir = EAST
+
+/obj/structure/pool/ladder/attack_hand(mob/living/user as mob)
+ if(Adjacent(user) && user.y == y && user.swimming == 0)
+ user.swimming = TRUE
+ user.forceMove(get_step(user, get_dir(user, src))) //Either way, you're getting IN or OUT of the pool.
+ else if(user.loc == loc && user.swimming == TRUE)
+ user.swimming = FALSE
+ user.forceMove(get_step(user, turn(dir, 180)))
+
+/obj/structure/pool/Rboard
+ name = "JumpBoard"
+ density = FALSE
+ icon_state = "boardright"
+ 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"
+ desc = "Get on there to jump!"
+ layer = FLY_LAYER
+ dir = WEST
+ var/jumping = FALSE
+ var/timer
+
+/obj/structure/pool/Lboard/proc/backswim(obj/O, mob/living/user) //Puts the sprite back to it's maiden condition after a jump.
+ if(jumping)
+ for(var/mob/living/jumpee in loc) //hackzors.
+ playsound(jumpee, 'sound/effects/splash.ogg', 60, TRUE, 1)
+ jumpee.layer = 4
+ jumpee.pixel_x = 0
+ jumpee.pixel_y = 0
+ jumpee.Stun(2)
+ jumpee.swimming = TRUE
+
+/obj/structure/pool/Lboard/attack_hand(mob/living/user)
+ if(iscarbon(user))
+ var/mob/living/carbon/jumper = user
+ if(jumping)
+ to_chat(user, "Someone else is already making a jump!")
+ return
+ var/turf/T = get_turf(src)
+ if(user.swimming)
+ return
+ else
+ for(var/obj/machinery/pool/controller/pc in range(4,src)) //Clunky as fuck I know.
+ if(pc.drained)
+ to_chat(user, "That would be suicide") //TODO: make this a suicide action.
+ return
+ if(Adjacent(jumper))
+ jumper.visible_message("[user] climbs up \the [src]!", \
+ "You climb up \the [src] and prepares to jump!")
+ jumper.Stun(40)
+ jumping = TRUE
+ jumper.layer = RIPPLE_LAYER
+ jumper.pixel_x = 3
+ jumper.pixel_y = 7
+ jumper.dir=8
+ sleep(1)
+ jumper.loc = T
+ addtimer(CALLBACK(src, .proc/dive, jumper), 10)
+
+/obj/structure/pool/Lboard/proc/dive(mob/living/carbon/jumper)
+ switch(rand(1, 100))
+ if(1 to 20)
+ jumper.visible_message("[jumper] goes for a small dive!", \
+ "You go for a small dive.")
+ sleep(15)
+ backswim()
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 1, 1)
+
+ if(21 to 40)
+ jumper.visible_message("[jumper] goes for a dive!", \
+ "You're going for a dive!")
+ sleep(20)
+ backswim()
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 2, 1)
+
+ if(41 to 60)
+ jumper.visible_message("[jumper] goes for a long dive! Stay far away!", \
+ "You're going for a long dive!!")
+ sleep(25)
+ backswim()
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 3, 1)
+
+ if(61 to 80)
+ jumper.visible_message("[jumper] goes for an awesome dive! Don't stand in [jumper.p_their()] way!", \
+ "You feel like this dive will be awesome")
+ sleep(30)
+ backswim()
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 4, 1)
+ if(81 to 91)
+ sleep(20)
+ backswim()
+ jumper.visible_message("[jumper] misses [jumper.p_their()] step!", \
+ "You misstep!")
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 0, 1)
+ jumper.Knockdown(100)
+ jumper.adjustBruteLoss(10)
+
+ if(91 to 100)
+ jumper.visible_message("[jumper] is preparing for the legendary dive! Can he make it?", \
+ "You start preparing for a legendary dive!")
+ jumper.SpinAnimation(7,1)
+
+ sleep(30)
+ if(prob(75))
+ backswim()
+ jumper.visible_message("[jumper] fails!", \
+ "You can't quite do it!")
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 1, 1)
+ else
+ jumper.fire_stacks = min(1,jumper.fire_stacks + 1)
+ jumper.IgniteMob()
+ sleep(5)
+ backswim()
+ jumper.visible_message("[jumper] bursts into flames of pure awesomness!", \
+ "No one can stop you now!")
+ var/atom/throw_target = get_edge_target_turf(src, dir)
+ jumper.throw_at(throw_target, 6, 1)
+ addtimer(CALLBACK(src, .proc/togglejumping), 35)
+
+/obj/structure/pool/Lboard/proc/togglejumping()
+ jumping = FALSE
diff --git a/code/modules/pool/pool_wires.dm b/code/modules/pool/pool_wires.dm
new file mode 100644
index 0000000000..7e98383606
--- /dev/null
+++ b/code/modules/pool/pool_wires.dm
@@ -0,0 +1,59 @@
+#define POOL_WIRE_DRAIN "drain"
+#define POOL_WIRE_TEMP "temp"
+
+
+/datum/wires/poolcontroller
+ holder_type = /obj/machinery/pool/controller
+ proper_name = "Pool"
+
+/datum/wires/poolcontroller/New(atom/holder)
+ wires = list(
+ POOL_WIRE_DRAIN, WIRE_SHOCK, WIRE_ZAP, POOL_WIRE_TEMP
+ )
+ add_duds(3)
+ ..()
+
+/datum/wires/poolcontroller/interactable(mob/user)
+ var/obj/machinery/pool/controller/P = holder
+ if(P.panel_open)
+ return TRUE
+
+/datum/wires/poolcontroller/get_status()
+ var/obj/machinery/pool/controller/P = holder
+ var/list/status = list()
+ status += "The blue light is [P.drainable ? "on" : "off"]."
+ status += "The red light is [P.tempunlocked ? "on" : "off"]."
+ status += "The yellow light is [P.shocked ? "on" : "off"]."
+ return status
+
+/datum/wires/poolcontroller/on_pulse(wire)
+ var/obj/machinery/pool/controller/P = holder
+ switch(wire)
+ if(POOL_WIRE_DRAIN)
+ P.drainable = FALSE
+ if(POOL_WIRE_TEMP)
+ P.tempunlocked = FALSE
+ if(WIRE_SHOCK)
+ P.shocked = !P.shocked
+ addtimer(CALLBACK(P, /obj/machinery/autolathe.proc/reset, wire), 60)
+
+/datum/wires/poolcontroller/on_cut(wire, mend)
+ var/obj/machinery/pool/controller/P = holder
+ switch(wire)
+ if(POOL_WIRE_DRAIN)
+ if(mend)
+ P.drainable = FALSE
+ else
+ P.drainable = TRUE
+ if(POOL_WIRE_TEMP)
+ if(mend)
+ P.tempunlocked = FALSE
+ else
+ P.tempunlocked = TRUE
+ if(WIRE_ZAP)
+ P.shock(usr, 50)
+ if(WIRE_SHOCK)
+ if(mend)
+ P.stat &= ~NOPOWER
+ else
+ P.stat |= NOPOWER
\ No newline at end of file
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index c0b5ef5b40..b60ff97b2b 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 71c453856a..4ca4a351c6 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 0ca09ad810..8546a78a73 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/sharks.dmi b/icons/mob/sharks.dmi
new file mode 100644
index 0000000000..e1b9228ba9
Binary files /dev/null and b/icons/mob/sharks.dmi differ
diff --git a/icons/obj/machines/pool.dmi b/icons/obj/machines/pool.dmi
new file mode 100644
index 0000000000..2bfb4f8c40
Binary files /dev/null and b/icons/obj/machines/pool.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index d5cae1db93..698c1f7a34 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index fe60cf6c0d..26740117fe 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/turf/pool.dmi b/icons/turf/pool.dmi
new file mode 100644
index 0000000000..211776ed93
Binary files /dev/null and b/icons/turf/pool.dmi differ
diff --git a/sound/effects/fillingwatter.ogg b/sound/effects/fillingwatter.ogg
new file mode 100644
index 0000000000..e1d2e19276
Binary files /dev/null and b/sound/effects/fillingwatter.ogg differ
diff --git a/sound/effects/pooldrain.ogg b/sound/effects/pooldrain.ogg
new file mode 100644
index 0000000000..8576dedc3d
Binary files /dev/null and b/sound/effects/pooldrain.ogg differ
diff --git a/sound/effects/splash.ogg b/sound/effects/splash.ogg
new file mode 100644
index 0000000000..22f17c0790
Binary files /dev/null and b/sound/effects/splash.ogg differ
diff --git a/sound/effects/water_wade1.ogg b/sound/effects/water_wade1.ogg
new file mode 100644
index 0000000000..27527f9d8b
Binary files /dev/null and b/sound/effects/water_wade1.ogg differ
diff --git a/sound/effects/water_wade2.ogg b/sound/effects/water_wade2.ogg
new file mode 100644
index 0000000000..f9c15cab64
Binary files /dev/null and b/sound/effects/water_wade2.ogg differ
diff --git a/sound/effects/water_wade3.ogg b/sound/effects/water_wade3.ogg
new file mode 100644
index 0000000000..3daccae01a
Binary files /dev/null and b/sound/effects/water_wade3.ogg differ
diff --git a/sound/effects/water_wade4.ogg b/sound/effects/water_wade4.ogg
new file mode 100644
index 0000000000..7ba705f499
Binary files /dev/null and b/sound/effects/water_wade4.ogg differ
diff --git a/sound/effects/watersplash.ogg b/sound/effects/watersplash.ogg
new file mode 100644
index 0000000000..a9a6e48608
Binary files /dev/null and b/sound/effects/watersplash.ogg differ
diff --git a/sound/misc/crack.ogg b/sound/misc/crack.ogg
new file mode 100644
index 0000000000..1fb5738051
Binary files /dev/null and b/sound/misc/crack.ogg differ
diff --git a/sound/misc/crunch.ogg b/sound/misc/crunch.ogg
new file mode 100644
index 0000000000..c73e1fae60
Binary files /dev/null and b/sound/misc/crunch.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 4372f525b3..0787449030 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -76,6 +76,7 @@
#include "code\__DEFINES\obj_flags.dm"
#include "code\__DEFINES\pinpointers.dm"
#include "code\__DEFINES\pipe_construction.dm"
+#include "code\__DEFINES\pool.dm"
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\procpath.dm"
#include "code\__DEFINES\profile.dm"
@@ -2352,6 +2353,7 @@
#include "code\modules\mob\living\simple_animal\hostile\netherworld.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
+#include "code\modules\mob\living\simple_animal\hostile\sharks.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton.dm"
#include "code\modules\mob\living\simple_animal\hostile\statue.dm"
#include "code\modules\mob\living\simple_animal\hostile\stickman.dm"
@@ -2500,6 +2502,13 @@
#include "code\modules\photography\photos\album.dm"
#include "code\modules\photography\photos\frame.dm"
#include "code\modules\photography\photos\photo.dm"
+#include "code\modules\pool\pool_controller.dm"
+#include "code\modules\pool\pool_drain.dm"
+#include "code\modules\pool\pool_effects.dm"
+#include "code\modules\pool\pool_main.dm"
+#include "code\modules\pool\pool_noodles.dm"
+#include "code\modules\pool\pool_structures.dm"
+#include "code\modules\pool\pool_wires.dm"
#include "code\modules\power\apc.dm"
#include "code\modules\power\cable.dm"
#include "code\modules\power\cell.dm"