diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index d2513719ecd..d22d23aeb9b 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1028,7 +1028,7 @@ datum/mind
 		del(flash)
 		take_uplink()
 		var/fail = 0
-		fail |= !ticker.mode.equip_traitor(current, 1)
+	//	fail |= !ticker.mode.equip_traitor(current, 1)
 		fail |= !ticker.mode.equip_revolutionary(current)
 
 
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8868bd5da51..60ba81a4825 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -202,7 +202,6 @@
 			verbs += /client/proc/toggleadminhelpsound
 //			verbs += /client/proc/togglebuildmodeself
 			verbs += /client/proc/hide_most_verbs
-			verbs += /client/proc/tension_report
 			verbs += /client/proc/jumptocoord
 			verbs += /client/proc/deadmin_self
 			verbs += /client/proc/startSinglo
@@ -220,7 +219,7 @@
 			verbs += /proc/release
 			verbs += /client/proc/toggleprayers
 			verbs += /client/proc/deadmin_self
-
+			verbs += /client/proc/tension_report
 
 		if (holder.level >= 2)//Admin Candidate********************************************************************
 			verbs += /client/proc/cmd_admin_add_random_ai_law
@@ -277,6 +276,7 @@
 			verbs += /client/proc/deadmin_self
 
 
+
 		if (holder.level >= -1)//Admin Observer
 			verbs += /client/proc/cmd_admin_say
 			verbs += /client/proc/cmd_admin_gib_self
@@ -734,6 +734,21 @@
 				//S.dissipate_track = 0
 				//S.dissipate_strength = 10
 
+	for(var/obj/machinery/power/rad_collector/Rad in world)
+		if(Rad.anchored)
+			if(!Rad.P)
+				var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad)
+				Plasma.air_contents.toxins = 70
+				Rad.drainratio = 0
+				Rad.P = Plasma
+				Plasma.loc = Rad
+
+			if(!Rad.active)
+				Rad.toggle_power()
+
+	for(var/obj/machinery/power/smes/SMES in world)
+		if(SMES.anchored)
+			SMES.chargemode = 1
 
 /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs
 	set name = "Toggle most admin verb visibility"
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 94b761882b4..8a4514cfee7 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -14,6 +14,7 @@
 		last_power = 0
 		active = 0
 		locked = 0
+		drainratio = 1
 
 	process()
 		if(P)
@@ -21,7 +22,7 @@
 				P.air_contents.toxins = 0
 				eject()
 			else
-				P.air_contents.toxins -= 0.001
+				P.air_contents.toxins -= 0.001*drainratio
 		return
 
 
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 034269b94f3..0f6170b6939 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -75,7 +75,8 @@ field_generator power level display
 				power = field_generator_max_power
 				anchored = 1
 				warming_up = 3
-				turn_on()
+				start_fields()
+				update_icon()
 			Varedit_start = 0
 
 		if(src.active == 2)