From c952ac2e5c601a505822e0f3dcea7c43963e2f12 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 12 Dec 2022 05:40:33 +1000
Subject: [PATCH 1/2] Re-enables old rover

---
 code/modules/vehicles/rover_vr.dm | 16 ++++++++--------
 vorestation.dme                   |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm
index 50d7dba8f9..5582508837 100644
--- a/code/modules/vehicles/rover_vr.dm
+++ b/code/modules/vehicles/rover_vr.dm
@@ -28,12 +28,11 @@
 	var/obj/item/weapon/key/rover/key
 	var/siren = 0 //This is for eventually getting the siren sprite to work.
 
-	dunebuggy
-		name = "Research Dune Buggy"
-		desc = "A Dune Buggy developed for asteroid exploration and transportation. It has a sticker that says to wear EVA suits if used in space."
-		icon = 'icons/vore/rover_vr.dmi'
-		icon_state = "dunebug"
-
+/obj/vehicle/train/rover/engine/dunebuggy
+	name = "Research Dune Buggy"
+	desc = "A Dune Buggy developed for asteroid exploration and transportation. It has a sticker that says to wear EVA suits if used in space."
+	icon = 'icons/vore/rover_vr.dmi'
+	icon_state = "dunebug"
 
 /obj/item/weapon/key/rover
 	name = "The Rover key"
@@ -100,8 +99,9 @@
 
 //cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead
 /obj/vehicle/train/rover/bullet_act(var/obj/item/projectile/Proj)
-	if(buckled_mob && prob(70))
-		buckled_mob.bullet_act(Proj)
+	if(has_buckled_mobs() && prob(70))
+		var/mob/living/L = pick(buckled_mobs)
+		L.bullet_act(Proj)
 		return
 	..()
 
diff --git a/vorestation.dme b/vorestation.dme
index 9341f6948d..6a3b807109 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4275,7 +4275,11 @@
 #include "code\modules\vehicles\cargo_train.dm"
 #include "code\modules\vehicles\construction.dm"
 #include "code\modules\vehicles\quad.dm"
+<<<<<<< HEAD
 #include "code\modules\vehicles\Securitrain_vr.dm"
+=======
+#include "code\modules\vehicles\rover_vr.dm"
+>>>>>>> cc34fe95e1... Merge pull request #14187 from Heroman3003/duke-rover
 #include "code\modules\vehicles\snowmobile.dm"
 #include "code\modules\vehicles\train.dm"
 #include "code\modules\vehicles\vehicle.dm"

From b22d271c04d812231637675e65f8b04e737722cf Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Sun, 11 Dec 2022 19:48:16 -0700
Subject: [PATCH 2/2] powder that makes you say yes

---
 vorestation.dme | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vorestation.dme b/vorestation.dme
index 6a3b807109..b0978ab4da 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4275,11 +4275,8 @@
 #include "code\modules\vehicles\cargo_train.dm"
 #include "code\modules\vehicles\construction.dm"
 #include "code\modules\vehicles\quad.dm"
-<<<<<<< HEAD
-#include "code\modules\vehicles\Securitrain_vr.dm"
-=======
 #include "code\modules\vehicles\rover_vr.dm"
->>>>>>> cc34fe95e1... Merge pull request #14187 from Heroman3003/duke-rover
+#include "code\modules\vehicles\Securitrain_vr.dm"
 #include "code\modules\vehicles\snowmobile.dm"
 #include "code\modules\vehicles\train.dm"
 #include "code\modules\vehicles\vehicle.dm"