Adjustments to events

Adds alarm for the singularity containment field.

code/game/events/EventProcs/miniblob.dm

@@ -15,7 +15,7 @@
 		dotheblobbaby()
 	spawn(15000)
 		blobevent = 0
-	spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes.
+	spawn(rand(30, 60)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
 		world << sound('outbreak5.ogg')
 

code/game/events/Events/ElectricalStorm.dm

@@ -6,7 +6,7 @@
 		list/obj/machinery/light/Comms = list( )
 
 	Announce()
-		command_alert("The station is flying through an electrical storm.  Radio communications may be disrupted", "Anomaly Alert")
+//		command_alert("The station is flying through an electrical storm.  Radio communications may be disrupted", "Anomaly Alert")
 
 		for(var/obj/machinery/light/Light in world)
 			if(Light.z == 1 && Light.status != 0)

code/game/events/Events/IonStorm.dm

@@ -5,7 +5,7 @@
 
 	Announce()
 		Lifetime = rand(15, 20)
-		command_alert("The station has entered an ion storm.  Monitor all electronic equipment for malfunctions", "Anomaly Alert")
+//		command_alert("The station has entered an ion storm.  Monitor all electronic equipment for malfunctions", "Anomaly Alert")
 		for (var/mob/living/carbon/human/player in world)
 			if(player.client)
 				players += player.real_name
@@ -43,4 +43,7 @@
 				if(prob(botEmagChance))
 					bot.Emag()
 
-	Die()
+	Die()
+		spawn(rand(5000,8000))
+			if(prob(50))
+				command_alert("It has come to our attention that the station passed through an ion storm.  Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")

code/game/events/Events/PowerOffline.dm

@@ -1,8 +1,15 @@
 /datum/event/power_offline
 	Announce()
-		command_alert("The station is performing an automated power system grid check, please stand by.", "Maintenance alert")
 		for(var/obj/machinery/power/apc/a in world)
 			if(!a.crit)
+				if(istype(a.area, /area/engine))
+					continue
 				a.eventoff = 1
-				spawn(200)
-					a.eventoff = 0 /*Got a few bug reports about this, disabling for now --Mloc*/
+				a.update()
+
+	Die()
+		command_alert("The station has finished an automated power system grid check, thank you.", "Maintenance alert")
+		for(var/obj/machinery/power/apc/a in world)
+			if(!a.crit)
+				a.eventoff = 0
+				a.update()

code/game/events/Events/RadiationBelt.dm

@@ -5,7 +5,7 @@
 
 	Tick()
 		for(var/mob/living/carbon/L in world)
-			L.apply_effect(rand(1,7), IRRADIATE)
+			L.apply_effect(rand(4,10), IRRADIATE)
 
 	Die()
 		command_alert("The station has cleared the radiation belt", "Medical Alert")

code/modules/power/singularity/containment_field.dm

@@ -62,7 +62,7 @@
 				user.burn_skin(shock_damage)
 				user.updatehealth()
 				user.visible_message("\red [user.name] was shocked by the [src.name]!", \
-					"\red <B>You feel a powerful shock course through your body sending you flying!</B>", \
+					"\red <B>You feel a powerful shock course through your body, sending you flying!</B>", \
 					"\red You hear a heavy electrical crack")
 
 				var/stun = min(shock_damage, 15)

code/modules/power/singularity/field_generator.dm

@@ -1,3 +1,4 @@
+var/containment_fail_announced = 0
 
 /*
 field_generator power level display
@@ -329,6 +330,13 @@ field_generator power level display
 
 
 		cleanup()
+			if(!containment_fail_announced)
+				containment_fail_announced = 1
+				var/obj/item/device/radio/a = new /obj/item/device/radio(null)
+				a.autosay("DANGER!  Field failure detected!  Immediate response advised!", "Singularity Monitoring Computer")
+				del(a)
+				spawn(6000)	//10 minutes.
+					containment_fail_announced = 0
 			clean_up = 1
 			for (var/obj/machinery/containment_field/F in fields)
 				if (isnull(F))