+
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
+
+/obj/machinery/pool/controller/proc/mist_on() //Spawn /obj/effect/mist (from the shower) on all linked pool tiles
+ if(mist_state)
+ return
+ mist_state = TRUE
+ for(var/X in linked_turfs)
+ var/turf/open/pool/W = X
+ if(W.filled)
+ var/M = new /obj/effect/mist(W)
+ 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)
+ mist_state = FALSE
diff --git a/code/modules/pool/pool_drain.dm b/code/modules/pool/pool_drain.dm
new file mode 100644
index 0000000000..940f7cd219
--- /dev/null
+++ b/code/modules/pool/pool_drain.dm
@@ -0,0 +1,160 @@
+/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
+ /// Active/on?
+ var/active = FALSE
+ /// Filling or draining
+ var/filling = FALSE
+ /// Drain item suction range
+ var/item_suction_range = 2
+ /// Fill mode knock away range
+ var/fill_push_range = 6
+ /// Drain mode suction range
+ var/drain_suck_range = 6
+ /// Parent controller
+ var/obj/machinery/pool/controller/controller
+ /// Cycles left for fill/drain while active
+ var/cycles_left = 0
+ /// Mobs we are swirling around
+ var/list/whirling_mobs
+ /// Suck in once per x ticks
+ var/suck_in_once_per = 3
+
+ var/cooldown
+
+/obj/machinery/pool/drain/Initialize()
+ START_PROCESSING(SSfastprocess, src)
+ whirling_mobs = list()
+ return ..()
+
+/obj/machinery/pool/drain/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ controller.linked_drain = null
+ controller = null
+ whirling_mobs = null
+ return ..()
+
+/obj/machinery/pool/drain/proc/is_in_our_pool(atom/A)
+ . = FALSE
+ if(istype(A.loc, /turf/open/pool))
+ var/turf/open/pool/P = A.loc
+ if(P.controller == controller)
+ . = TRUE
+
+// This should probably start using move force sometime in the future but I'm lazy.
+/obj/machinery/pool/drain/process()
+ if(!filling)
+ for(var/obj/item/I in range(min(item_suction_range, 10), src))
+ if(!I.anchored && (I.w_class <= WEIGHT_CLASS_SMALL))
+ step_towards(I, src)
+ if((I.w_class <= WEIGHT_CLASS_TINY) && (get_dist(I, src) == 0))
+ I.forceMove(controller.linked_filter)
+ if(active)
+ if(filling)
+ if(cycles_left-- > 0)
+ playsound(src, 'sound/effects/fillingwatter.ogg', 100, TRUE)
+ for(var/obj/O in orange(min(fill_push_range, 10), src))
+ if(!O.anchored && is_in_our_pool(O))
+ step_away(O, src)
+ for(var/mob/M in orange(min(fill_push_range, 10), src)) //compiler fastpath apparently?
+ if(!M.anchored && isliving(M) && is_in_our_pool(M))
+ step_away(M, src)
+ else
+ for(var/turf/open/pool/P in controller.linked_turfs)
+ P.filled = TRUE
+ P.update_icon()
+ for(var/obj/effect/waterspout/S in range(1, src))
+ qdel(S)
+ controller.drained = FALSE
+ if(controller.bloody < 1000)
+ controller.bloody /= 2
+ else
+ controller.bloody /= 4
+ controller.update_color()
+ filling = FALSE
+ active = FALSE
+ else
+ if(cycles_left-- > 0)
+ playsound(src, 'sound/effects/pooldrain.ogg', 100, TRUE)
+ playsound(src, "water_wade", 60, TRUE)
+ for(var/obj/O in orange(min(drain_suck_range, 10), src))
+ if(!O.anchored && is_in_our_pool(O))
+ step_towards(O, src)
+ for(var/mob/M in orange(min(drain_suck_range, 10), src))
+ if(isliving(M) && !M.anchored && is_in_our_pool(M))
+ if(!(cycles_left % suck_in_once_per))
+ step_towards(M, src)
+ whirl_mob(M)
+ if(ishuman(M) && (get_dist(M, src) <= 1))
+ var/mob/living/carbon/human/H = M
+ playsound(src, pick('sound/misc/crack.ogg','sound/misc/crunch.ogg'), 50, TRUE)
+ if(H.lying) //down for any reason
+ H.adjustBruteLoss(2)
+ to_chat(H, "
You're caught in the drain!")
+ else
+ H.apply_damage(2.5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) //drain should only target the legs
+ to_chat(H, "
Your legs are caught in the drain!")
+ else
+ for(var/turf/open/pool/P in controller.linked_turfs)
+ P.filled = FALSE
+ P.update_icon()
+ for(var/obj/effect/whirlpool/W in range(1, src))
+ qdel(W)
+ controller.drained = TRUE
+ controller.mist_off()
+ active = FALSE
+ filling = TRUE
+
+/// dangerous proc don't fuck with, admins
+/obj/machinery/pool/drain/proc/whirl_mob(mob/living/L, duration = 8, delay = 1)
+ set waitfor = FALSE
+ if(whirling_mobs[L])
+ return
+ whirling_mobs[L] = TRUE
+ for(var/i in 1 to min(duration, 100))
+ L.setDir(turn(L.dir, 90))
+ sleep(delay)
+ if(QDELETED(L))
+ break
+ if(QDELETED(src))
+ return
+ whirling_mobs -= L
+
+/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/controller
+
+/obj/machinery/pool/filter/Destroy()
+ controller.linked_filter = null
+ controller = null
+ return ..()
+
+/obj/machinery/pool/filter/emag_act(mob/living/user)
+ . = ..()
+ 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)
+ var/msg = "[key_name(user)] emagged the pool filter and spawned a shark"
+ log_game(msg)
+ message_admins(msg)
+
+/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..2b260b5c0b
--- /dev/null
+++ b/code/modules/pool/pool_main.dm
@@ -0,0 +1,191 @@
+/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 = 0
+ var/obj/machinery/pool/controller/controller
+ var/obj/effect/overlay/water/watereffect
+ var/obj/effect/overlay/water/top/watertop
+
+/turf/open/pool/Initialize(mapload)
+ . = ..()
+ update_icon()
+
+/turf/open/pool/Destroy()
+ if(controller)
+ controller.linked_turfs -= src
+ controller = null
+ QDEL_NULL(watereffect)
+ QDEL_NULL(watertop)
+ return ..()
+
+/turf/open/pool/update_icon()
+ . = ..()
+ 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 = FALSE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ layer = ABOVE_MOB_LAYER
+ anchored = TRUE
+ resistance_flags = INDESTRUCTIBLE
+
+/obj/effect/overlay/water/top
+ icon_state = "top"
+ layer = BELOW_MOB_LAYER
+
+// Mousedrop hook to normal turfs to get out of pools.
+/turf/open/MouseDrop_T(atom/from, mob/user)
+ // 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
+ //The element only exists if you're on water and a living mob, so let's skip those checks.
+ var/pre_msg
+ var/post_msg
+ if(user == from)
+ pre_msg = "
[L] is getting out of the pool."
+ post_msg = "
[L] gets out of the pool."
+ else
+ pre_msg = "
[L] is being pulled out of the pool by [user]."
+ post_msg = "
[user] pulls [L] out of the pool."
+ L.visible_message(pre_msg)
+ if(do_mob(user, L, 20))
+ L.visible_message(post_msg)
+ L.forceMove(src)
+ else
+ return ..()
+
+// Exit check
+/turf/open/pool/Exit(atom/movable/AM, atom/newloc)
+ if(!AM.has_gravity(src))
+ return ..()
+ if(isliving(AM) || isstructure(AM))
+ if(AM.throwing)
+ return ..() //WHEEEEEEEEEEE
+ if(istype(AM, /obj/structure) && isliving(AM.pulledby))
+ return ..() //people pulling stuff out of pool
+ if(!ishuman(AM))
+ return ..() //human weak, monkey (and anyone else) ook ook eek eek strong
+ if(isliving(AM) && (locate(/obj/structure/pool/ladder) in src))
+ return ..() //climbing out
+ return istype(newloc, /turf/open/pool)
+ return ..()
+
+// Exited logic
+/turf/open/pool/Exited(atom/A, atom/newLoc)
+ . = ..()
+ if(isliving(A))
+ var/turf/open/pool/P = newLoc
+ if(!istype(P) || (P.controller != controller))
+ controller?.mobs_in_pool -= A
+
+// Entered logic
+/turf/open/pool/Entered(atom/movable/AM, atom/oldloc)
+ if(istype(AM, /obj/effect/decal/cleanable))
+ var/obj/effect/decal/cleanable/C = AM
+ if(prob(C.bloodiness))
+ controller.set_bloody(TRUE)
+ QDEL_IN(AM, 25)
+ animate(AM, alpha = 10, time = 20)
+ return ..()
+ if(!AM.has_gravity(src))
+ return ..()
+ if(isliving(AM))
+ var/mob/living/victim = AM
+ if(!HAS_TRAIT(victim, TRAIT_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 src) //safe climbing
+ return
+ if(iscarbon(AM)) //FUN TIME!
+ var/mob/living/carbon/H = victim
+ 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(!H.head || !(H.head.armor.getRating("melee") > 20))
+ 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)
+ victim.adjustStaminaLoss(1)
+ playsound(src, "water_wade", 20, TRUE)
+ return ..()
+
+/turf/open/pool/MouseDrop_T(atom/from, mob/user)
+ . = ..()
+ if(!isliving(from))
+ return
+ var/mob/living/victim = from
+ if(user.stat || user.lying || !Adjacent(user) || !from.Adjacent(user) || !iscarbon(user) || !victim.has_gravity(src) || HAS_TRAIT(victim, TRAIT_SWIMMING))
+ return
+ var/victimname = victim == user? "themselves" : "[victim]"
+ var/starttext = victim == user? "[user] is descending into [src]." : "[user] is lowering [victim] into [src]."
+ user.visible_message("
[starttext]")
+ if(do_mob(user, victim, 20))
+ user.visible_message("
[user] lowers [victimname] into [src].")
+ victim.AddElement(/datum/element/swimming) //make sure they have it so they don't fall/whatever
+ victim.forceMove(src)
+
+/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)
+ else
+ return ..()
+
+/turf/open/pool/attack_hand(mob/living/user)
+ . = ..()
+ if(.)
+ return
+ if((user.loc != src) && !user.IsStun() && !user.IsKnockdown() && !user.incapacitated() && Adjacent(user) && HAS_TRAIT(user, TRAIT_SWIMMING) && filled && (next_splash < world.time))
+ playsound(src, 'sound/effects/watersplash.ogg', 8, TRUE, 1)
+ next_splash = world.time + 25
+ var/obj/effect/splash/S = new(src)
+ animate(S, alpha = 0, time = 8)
+ QDEL_IN(S, 10)
+ for(var/mob/living/carbon/human/H in src)
+ if(!H.wear_mask && (H.stat == CONSCIOUS))
+ H.emote("cough")
+ H.adjustStaminaLoss(4)
diff --git a/code/modules/pool/pool_noodles.dm b/code/modules/pool/pool_noodles.dm
new file mode 100644
index 0000000000..6118354792
--- /dev/null
+++ b/code/modules/pool/pool_noodles.dm
@@ -0,0 +1,32 @@
+//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)
+ . = ..()
+ user.spin(prob(20)? 16 : 8, 1)
+
+/obj/item/toy/poolnoodle/red
+ item_state = "noodlered"
+ color = "#ff4c4c"
+
+/obj/item/toy/poolnoodle/blue
+ item_state = "noodleblue"
+ color = "#3232ff"
+
+/obj/item/toy/poolnoodle/yellow
+ item_state = "noodleyellow"
+ color = "#ffff66"
diff --git a/code/modules/pool/pool_structures.dm b/code/modules/pool/pool_structures.dm
new file mode 100644
index 0000000000..92350abf44
--- /dev/null
+++ b/code/modules/pool/pool_structures.dm
@@ -0,0 +1,159 @@
+/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)
+ . = ..()
+ if(.)
+ return
+ if(!HAS_TRAIT(user, TRAIT_SWIMMING))
+ if(user.CanReach(src))
+ user.AddElement(/datum/element/swimming)
+ user.forceMove(get_step(src, dir))
+ else
+ if(user.loc == loc)
+ user.forceMove(get_step(src, turn(dir, 180))) //If this moves them out the element cleans up after itself.
+
+/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/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()
+ if(jumping)
+ for(var/mob/living/jumpee in loc) //hackzors.
+ playsound(jumpee, 'sound/effects/splash.ogg', 60, TRUE, 1)
+ if(!HAS_TRAIT(jumpee, TRAIT_SWIMMING))
+ jumpee.AddElement(/datum/element/swimming)
+ jumpee.Stun(2)
+
+/obj/structure/pool/Lboard/proc/reset_position(mob/user, initial_layer, initial_px, initial_py)
+ user.layer = initial_layer
+ user.pixel_x = initial_px
+ user.pixel_y = initial_py
+
+/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(HAS_TRAIT(user, TRAIT_SWIMMING))
+ return
+ else
+ 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
+ var/original_layer = jumper.layer
+ var/original_px = jumper.pixel_x
+ var/original_py = jumper.pixel_y
+ jumper.layer = RIPPLE_LAYER
+ jumper.pixel_x = 3
+ jumper.pixel_y = 7
+ jumper.dir = WEST
+ jumper.AddElement(/datum/element/swimming)
+ sleep(1)
+ jumper.forceMove(T)
+ addtimer(CALLBACK(src, .proc/dive, jumper, original_layer, original_px, original_py), 10)
+
+/obj/structure/pool/Lboard/proc/dive(mob/living/carbon/jumper, original_layer, original_px, original_py)
+ 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+
+ 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+
+ 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+
+ 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.Knockdown(100)
+ jumper.adjustBruteLoss(10)
+
+ if(91 to 100)
+ jumper.visible_message("
[jumper] is preparing for the legendary dive! Can [jumper.p_they()] 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ 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, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ addtimer(CALLBACK(src, .proc/togglejumping), 35)
+ reset_position(jumper, original_layer, original_px, original_py)
+
+/obj/structure/pool/Lboard/proc/togglejumping()
+ jumping = FALSE
+
+/obj/structure/pool/Lboard/proc/on_finish_jump(mob/living/victim)
+ if(istype(victim.loc, /turf/open/pool))
+ var/turf/open/pool/P = victim.loc
+ if(!P.filled) //you dun fucked up now
+ to_chat(victim, "
That was stupid of you..")
+ victim.visible_message("
[victim] smashes into the ground!")
+ victim.apply_damage(50)
+ victim.Knockdown(200)
diff --git a/code/modules/pool/pool_wires.dm b/code/modules/pool/pool_wires.dm
new file mode 100644
index 0000000000..7341c503a9
--- /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.temperature_unlocked ? "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.temperature_unlocked = 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.temperature_unlocked = FALSE
+ else
+ P.temperature_unlocked = 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 aad3e78590..cd504a124a 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
old mode 100755
new mode 100644
index 2d6ee5650f..1f6956c78a
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1,3 +1,4 @@
+
// DM Environment file for tgstation.dme.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.
@@ -77,6 +78,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"
@@ -491,6 +493,7 @@
#include "code\datums\elements\earhealing.dm"
#include "code\datums\elements\ghost_role_eligibility.dm"
#include "code\datums\elements\mob_holder.dm"
+#include "code\datums\elements\swimming.dm"
#include "code\datums\elements\wuv.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
@@ -2371,6 +2374,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"
@@ -2527,6 +2531,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"