Skip to content

Commit

Permalink
Merge pull request #5338 from ARF-SS13/slow-it-down-jack
Browse files Browse the repository at this point in the history
More ambient forest noises
  • Loading branch information
Tk420634 committed Jul 9, 2024
2 parents 8dd6a69 + 66cd824 commit 93bf7cc
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 1 deletion.
24 changes: 24 additions & 0 deletions code/datums/looping_sounds/ambient_sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@
SOUND_LOOP_ENTRY('sound/f13effects/sunsetsounds/coyoteawoo5.ogg', 10 SECONDS, 1)
)

/datum/looping_sound/ambient/critters/extra
chance = 15

//ANIMALS//
///////////////////
//Small Critters//
Expand Down Expand Up @@ -545,3 +548,24 @@
SOUND_LOOP_ENTRY('sound/f13ambience/creek_07.ogg', 2 SECONDS, 10),
SOUND_LOOP_ENTRY('sound/f13ambience/creek_08.ogg', 2 SECONDS, 10),
)

/datum/looping_sound/ambient/general/forest
chance = 100
vary = FALSE
volume = SOUND_LOOP_VOL_RANGE(90, 100)
direct = TRUE
loop_delay = 0
mid_sounds = list(
SOUND_LOOP_ENTRY('sound/f13ambience/ambientforestcenter.ogg', 28 SECONDS, 1)
)

/datum/looping_sound/ambient/general/forest/direcitonal
chance = 30
vary = FALSE
volume = SOUND_LOOP_VOL_RANGE(50, 100)
direct = TRUE
loop_delay = 0
mid_sounds = list(
SOUND_LOOP_ENTRY('sound/f13ambience/ambientforestleft.ogg', 28 SECONDS, 1),
SOUND_LOOP_ENTRY('sound/f13ambience/ambientforestright.ogg', 28 SECONDS, 1)
)
12 changes: 11 additions & 1 deletion code/modules/fallout/areas/area.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
icon_state = "wasteland"
ambience_area = list(
/datum/looping_sound/ambient/critters,
/datum/looping_sound/ambient/critters/extra,
/datum/looping_sound/ambient/swamp,
/datum/looping_sound/ambient/critters/birds,
/datum/looping_sound/ambient/critters/birds/crow,
/datum/looping_sound/ambient/critters/frogs,
/datum/looping_sound/ambient/forest,
/datum/looping_sound/ambient/general/forest,
/datum/looping_sound/ambient/general/forest/direcitonal
)
outdoors = 1
open_space = 1
Expand Down Expand Up @@ -63,6 +66,7 @@
ambience_area = list(
/datum/looping_sound/ambient/city,
/datum/looping_sound/ambient/critters,
/datum/looping_sound/ambient/critters/extra,
/datum/looping_sound/ambient/general,
/datum/looping_sound/ambient/swamp/quiet,
/datum/looping_sound/ambient/critters/birds,
Expand Down Expand Up @@ -222,6 +226,9 @@
/area/f13/wasteland/newboston
name = "New Boston Wasteland"

/area/f13/wasteland/newboston/redwater
name = "Redwater Wasteland"

/area/f13/wasteland/garlandcity
name = "Garland City Wasteland"

Expand Down Expand Up @@ -263,11 +270,14 @@
AREA_SOUND('sound/f13ambience/bird_8.ogg', 10 SECONDS))

ambience_area = list(
/datum/looping_sound/ambient/town,
/datum/looping_sound/ambient/general,
/datum/looping_sound/ambient/swamp/quiet,
/datum/looping_sound/ambient/critters/birds,
/datum/looping_sound/ambient/critters/birds/crow,
/datum/looping_sound/ambient/woodcreak,
/datum/looping_sound/ambient/lightbulb,


)
weather_tags = list(WEATHER_SAFE)
outdoors = TRUE
Expand Down
Binary file added sound/f13ambience/ambientforestcenter.ogg
Binary file not shown.
Binary file added sound/f13ambience/ambientforestleft.ogg
Binary file not shown.
Binary file added sound/f13ambience/ambientforestright.ogg
Binary file not shown.

0 comments on commit 93bf7cc

Please sign in to comment.