From cdf387cd6baa0c911f8b33fcf59e7bce971b8404 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Sun, 5 Nov 2023 23:33:45 -0500 Subject: [PATCH 1/9] Added Ability for Looping Sounds to be heard from further away. --- code/datums/looping_sounds/_looping_sound.dm | 37 +++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index c6fc23c68eba..b1aa195600b1 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -37,6 +37,12 @@ /// Has the looping started yet? var/loop_started = FALSE + //Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away.______qdel_list_wrapper(list/L) + //Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv + //with a longer "falloff distance." Fixes the extra_range stuff + var/is_sound_projecting = FALSE + var/falloff_distance = 50 + /* // as of yet unused varen \\ /// How much the sound will be affected by falloff per tile. @@ -130,19 +136,24 @@ sound_to_play.channel = get_free_channel() sound_to_play.volume = volume_override || volume //Use volume as fallback if theres no override SEND_SOUND(parent, sound_to_play) - else - playsound( - parent, - sound_to_play, - volume, - vary, - extra_range//, - // falloff_exponent = falloff_exponent, - // pressure_affected = pressure_affected, - // ignore_walls = ignore_walls, - // falloff_distance = falloff_distance, - // use_reverb = use_reverb - ) + return + if (is_sound_projecting) + playsound(parent, sound_to_play, volume, vary, extra_range, VOLUME_SFX, 0, 0, falloff_distance) + //playsound(loc, '.ogg', 100, 0, 100, VOLUME_SFX, 0, 0, 50, 50) + return + + playsound( + parent, + sound_to_play, + volume, + vary, + extra_range//, + // falloff_exponent = falloff_exponent, + // pressure_affected = pressure_affected, + // ignore_walls = ignore_walls, + // falloff_distance = falloff_distance, + // use_reverb = use_reverb + ) /// Returns the sound we should now be playing. /datum/looping_sound/proc/get_sound(_mid_sounds) From 9bd26685c91be86f0c1d8a172e76bcbc722f26ff Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Sun, 5 Nov 2023 23:35:53 -0500 Subject: [PATCH 2/9] Added Ability to turn on and turn off a dropship alarm. (Requires projecting-looping-sounds branch made 5 November 2023 to work) --- code/datums/looping_sounds/misc_sounds.dm | 3 + .../shuttle/computers/dropship_computer.dm | 11 ++++ code/modules/shuttle/shuttle.dm | 11 ++++ colonialmarines.dme | 1 + sound/vehicles/Dropships/Single Alarm brr.ogg | Bin 0 -> 22433 bytes .../tgui/interfaces/DropshipFlightControl.tsx | 60 ++++++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 code/datums/looping_sounds/misc_sounds.dm create mode 100644 sound/vehicles/Dropships/Single Alarm brr.ogg diff --git a/code/datums/looping_sounds/misc_sounds.dm b/code/datums/looping_sounds/misc_sounds.dm new file mode 100644 index 000000000000..1f413a1d2543 --- /dev/null +++ b/code/datums/looping_sounds/misc_sounds.dm @@ -0,0 +1,3 @@ +/datum/looping_sound/looping_launch_announcement_alarm + mid_sounds = list('sound/vehicles/Dropships/Single Alarm brr.ogg' = 1) + start_sound = list('sound/items/taperecorder/taperecorder_hiss_start.ogg' = 1) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 4540588ca628..738da4497b38 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -319,6 +319,9 @@ .["door_status"] = is_remote ? list() : shuttle.get_door_data() .["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT) + // Launch Alarm Variables + .["playing_Launch_Announcement_Alarm"] = shuttle.playing_Launch_Announcement_Alarm + .["destinations"] = list() // add flight .["destinations"] += list( @@ -469,6 +472,14 @@ if("cancel-flyby") if(shuttle.in_flyby && shuttle.timer && shuttle.timeLeft(1) >= DROPSHIP_WARMUP_TIME) shuttle.setTimer(DROPSHIP_WARMUP_TIME) + if("playlaunchannouncementalarm") + shuttle.alarm_sound_loop.start() + shuttle.playing_Launch_Announcement_Alarm = 1 + return TRUE + if ("stopplaylaunchannouncementalarm") + shuttle.alarm_sound_loop.stop() + shuttle.playing_Launch_Announcement_Alarm = 0 + return TRUE /obj/structure/machinery/computer/shuttle/dropship/flight/lz1 icon = 'icons/obj/structures/machinery/computer.dmi' diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 7bbdb214d34b..065b51b6a059 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -343,6 +343,9 @@ var/rechargeTime = 0 //time spent after arrival before being able to launch again var/prearrivalTime = 0 //delay after call time finishes for sound effects, explosions, etc. + var/playing_Launch_Announcement_Alarm = 0 // 0 = off ; 1 = on + var/datum/looping_sound/looping_launch_announcement_alarm/alarm_sound_loop + var/landing_sound = 'sound/effects/engine_landing.ogg' var/ignition_sound = 'sound/effects/engine_startup.ogg' /// Default shuttle audio ambience while flying @@ -410,6 +413,14 @@ initial_engines = count_engines() current_engines = initial_engines + //Launch Announcement Alarm variables setup + alarm_sound_loop = new(src) + alarm_sound_loop.mid_length = 20 + alarm_sound_loop.extra_range = 30 + alarm_sound_loop.volume = 100 + alarm_sound_loop.is_sound_projecting = TRUE + alarm_sound_loop.falloff_distance = 7 + #ifdef DOCKING_PORT_HIGHLIGHT highlight("#0f0") #endif diff --git a/colonialmarines.dme b/colonialmarines.dme index 192217ea59b3..bf982696ebf2 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -553,6 +553,7 @@ #include "code\datums\langchat\langchat.dm" #include "code\datums\looping_sounds\_looping_sound.dm" #include "code\datums\looping_sounds\item_sounds.dm" +#include "code\datums\looping_sounds\misc_sounds.dm" #include "code\datums\origin\civilian.dm" #include "code\datums\origin\origin.dm" #include "code\datums\origin\upp.dm" diff --git a/sound/vehicles/Dropships/Single Alarm brr.ogg b/sound/vehicles/Dropships/Single Alarm brr.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9fe0b4c11da16009e15c30e998f35e6f479d37e8 GIT binary patch literal 22433 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 R9cJ@J!mrSPqN*?O{{mNrQ#b$s literal 0 HcmV?d00001 diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx index 65a67524f5b4..ac460c6cb2ec 100644 --- a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx +++ b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx @@ -23,6 +23,10 @@ interface DropshipNavigationProps extends NavigationProps { primary_lz?: string; automated_control: AutomatedControl; has_flyby_skill: 0 | 1; + + playing_Launch_Announcement_Alarm: 0 | 1; + launchAnnouncementAlarmTimer: number /* the timer that counts */; + launchAnnouncementAlarmExpireTime: number /* When the timer expires. How long the alarm can play. */; } const DropshipDoorControl = (_, context) => { @@ -276,6 +280,61 @@ const AutopilotConfig = (props, context) => { ); }; +export const StopPlayLaunchAnnouncementAlarm = (_, context) => { + const { act } = useBackend(context); + return ( + + ); +}; + +export const PlayLaunchAnnouncementAlarm = (_, context) => { + const { act } = useBackend(context); + return ( + + ); +}; + +export const LaunchAnnouncementAlarm = (_, context) => { + const { data, act } = useBackend(context); + const [siteselection, setSiteSelection] = useSharedState( + context, + 'target_site', + undefined + ); + return ( +
+ {data.playing_Launch_Announcement_Alarm === 0 && ( + + )} + + {data.playing_Launch_Announcement_Alarm === 1 && ( + + )} + + } + /> + ); +}; + const RenderScreen = (props, context) => { const { data } = useBackend(context); return ( @@ -292,6 +351,7 @@ const RenderScreen = (props, context) => { )} {data.door_status.length > 0 && } + {} ); }; From dc259c96ef679025ffa593ac94805a52c9c0f6aa Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Mon, 6 Nov 2023 13:19:51 -0500 Subject: [PATCH 3/9] Removed moot comments. Changed necessary doc comments. --- code/datums/looping_sounds/_looping_sound.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index b1aa195600b1..a0b0d77ce165 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -37,9 +37,9 @@ /// Has the looping started yet? var/loop_started = FALSE - //Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away.______qdel_list_wrapper(list/L) - //Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv - //with a longer "falloff distance." Fixes the extra_range stuff + ///Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away. + ///Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv + ///with a longer "falloff distance." Fixes the extra_range stuff var/is_sound_projecting = FALSE var/falloff_distance = 50 @@ -139,7 +139,6 @@ return if (is_sound_projecting) playsound(parent, sound_to_play, volume, vary, extra_range, VOLUME_SFX, 0, 0, falloff_distance) - //playsound(loc, '.ogg', 100, 0, 100, VOLUME_SFX, 0, 0, 50, 50) return playsound( @@ -147,12 +146,7 @@ sound_to_play, volume, vary, - extra_range//, - // falloff_exponent = falloff_exponent, - // pressure_affected = pressure_affected, - // ignore_walls = ignore_walls, - // falloff_distance = falloff_distance, - // use_reverb = use_reverb + extra_range ) /// Returns the sound we should now be playing. From 782fe7ca10e783cbecc32e6e2518d927b650677b Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Mon, 6 Nov 2023 13:37:15 -0500 Subject: [PATCH 4/9] Made syntax/style fixes --- code/datums/looping_sounds/misc_sounds.dm | 4 ++-- .../shuttle/computers/dropship_computer.dm | 14 ++++++------ code/modules/shuttle/shuttle.dm | 3 ++- ... brr.ogg => single_alarm_brr_dropship.ogg} | Bin .../tgui/interfaces/DropshipFlightControl.tsx | 20 ++++++++---------- 5 files changed, 20 insertions(+), 21 deletions(-) rename sound/vehicles/Dropships/{Single Alarm brr.ogg => single_alarm_brr_dropship.ogg} (100%) diff --git a/code/datums/looping_sounds/misc_sounds.dm b/code/datums/looping_sounds/misc_sounds.dm index 1f413a1d2543..2c14223808e9 100644 --- a/code/datums/looping_sounds/misc_sounds.dm +++ b/code/datums/looping_sounds/misc_sounds.dm @@ -1,3 +1,3 @@ /datum/looping_sound/looping_launch_announcement_alarm - mid_sounds = list('sound/vehicles/Dropships/Single Alarm brr.ogg' = 1) - start_sound = list('sound/items/taperecorder/taperecorder_hiss_start.ogg' = 1) + mid_sounds = list('sound/vehicles/Dropships/single_alarm_brr_dropship.ogg' = 1) + start_sound = list('sound/vehicles/Dropships/single_alarm_brr_dropship.ogg' = 1) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 738da4497b38..4cd79f7fa62f 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -320,7 +320,7 @@ .["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT) // Launch Alarm Variables - .["playing_Launch_Announcement_Alarm"] = shuttle.playing_Launch_Announcement_Alarm + .["playing_launch_announcement_alarm"] = shuttle.playing_launch_announcement_alarm .["destinations"] = list() // add flight @@ -472,14 +472,14 @@ if("cancel-flyby") if(shuttle.in_flyby && shuttle.timer && shuttle.timeLeft(1) >= DROPSHIP_WARMUP_TIME) shuttle.setTimer(DROPSHIP_WARMUP_TIME) - if("playlaunchannouncementalarm") + if("play_launch_announcement_alarm") shuttle.alarm_sound_loop.start() - shuttle.playing_Launch_Announcement_Alarm = 1 - return TRUE - if ("stopplaylaunchannouncementalarm") + shuttle.playing_launch_announcement_alarm = TRUE + return + if ("stop_play_launch_announcement_alarm") shuttle.alarm_sound_loop.stop() - shuttle.playing_Launch_Announcement_Alarm = 0 - return TRUE + shuttle.playing_launch_announcement_alarm = FALSE + return /obj/structure/machinery/computer/shuttle/dropship/flight/lz1 icon = 'icons/obj/structures/machinery/computer.dmi' diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 065b51b6a059..aef678f69bde 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -343,7 +343,7 @@ var/rechargeTime = 0 //time spent after arrival before being able to launch again var/prearrivalTime = 0 //delay after call time finishes for sound effects, explosions, etc. - var/playing_Launch_Announcement_Alarm = 0 // 0 = off ; 1 = on + var/playing_launch_announcement_alarm = FALSE // FALSE = off ; TRUE = on var/datum/looping_sound/looping_launch_announcement_alarm/alarm_sound_loop var/landing_sound = 'sound/effects/engine_landing.ogg' @@ -386,6 +386,7 @@ /obj/docking_port/mobile/Destroy(force) if(force) + alarm_sound_loop = null SSshuttle.mobile -= src destination = null previous = null diff --git a/sound/vehicles/Dropships/Single Alarm brr.ogg b/sound/vehicles/Dropships/single_alarm_brr_dropship.ogg similarity index 100% rename from sound/vehicles/Dropships/Single Alarm brr.ogg rename to sound/vehicles/Dropships/single_alarm_brr_dropship.ogg diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx index ac460c6cb2ec..d4194fbaee2b 100644 --- a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx +++ b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx @@ -24,9 +24,7 @@ interface DropshipNavigationProps extends NavigationProps { automated_control: AutomatedControl; has_flyby_skill: 0 | 1; - playing_Launch_Announcement_Alarm: 0 | 1; - launchAnnouncementAlarmTimer: number /* the timer that counts */; - launchAnnouncementAlarmExpireTime: number /* When the timer expires. How long the alarm can play. */; + playing_launch_announcement_alarm: boolean; } const DropshipDoorControl = (_, context) => { @@ -280,33 +278,33 @@ const AutopilotConfig = (props, context) => { ); }; -export const StopPlayLaunchAnnouncementAlarm = (_, context) => { +const StopPlayLaunchAnnouncementAlarm = (_, context) => { const { act } = useBackend(context); return ( ); }; -export const PlayLaunchAnnouncementAlarm = (_, context) => { +const PlayLaunchAnnouncementAlarm = (_, context) => { const { act } = useBackend(context); return ( ); }; -export const LaunchAnnouncementAlarm = (_, context) => { +const LaunchAnnouncementAlarm = (_, context) => { const { data, act } = useBackend(context); const [siteselection, setSiteSelection] = useSharedState( context, @@ -318,13 +316,13 @@ export const LaunchAnnouncementAlarm = (_, context) => { title="Launch Announcement Alarm" buttons={ <> - {data.playing_Launch_Announcement_Alarm === 0 && ( + {data.playing_launch_announcement_alarm === false && ( )} - {data.playing_Launch_Announcement_Alarm === 1 && ( + {data.playing_launch_announcement_alarm === true && ( From e1aa1abf24865590a2ac2d2dfdf169aaa60f2da5 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Mon, 6 Nov 2023 23:52:55 -0500 Subject: [PATCH 5/9] Fixes for PR 4858 some minor file naming stuff --- code/datums/looping_sounds/misc_sounds.dm | 4 ++-- code/modules/shuttle/shuttle.dm | 2 +- ...dropship.ogg => single_alarm_brr_dropship_1.ogg} | Bin 3 files changed, 3 insertions(+), 3 deletions(-) rename sound/vehicles/Dropships/{single_alarm_brr_dropship.ogg => single_alarm_brr_dropship_1.ogg} (100%) diff --git a/code/datums/looping_sounds/misc_sounds.dm b/code/datums/looping_sounds/misc_sounds.dm index 2c14223808e9..6411b3f51f4a 100644 --- a/code/datums/looping_sounds/misc_sounds.dm +++ b/code/datums/looping_sounds/misc_sounds.dm @@ -1,3 +1,3 @@ /datum/looping_sound/looping_launch_announcement_alarm - mid_sounds = list('sound/vehicles/Dropships/single_alarm_brr_dropship.ogg' = 1) - start_sound = list('sound/vehicles/Dropships/single_alarm_brr_dropship.ogg' = 1) + mid_sounds = list('sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg' = 1) + start_sound = list('sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg' = 1) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index aef678f69bde..85fc38bf5f1b 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -386,7 +386,7 @@ /obj/docking_port/mobile/Destroy(force) if(force) - alarm_sound_loop = null + QDEL_NULL(alarm_sound_loop) SSshuttle.mobile -= src destination = null previous = null diff --git a/sound/vehicles/Dropships/single_alarm_brr_dropship.ogg b/sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg similarity index 100% rename from sound/vehicles/Dropships/single_alarm_brr_dropship.ogg rename to sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg From d649a31725eda11fac5ba0b207deb430238c1df2 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Tue, 7 Nov 2023 00:02:34 -0500 Subject: [PATCH 6/9] Fixed doc comment. --- code/datums/looping_sounds/_looping_sound.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index a0b0d77ce165..2c4469a2d623 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -37,9 +37,7 @@ /// Has the looping started yet? var/loop_started = FALSE - ///Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away. - ///Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv - ///with a longer "falloff distance." Fixes the extra_range stuff + ///Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away. /n Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv /n with a longer "falloff distance." Fixes the extra_range stuff var/is_sound_projecting = FALSE var/falloff_distance = 50 From 5caf12ff37b53121799e0df97560038696a1e153 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Tue, 7 Nov 2023 11:24:34 -0500 Subject: [PATCH 7/9] Adjusted multi line auto doc --- code/datums/looping_sounds/_looping_sound.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 2c4469a2d623..8aefb1a5019e 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -37,7 +37,11 @@ /// Has the looping started yet? var/loop_started = FALSE - ///Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away. /n Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv /n with a longer "falloff distance." Fixes the extra_range stuff + /* + * Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away. + * Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv + * with a longer "falloff distance." Fixes the extra_range stuff + */ var/is_sound_projecting = FALSE var/falloff_distance = 50 From eabb46320b20057ef54ff546828359764a61cb5d Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Tue, 7 Nov 2023 21:51:39 -0500 Subject: [PATCH 8/9] Two stars for auto documentation. --- code/datums/looping_sounds/_looping_sound.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 8aefb1a5019e..ddff3630f37f 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -37,7 +37,7 @@ /// Has the looping started yet? var/loop_started = FALSE - /* + /** * Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away. * Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv * with a longer "falloff distance." Fixes the extra_range stuff From 0a2e53c054cb1e0bbb4642d898c54d70877086f8 Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Wed, 8 Nov 2023 14:45:27 -0500 Subject: [PATCH 9/9] Update code/datums/looping_sounds/_looping_sound.dm Thanks to Drulikar for the suggested Documentation. Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/datums/looping_sounds/_looping_sound.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index ddff3630f37f..11ba15146430 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -43,6 +43,7 @@ * with a longer "falloff distance." Fixes the extra_range stuff */ var/is_sound_projecting = FALSE + ///only applicable to is_sound_projecting: max range till sound volume starts dropping as distance increases var/falloff_distance = 50 /* // as of yet unused varen \\