mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Merge pull request #1007 from daklaj/vehicle-speed
Adjust vehicles speed to match global move speed
This commit is contained in:
@@ -148,7 +148,11 @@
|
|||||||
|
|
||||||
if(world.time < next_vehicle_move)
|
if(world.time < next_vehicle_move)
|
||||||
return
|
return
|
||||||
next_vehicle_move = world.time + vehicle_move_delay
|
var/static/datum/config_entry/number/run_delay/config_run_delay //yogs start
|
||||||
|
if(isnull(config_run_delay))
|
||||||
|
config_run_delay = CONFIG_GET(number/run_delay)
|
||||||
|
var/combined_delay = vehicle_move_delay * config_run_delay
|
||||||
|
next_vehicle_move = world.time + combined_delay //yogs end
|
||||||
|
|
||||||
if(keycheck(user))
|
if(keycheck(user))
|
||||||
var/turf/next = get_step(AM, direction)
|
var/turf/next = get_step(AM, direction)
|
||||||
|
|||||||
@@ -109,7 +109,11 @@
|
|||||||
vehicle_move(direction)
|
vehicle_move(direction)
|
||||||
|
|
||||||
/obj/vehicle/proc/vehicle_move(direction)
|
/obj/vehicle/proc/vehicle_move(direction)
|
||||||
if(lastmove + movedelay > world.time)
|
var/static/datum/config_entry/number/run_delay/config_run_delay //yogs start
|
||||||
|
if(isnull(config_run_delay))
|
||||||
|
config_run_delay = CONFIG_GET(number/run_delay)
|
||||||
|
var/combined_delay = movedelay * config_run_delay
|
||||||
|
if(lastmove + combined_delay > world.time) //yogs end
|
||||||
return FALSE
|
return FALSE
|
||||||
lastmove = world.time
|
lastmove = world.time
|
||||||
if(trailer)
|
if(trailer)
|
||||||
|
|||||||
Reference in New Issue
Block a user