mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
aec6ccff78
commit
a6089302a7
@@ -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)
|
||||
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
Reference in New Issue
Block a user