diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 98d53ef104f..3bb4c433f4c 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -15,7 +15,7 @@ return 0 return ..() -/mob/living/carbon/human/has_gravity() +/mob/living/carbon/human/mob_has_gravity() . = ..() if(!.) if(mob_negates_gravity()) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index f44ca1855ba..9cd7b339a0f 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -43,7 +43,7 @@ //stuff in the stomach handle_stomach() - update_gravity(has_gravity()) + update_gravity(mob_has_gravity()) if(machine) machine.check_eye(src) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 0c3b45c2d5c..946f2e04900 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -9,7 +9,7 @@ else //I'm not removing that shitton of tabs, unneeded as they are. -- Urist //Being dead doesn't mean your temperature never changes - update_gravity(has_gravity()) + update_gravity(mob_has_gravity()) if(malfhack && malfhack.aidisabled) deltimer(malfhacking) diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 695ea3e4978..63d76801c78 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -11,7 +11,7 @@ /mob/living/silicon/robot/mob_negates_gravity() return magpulse -/mob/living/silicon/robot/has_gravity() +/mob/living/silicon/robot/mob_has_gravity() return ..() || mob_negates_gravity() /mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 3e10570986b..3a0ff80b5db 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -251,7 +251,7 @@ /mob/living/simple_animal/drone/mob_negates_gravity() return 1 -/mob/living/simple_animal/drone/has_gravity() +/mob/living/simple_animal/drone/mob_has_gravity() return ..() || mob_negates_gravity() /mob/living/simple_animal/drone/experience_pressure_difference(pressure_difference, direction) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 9cf04369356..37053278da2 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -303,6 +303,9 @@ break . = dense_object_backup +/mob/proc/mob_has_gravity() + return has_gravity() + /mob/proc/mob_negates_gravity() return 0 diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 5ec232ea1ed..80b96c18152 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -372,7 +372,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 for(var/mob/M in mob_list) if(M.z != z) continue - M.update_gravity(M.has_gravity()) + M.update_gravity(M.mob_has_gravity()) if(M.client) shake_camera(M, 15, 1) M.playsound_local(T, 'sound/effects/alert.ogg', 100, 1, 0.5)