From caa6f83e14d8129de80f45906fe89acce7f7e330 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Wed, 6 Nov 2024 22:07:54 +0100
Subject: [PATCH] fixes an invisibility exploit (#16573)

---
 code/modules/vehicles/rover_vr.dm | 7 +++++--
 code/modules/vehicles/vehicle.dm  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm
index 12094f58c62..9ad03c25bfa 100644
--- a/code/modules/vehicles/rover_vr.dm
+++ b/code/modules/vehicles/rover_vr.dm
@@ -292,12 +292,15 @@
 	if(!istype(C, /mob/living/carbon/human))
 		return 0
 
+	. = ..(C)
+
+	if(!.)
+		return
+
 	if(ismob(C))
 		buckle_mob(C)
 		C.alpha = 0
 
-	return ..()
-
 /obj/vehicle/train/rover/engine/unload(var/mob/user, var/direction)
 	var/mob/living/carbon/human/C = load
 
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 97e9dfa7469..963faa32f8a 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -340,7 +340,7 @@
 			C.pixel_y += load_offset_y
 		C.layer = layer + 0.1
 
-	if(ismob(C))
+	if(ismob(C) && user)
 		user_buckle_mob(C, user)
 
 	return 1