From 690cb4d36def03693b0f819cb07f39cd6359f919 Mon Sep 17 00:00:00 2001
From: MistakeNot4892 <AGMogett@gmail.com>
Date: Wed, 9 Aug 2023 20:35:31 +1000
Subject: [PATCH] Fixing issues with human spacemove.

---
 .../mob/living/carbon/human/human_movement.dm       | 13 ++++++-------
 .../mob/living/silicon/robot/subtypes/flying.dm     |  2 +-
 code/modules/mob/mob_movement.dm                    |  6 ++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 2013c39ab0..9b9c916ddb 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -165,13 +165,12 @@
 #undef HUMAN_LOWEST_SLOWDOWN
 
 /mob/living/carbon/human/get_jetpack()
-	if(back)
-		var/obj/item/rig/rig = get_rig()
-		if(istype(back, /obj/item/tank/jetpack))
-			return back
-		else if(istype(rig))
-			for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules)
-				return module.jets
+	if(istype(back, /obj/item/tank/jetpack))
+		return back
+	var/obj/item/rig/rig = get_rig()
+	for(var/obj/item/rig_module/maneuvering_jets/module in rig?.installed_modules)
+		return module.jets
+	return ..()
 
 /mob/living/carbon/human/Process_Spaceslipping(var/prob_slip = 5)
 	//If knocked out we might just hit it and stop.  This makes it possible to get dead bodies and such.
diff --git a/code/modules/mob/living/silicon/robot/subtypes/flying.dm b/code/modules/mob/living/silicon/robot/subtypes/flying.dm
index cfcd3ea266..0394405af3 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/flying.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/flying.dm
@@ -45,7 +45,7 @@
 	if(!QDELETED(src) && stat == DEAD)
 		stop_hovering()
 
-/mob/living/silicon/robot/flying/Allow_Spacemove(var/dense_object, check_drift = 0)
+/mob/living/silicon/robot/flying/Allow_Spacemove(var/dense_object)
 	return hovering || ..()
 
 /mob/living/silicon/robot/flying/Process_Spaceslipping(var/prob_slip = 5)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 91d988eaee..84add309d3 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -403,9 +403,7 @@
 	var/obj/item/tank/jetpack/J = get_jetpack()
 	if(J?.can_thrust(0.01))
 		return TRUE
-	if(!dense_object) //Nothing to push off of so end here
-		return FALSE
-	return TRUE
+	return !!dense_object
 
 ///Process_Spacemove
 ///Called by /client/Move()
@@ -417,7 +415,7 @@
 		return FALSE
 
 	var/dense_object = Check_Dense_Object()
-	if(!Allow_Spacemove())
+	if(!Allow_Spacemove(dense_object))
 		update_floating(dense_object)
 		return FALSE