From 76d68971d42e2da6073754428b6b733ece137046 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 2 Sep 2017 19:43:53 +0200 Subject: [PATCH] Fixes airless shuttles --- code/game/turfs/simulated/floor.dm | 4 ++-- code/game/turfs/simulated/floor/light_floor.dm | 2 +- code/game/turfs/simulated/floor/misc_floor.dm | 2 +- code/game/turfs/simulated/floor/reinf_floor.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index c13def98977..cfc834037db 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -117,10 +117,10 @@ /turf/open/floor/proc/make_plating() return ChangeTurf(/turf/open/floor/plating) -/turf/open/floor/ChangeTurf(new_path) +/turf/open/floor/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE) if(!isfloorturf(src)) return ..() //fucking turfs switch the fucking src of the fucking running procs - if(!ispath(new_path, /turf/open/floor)) + if(!ispath(path, /turf/open/floor)) return ..() var/old_icon = icon_regular_floor var/old_dir = dir diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 971701aa2b8..542a0ed81d4 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -43,7 +43,7 @@ icon_state = "light_off" -/turf/open/floor/light/ChangeTurf(turf/T) +/turf/open/floor/light/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE) set_light(0) return ..() diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 6ffdcb3af57..f8d6c1da718 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -273,7 +273,7 @@ if(prob(50)) ChangeTurf(src.baseturf) -/turf/open/floor/vines/ChangeTurf(turf/open/floor/T) +/turf/open/floor/vines/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE) . = ..() //Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't for(var/obj/structure/spacevine/SV in src) diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index be8d949eba7..df353653d76 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -116,7 +116,7 @@ be_removed() return ..() -/turf/open/floor/engine/cult/ChangeTurf(path, defer_change = FALSE) +/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE) if(path != type) be_removed() return ..()