Reduces volume of the nuke sound (#86888)

This commit is contained in:
grungussuss
2024-09-27 16:33:45 +02:00
committed by GitHub
parent 3ceaf41119
commit 2cf34ec44e
13 changed files with 15 additions and 15 deletions
@@ -238,7 +238,7 @@ GLOBAL_DATUM_INIT(battle_royale_master, /datum/battle_royale_master, new)
As a gesture of gratitude, we will be providing our premium broadcast to your entertainment monitors at no cost so that you can watch the excitement. \n\
Bystanders are advised not to intervene... but if you do, make it look good for the camera!",
title = "Rumble Royale Beginning",
sound = 'sound/machines/alarm.ogg',
sound = 'sound/announcer/alarm/nuke_alarm.ogg',
has_important_message = TRUE,
sender_override = "Rumble Royale Pirate Broadcast Station",
color_override = "red",
+2 -2
View File
@@ -963,7 +963,7 @@
cooldown = world.time + 600
user.audible_message(span_hear("You hear the click of a button."), self_message = span_notice("You activate [src], it plays a loud noise!"))
sleep(0.5 SECONDS)
playsound(src, 'sound/machines/alarm.ogg', 20, FALSE)
playsound(src, 'sound/announcer/alarm/nuke_alarm.ogg', 20, FALSE)
sleep(14 SECONDS)
user.visible_message(span_alert("[src] violently explodes!"))
explosion(src, light_impact_range = 1)
@@ -973,7 +973,7 @@
user.visible_message(span_warning("[user] presses a button on [src]."), span_notice("You activate [src], it plays a loud noise!"), span_hear("You hear the click of a button."))
sleep(0.5 SECONDS)
icon_state = "nuketoy"
playsound(src, 'sound/machines/alarm.ogg', 20, FALSE)
playsound(src, 'sound/announcer/alarm/nuke_alarm.ogg', 20, FALSE)
sleep(13.5 SECONDS)
icon_state = "nuketoycool"
sleep(cooldown - world.time)
+1 -1
View File
@@ -187,7 +187,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
blobstrain.on_sporedeath(spore)
/mob/camera/blob/proc/victory()
sound_to_playing_players('sound/machines/alarm.ogg')
sound_to_playing_players('sound/announcer/alarm/nuke_alarm.ogg', 70)
sleep(10 SECONDS)
for(var/mob/living/live_guy as anything in GLOB.mob_living_list)
var/turf/guy_turf = get_turf(live_guy)
@@ -350,7 +350,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
var/sec_left = seconds_remaining()
if(!sec_left)
timing = FALSE
sound_to_playing_players('sound/machines/alarm.ogg')
sound_to_playing_players('sound/announcer/alarm/nuke_alarm.ogg', 70)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(play_cinematic), /datum/cinematic/malf, world, CALLBACK(src, PROC_REF(trigger_doomsday))), 10 SECONDS)
else if(world.time >= next_announce)
@@ -102,7 +102,7 @@
/obj/item/disk/nuclear/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!"))
playsound(src, 'sound/machines/alarm.ogg', 50, -1, TRUE)
playsound(src, 'sound/announcer/alarm/nuke_alarm.ogg', 50, -1, TRUE)
for(var/i in 1 to 100)
addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, add_atom_colour), (i % 2)? COLOR_VIBRANT_LIME : COLOR_RED, ADMIN_COLOUR_PRIORITY), i)
addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101)
@@ -519,7 +519,7 @@ GLOBAL_VAR(station_nuke_source)
yes_code = FALSE
safety = TRUE
update_appearance()
sound_to_playing_players('sound/machines/alarm.ogg')
sound_to_playing_players('sound/announcer/alarm/nuke_alarm.ogg', 70)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NUKE_DEVICE_DETONATING, src)
@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
priority_announce(
text = memo,
title = "Declaration of War",
sound = 'sound/machines/alarm.ogg',
sound = 'sound/announcer/alarm/nuke_alarm.ogg',
has_important_message = TRUE,
sender_override = "Nuclear Operative Outpost",
color_override = "red",
@@ -192,7 +192,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
priority_announce(
text = memo,
title = "Declaration of War",
sound = 'sound/machines/alarm.ogg',
sound = 'sound/announcer/alarm/nuke_alarm.ogg',
has_important_message = TRUE,
sender_override = "Nuclear Operative Outpost",
color_override = "red",
+1 -1
View File
@@ -7,5 +7,5 @@
description = "The nuclear explosion cutscene begins to play to scare the crew."
/datum/round_event/wizard/fake_explosion/start()
sound_to_playing_players('sound/machines/alarm.ogg')
sound_to_playing_players('sound/announcer/alarm/nuke_alarm.ogg', 70)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(play_cinematic), /datum/cinematic/nuke/fake, world), 10 SECONDS)
+2 -2
View File
@@ -58,8 +58,8 @@
sound_type = list('sound/effects/glass/glassbr1.ogg', 'sound/effects/glass/glassbr2.ogg', 'sound/effects/glass/glassbr3.ogg')
/datum/hallucination/fake_sound/normal/alarm
volume = 100
sound_type = 'sound/machines/alarm.ogg'
volume = 70
sound_type = 'sound/announcer/alarm/nuke_alarm.ogg'
/datum/hallucination/fake_sound/normal/beepsky
volume = 35
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -546,7 +546,7 @@
GLOB.cult_narsie.souls += 1
if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE))
GLOB.cult_narsie.resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
sound_to_playing_players('sound/announcer/alarm/nuke_alarm.ogg', 70)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_VICTORY_MASS_CONVERSION), 12 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 27 SECONDS)
if(client)
+1 -1
View File
@@ -291,7 +291,7 @@
return
if(GLOB.cult_narsie.resolved == FALSE)
GLOB.cult_narsie.resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
sound_to_playing_players('sound/announcer/alarm/nuke_alarm.ogg', 70)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper)), 12 SECONDS)
///Called only if the crew managed to destroy narsie at the very last second for [/proc/begin_the_end()]