From 2160a1a124adb7e5e095f8490f16dd26b8ec78f6 Mon Sep 17 00:00:00 2001 From: Huz2e Date: Sun, 14 Jul 2024 02:56:25 +0300 Subject: [PATCH 1/2] my ears are finally saved --- code/game/machinery/doors/firedoor.dm | 14 +++++++------- code/game/machinery/firealarm.dm | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 30deaef9183f3..7fa3a5be2fee2 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -328,7 +328,7 @@ /obj/machinery/door/firedoor/proc/start_activation_process(code = FIRELOCK_ALARM_TYPE_GENERIC) if(active) return //We're already active - soundloop.start() + // soundloop.start() - MASSMETA EDIT DELETION is_playing_alarm = TRUE my_area.fault_status = AREA_FAULT_AUTOMATIC my_area.fault_location = name @@ -342,7 +342,7 @@ * in the merge group datum. sets our alarm type to null, signifying no alarm. */ /obj/machinery/door/firedoor/proc/start_deactivation_process() - soundloop.stop() + // soundloop.stop() - MASSMETA EDIT DELETION is_playing_alarm = FALSE my_area.fault_status = AREA_FAULT_NONE my_area.fault_location = null @@ -397,7 +397,7 @@ alarm_type = null active = FALSE remove_as_source() - soundloop.stop() + // soundloop.stop() - MASSMETA EDIT DELETION is_playing_alarm = FALSE update_appearance(UPDATE_ICON) //Sets the door lights even if the door doesn't move. correct_state() @@ -414,7 +414,7 @@ if(!length(issue_turfs)) // Generic alarms get out alarm_type = null - soundloop.stop() + // soundloop.stop() - MASSMETA EDIT DELETION is_playing_alarm = FALSE remove_as_source() update_appearance(UPDATE_ICON) //Sets the door lights even if the door doesn't move. @@ -469,15 +469,15 @@ /obj/machinery/door/firedoor/proc/on_power_loss() SIGNAL_HANDLER - soundloop.stop() + // soundloop.stop() - MASSMETA EDIT DELETION /obj/machinery/door/firedoor/proc/on_power_restore() SIGNAL_HANDLER correct_state() - if(is_playing_alarm) - soundloop.start() + // if(is_playing_alarm) - MASSMETA EDIT DELETION + // soundloop.start() /obj/machinery/door/firedoor/attack_hand(mob/living/user, list/modifiers) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 10055aee5b29d..910d47825d086 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -141,6 +141,8 @@ /obj/machinery/firealarm/proc/set_status() if(!(my_area.fire || LAZYLEN(my_area.active_firelocks)) || (obj_flags & EMAGGED)) soundloop.stop() + else // MASSMETA EDIT ADDITION START + soundloop.start() // MASSMETA EDIT ADDITION END update_appearance() /obj/machinery/firealarm/update_appearance(updates) @@ -252,6 +254,7 @@ return if(my_area.fire) + soundloop.start() // MASSMETA EDIT ADDITION return //area alarm already active my_area.alarm_manager.send_alarm(ALARM_FIRE, my_area) // This'll setup our visual effects, so we only need to worry about the alarm From 7b6f22b3322cb6a1d576e68296daa1a51f89c6ed Mon Sep 17 00:00:00 2001 From: Huz2e <102353096+Huz2e@users.noreply.github.com> Date: Mon, 29 Jul 2024 04:48:21 +0300 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Artemchik542 <32270644+Artemchik542@users.noreply.github.com> --- code/game/machinery/doors/firedoor.dm | 18 +++++++++++------- code/game/machinery/firealarm.dm | 6 ++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 7fa3a5be2fee2..f60de8d155097 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -328,7 +328,7 @@ /obj/machinery/door/firedoor/proc/start_activation_process(code = FIRELOCK_ALARM_TYPE_GENERIC) if(active) return //We're already active - // soundloop.start() - MASSMETA EDIT DELETION + // soundloop.start() //MASSMETA EDIT REMOVAL is_playing_alarm = TRUE my_area.fault_status = AREA_FAULT_AUTOMATIC my_area.fault_location = name @@ -342,7 +342,7 @@ * in the merge group datum. sets our alarm type to null, signifying no alarm. */ /obj/machinery/door/firedoor/proc/start_deactivation_process() - // soundloop.stop() - MASSMETA EDIT DELETION + // soundloop.stop() //MASSMETA EDIT REMOVAL is_playing_alarm = FALSE my_area.fault_status = AREA_FAULT_NONE my_area.fault_location = null @@ -397,7 +397,7 @@ alarm_type = null active = FALSE remove_as_source() - // soundloop.stop() - MASSMETA EDIT DELETION + // soundloop.stop() //MASSMETA EDIT REMOVAL is_playing_alarm = FALSE update_appearance(UPDATE_ICON) //Sets the door lights even if the door doesn't move. correct_state() @@ -414,7 +414,7 @@ if(!length(issue_turfs)) // Generic alarms get out alarm_type = null - // soundloop.stop() - MASSMETA EDIT DELETION + // soundloop.stop() //MASSMETA EDIT REMOVAL is_playing_alarm = FALSE remove_as_source() update_appearance(UPDATE_ICON) //Sets the door lights even if the door doesn't move. @@ -469,15 +469,19 @@ /obj/machinery/door/firedoor/proc/on_power_loss() SIGNAL_HANDLER - // soundloop.stop() - MASSMETA EDIT DELETION + // soundloop.stop() //MASSMETA EDIT REMOVAL /obj/machinery/door/firedoor/proc/on_power_restore() SIGNAL_HANDLER correct_state() - // if(is_playing_alarm) - MASSMETA EDIT DELETION - // soundloop.start() + // MASSMETA EDIT REMOVAL BEGIN + /* + if(is_playing_alarm) + soundloop.start() + */ + // MASSMETA EDIT REMOVAL END /obj/machinery/door/firedoor/attack_hand(mob/living/user, list/modifiers) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 910d47825d086..a6fa95854663b 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -141,8 +141,10 @@ /obj/machinery/firealarm/proc/set_status() if(!(my_area.fire || LAZYLEN(my_area.active_firelocks)) || (obj_flags & EMAGGED)) soundloop.stop() - else // MASSMETA EDIT ADDITION START - soundloop.start() // MASSMETA EDIT ADDITION END + // MASSMETA EDIT ADDITION START + else + soundloop.start() + // MASSMETA EDIT ADDITION END update_appearance() /obj/machinery/firealarm/update_appearance(updates)