From ca9e7742aa601c10f260893ef3ae5491bdb1bcbf Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Wed, 11 Jun 2025 10:57:18 +0100 Subject: [PATCH] Fixes the rolling fog effect (#20820) Separates the rolling fog effect into its own type rather than relying on varedits, shifts it up a few layers so it renders ingame. Currently, it doesn't appear at all in the holodeck settings it's used in. --- code/game/objects/effects/decals/misc.dm | 8 +++ html/changelogs/hazelmouse-fogfix.yml | 58 ++++++++++++++++ maps/sccv_horizon/sccv_horizon.dmm | 84 ++++-------------------- 3 files changed, 78 insertions(+), 72 deletions(-) create mode 100644 html/changelogs/hazelmouse-fogfix.yml diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 2ee5ad5eb8d..194fb983469 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -28,6 +28,14 @@ anchored = 1 layer = OBJ_LAYER +// Fancy animated effect used for the holodecks. +/obj/effect/decal/rolling_fog + name = "rolling fog" + icon = 'icons/effects/props/holodeck/biesel/32x32.dmi' + icon_state = "fog_roll" + anchored = 1 + layer = ABOVE_PROJECTILE_LAYER + /obj/effect/decal/fake_object/Initialize(mapload) .=..() appearance_flags &= ~TILE_BOUND diff --git a/html/changelogs/hazelmouse-fogfix.yml b/html/changelogs/hazelmouse-fogfix.yml new file mode 100644 index 00000000000..ba308b69c45 --- /dev/null +++ b/html/changelogs/hazelmouse-fogfix.yml @@ -0,0 +1,58 @@ +################################ +# 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: "The Foggy Mendell Skyline and Jupiter Upper Atmosphere holodeck settings now render their rolling fog correctly." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index e45e581bafe..e34698d7138 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -2124,12 +2124,7 @@ pixel_x = 7; pixel_y = 14 }, -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/structure/railing/mapped{ dir = 8 }, @@ -12157,12 +12152,7 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "bGN" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/item/device/flashlight/lamp/holodeck{ light_color = "#C48A18"; light_power = 2; @@ -52053,12 +52043,7 @@ icon_state = "freighter_flip"; name = "passing vessel shadows" }, -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_biesel) "hsY" = ( @@ -91836,12 +91821,7 @@ /turf/simulated/floor/tiled, /area/operations/storage) "niJ" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/machinery/door/window/holowindoor, /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_biesel) @@ -102694,12 +102674,7 @@ /turf/unsimulated/floor/monotile, /area/antag/mercenary) "oOX" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_biesel) "oPh" = ( @@ -104282,12 +104257,7 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "paV" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_jupiter) "paY" = ( @@ -116013,12 +115983,7 @@ /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "qJv" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/structure/railing/mapped{ dir = 8 }, @@ -125796,12 +125761,7 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) "sgj" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/structure/railing/mapped{ dir = 4 }, @@ -143071,12 +143031,7 @@ icon_state = "background"; name = "holographic Jupiter Atmosphere" }, -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_jupiter) "uGI" = ( @@ -157616,12 +157571,7 @@ pixel_x = 7; pixel_y = 14 }, -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/structure/railing/mapped{ dir = 8 }, @@ -158499,12 +158449,7 @@ icon_state = "freighter"; name = "passing vessel shadows" }, -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/effect/decal/fake_object{ desc = "The distant cityscape of Mendell City."; icon = 'icons/effects/props/holodeck/biesel/384x224.dmi'; @@ -161463,12 +161408,7 @@ /turf/simulated/floor/tiled/dark/full, /area/tcommsat/entrance) "xlq" = ( -/obj/effect/decal{ - anchored = 1; - icon = 'icons/effects/props/holodeck/biesel/32x32.dmi'; - icon_state = "fog_roll"; - name = "rolling fog" - }, +/obj/effect/decal/rolling_fog, /obj/structure/railing/mapped{ name = "adjusted railing" },