From 7cdfaa1d4bd875f8d604e71e9d798dc804bf76e3 Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Mon, 16 Jun 2025 23:17:08 +0100 Subject: [PATCH] Sewage + shallow water bugfixes (#20846) Sewage no longer inexplicably changes colour when a mob goes over it, and you aren't climbing out of water with every turf you take in it. --- .../overmap/exoplanets/decor/turfs/water.dm | 4 +- html/changelogs/hazelmouse-water.yml | 59 +++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/hazelmouse-water.yml diff --git a/code/modules/overmap/exoplanets/decor/turfs/water.dm b/code/modules/overmap/exoplanets/decor/turfs/water.dm index 9a7be0711fb..70a767968b4 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/water.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/water.dm @@ -91,12 +91,12 @@ if(numobjects) numobjects -= 1 var/mob/living/L = AM - if(!istype(newloc, /turf/simulated/floor/exoplanet/water)) + var/new_turf = get_step(src, newloc) + if(!istype(new_turf, src)) to_chat(L, SPAN_WARNING("You climb out of \the [src].")) ..() /turf/simulated/floor/exoplanet/water/process() - clean(src) for(var/mob/living/L in src) var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src) if(!lattice) diff --git a/html/changelogs/hazelmouse-water.yml b/html/changelogs/hazelmouse-water.yml new file mode 100644 index 00000000000..8b27cfeff66 --- /dev/null +++ b/html/changelogs/hazelmouse-water.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Exoplanet water turfs no longer describe mobs as stepping out of them when they shouldn't." + - bugfix: "Sewage turfs no longer reset in colour when a mob moves over them."