Merge pull request #121 from unusualcrow/solarflare

Solar Flare Weather Event

code/modules/events/solar_flare.dm

@@ -0,0 +1,17 @@
+/datum/round_event_control/solar_flare
+	name = "Solar Flare"
+	typepath = /datum/round_event/solar_flare
+	max_occurrences = 1
+
+/datum/round_event/solar_flare
+
+/datum/round_event/solar_flare/setup()
+	startWhen = 3
+	endWhen = startWhen + 1
+	announceWhen	= 1
+
+/datum/round_event/solar_flare/announce()
+	priority_announce("Incoming solar flare detected near the station. Expect power outages in all exposed areas for a short duration.", "Anomaly Alert", 'sound/effects/alert.ogg')
+
+/datum/round_event/solar_flare/start()
+	SSweather.run_weather("solar flare",1)

code/modules/power/apc.dm

@@ -55,6 +55,7 @@
 	var/cell_type = 2500				// 0=no cell, 1=regular, 2=high-cap (x5) <- old, now it's just 0=no cell, otherwise dictate cellcapacity by changing this value. 1 used to be 1000, 2 was 2500
 	var/opened = 0 //0=closed, 1=opened, 2=cover removed
 	var/shorted = 0
+	var/shorted_old = 0 //for solar flare
 	var/lighting = 3
 	var/equipment = 3
 	var/environ = 3
@@ -1156,4 +1157,4 @@
 /obj/item/weapon/electronics/apc
 	name = "power control module"
 	icon_state = "power_mod"
-	desc = "Heavy-duty switching circuits for power control."
+	desc = "Heavy-duty switching circuits for power control."