From 3bcb6602b60b3d78dab754b8809b299c0ec26a0f Mon Sep 17 00:00:00 2001 From: spookydonut Date: Fri, 29 May 2020 01:36:24 +0800 Subject: [PATCH] Should fix a rare edgecase with explosions and shuttles (#51017) --- code/controllers/subsystem/explosions.dm | 6 ++++++ code/modules/shuttle/on_move.dm | 2 ++ 2 files changed, 8 insertions(+) diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index 60fd8de801e..c402d8b4ab0 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -74,6 +74,12 @@ SUBSYSTEM_DEF(explosions) /datum/controller/subsystem/explosions/proc/is_exploding() return (lowturf.len || medturf.len || highturf.len || flameturf.len || throwturf.len || lowobj.len || medobj.len || highobj.len) +/datum/controller/subsystem/explosions/proc/wipe_turf(turf/T) + lowturf -= T + medturf -= T + highturf -= T + flameturf -= T + throwturf -= T /client/proc/check_bomb_impacts() set name = "Check Bomb Impact" diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index dec80370539..39bf5b4ab48 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -71,6 +71,8 @@ All ShuttleMove procs go here /turf/proc/afterShuttleMove(turf/oldT, rotation) //Dealing with the turf we left behind oldT.TransferComponents(src) + + SSexplosions.wipe_turf(src) var/shuttle_boundary = baseturfs.Find(/turf/baseturf_skipover/shuttle) if(shuttle_boundary) oldT.ScrapeAway(baseturfs.len - shuttle_boundary + 1)