cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverts looping delta alert noise (#21854)

Browse Source
This commit is contained in:
AffectedArc07
2023-09-01 22:41:55 +01:00
committed by GitHub
parent 8803f536b7
commit d17ebbd2a4
7 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences.dm
-1
View File
@@ -88,7 +88,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
"1017" = 100, // CHANNEL_ENGINE
"1016" = 100, // CHANNEL_FIREALARM
"1015" = 100, // CHANNEL_ASH_STORM
"1014" = 100, // CHANNEL_DELTA_ALARM
)
/// The volume mixer save timer handle. Used to debounce the DB call to save, to avoid spamming.
var/volume_mixer_saving = null
code/modules/security_levels/security_levels.dm
+2 -26
View File
@@ -24,9 +24,6 @@ GLOBAL_DATUM_INIT(security_announcement, /datum/announcer, new(config_type = /da
if("delta")
level = SEC_LEVEL_DELTA
if(level != SEC_LEVEL_DELTA)
stop_delta_alarm()
//Will not be announced if you try to set to the same level as it already is
if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != GLOB.security_level)
if(level >= SEC_LEVEL_RED && GLOB.security_level < SEC_LEVEL_RED)
@@ -98,14 +95,13 @@ GLOBAL_DATUM_INIT(security_announcement, /datum/announcer, new(config_type = /da
var/temp_sound = GLOB.security_announcement.config.sound
GLOB.security_announcement.config.sound = null
GLOB.security_announcement.Announce("The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.","Attention! Delta security level reached!",
new_sound = null,
new_sound2 = null)
new_sound = 'sound/effects/delta_klaxon.ogg',
new_sound2 = 'sound/AI/delta.ogg')
GLOB.security_announcement.config.sound = temp_sound
GLOB.security_level = SEC_LEVEL_DELTA
post_status(STATUS_DISPLAY_ALERT, "deltaalert")
update_firealarms()
set_stationwide_emergency_lighting()
delta_alarm()
SSblackbox.record_feedback("tally", "security_level_changes", 1, level)
return
@@ -227,23 +223,3 @@ GLOBAL_DATUM_INIT(security_announcement, /datum/announcer, new(config_type = /da
L.fire_mode = TRUE
L.update()
update_firealarms()
/proc/delta_alarm()
var/station_z = level_name_to_num(MAIN_STATION)
var/list/mobs_for_alarm = list()
for(var/mob/M in get_mob_with_client_list())
if(M.z != station_z)
continue
mobs_for_alarm += M
var/datum/looping_sound/decreasing/delta_alarm/alarm = new(_output_atoms = mobs_for_alarm, _direct = TRUE)
alarm.channel = CHANNEL_DELTA_ALARM
alarm.start()
/proc/stop_delta_alarm()
for(var/datum/looping_sound/decreasing/delta_alarm/alarm in GLOB.looping_sounds)
for(var/mob/hearer in alarm.output_atoms) // Immediately stop the alarm for anyone who can hear it.
hearer.stop_sound_channel(CHANNEL_DELTA_ALARM)
qdel(alarm)