diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index 1142c23d2d9..22dd4101366 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -139,8 +139,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/looping_sound/firealarm - mid_sounds = list('sound/machines/FireAlarm.ogg'=1) - mid_length = 9.7 SECONDS + mid_sounds = list('sound/machines/FireAlarm1.ogg'=1,'sound/machines/FireAlarm2.ogg'=1,'sound/machines/FireAlarm3.ogg'=1,'sound/machines/FireAlarm4.ogg'=1 ) + mid_length = 2.4 SECONDS volume = 75 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 69f0af98c1f..0d66a44f761 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -358,7 +358,7 @@ if((my_area?.fire || LAZYLEN(my_area?.active_firelocks))) . += "The local area hazard light is flashing." . += "Left-Click to activate all firelocks in this area." - . += "Right-Click or Alt-Click to reset firelocks in this area." + . += "Right-Click to reset firelocks in this area." else . += "The local area thermal detection light is [my_area.fire_detect ? "lit" : "unlit"]." . += "Left-Click to activate all firelocks in this area." diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index e577684864a..ffad6956f2c 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -688,7 +688,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) cost = 25 power_type = /datum/action/innate/ai/break_fire_alarms unlock_text = "You replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will." - unlock_sound = 'sound/machines/FireAlarm.ogg' + unlock_sound = 'sound/machines/FireAlarm1.ogg' /datum/action/innate/ai/break_fire_alarms name = "Override Thermal Sensors" diff --git a/sound/machines/FireAlarm.ogg b/sound/machines/FireAlarm.ogg deleted file mode 100644 index 8887ceb1f23..00000000000 Binary files a/sound/machines/FireAlarm.ogg and /dev/null differ diff --git a/sound/machines/FireAlarm1.ogg b/sound/machines/FireAlarm1.ogg new file mode 100644 index 00000000000..da7632ce8b6 Binary files /dev/null and b/sound/machines/FireAlarm1.ogg differ diff --git a/sound/machines/FireAlarm2.ogg b/sound/machines/FireAlarm2.ogg new file mode 100644 index 00000000000..e5b7f4b1e73 Binary files /dev/null and b/sound/machines/FireAlarm2.ogg differ diff --git a/sound/machines/FireAlarm3.ogg b/sound/machines/FireAlarm3.ogg new file mode 100644 index 00000000000..8f1fd525949 Binary files /dev/null and b/sound/machines/FireAlarm3.ogg differ diff --git a/sound/machines/FireAlarm4.ogg b/sound/machines/FireAlarm4.ogg new file mode 100644 index 00000000000..ee5a6e6a59b Binary files /dev/null and b/sound/machines/FireAlarm4.ogg differ