a

Author: warface1234455

code/modules/antagonists/blob/overmind.dm

@@ -141,7 +141,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 			has_announced = TRUE
 			SSshuttle.registerHostileEnvironment(src)
 		else if(!check_containment(blob_core, 5) && !contained && !has_announced)
-			priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/default/outbreak5.ogg', color_override="yellow")
+			priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/default/outbreak5.ogg', color_override="red")
 			has_announced = TRUE
 
 /mob/camera/blob/proc/victory()

code/modules/events/portal_storm.dm

@@ -205,7 +205,7 @@
 				A.visible_message(span_userdanger("[A] overloads and makes a huge arc!"))
 				tesla_zap(A, 5, 10000) // woe
 	message_centcom("Alert, a large scale of abnormal activity has been detected on [station_name()]. Investigate and send the special forces to the station immediately.", "Central Command Higher Dimensional Affairs")
-	priority_announce("Unknown anomalous portals detected on a large scale of the station. There is no additional data.", "Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES)
+	priority_announce("Unknown anomalous portals detected on a large scale of the station. There is no additional data.", "Central Command Higher Dimensional Affairs", ANNOUNCER_SPANOMALIES, color_override="red")
 	addtimer(CALLBACK(src, PROC_REF(call_shuttle)), 4 SECONDS) //Wait till the annoucement finishes till the the next one so the sounds dont overlap each other
 
 /datum/round_event/portal_storm/resonance_cascade/proc/call_shuttle()
@@ -216,11 +216,10 @@
 		return
 	priority_announce("Attention all personnel, this is an emergency announcement on [station_name()]. \
 		An evacuation is immediately underway due to abnormal hostile activity detected on the premises. \
-		A distress signal has been sent to Central Command to alert them of the situation. In addition to that, \
-		we have observed a substantial number of meteors approaching the station on a large scale. \
+		A distress signal has been sent to Central Command to alert them of the situation. \
 		Please remain calm and follow the evacuation procedures provided. \
 		Proceed to the designated evacuation points swiftly and orderly. To ensure your safety, \
-		please avoid areas with abnormal activity and refrain from going outside the station to minimize the risk of collisions with meteors. \
+		please avoid areas with abnormal activity. \
 		Security personnel are present to assist and ensure your safety. \
 		Cooperate with their instructions and refrain from engaging with any hostiles. \
 		Central Command is actively responding and coordinating a comprehensive emergency response. \
@@ -229,6 +228,7 @@
 		Assistance is on the way.",
 		title = "Central Command Higher Dimensional Affairs",
 		sound = 'sound/misc/airraid.ogg',
+		color_override="red",
 	)
 
 /datum/round_event/portal_storm/resonance_cascade/tick()

code/modules/power/supermatter/supermatter.dm

@@ -164,6 +164,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	var/noblium_suppressed = FALSE		// or is it?
 	var/bypass_containment = FALSE      // If support_integrity is below 30, setting up a containment field at this point is useless
 	var/debug_inhibitor = FALSE
+
 	// Blob related shit
 	var/supermatter_blob = FALSE // Well say sike rn
 
@@ -437,7 +438,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 						priority_announce("RESONANCE CASCADE IMMINENT.", "Anomaly Alert", 'sound/misc/notice1.ogg', color_override="yellow")
 					resonance_cascading = TRUE
 					sound_to_playing_players('sound/magic/lightning_chargeup.ogg', 50, FALSE) // yogs end
-					add_overlay(mutable_appearance("icons/obj/tesla_engine/energy_ball.dmi", "smenergy_ball", LIGHTING_PRIMARY_LAYER))
+					add_overlay(mutable_appearance('icons/obj/tesla_engine/energy_ball.dmi', "smenergy_ball", /obj/singularity/energy_ball, LIGHTING_PRIMARY_LAYER, MASSIVE_OBJ_PLANE))
 				if(supermatter_blob)
 					if(!check_containment(src, 5))
 						priority_announce("LEVEL 5 BIOHAZARD OUTBREAK IMMINENT.", "Anomaly Alert", 'sound/misc/notice1.ogg', color_override="yellow")
@@ -603,8 +604,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 		else
 			powerloss_dynamic_scaling = clamp(powerloss_dynamic_scaling - 0.05,0, 1)
 
-		if((support_integrity >= 20 && (!supermatter_blob || check_containment(src, 5))) || !debug_inhibitor)
-			powerloss_inhibitor = clamp(1-(powerloss_dynamic_scaling * clamp(combined_gas/POWERLOSS_INHIBITION_MOLE_BOOST_THRESHOLD,1 ,1.5)),0 ,1)
+		if(!debug_inhibitor)
+			if(support_integrity >= 20 && (!supermatter_blob || check_containment(src, 5)))
+				powerloss_inhibitor = clamp(1-(powerloss_dynamic_scaling * clamp(combined_gas/POWERLOSS_INHIBITION_MOLE_BOOST_THRESHOLD,1 ,1.5)),0 ,1)
 
 		if(matter_power)
 			var/removed_matter = max(matter_power/MATTER_POWER_CONVERSION, 40)
@@ -821,7 +823,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	//blob SM HAMMM
 	if(supermatter_blob)
 		if(!check_containment(src, 5))
-			powerloss_inhibitor = 0.01
+			if(!debug_inhibitor)
+				powerloss_inhibitor = 0.01
 			power += 10000
 			if(prob(2))
 				empulse(src, 10, 5)
@@ -833,6 +836,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 				supermatter_zap(src, 5, power)
 				for(var/i = 1 to 20)
 					fire_nuclear_particle()
+		else if(prob(30))
+			for(var/obj/machinery/field/generator/gens in urange(5, src, 1))
+				Beam(gens, icon_state = "lightning[rand(1,12)]", time = 5, maxdistance = INFINITY, beam_color="#bb0074")
 		if(istype(T, /turf/open/space) || T.return_air().total_moles() < MOLE_SPACE_THRESHOLD)
 			damage += DAMAGE_HARDCAP * explosion_point
 
@@ -884,19 +890,17 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 			supermatter_zap(src, 7, 2000)
 			antinoblium_safety()
 			if(support_integrity<3)
-				var/emp_power = round(explosion_power * (1+(1-(support_integrity/3))),1)
-				empulse(src, emp_power)
+				if(!antinoblium_safety())
+					var/emp_power = round(explosion_power * (1+(1-(support_integrity/3))),1)
+					empulse(src, emp_power)
 				supermatter_zap(src, 7, 2000+power)
-				antinoblium_safety()
 		if(support_integrity<100)
 			power += round((100-support_integrity)/2,1)
 			supermatter_zap(src, 7, 2000+power)
-			antinoblium_safety()
 		if(support_integrity<70)
 			if(prob(30+round((100-support_integrity)/2,1)))
 				playsound(src.loc, 'sound/weapons/emitter2.ogg', 100, 1, extrarange = 10)
 				supermatter_zap(src, 7, 2000+min(power*2, 20000))
-				antinoblium_safety()
 		if(support_integrity<40)
 			if(prob(10))
 				T.hotspot_expose(max(((100-support_integrity)*2)+FIRE_MINIMUM_TEMPERATURE_TO_EXIST,T.return_air().return_temperature()), 100)
@@ -905,7 +909,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 				var/ballcount = round(10-(support_integrity/10), 1) // Cause more radballs to be spawned
 				for(var/i = 1 to ballcount)
 					fire_nuclear_particle()
-					antinoblium_safety()
 					supermatter_zap(src, 7, 2000+power)
 		if(support_integrity<=20)
 			if(!antinoblium_safety())
@@ -918,7 +921,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 			if(prob(2))
 				empulse(src, 10-support_integrity) //EMPs must always be spewing every so often to ensure that containment is guaranteed to fail.
 			if(prob(30))
-				antinoblium_safety()
 				supermatter_zap(src, 7, 2000+power)
 
 	// I FUCKING LOVE DATA!!!!!!