From e764307cba7843280e4a2e5f409b832f0dd3d817 Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Thu, 16 Oct 2025 13:36:19 +0200
Subject: [PATCH] The cargo and janitorial tugs are now faster (#21485)

- The cargo tug now has a speed between the former speed and the emagged
speed
- The emag speed buff is removed
- An antag feedback hint was added to show that it can run people over
when emagged
- These changes also affect the C8000 deluxe custodial truck

On a sidenote, the emagged running over may need tuning at some point.
---
 code/modules/vehicles/cargo_train.dm | 8 +-------
 code/modules/vehicles/train.dm       | 4 ++++
 html/changelogs/FastTug.yml          | 7 +++++++
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/FastTug.yml

diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 6b305fd7972..8cf67b3a64a 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -314,11 +314,6 @@
 	user.put_in_hands(key)
 	key = null
 
-/obj/vehicle/train/cargo/engine/emag_act(var/remaining_charges, mob/user)
-	. = ..()
-	if(.)
-		update_car(train_length, active_engines)
-
 //-------------------------------------------
 // Loading/unloading procs
 //-------------------------------------------
@@ -402,8 +397,7 @@
 		move_delay *= (1 / max(1, active_engines)) * 2 										//overweight penalty (scaled by the number of engines)
 		move_delay += GLOB.config.walk_speed 													//base reference speed
 		move_delay *= GLOB.config.vehicle_delay_multiplier												//makes cargo trains 10% slower than running when not overweight
-		if(emagged)
-			move_delay -= 2
+		move_delay -= 1
 
 /obj/vehicle/train/cargo/trolley/update_car(var/train_length, var/active_engines)
 	src.train_length = train_length
diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm
index b80b2ba432c..e99a3de1ab0 100644
--- a/code/modules/vehicles/train.dm
+++ b/code/modules/vehicles/train.dm
@@ -26,6 +26,10 @@
 	if(tow)
 		. += SPAN_NOTICE("It towing \the [tow] in the [dir2text(get_dir(src, tow))].")
 
+/obj/vehicle/train/cargo/engine/antagonist_hints(mob/user, distance, is_adjacent)
+	. = ..()
+	. += "When emagged, it can be used to run people over with."
+
 //-------------------------------------------
 // Standard procs
 //-------------------------------------------
diff --git a/html/changelogs/FastTug.yml b/html/changelogs/FastTug.yml
new file mode 100644
index 00000000000..31bf3501e71
--- /dev/null
+++ b/html/changelogs/FastTug.yml
@@ -0,0 +1,7 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - rscadd: "The cargo and janitorial tugs are now faster, but don't gain speed when emagged."
+  - rscadd: "Added a hint to the cargo, janitorial and mining tugs that they can run over people when emagged."