diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 27decb5d2f3..b4ab640942d 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -127,6 +127,11 @@ . = ..() /area/Initialize(mapload) +#ifdef UNIT_TEST + if (!islist(ambience)) + log_error("Area: [src.type] set list/ambience with [ambience] instead of a list. This var MUST be a list().") +#endif + icon_state = "white" color = null @@ -381,7 +386,7 @@ L.lastarea = newarea // Start playing ambience. - if(src.ambience.len && L && L.client && (L.client.prefs.sfx_toggles & ASFX_AMBIENCE) && !L.ear_deaf) + if(length(src.ambience) && L && L.client && (L.client.prefs.sfx_toggles & ASFX_AMBIENCE) && !L.ear_deaf) play_ambience(L) else stop_ambience(L) diff --git a/html/changelogs/hellfirejag-fix-away-site-ambience.yml b/html/changelogs/hellfirejag-fix-away-site-ambience.yml new file mode 100644 index 00000000000..8f1ec4d2c14 --- /dev/null +++ b/html/changelogs/hellfirejag-fix-away-site-ambience.yml @@ -0,0 +1,5 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed the Hiskyn Treasure Trove away site not having any ambience." + - rscadd: "Map Areas will now cause unit tests to fail if given invalid ambience." diff --git a/maps/away/away_site/treasure_trove/treasure_trove_areas.dm b/maps/away/away_site/treasure_trove/treasure_trove_areas.dm index 09d8e57e506..a63a9d188c0 100644 --- a/maps/away/away_site/treasure_trove/treasure_trove_areas.dm +++ b/maps/away/away_site/treasure_trove/treasure_trove_areas.dm @@ -12,7 +12,7 @@ name = "Treasure Trove Beach" icon_state = "yellow" is_outside = OUTSIDE_YES - ambience = 'sound/ambience/konyang/konyang-water.ogg' + ambience = list('sound/ambience/konyang/konyang-water.ogg') area_blurb = "You can hear the sound of waves hitting the shore. Something at the back of your mind makes you think the beauty of the area hides something darker." /area/trove/beach/landing @@ -21,14 +21,14 @@ name = "Treasure Trove Ocean" icon_state = "purple" is_outside = OUTSIDE_YES - ambience = 'sound/ambience/konyang/konyang-water.ogg' + ambience = list('sound/ambience/konyang/konyang-water.ogg') area_blurb = "Endless blue in all directions broken by the occasional jutting rock." /area/trove/jungle name = "Treasure Trove Jungle" icon_state = "green" is_outside = OUTSIDE_YES - ambience = 'sound/ambience/eeriejungle1.ogg' + ambience = list('sound/ambience/eeriejungle1.ogg') area_blurb = "Lush foliage and the sounds of distant animals... and something larger." // ----- Interior