Nuclear-detonation adjustments and round-start silence (#588)

cmss13-devs · Jan 30, 2025 · 0e1ef39 · 0e1ef39
1 parent eaf955c
commit 0e1ef39
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -6,7 +6,7 @@
 #define GLOBAL_PROC "magic BS"
 
 //Game defining directives.
-#define MAIN_AI_SYSTEM "ARES v3.2"
+#define MAIN_AI_SYSTEM "TITAN 1200" //Previously ARES v3.2
 
 // Maploader bounds indices
 #define MAP_MINX 1

diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm
@@ -15,6 +15,11 @@
 	var/input = "ARES. Online. Good morning, marines."
 	shipwide_ai_announcement(input, name, 'sound/AI/ares_online.ogg')
 
+/datum/game_mode/proc/titan_online()
+	var/name = "TITAN 1200 Report"
+	var/input = "TITAN unit online. Good morning, marines."
+	shipwide_ai_announcement(input, name)
+
 /datum/game_mode/proc/request_ert(user, ares = FALSE)
 	if(!user)
 		return FALSE

diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm
@@ -120,8 +120,8 @@
 	if(SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_BASIC_RT])
 		flags_round_type |= MODE_BASIC_RT
 
-	addtimer(CALLBACK(src, PROC_REF(ares_online)), 5 SECONDS)
-	addtimer(CALLBACK(src, PROC_REF(map_announcement)), 20 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(titan_online)), 5 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(map_announcement)), 40 SECONDS)
 	//addtimer(CALLBACK(src, PROC_REF(start_lz_hazards)), LZ_HAZARD_START)
 
 	return ..()

diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm
@@ -394,12 +394,19 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
 	safety = TRUE
 
 	playsound(src, 'sound/machines/Alarm.ogg', 75, 0, 30)
-	world << pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg')
+	world << pick('sound/theme/nuclear_klaxon.ogg')
 
-	for(var/mob/current_mob as anything in GLOB.mob_list)
-		var/turf/current_turf = get_turf(current_mob)
-		if(current_turf?.z == z && current_mob.stat != DEAD)
-			shake_camera(current_mob, 110, 4)
+	var/list/humans_other = GLOB.human_mob_list + GLOB.dead_mob_list
+	var/list/humans_uscm = list()
+	for(var/mob/current_mob as anything in humans_other)
+		if(current_mob.stat != CONSCIOUS || isyautja(current_mob))
+			humans_other -= current_mob
+			continue
+		if(current_mob.faction == FACTION_MARINE || current_mob.faction == FACTION_SURVIVOR) //separating marines from other factions. Survs go here too
+			humans_uscm += current_mob
+			humans_other -= current_mob
+	announcement_helper("IMMINENT NUCLEAR DETONATION.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/effects/ob_alert.ogg')
+	announcement_helper("IMMINENT NUCLEAR BLAST, DUCK AND COVER IMMEDIATELY.", "Colony Alert System", humans_other, 'sound/effects/ob_alert.ogg')
 
 	sleep(10 SECONDS)
 
@@ -424,7 +431,9 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
 		for(var/obj/item/alien_embryo/embryo in current_mob)
 			qdel(embryo)
 
-	cell_explosion(loc, 500, 150, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name)))
+	cell_explosion(loc, 500, 10, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name)))
+	announcement_helper("NUCLEAR DETONATION DETECTED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
+	announcement_helper("NUCLEAR DETONATION DETECTED.", "Colony Alert System", humans_other, 'sound/misc/notice1.ogg')
 	qdel(src)
 	return TRUE
 

diff --git a/sound/theme/nuclear_klaxon.ogg b/sound/theme/nuclear_klaxon.ogg