From c49501f068c3a9cfbd93da628a35999e97b78462 Mon Sep 17 00:00:00 2001
From: daklaj <0937@openmailbox.org>
Date: Sat, 26 May 2018 11:17:42 +0200
Subject: [PATCH] Adjust vehicles speed to match global move speed

---
 code/datums/components/riding.dm  | 6 +++++-
 code/modules/vehicles/_vehicle.dm | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 4a720b655071..d2fcb9a08f35 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -148,7 +148,11 @@
 
 	if(world.time < next_vehicle_move)
 		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))
 		var/turf/next = get_step(AM, direction)
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index ef529ab84931..ffb5de3f635d 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -109,7 +109,11 @@
 	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
 	lastmove = world.time
 	if(trailer)