From 88b1ef4fc66a286fcdcc971f0126c3d183b682e7 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Fri, 15 May 2020 17:55:43 -0700
Subject: [PATCH] Add some ctrl/alt vehicle helper clicks

---
 code/modules/vehicles/bike.dm        | 1 +
 code/modules/vehicles/cargo_train.dm | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm
index 1d4cb49a3b..fe059b9e07 100644
--- a/code/modules/vehicles/bike.dm
+++ b/code/modules/vehicles/bike.dm
@@ -1,6 +1,7 @@
 /obj/vehicle/bike
 	name = "space-bike"
 	desc = "Space wheelies! Woo!"
+	description_info = "Use ctrl-click to quickly toggle the engine if you're adjacent (only when vehicle is stationary). Alt-click will similarly toggle the kickstand."
 	icon = 'icons/obj/bike.dmi'
 	icon_state = "bike_off"
 	dir = SOUTH
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 939c72110e..10ff1c94d5 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -1,7 +1,12 @@
 /obj/vehicle/train/engine
 	name = "cargo train tug"
 	desc = "A ridable electric car designed for pulling cargo trolleys."
+<<<<<<< HEAD
 	icon = 'icons/obj/vehicles_vr.dmi'	//VOREStation Edit
+=======
+	description_info = "Use ctrl-click to quickly toggle the engine if you're adjacent (only when vehicle is stationary). Alt-click will grab the keys, if present."
+	icon = 'icons/obj/vehicles.dmi'
+>>>>>>> e09f035... Merge pull request #7115 from VOREStation/pol-veh
 	icon_state = "cargo_engine"
 	on = 0
 	powered = 1