Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts:
#	icons/mob/clothing/mask.dmi

code/modules/events/abductor.dm

@@ -3,7 +3,7 @@
 	typepath = /datum/round_event/ghost_role/abductor
 	weight = 10
 	max_occurrences = 1
-	min_players = 20
+	min_players = 30
 	gamemode_blacklist = list("nuclear","wizard","revolution","dynamic")
 
 /datum/round_event/ghost_role/abductor

code/modules/events/brain_trauma.dm

@@ -27,6 +27,7 @@
 		if(!is_station_level(H.z))
 			continue
 		traumatize(H)
+		announce_to_ghosts(H)
 		break
 
 /datum/round_event/brain_trauma/proc/traumatize(mob/living/carbon/human/H)

code/modules/events/holiday/vday.dm

@@ -21,27 +21,6 @@
 			new /obj/item/reagent_containers/food/snacks/candyheart(B)
 			new /obj/item/storage/fancy/heart_box(B)
 
-	var/list/valentines = list()
-	for(var/mob/living/M in GLOB.player_list)
-		if(!M.stat && M.client && M.mind && !HAS_TRAIT(M, TRAIT_NO_MIDROUND_ANTAG))
-			valentines |= M
-
-
-	while(valentines.len)
-		var/mob/living/L = pick_n_take(valentines)
-		if(valentines.len)
-			var/mob/living/date = pick_n_take(valentines)
-
-
-			forge_valentines_objective(L, date)
-			forge_valentines_objective(date, L)
-
-			if(valentines.len && prob(4))
-				var/mob/living/notgoodenough = pick_n_take(valentines)
-				forge_valentines_objective(notgoodenough, date)
-		else
-			L.mind.add_antag_datum(/datum/antagonist/heartbreaker)
-
 /proc/forge_valentines_objective(mob/living/lover,mob/living/date,var/chemLove = FALSE)
 	lover.mind.special_role = "valentine"
 	if (chemLove == TRUE)

code/modules/events/immovable_rod.dm

@@ -160,6 +160,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 			wizard.apply_damage(25, BRUTE)
 			qdel(src)
 		else
+			U.client.give_award(/datum/award/achievement/misc/feat_of_strength, U) //rod-form wizards would probably make this a lot easier to get so keep it to regular rods only
 			U.visible_message("<span class='boldwarning'>[U] suplexes [src] into the ground!</span>", "<span class='warning'>You suplex [src] into the ground!</span>")
 			new /obj/structure/festivus/anchored(drop_location())
 			new /obj/effect/anomaly/flux(drop_location())

code/modules/events/supermatter_surge.dm

@@ -0,0 +1,23 @@
+/datum/round_event_control/supermatter_surge
+	name = "Supermatter Surge"
+	typepath = /datum/round_event/supermatter_surge
+	weight = 20
+	max_occurrences = 4
+	earliest_start = 10 MINUTES
+
+/datum/round_event_control/supermatter_surge/canSpawnEvent()
+	if(GLOB.main_supermatter_engine?.has_been_powered)
+		return ..()
+
+/datum/round_event/supermatter_surge
+	var/power = 2000
+
+/datum/round_event/supermatter_surge/setup()
+	power = rand(200,4000)
+
+/datum/round_event/supermatter_surge/announce()
+	if(power > 800 || prob(round(power/8)))
+		priority_announce("Class [round(power/500) + 1] supermatter surge detected. Intervention may be required.", "Anomaly Alert")
+
+/datum/round_event/supermatter_surge/start()
+	GLOB.main_supermatter_engine.matter_power += power

code/modules/events/supernova.dm

@@ -0,0 +1,67 @@
+/datum/round_event_control/supernova
+	name = "Supernova"
+	typepath = /datum/round_event/supernova
+	weight = 10
+	max_occurrences = 2
+	min_players = 2
+
+/datum/round_event/supernova
+	announceWhen = 40
+	startWhen = 1
+	endWhen = 300
+	var/power = 1
+	var/datum/sun/supernova
+	var/storm_count = 0
+
+/datum/round_event/supernova/setup()
+	announceWhen = rand(4, 60)
+	supernova = new
+	SSsun.suns += supernova
+	if(prob(20))
+		power = rand(5,100) / 100
+	else
+		power = rand(5,5000) / 100
+	supernova.azimuth = rand(0, 359)
+	supernova.power_mod = 0
+
+/datum/round_event/supernova/announce()
+	var/message = "Our tachyon-doppler array has detected a supernova in your vicinity. Peak flux from the supernova estimated to be [round(power,0.1)] times current solar flux. [power > 4 ? "Short burts of radiation may be possible, so please prepare accordingly." : ""]"
+	if(prob(power * 25))
+		priority_announce(message)
+	else
+		print_command_report(message)
+
+
+/datum/round_event/supernova/start()
+	supernova.power_mod = 0.001 * power
+	var/explosion_size = rand(1000000000, 999999999)
+	var/turf/epicenter = get_turf_in_angle(supernova.azimuth, SSmapping.get_station_center(), round(world.maxx * 0.45))
+	for(var/array in GLOB.doppler_arrays)
+		var/obj/machinery/doppler_array/A = array
+		A.sense_explosion(epicenter, explosion_size/2, explosion_size, 0, 107000000 / power, explosion_size/2, explosion_size, 0)
+	if(power > 1 && SSticker.mode.bloodsucker_sunlight?.time_til_cycle > 90)
+		var/obj/effect/sunlight/sucker_light = SSticker.mode.bloodsucker_sunlight
+		sucker_light.time_til_cycle = 90
+		sucker_light.warn_daylight(1,"<span class = 'danger'>A supernova will bombard the station with dangerous UV in [90 / 60] minutes. <b>Prepare to seek cover in a coffin or closet.</b></span>")
+		sucker_light.give_home_power()
+
+/datum/round_event/supernova/tick()
+	var/midpoint = round((endWhen-startWhen)/2)
+	switch(activeFor)
+		if(startWhen to midpoint)
+			supernova.power_mod = min(supernova.power_mod*1.2, power)
+		if(endWhen-10 to endWhen)
+			supernova.power_mod /= 4
+	if(prob(round(supernova.power_mod / 2)) && storm_count < 4 && !SSweather.get_weather_by_type(/datum/weather/rad_storm))
+		SSweather.run_weather(/datum/weather/rad_storm/supernova)
+		storm_count++
+
+/datum/round_event/supernova/end()
+	SSsun.suns -= supernova
+	qdel(supernova)
+
+/datum/weather/rad_storm/supernova
+	weather_duration_lower = 50
+	weather_duration_upper = 100
+	telegraph_duration = 100
+	radiation_intensity = 50