From a6089302a7022ef21d137baf5a586560ea17637d Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Thu, 23 Oct 2025 23:46:55 -0700 Subject: [PATCH] [MIRROR] fixes a mistake I made in #18679 (#11861) Co-authored-by: Cameron Lennox --- code/__defines/is_helpers.dm | 3 +++ code/modules/vehicles/Securitrain_vr.dm | 2 +- code/modules/vehicles/bike.dm | 2 +- code/modules/vehicles/cargo_train.dm | 2 +- code/modules/vehicles/rover_vr.dm | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/__defines/is_helpers.dm b/code/__defines/is_helpers.dm index 4a1fedcdce..4ad53cb1f0 100644 --- a/code/__defines/is_helpers.dm +++ b/code/__defines/is_helpers.dm @@ -86,6 +86,9 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur"))) #define istaurtail(A) istype(A, /datum/sprite_accessory/tail/taur) #define islongtail(A) istype(A, /datum/sprite_accessory/tail/longtail) +///If a vehicle cannot pass through the turf +#define is_vehicle_inpassable(A) (istype(A, /turf/space) || istype(A, /turf/simulated/floor/water) || istype(A, /turf/simulated/floor/lava)) + // Diveable water #define isdiveablewater(A) istype(A, /turf/simulated/floor/water/deep/ocean/diving) diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 612fef99c0..7a3d8e2887 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -78,7 +78,7 @@ return FALSE //space check ~no flying space trains sorry - if(on && isnonsolidturf(newloc)) + if(on && is_vehicle_inpassable(newloc)) return FALSE return ..() diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 02630725fa..36aef7635f 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -145,7 +145,7 @@ if(on && cell) cell.use(charge_use) - if(isnonsolidturf(newloc) || pulledby) + if(is_vehicle_inpassable(newloc) || pulledby) if(!space_speed) return FALSE move_delay = space_speed diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index c8c72c1833..62365cd376 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -62,7 +62,7 @@ return FALSE //space check ~no flying space trains sorry - if(on && isnonsolidturf(newloc)) + if(on && is_vehicle_inpassable(newloc)) return FALSE return ..() diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index bb1af6a286..9fe68fd698 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -78,7 +78,7 @@ return FALSE //space check ~no flying space trains sorry - if(on && isnonsolidturf(newloc)) + if(on && is_vehicle_inpassable(newloc)) return FALSE return ..()