Splits the Fire Alarm sound into four files (#64324)

* sound fission * I can't believe malf tools betrayed me like this * much ado about 0.008 Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> * Pay no attention to this Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
GesuArchive · Feb 25, 2022 · c3cc772 · c3cc772
1 parent 838219d
commit c3cc772
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 1 deletion.
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
@@ -136,6 +136,14 @@
 	volume = 50
 	falloff_distance = 5
 	falloff_exponent = 10
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/firealarm
+	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
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /datum/looping_sound/pulse_engine
 	mid_sounds = list('white/valtos/sounds/pulseengine.ogg' = 1)

diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
@@ -338,6 +338,13 @@
 		return  // do nothing if we're already active
 	if(fire)
 		set_light(l_power = 0.8)
+// Allows users to examine the state of the thermal sensor
+/obj/machinery/firealarm/examine(mob/user)
+	. = ..()
+	if((my_area?.fire || LAZYLEN(my_area?.active_firelocks)))
+		. += "<hr>В данной зоне обнаружена тревога."
+		. += "\n<b>ЛКМ</b> для активации всех пожарных шлюзов в зоне."
+		. += "\n<b>ПКМ</b> для сброса настроек всех пожарных шлюзов в зоне."
 	else
 		set_light(l_power = 0)
 

diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -674,7 +674,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
 	cost = 25
 	power_type = /datum/action/innate/ai/break_fire_alarms
 	unlock_text = span_notice("Вы изменили тепловую чувствительность на всех пожарных извещателях, что позволяет вам включать и выключать их по своему желанию. ")
-	unlock_sound = 'sound/machines/FireAlarm.ogg'
+	unlock_sound = 'sound/machines/FireAlarm1.ogg'
 
 /datum/action/innate/ai/break_fire_alarms
 	name = "Переписать протоколы Тепловых Датчиков"

diff --git a/sound/machines/FireAlarm.ogg b/sound/machines/FireAlarm.ogg
diff --git a/sound/machines/FireAlarm1.ogg b/sound/machines/FireAlarm1.ogg
diff --git a/sound/machines/FireAlarm2.ogg b/sound/machines/FireAlarm2.ogg
diff --git a/sound/machines/FireAlarm3.ogg b/sound/machines/FireAlarm3.ogg
diff --git a/sound/machines/FireAlarm4.ogg b/sound/machines/FireAlarm4.ogg