mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-30 08:38:13 +01:00
Fixing issues with human spacemove.
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user