cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 14:16:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] August 2024 various fixes (#8766)

Browse Source 
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-08-14 02:15:42 +02:00
committed by GitHub
co-authored by Nadyr
parent f859c5e25f
commit 24658f4b9d
32 changed files with 703 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/train.dm
+2
View File
@@ -38,6 +38,8 @@
unattach()
/obj/vehicle/train/Bump(atom/Obstacle)
if(istype(Obstacle,/obj/structure/stairs)) // VOREstation edit - Stair support for towing vehicles
return ..()
if(!istype(Obstacle, /atom/movable))
return
var/atom/movable/A = Obstacle
code/modules/vehicles/vehicle.dm
+7 -3
View File
@@ -80,16 +80,20 @@
riding_datum.handle_vehicle_offsets() // So the person in back goes to the front.
/obj/vehicle/Move(var/newloc, var/direction, var/movetime)
if(world.time < l_move_time + move_delay) //This AND the riding datum move speed limit?
// VOREstation edit - Zmoving for falling
var/turf/newturf = newloc
var/zmove = (newturf && z != newturf.z)
if(!zmove && world.time < l_move_time + move_delay) //This AND the riding datum move speed limit? // VOREstation edit end
return
if(mechanical && on && powered && cell.charge < charge_use)
if(!zmove && mechanical && on && powered && cell.charge < charge_use) // VOREstation edit - zmove doesn't run this
turn_off()
return
. = ..()
if(mechanical && on && powered)
if(!zmove && mechanical && on && powered) // VOREstation edit - zmove doesn't run this
cell.use(charge_use)
//Dummy loads do not have to be moved as they are just an overlay