From 04c09cc73b4484c16feefb7b8f683fbb7ac5a6d0 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sun, 15 Jun 2025 21:00:46 -0400 Subject: [PATCH] Fix the lobby art not fading out (#91637) ## About The Pull Request ports a fix from https://github.com/Monkestation/Monkestation2.0/pull/6991 https://github.com/tgstation/tgstation/pull/76772 accidentally broke most instances of using `/atom/movable/screen/splash`, bc now the client needs to be third instead of second argument to `new /atom/movable/screen/splash`... yeah.

pre-fix video clip

https://github.com/user-attachments/assets/87015373-de72-4753-bf6e-55c3d9ffa207

post-fix video clip

https://github.com/user-attachments/assets/3dc80c68-f4a5-44a7-95fe-d590affc273d
## Why It's Good For The Game bugfix good ## Changelog :cl: fix: The lobby art properly fades out during roundstart, latejoin, and server restart again. /:cl: --- code/controllers/subsystem/ticker.dm | 2 +- code/controllers/subsystem/title.dm | 2 +- code/game/area/areas/shuttles.dm | 2 +- code/modules/mob/dead/dead.dm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 40c7769a31c..9f45061c88a 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -502,7 +502,7 @@ SUBSYSTEM_DEF(ticker) qdel(player) ADD_TRAIT(living, TRAIT_NO_TRANSFORM, SS_TICKER_TRAIT) if(living.client) - var/atom/movable/screen/splash/fade_out = new(null, living.client, TRUE) + var/atom/movable/screen/splash/fade_out = new(null, null, living.client, TRUE) fade_out.Fade(TRUE) living.client.init_verbs() livings += living diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 896479a88ec..46e3ce6864d 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(title) for(var/thing in GLOB.clients) if(!thing) continue - var/atom/movable/screen/splash/S = new(null, thing, FALSE) + var/atom/movable/screen/splash/S = new(null, null, thing, FALSE) S.Fade(FALSE,FALSE) /datum/controller/subsystem/title/Recover() diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 5a104c7b908..e240e0d5ad1 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -128,7 +128,7 @@ /area/shuttle/arrival/on_joining_game(mob/living/boarder) if(SSshuttle.arrivals?.mode == SHUTTLE_CALL) - var/atom/movable/screen/splash/Spl = new(null, boarder.client, TRUE) + var/atom/movable/screen/splash/Spl = new(null, null, boarder.client, TRUE) Spl.Fade(TRUE) boarder.playsound_local(get_turf(boarder), 'sound/announcer/ApproachingTG.ogg', 25) boarder.update_parallax_teleport() diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index d5a469bd2c3..cc318147fe1 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -76,7 +76,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) var/client/hopper = client to_chat(hopper, span_notice("Sending you to [pick].")) - var/atom/movable/screen/splash/fade_in = new(null, src, hopper, FALSE) + var/atom/movable/screen/splash/fade_in = new(null, null, src, hopper, FALSE) fade_in.Fade(FALSE) ADD_TRAIT(src, TRAIT_NO_TRANSFORM, SERVER_HOPPER_TRAIT)