CME changes (#7814)

* a

* a

* Why

* a

* a

code/modules/events/alien_infestation.dm

@@ -1,10 +1,7 @@
 /datum/round_event_control/alien_infestation
 	name = "Alien Infestation"
 	typepath = /datum/round_event/ghost_role/alien_infestation
-	//SKYRAT EDIT CHANGE BEGIN
-	//weight = 5 - SKYRAT EDIT - ORIGINAL
-	weight = 0
-	//SKYRAT EDIT CHANGE END
+	weight = 0 //SKYRAT EDIT CHANGE, ORIGINAL: 5
 
 	min_players = 10
 

code/modules/events/brain_trauma.dm

@@ -2,7 +2,7 @@
 	name = "Spontaneous Brain Trauma"
 	typepath = /datum/round_event/brain_trauma
 	weight = 25
-	max_occurrences = 0 //SKYRAT EDIT ADDITION - EVENTS
+	max_occurrences = 0 //SKYRAT EDIT CHANGE
 
 /datum/round_event/brain_trauma
 	fakeable = FALSE

code/modules/events/space_dragon.dm

@@ -2,8 +2,7 @@
 	name = "Spawn Space Dragon"
 	typepath = /datum/round_event/ghost_role/space_dragon
 	weight = 7
-	//max_occurrences = 1 //ORIGINAL
-	max_occurrences = 0 //SKYRAT EDIT CHANGE - EVENTS
+	max_occurrences = 0 //SKYRAT EDIT CHANGE
 	min_players = 20
 	dynamic_should_hijack = TRUE
 

code/modules/events/space_ninja.dm

@@ -1,8 +1,7 @@
 /datum/round_event_control/space_ninja
 	name = "Spawn Space Ninja"
 	typepath = /datum/round_event/ghost_role/space_ninja
-	//max_occurrences = 1 //ORIGINAL
-	max_occurrences = 0 //SKYRAT EDIT CHANGE - EVENTS
+	max_occurrences = 0 //SKYRAT EDIT CHANGE
 	weight = 10
 	earliest_start = 20 MINUTES
 	min_players = 20

code/modules/events/spider_infestation.dm

@@ -2,9 +2,8 @@
 	name = "Spider Infestation"
 	typepath = /datum/round_event/spider_infestation
 	weight = 10
-	//max_occurrences = 1 //ORIGINAL
 	max_occurrences = 0 //SKYRAT EDIT CHANGE
-	//min_players = 20 - SKYRAT EDIT - moved to modular_skyrat/master_files
+	min_players = 60 //SKYRAT EDIT - ORIGINAL: 20
 	dynamic_should_hijack = TRUE
 
 /datum/round_event/spider_infestation

code/modules/events/swarmer.dm

@@ -1,9 +1,8 @@
 /datum/round_event_control/spawn_swarmer
 	name = "Spawn Swarmer Beacon"
 	typepath = /datum/round_event/spawn_swarmer
-	//weight = 10 //ORIGINAL
-	weight = 0 //SKYRAT EDIT CHANGE - EVENTS - same as the dynamic ruleset
-	max_occurrences = 1 //Only once okay fam
+	weight = 10
+	max_occurrences = 0 //Only once okay fam //SKYRAT EDIT CHANGE
 	min_players = 20
 	dynamic_should_hijack = TRUE
 

modular_skyrat/master_files/code/modules/events/spider_infestation.dm

@@ -1,2 +0,0 @@
-/datum/round_event_control/spider_infestation
-	min_players = 60

modular_skyrat/modules/cme/code/_cme_defines.dm

@@ -3,12 +3,10 @@
 ///////////////////////
 
 GLOBAL_LIST_INIT(cme_loot_list, list(
-	/obj/item/stack/sheet/bluespace_crystal = 30,
-	/obj/item/stack/sheet/mineral/diamond = 20,
-	/obj/item/stack/sheet/mineral/plasma = 50,
-	/obj/item/stack/sheet/mineral/gold = 80,
-	/obj/item/raw_anomaly_core/random = 10,
-	/obj/item/relic = 40))
+	/obj/item/raw_anomaly_core/random = 30,
+	/obj/item/stack/sheet/bluespace_crystal = 20,
+	/obj/item/stack/sheet/mineral/diamond = 10,
+	))
 
 /obj/item/strange
 
@@ -27,7 +25,7 @@ GLOBAL_LIST_INIT(cme_loot_list, list(
 #define CME_MINIMAL_HEAVY_RANGE_UPPER 7 //The highest range for the emp pulse heavy range.
 #define CME_MINIMAL_FREQUENCY_LOWER 25 * 0.5 //The lower time range for cme bubbles to appear.
 #define CME_MINIMAL_FREQUENCY_UPPER 30 * 0.5 //The higher time range for cme bubbles to appear.
-#define CME_MINIMAL_BUBBLE_BURST_TIME 40 SECONDS //The time taken for a cme bubble to pop.
+#define CME_MINIMAL_BUBBLE_BURST_TIME 45 SECONDS //The time taken for a cme bubble to pop.
 #define CME_MINIMAL_START_LOWER 120 * 0.5 //The lowest amount of time for the event to start from the announcement. - Prep time
 #define CME_MINIMAL_START_UPPER 180 * 0.5 //The highest amount of time for the event to start from the announcement. - Prep time
 #define CME_MINIMAL_END 240 * 0.5 //The amount of time starting from THE MINIMAL START TIME for the event to end. - How long it actually lasts.
@@ -38,7 +36,7 @@ GLOBAL_LIST_INIT(cme_loot_list, list(
 #define CME_MODERATE_HEAVY_RANGE_UPPER 10
 #define CME_MODERATE_FREQUENCY_LOWER 20 * 0.5
 #define CME_MODERATE_FREQUENCY_UPPER 25 * 0.5
-#define CME_MODERATE_BUBBLE_BURST_TIME 30 SECONDS
+#define CME_MODERATE_BUBBLE_BURST_TIME 35 SECONDS
 #define CME_MODERATE_START_LOWER 120 * 0.5
 #define CME_MODERATE_START_UPPER 180 * 0.5
 #define CME_MODERATE_END 240 * 0.5
@@ -50,7 +48,7 @@ GLOBAL_LIST_INIT(cme_loot_list, list(
 #define CME_EXTREME_HEAVY_RANGE_UPPER 13
 #define CME_EXTREME_FREQUENCY_LOWER 15 * 0.5
 #define CME_EXTREME_FREQUENCY_UPPER 20 * 0.5
-#define CME_EXTREME_BUBBLE_BURST_TIME 20 SECONDS
+#define CME_EXTREME_BUBBLE_BURST_TIME 25 SECONDS
 #define CME_EXTREME_START_LOWER 60 * 0.5
 #define CME_EXTREME_START_UPPER 120 * 0.5
 #define CME_EXTREME_END 300 * 0.5

modular_skyrat/modules/cme/code/cme.dm

@@ -15,9 +15,9 @@ Armageddon is truly going to fuck the station, use it sparingly.
 /datum/round_event_control/cme
 	name = "Coronal Mass Ejection: Random"
 	typepath = /datum/round_event/cme
-	weight = 10
+	weight = 4
 	min_players = 30
-	max_occurrences = 1 // Why was this allowed to roll three times bruh
+	max_occurrences = 1
 	earliest_start = 25 MINUTES
 
 /datum/round_event/cme
@@ -37,7 +37,7 @@ Armageddon is truly going to fuck the station, use it sparingly.
 
 /datum/round_event/cme/unknown
 	cme_intensity = CME_UNKNOWN
-	
+
 /datum/round_event_control/cme/minimal
 	name = "Coronal Mass Ejection: Minimal"
 	typepath = /datum/round_event/cme/minimal
@@ -151,7 +151,6 @@ Armageddon is truly going to fuck the station, use it sparingly.
 		intensity = pick(CME_MINIMAL, CME_MODERATE, CME_EXTREME)
 	var/area/loc_area_name = get_area(spawnpoint)
 	minor_announce("WARNING! [uppertext(intensity)] PULSE EXPECTED IN: [loc_area_name.name]", "Solar Flare Log:")
-	alert_sound_to_playing(sound('modular_skyrat/modules/cme/sound/cme_warning.ogg'))
 	switch(intensity)
 		if(CME_MINIMAL)
 			var/obj/effect/cme/spawnedcme = new(spawnpoint)
@@ -248,11 +247,7 @@ Armageddon is truly going to fuck the station, use it sparingly.
 	empulse(src, pulse_range_heavy, pulse_range_light)
 	playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE)
 	explosion(src, 0, 0, 2, flame_range = 3)
-	for(var/i in GLOB.mob_list)
-		var/mob/M = i
-		if(M.client && M.z == z)
-			SEND_SOUND(M, sound('modular_skyrat/modules/cme/sound/cme.ogg'))
-			shake_camera(M, 15, 1)
+	playsound(src,'modular_skyrat/modules/cme/sound/cme.ogg', 100)
 	qdel(src)
 
 /obj/effect/cme/armageddon/burst()
@@ -266,11 +261,7 @@ Armageddon is truly going to fuck the station, use it sparingly.
 	empulse(src, pulse_range_heavy, pulse_range_light)
 	explosion(src, 0, 3, 10, flame_range = 10)
 	playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE)
-	for(var/i in GLOB.mob_list)
-		var/mob/M = i
-		if(M.client && M.z == z)
-			SEND_SOUND(M, sound('modular_skyrat/modules/cme/sound/cme.ogg'))
-			shake_camera(M, 15, 1)
+	playsound(src,'modular_skyrat/modules/cme/sound/cme.ogg', 100)
 	qdel(src)
 
 /obj/effect/cme/singularity_pull()
@@ -280,8 +271,6 @@ Armageddon is truly going to fuck the station, use it sparingly.
 	playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE)
 	new /obj/effect/particle_effect/smoke/bad(loc)
 	var/turf/open/T = get_turf(src)
-	if(istype(T))
-		T.atmos_spawn_air("o2=30;TEMP=5778")
 	color = COLOR_WHITE
 	light_color = COLOR_WHITE
 	neutralized = TRUE

tgstation.dme

@@ -3876,7 +3876,6 @@
 #include "modular_skyrat\master_files\code\modules\clothing\head\monkey_magnification_helmet.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\outfits\ert.dm"
 #include "modular_skyrat\master_files\code\modules\events\spacevine.dm"
-#include "modular_skyrat\master_files\code\modules\events\spider_infestation.dm"
 #include "modular_skyrat\master_files\code\modules\jobs\departments\departments.dm"
 #include "modular_skyrat\master_files\code\modules\jobs\job_types\cyborg.dm"
 #include "modular_skyrat\master_files\code\modules\language\language_holders.dm"