this is so fucking dumb

2016-09-11 18:38:14 -04:00
parent c7670b5dbe
commit dc930b9da8
7 changed files with 9 additions and 6 deletions
@@ -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())
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -303,6 +303,9 @@
 				break
 	. = dense_object_backup

+/mob/proc/mob_has_gravity()
+	return has_gravity()
+
 /mob/proc/mob_negates_gravity()
 	return 0

@@ -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)