From dcd86153fe69f36bee9c834be7e98b279bc8f56d Mon Sep 17 00:00:00 2001
From: Jacquerel <hnevard@gmail.com>
Date: Sat, 30 Jul 2022 09:40:23 +0100
Subject: [PATCH] Fixes some quirks with motorised wheelchair density (#68715)

* Motorised Wheelchairs will not become dense when someone is buckled.
Motorised Wheelchairs will manually bump living mobs they tried to move through.

* Removes unnecessary check for emag, we want this behaviour at all times.
---
 code/modules/vehicles/motorized_wheelchair.dm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index 5d80f1360ea..737f4563c38 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -56,14 +56,6 @@
 		return FALSE
 	return ..()
 
-/obj/vehicle/ridden/wheelchair/motorized/post_buckle_mob(mob/living/user)
-	. = ..()
-	set_density(TRUE)
-
-/obj/vehicle/ridden/wheelchair/motorized/post_unbuckle_mob()
-	. = ..()
-	set_density(FALSE)
-
 /obj/vehicle/ridden/wheelchair/motorized/attack_hand(mob/living/user, list/modifiers)
 	if(!power_cell || !panel_open)
 		return ..()
@@ -132,6 +124,16 @@
 	. += "Energy efficiency: [power_efficiency]"
 	. += "Power: [power_cell.charge] out of [power_cell.maxcharge]"
 
+/obj/vehicle/ridden/wheelchair/motorized/Move(newloc, direct)
+	. = ..()
+	if (.)
+		return
+	if (!has_buckled_mobs())
+		return
+	for (var/mob/living/guy in newloc)
+		if(!(guy in buckled_mobs))
+			Bump(guy)
+
 /obj/vehicle/ridden/wheelchair/motorized/Bump(atom/A)
 	. = ..()
 	// Here is the shitty emag functionality.