diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 09a7fdccdcd..806f9269910 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -276,3 +276,8 @@
/obj/proc/set_pixel_offsets()
return
+
+//wash an object
+/obj/proc/clean()
+ clean_blood()
+ color = initial(color)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index cf28960382f..6c26df3365a 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -236,122 +236,18 @@
W.reagents.add_reagent(/singleton/reagent/water, spray_amount)
W.set_up(O, spray_amount)
- if(iscarbon(O))
- var/update_icons_required = FALSE
+ if(ishuman(O))
+ var/mob/living/carbon/human/H = O
+ H.wash()
- var/mob/living/carbon/M = O
- if(M.r_hand)
- M.r_hand.clean_blood()
- if(M.l_hand)
- M.l_hand.clean_blood()
- if(M.back)
- if(M.back.clean_blood())
- M.update_inv_back(0)
-
- //flush away reagents on the skin
- if(M.touching)
- var/remove_amount = M.touching.maximum_volume * M.reagent_permeability() //take off your suit first
- M.touching.remove_any(remove_amount)
-
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/washgloves = TRUE
- var/washshoes = TRUE
- var/washmask = TRUE
- var/washears = TRUE
- var/washglasses = TRUE
- var/washwrists = TRUE
-
- if(H.wear_suit)
- washgloves = !(H.wear_suit.flags_inv & HIDEGLOVES)
- washshoes = !(H.wear_suit.flags_inv & HIDESHOES)
- washwrists = !(H.wear_suit.flags_inv & HIDEWRISTS)
-
- if(H.head)
- washmask = !(H.head.flags_inv & HIDEMASK)
- washglasses = !(H.head.flags_inv & HIDEEYES)
- washears = !(H.head.flags_inv & HIDEEARS)
-
- if(H.wear_mask)
- if (washears)
- washears = !(H.wear_mask.flags_inv & HIDEEARS)
- if (washglasses)
- washglasses = !(H.wear_mask.flags_inv & HIDEEYES)
-
- if(H.head)
- if(H.head.clean_blood())
- H.update_inv_head(0)
- update_icons_required = TRUE
- if(H.wear_suit)
- if(H.wear_suit.clean_blood())
- H.update_inv_wear_suit(0)
- update_icons_required = TRUE
- else if(H.w_uniform)
- if(H.w_uniform.clean_blood())
- H.update_inv_w_uniform(0)
- update_icons_required = TRUE
- if(H.gloves && washgloves)
- if(H.gloves.clean_blood())
- H.update_inv_gloves(0)
- update_icons_required = TRUE
- if(H.shoes && washshoes)
- if(H.shoes.clean_blood())
- H.update_inv_shoes(0)
- update_icons_required = TRUE
- if(H.wear_mask && washmask)
- if(H.wear_mask.clean_blood())
- H.update_inv_wear_mask(0)
- update_icons_required = TRUE
- if(H.glasses && washglasses)
- if(H.glasses.clean_blood())
- H.update_inv_glasses(0)
- update_icons_required = TRUE
- if(H.l_ear && washears)
- if(H.l_ear.clean_blood())
- H.update_inv_l_ear(0)
- update_icons_required = TRUE
- if(H.r_ear && washears)
- if(H.r_ear.clean_blood())
- H.update_inv_r_ear(0)
- update_icons_required = TRUE
- if(H.belt)
- if(H.belt.clean_blood())
- H.update_inv_belt(0)
- update_icons_required = TRUE
- if(H.wrists && washwrists)
- if(H.wrists.clean_blood())
- H.update_inv_wrists(0)
- update_icons_required = TRUE
- H.clean_blood(washshoes)
- else
- if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
- if(M.wear_mask.clean_blood())
- M.update_inv_wear_mask(0)
- update_icons_required = TRUE
- M.clean_blood()
-
- if (update_icons_required)
- M.update_icon()
- else
- O.clean_blood()
-
- if(istype(O, /obj/item/light))
- var/obj/item/light/L = O
- L.brightness_color = initial(L.brightness_color)
- L.update()
- else if(istype(O, /obj/machinery/light))
- var/obj/machinery/light/L = O
- L.brightness_color = initial(L.brightness_color)
- L.update()
-
- O.color = initial(O.color)
+ if(isobj(O))
+ var/obj/object = O
+ object.clean()
if(isturf(loc))
var/turf/tile = loc
- loc.clean_blood()
- for(var/obj/effect/E in tile)
- if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
- qdel(E)
+ tile.clean_blood()
+ tile.remove_cleanables()
/obj/machinery/shower/process()
if(!on)
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index fc1ffbb1bb3..53eaa5495fd 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -147,102 +147,15 @@
W.reagents.add_reagent(/singleton/reagent/water, 100)
W.set_up(O, 100)
- if(iscarbon(O))
- var/mob/living/carbon/M = O
- if(M.r_hand)
- M.r_hand.clean_blood()
- if(M.l_hand)
- M.l_hand.clean_blood()
- if(M.back)
- if(M.back.clean_blood())
- M.update_inv_back(0)
+ if(ishuman(O))
+ var/mob/living/carbon/human/H = O
+ H.wash()
- //flush away reagents on the skin
- if(M.touching)
- var/remove_amount = M.touching.maximum_volume * M.reagent_permeability() //take off your suit first
- M.touching.remove_any(remove_amount)
-
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/washgloves = TRUE
- var/washshoes = TRUE
- var/washmask = TRUE
- var/washears = TRUE
- var/washglasses = TRUE
- var/washwrists = TRUE
-
- if(H.wear_suit)
- washgloves = !(H.wear_suit.flags_inv & HIDEGLOVES)
- washshoes = !(H.wear_suit.flags_inv & HIDESHOES)
- washwrists = !(H.wear_suit.flags_inv & HIDEWRISTS)
-
- if(H.head)
- washmask = !(H.head.flags_inv & HIDEMASK)
- washglasses = !(H.head.flags_inv & HIDEEYES)
- washears = !(H.head.flags_inv & HIDEEARS)
-
- if(H.wear_mask)
- if (washears)
- washears = !(H.wear_mask.flags_inv & HIDEEARS)
- if (washglasses)
- washglasses = !(H.wear_mask.flags_inv & HIDEEYES)
-
- if(H.head)
- if(H.head.clean_blood())
- H.update_inv_head(0)
- if(H.wear_suit)
- if(H.wear_suit.clean_blood())
- H.update_inv_wear_suit(0)
- else if(H.w_uniform)
- if(H.w_uniform.clean_blood())
- H.update_inv_w_uniform(0)
- if(H.gloves && washgloves)
- if(H.gloves.clean_blood())
- H.update_inv_gloves(0)
- if(H.shoes && washshoes)
- if(H.shoes.clean_blood())
- H.update_inv_shoes(0)
- if(H.wear_mask && washmask)
- if(H.wear_mask.clean_blood())
- H.update_inv_wear_mask(0)
- if(H.glasses && washglasses)
- if(H.glasses.clean_blood())
- H.update_inv_glasses(0)
- if(H.l_ear && washears)
- if(H.l_ear.clean_blood())
- H.update_inv_l_ear(0)
- if(H.r_ear && washears)
- if(H.r_ear.clean_blood())
- H.update_inv_r_ear(0)
- if(H.belt)
- if(H.belt.clean_blood())
- H.update_inv_belt(0)
- if(H.wrists && washwrists)
- if(H.wrists.clean_blood())
- H.update_inv_wrists(0)
- H.clean_blood(washshoes)
- else
- if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
- if(M.wear_mask.clean_blood())
- M.update_inv_wear_mask(0)
- M.clean_blood()
- else
- O.clean_blood()
-
- if(istype(O, /obj/item/light))
- var/obj/item/light/L = O
- L.brightness_color = initial(L.brightness_color)
- L.update()
- else if(istype(O, /obj/machinery/light))
- var/obj/machinery/light/L = O
- L.brightness_color = initial(L.brightness_color)
- L.update()
-
- O.color = initial(O.color)
+ if(isobj(O))
+ var/obj/object = O
+ object.clean()
if(isturf(loc))
var/turf/tile = loc
- loc.clean_blood()
- for(var/obj/effect/E in tile)
- if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
- qdel(E)
+ tile.clean_blood()
+ tile.remove_cleanables()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index c06a4464785..2198b48d210 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -516,3 +516,4 @@ var/const/enterloopsanity = 100
for(var/obj/effect/O in src)
if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable))
qdel(O)
+ clean_blood()
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index b7cfbe66157..b91a79cbde7 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -443,3 +443,74 @@
/mob/living/carbon/human/adjust_typing_indicator_offsets(var/atom/movable/typing_indicator/indicator)
indicator.pixel_x = species.typing_indicator_x_offset
indicator.pixel_y = species.typing_indicator_y_offset
+
+/mob/living/carbon/human/proc/wash()
+ if(r_hand)
+ r_hand.clean_blood()
+ if(l_hand)
+ l_hand.clean_blood()
+ if(back)
+ if(back.clean_blood())
+ update_inv_back(0)
+
+ if(touching)
+ var/remove_amount = touching.maximum_volume * reagent_permeability() //take off your suit first
+ touching.remove_any(remove_amount)
+
+ var/washgloves = TRUE
+ var/washshoes = TRUE
+ var/washmask = TRUE
+ var/washears = TRUE
+ var/washglasses = TRUE
+ var/washwrists = TRUE
+
+ if(wear_suit)
+ washgloves = !(wear_suit.flags_inv & HIDEGLOVES)
+ washshoes = !(wear_suit.flags_inv & HIDESHOES)
+ washwrists = !(wear_suit.flags_inv & HIDEWRISTS)
+
+ if(head)
+ washmask = !(head.flags_inv & HIDEMASK)
+ washglasses = !(head.flags_inv & HIDEEYES)
+ washears = !(head.flags_inv & HIDEEARS)
+
+ if(wear_mask)
+ if (washears)
+ washears = !(wear_mask.flags_inv & HIDEEARS)
+ if (washglasses)
+ washglasses = !(wear_mask.flags_inv & HIDEEYES)
+
+ if(head)
+ if(head.clean_blood())
+ update_inv_head(0)
+ if(wear_suit)
+ if(wear_suit.clean_blood())
+ update_inv_wear_suit(0)
+ else if(w_uniform)
+ if(w_uniform.clean_blood())
+ update_inv_w_uniform(0)
+ if(gloves && washgloves)
+ if(gloves.clean_blood())
+ update_inv_gloves(0)
+ if(shoes && washshoes)
+ if(shoes.clean_blood())
+ update_inv_shoes(0)
+ if(wear_mask && washmask)
+ if(wear_mask.clean_blood())
+ update_inv_wear_mask(0)
+ if(glasses && washglasses)
+ if(glasses.clean_blood())
+ update_inv_glasses(0)
+ if(l_ear && washears)
+ if(l_ear.clean_blood())
+ update_inv_l_ear(0)
+ if(r_ear && washears)
+ if(r_ear.clean_blood())
+ update_inv_r_ear(0)
+ if(belt)
+ if(belt.clean_blood())
+ update_inv_belt(0)
+ if(wrists && washwrists)
+ if(wrists.clean_blood())
+ update_inv_wrists(0)
+ clean_blood(washshoes)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 3a60823cdef..cfd8bef2a9a 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -74,6 +74,9 @@
changeling = mind.antag_datums[MODE_CHANGELING]
if(!changeling)
tally += T.movement_cost
+ if(species && istype(T, /turf/simulated/floor/exoplanet/water))
+ if(species.can_breathe_water())
+ tally -= T.movement_cost
tally += GLOB.config.human_delay
diff --git a/code/modules/overmap/exoplanets/decor/turfs/water.dm b/code/modules/overmap/exoplanets/decor/turfs/water.dm
index 9b36935b17b..f9b04d00b82 100644
--- a/code/modules/overmap/exoplanets/decor/turfs/water.dm
+++ b/code/modules/overmap/exoplanets/decor/turfs/water.dm
@@ -1,5 +1,13 @@
/turf/simulated/floor/exoplanet/water
does_footprint = FALSE
+ footstep_sound = /singleton/sound_category/water_footstep
+ movement_cost = 4
+ ///How many objects are currently on this turf? Used to stop empty water turfs from processing.
+ var/numobjects = 0
+ ///Is this water deep enough to drown in?
+ var/deep = TRUE
+ ///The overlay used to make it look like atoms on the turf are underwater.
+ var/obj/effect/water_effect/water_overlay
/turf/simulated/floor/exoplanet/water/update_icon()
return
@@ -7,6 +15,95 @@
/turf/simulated/floor/exoplanet/water/update_dirt()
return // Water doesn't become dirty
+/turf/simulated/floor/exoplanet/water/Initialize()
+ . = ..()
+ if(deep)
+ var/obj/effect/water_effect/W = new /obj/effect/water_effect(src)
+ W.icon = icon
+ W.icon_state = icon_state
+ water_overlay = W
+ W.alpha = 128
+ create_reagents(4)
+
+/turf/simulated/floor/exoplanet/water/Destroy()
+ if(water_overlay)
+ qdel(water_overlay)
+ water_overlay = null
+ return ..()
+
+/turf/simulated/floor/exoplanet/water/return_air_for_internal_lifeform(var/mob/living/carbon/L)
+ if(!L)
+ return
+ if(L.lying || deep) //are they lying down/is the water deep enough to keep their head above it?
+ if(water_overlay && L.layer > water_overlay.layer) //are they on a vehicle or something else that physically puts them above the water?
+ return return_air()
+ if(L.can_breathe_water() || (istype(L.wear_mask, /obj/item/clothing/mask/snorkel)))
+ var/datum/gas_mixture/water_breath = new()
+ var/datum/gas_mixture/above_air = return_air()
+ var/amount = 300
+ water_breath.adjust_gas(GAS_OXYGEN, amount) // Assuming water breathes just extract the oxygen directly from the water.
+ water_breath.temperature = above_air.temperature
+ return water_breath
+ else
+ var/gasid = GAS_CO2
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ if(H.species && H.species.exhale_type)
+ gasid = H.species.exhale_type
+ var/datum/gas_mixture/water_breath = new()
+ var/datum/gas_mixture/above_air = return_air()
+ water_breath.adjust_gas(gasid, ONE_ATMOSPHERE) // this will cause them to suffocate, but not pop their lung
+ water_breath.temperature = above_air.temperature
+ return water_breath
+ return return_air()
+
+/turf/simulated/floor/exoplanet/water/Entered(atom/movable/AM, atom/oldloc)
+ if(!(SSATOMS_IS_PROBABLY_DONE))
+ return
+ reagents.add_reagent(/singleton/reagent/water, 2)
+ clean(src)
+ var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src)
+ if(lattice)
+ return
+ START_PROCESSING(SSprocessing, src)
+ if(isobj(AM))
+ numobjects += 1
+ else if(isliving(AM))
+ numobjects += 1
+ var/mob/living/L = AM
+ if(!istype(oldloc, /turf/simulated/floor/exoplanet/water))
+ to_chat(L, SPAN_WARNING("You get drenched in water from entering \the [src]!"))
+ wash(L)
+ ..()
+
+/turf/simulated/floor/exoplanet/water/Exited(atom/movable/AM, atom/newloc)
+ if(!SSATOMS_IS_PROBABLY_DONE)
+ return
+ reagents.add_reagent(/singleton/reagent/water, 2)
+ clean(src)
+ var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src)
+ if(lattice)
+ return
+ if(isobj(AM) && numobjects)
+ numobjects -= 1
+ else if(isliving(AM))
+ if(numobjects)
+ numobjects -= 1
+ var/mob/living/L = AM
+ if(!istype(newloc, /turf/simulated/floor/exoplanet/water))
+ to_chat(L, SPAN_WARNING("You climb out of \the [src]."))
+ ..()
+
+/turf/simulated/floor/exoplanet/water/process()
+ reagents.add_reagent(/singleton/reagent/water, 2)
+ clean(src)
+ for(var/mob/living/L in src)
+ var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src)
+ if(!lattice)
+ wash(L)
+ if(!numobjects)
+ STOP_PROCESSING(SSprocessing, src)
+
/turf/simulated/floor/exoplanet/water/konyang
name = "deep glistening water"
desc = "Water, dense with algae and lustrous greenery. It maintains an almost glowing sea-blue sheen nonetheless."
@@ -20,13 +117,14 @@
icon = 'icons/misc/beach.dmi'
icon_state = "seashallow"
footstep_sound = /singleton/sound_category/water_footstep
+ deep = FALSE
var/reagent_type = /singleton/reagent/water
/turf/simulated/floor/exoplanet/water/shallow/attackby(obj/item/attacking_item, mob/user)
var/obj/item/reagent_containers/RG = attacking_item
if (reagent_type && istype(RG) && RG.is_open_container() && RG.reagents)
RG.reagents.add_reagent(reagent_type, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
- user.visible_message("[user] fills \the [RG] from \the [src].","You fill \the [RG] from \the [src].")
+ user.visible_message(SPAN_NOTICE("[user] fills \the [RG] from \the [src]."),SPAN_NOTICE("You fill \the [RG] from \the [src]."))
else
return ..()
@@ -51,3 +149,43 @@
name = "putrid sewage"
desc = "This is utterly vile."
color = "#9ea844"//Ew
+
+/turf/simulated/floor/exoplanet/water/shallow/sewage/process()
+ . = ..()
+ var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src) //you're not gonna get covered in disgusting sewer water if you have a grate/lattice over it
+ if(lattice)
+ return
+ for(var/mob/living/carbon/human/H in src) // Sewage is poisonous.
+ if(!H.reagents.has_reagent(/singleton/reagent/toxin, 10))
+ H.reagents.add_reagent(/singleton/reagent/toxin, 1)
+ if(!H.reagents.has_reagent(/singleton/reagent/ammonia, 10))
+ H.reagents.add_reagent(/singleton/reagent/ammonia, 1)
+ for(var/A in H.organs)
+ var/obj/item/organ/external/E = A
+ if(BP_IS_ROBOTIC(E))
+ continue
+ if (E.wounds.len)
+ for(var/datum/wound/W in E.wounds)
+ if(W.germ_level < INFECTION_LEVEL_ONE)
+ W.germ_level = INFECTION_LEVEL_ONE
+ W.germ_level += rand(10, 50)
+
+/turf/simulated/floor/exoplanet/water/proc/wash(atom/movable/O)
+
+ var/obj/effect/effect/water/W = new(O)
+ W.create_reagents(100)
+ W.reagents.add_reagent(/singleton/reagent/water, 100)
+ W.set_up(O, 100)
+
+ if(ishuman(O))
+ var/mob/living/carbon/human/H = O
+ H.wash()
+
+ if(isobj(O))
+ var/obj/object = O
+ object.clean()
+
+ if(isturf(loc))
+ var/turf/tile = loc
+ tile.clean_blood()
+ tile.remove_cleanables()
diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm
index f5b9223ca27..38f89164221 100644
--- a/code/modules/power/lights/bulbs.dm
+++ b/code/modules/power/lights/bulbs.dm
@@ -192,3 +192,8 @@
/obj/item/light/throw_impact(atom/hit_atom)
..()
shatter()
+
+/obj/item/light/clean()
+ . = ..()
+ brightness_color = initial(brightness_color)
+ update()
diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm
index ab3a7264f0a..060ee168ff6 100644
--- a/code/modules/power/lights/fixtures.dm
+++ b/code/modules/power/lights/fixtures.dm
@@ -714,3 +714,8 @@
if(brightness_color != default_color)
brightness_color = default_color
update(0)
+
+/obj/machinery/light/clean()
+ . = ..()
+ brightness_color = initial(brightness_color)
+ update()
diff --git a/html/changelogs/RustingWithYou - slightlydamp.yml b/html/changelogs/RustingWithYou - slightlydamp.yml
new file mode 100644
index 00000000000..5c07aede42e
--- /dev/null
+++ b/html/changelogs/RustingWithYou - slightlydamp.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Gives exoplanet water turfs some of the mechanics of normal water turfs."
diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm
index 671663f30b4..4b7ae31a861 100644
--- a/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm
+++ b/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm
@@ -659,7 +659,7 @@
/obj/effect/decal/exterior_stairs/half{
layer = 2.8
},
-/turf/simulated/floor/exoplanet/water/konyang,
+/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/water)
"bP" = (
/obj/effect/map_effect/window_spawner/full/wood,
@@ -2011,7 +2011,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor/urban,
-/turf/simulated/floor/exoplanet/water/konyang,
+/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/water)
"fK" = (
/obj/structure/closet/crate/bin/urban,
@@ -19622,7 +19622,7 @@
/area/point_verdant/outdoors)
"YY" = (
/obj/structure/lattice/catwalk/indoor/urban,
-/turf/simulated/floor/exoplanet/water/konyang,
+/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/water)
"YZ" = (
/obj/item/paper_bin,
@@ -31445,9 +31445,9 @@ AL
XV
XV
AL
-XV
-XV
-RZ
+AL
+AL
+AL
AL
AL
XV