cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fixes a mistake I made in #18679 (#11861)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-23 23:46:55 -07:00
committed by GitHub
parent aec6ccff78
commit a6089302a7
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__defines/is_helpers.dm
View File

@@ -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 istaurtail(A) istype(A, /datum/sprite_accessory/tail/taur)
#define islongtail(A) istype(A, /datum/sprite_accessory/tail/longtail) #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 // Diveable water
#define isdiveablewater(A) istype(A, /turf/simulated/floor/water/deep/ocean/diving) #define isdiveablewater(A) istype(A, /turf/simulated/floor/water/deep/ocean/diving)

2
code/modules/vehicles/Securitrain_vr.dm
View File

@@ -78,7 +78,7 @@
return FALSE return FALSE
//space check ~no flying space trains sorry //space check ~no flying space trains sorry
if(on && isnonsolidturf(newloc)) if(on && is_vehicle_inpassable(newloc))
return FALSE return FALSE
return ..() return ..()

2
code/modules/vehicles/bike.dm
View File

@@ -145,7 +145,7 @@
if(on && cell) if(on && cell)
cell.use(charge_use) cell.use(charge_use)
if(isnonsolidturf(newloc) || pulledby) if(is_vehicle_inpassable(newloc) || pulledby)
if(!space_speed) if(!space_speed)
return FALSE return FALSE
move_delay = space_speed move_delay = space_speed

2
code/modules/vehicles/cargo_train.dm
View File

@@ -62,7 +62,7 @@
return FALSE return FALSE
//space check ~no flying space trains sorry //space check ~no flying space trains sorry
if(on && isnonsolidturf(newloc)) if(on && is_vehicle_inpassable(newloc))
return FALSE return FALSE
return ..() return ..()

2
code/modules/vehicles/rover_vr.dm
View File

@@ -78,7 +78,7 @@
return FALSE return FALSE
//space check ~no flying space trains sorry //space check ~no flying space trains sorry
if(on && isnonsolidturf(newloc)) if(on && is_vehicle_inpassable(newloc))
return FALSE return FALSE
return ..() return ..()