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

# Conflicts:
#	tgstation.dme

code/modules/events/cat_surgeon.dm

@@ -10,8 +10,28 @@
 
 /datum/round_event/cat_surgeon/start()
     var/list/spawn_locs = list()
+    var/list/unsafe_spawn_locs = list()
     for(var/X in GLOB.xeno_spawn)
-        spawn_locs += X
+        if(!isfloorturf(X))
+            unsafe_spawn_locs += X
+            continue
+        var/turf/open/floor/F = X
+        var/datum/gas_mixture/A = F.air
+        var/oxy_moles = A.get_moles(GAS_O2)
+        if((oxy_moles < 16 || oxy_moles > 50) || A.get_moles(GAS_PLASMA) || A.get_moles(GAS_CO2) >= 10)
+            unsafe_spawn_locs += F
+            continue
+        if((A.return_temperature() <= 270) || (A.return_temperature() >= 360))
+            unsafe_spawn_locs += F
+            continue
+        var/pressure = A.return_pressure()
+        if((pressure <= 20) || (pressure >= 550))
+            unsafe_spawn_locs += F
+            continue
+        spawn_locs += F
+
+    if(!spawn_locs.len)
+        spawn_locs += unsafe_spawn_locs
 
     if(!spawn_locs.len)
         message_admins("No valid spawn locations found, aborting...")

code/modules/events/mass_hallucination.dm

@@ -9,7 +9,7 @@
 /datum/round_event_control/mass_hallucination/admin_setup()
 	if(!check_rights(R_FUN))
 		return
-	
+
 	forced_hallucination = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in subtypesof(/datum/hallucination)
 
 /datum/round_event/mass_hallucination
@@ -26,7 +26,7 @@
 
 	switch(rand(1,4))
 		if(1) //same sound for everyone
-			var/sound = pick("airlock","airlock_pry","console","explosion","far_explosion","mech","glass","alarm","beepsky","mech","wall_decon","door_hack","tesla")
+			var/sound = pick("airlock","airlock_pry","console","explosion","far_explosion","mech","glass","alarm","beepsky","mech","wall_decon","door_hack","tesla","seth")
 			for(var/mob/living/carbon/C in GLOB.alive_mob_list)
 				new /datum/hallucination/sounds(C, TRUE, sound)
 		if(2)

code/modules/events/supermatter_surge.dm

@@ -27,13 +27,27 @@
 				if(prob(low_threat_perc))
 					severity = "low; the supermatter should return to normal operation shortly."
 				else
-					severity = "medium; the supermatter should return to normal operation, but check NT CIMS to ensure this."
+					severity = "medium; the supermatter should return to normal operation, but regardless, check if the emitters may need to be turned off temporarily."
 			else
-				severity = "high; if the supermatter's cooling is not fortified, coolant may need to be added."
+				severity = "high; the emitters likely need to be turned off, and if the supermatter's cooling loop is not fortified, pre-cooled gas may need to be added."
 		if(100000 to INFINITY)
-			severity = "extreme; emergency action is likely to be required even if coolant loop is fine."
+			severity = "extreme; emergency action is likely to be required even if coolant loop is fine. Turn off the emitters and make sure the loop is properly cooling gases."
 	if(power > 20000 || prob(round(power/200)))
 		priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert")
 
 /datum/round_event/supermatter_surge/start()
-	GLOB.main_supermatter_engine.matter_power += power
+	var/obj/machinery/power/supermatter_crystal/supermatter = GLOB.main_supermatter_engine
+	var/power_proportion = supermatter.powerloss_inhibitor/2 // what % of the power goes into matter power, at most 50%
+	// we reduce the proportion that goes into actual matter power based on powerloss inhibitor
+	// primarily so the supermatter doesn't tesla the instant these happen
+	supermatter.matter_power += power * power_proportion
+	var/datum/gas_mixture/methane_puff = new
+	var/selected_gas = pick(4;GAS_CO2, 10;GAS_METHANE, 4;GAS_H2O, 1;GAS_BZ, 1;GAS_METHYL_BROMIDE)
+	methane_puff.set_moles(selected_gas, 500)
+	methane_puff.set_temperature(500)
+	var/energy_ratio = (power * 500 * (1-power_proportion)) / methane_puff.thermal_energy()
+	if(energy_ratio < 1) // energy output we want is lower than current energy, reduce the amount of gas we puff out
+		methane_puff.set_moles(GAS_METHANE, energy_ratio * 500)
+	else // energy output we want is higher than current energy, increase its actual heat
+		methane_puff.set_temperature(energy_ratio * 500)
+	supermatter.assume_air(methane_puff)