Merge pull request #5383 from CHOMPStation2/upstream-merge-14187

[MIRROR] Re-enables old rover

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
 	..()
 

vorestation.dme

@@ -4276,6 +4276,7 @@
 #include "code\modules\vehicles\cargo_train.dm"
 #include "code\modules\vehicles\construction.dm"
 #include "code\modules\vehicles\quad.dm"
+#include "code\modules\vehicles\rover_vr.dm"
 #include "code\modules\vehicles\Securitrain_vr.dm"
 #include "code\modules\vehicles\snowmobile.dm"
 #include "code\modules\vehicles\train.dm"