diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index e06d5a73..0918e03f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -95,6 +95,10 @@
 /mob/proc/Life()
 //	if(organStructure)
 //		organStructure.ProcessOrgans()
+	if(floating && mob_has_gravity(loc) && buckled)
+		float(0)
+	else if(!floating && !mob_has_gravity(loc) && !buckled)
+		float(1)
 	return
 
 
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index c3537785..8c583499 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -215,11 +215,6 @@
 	if(!mob.lastarea)
 		mob.lastarea = get_area(mob.loc)
 
-	if(mob.floating && mob.mob_has_gravity(mob.loc))
-		mob.float(0)
-	else if(!mob.floating && !mob.mob_has_gravity(mob.loc))
-		mob.float(1)
-
 	if((istype(mob.loc, /turf/space)) || (mob.lastarea.has_gravity == 0))
 		if(!mob.Process_Spacemove(0))	return 0
 
diff --git a/html/changelog.html b/html/changelog.html
index a3bd10bb..6fd49259 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,6 +62,8 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<ul class='changes bgimages16'>
 		<li class='rscadd'>Wrist watches</li>
 		<li class='rscdel'>Service borgs printing money</li>
+		<li class='tweak'>Supercharded flashes have a chance of hurting when used</li>
+		<li class='tweak'>Gravity foundation code (stilll checking the animation)</li>
 		<li class='bugfix'>Extinguishers now extinguish mobs on fire</li>
 		<li class='bugfix'>Flatdough no longer eats kitchen knifes</li>
 		<li class='bugfix'>Guest pass machine no longer eats ID's</li>