diff --git a/baystation12.dme b/baystation12.dme
index 1d03160997b..dc5efbd600c 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -926,7 +926,6 @@
 #include "code\modules\events\sayuevents\meaty_ores.dm"
 #include "code\modules\events\sayuevents\spooky.dm"
 #include "code\modules\events\sayuevents\undead.dm"
-#include "code\modules\events\sayuevents\weightless.dm"
 #include "code\modules\events\sayuevents\wormholes.dm"
 #include "code\modules\events\tgevents\alien_infestation.dm"
 #include "code\modules\events\tgevents\anomaly.dm"
diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm
index c5f3ee4d8c4..3a03999b0a7 100644
--- a/code/modules/events/event_dynamic.dm
+++ b/code/modules/events/event_dynamic.dm
@@ -54,7 +54,7 @@ var/global/list/possibleEvents = list()
 	possibleEvents[/datum/event/vent_clog] = 300
 	possibleEvents[/datum/event/anomaly/anomaly_grav] = 200
 
-	possibleEvents[/datum/event/weightless] = 150
+//	possibleEvents[/datum/event/weightless] = 150
 	possibleEvents[/datum/event/wormholes] = 150
 
 	possibleEvents[/datum/event/pda_spam] = max(min(25, player_list.len) * 4, 200)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index a2beecbbecb..9e494458225 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -289,11 +289,18 @@ var/const/GRAV_NEEDS_WRENCH = 3
 			alert = 1
 			investigate_log("was brought online and is now producing gravity for this level.", "gravity")
 			message_admins("The gravity generator was brought online. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
+			for(var/area/A in world)
+				if (A.z != 1) continue
+				A.gravitychange(1,A)
 	else
 		if(gravity_in_level() == 1)
 			alert = 1
 			investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
 			message_admins("The gravity generator was brought offline with no backup generator. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
+			for(var/area/A in world)
+				if (A.z != 1) continue
+				A.gravitychange(0,A)
+
 
 	update_icon()
 	update_list()