diff --git a/tgstation.dme b/tgstation.dme index d7632a15eee..95591a6b0a0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6812,6 +6812,7 @@ #include "voidcrew\datums\ruins\space.dm" #include "voidcrew\datums\ruins\wasteland.dm" #include "voidcrew\datums\votes\transfer_vote.dm" +#include "voidcrew\edits\area_ambience.dm" #include "voidcrew\edits\config.dm" #include "voidcrew\edits\gps.dm" #include "voidcrew\edits\hyperspace_overboard.dm" diff --git a/voidcrew/_DEFINES/sound.dm b/voidcrew/_DEFINES/sound.dm index ad02ae848dc..5dae1d7e707 100644 --- a/voidcrew/_DEFINES/sound.dm +++ b/voidcrew/_DEFINES/sound.dm @@ -84,3 +84,44 @@ 'sound/hallucinations/wail.ogg') #define BEACH list('sound/ambience/beach/shore.ogg', 'sound/ambience/beach/seag1.ogg','sound/ambience/beach/seag2.ogg','sound/ambience/beach/seag2.ogg','sound/ambience/misc/ambiodd.ogg','sound/ambience/medical/ambinice.ogg') + +// Planet surface ambience: the old list for that surface, then Voidcrew's own tracks. +#define PLANET_LAVA_AMBIENCE list( \ + 'sound/ambience/ruin/ambimine.ogg', 'sound/ambience/lavaland/ambicave.ogg', \ + 'sound/ambience/ruin/ambiruin.ogg', 'sound/ambience/ruin/ambiruin2.ogg', \ + 'sound/ambience/ruin/ambiruin3.ogg', 'sound/ambience/ruin/ambiruin4.ogg', \ + 'sound/ambience/ruin/ambiruin5.ogg', 'sound/ambience/ruin/ambiruin6.ogg', \ + 'sound/ambience/ruin/ambiruin7.ogg', 'sound/ambience/misc/ambidanger.ogg', \ + 'sound/ambience/misc/ambidanger2.ogg', 'sound/ambience/maintenance/ambimaint1.ogg', \ + 'voidcrew/sound/ambience/planet_lava.ogg', 'voidcrew/sound/ambience/planet_lava_2.ogg') +#define PLANET_ICE_AMBIENCE list( \ + 'sound/ambience/medical/ambimo1.ogg', 'sound/ambience/medical/ambimo2.ogg', \ + 'sound/ambience/ruin/ambiruin7.ogg', 'sound/ambience/ruin/ambiruin6.ogg', \ + 'sound/ambience/misc/ambiodd.ogg', 'sound/ambience/misc/ambimystery.ogg', \ + 'voidcrew/sound/ambience/planet_snow.ogg', 'voidcrew/sound/ambience/planet_snow_2.ogg', \ + 'voidcrew/sound/ambience/planet_snow_3.ogg', 'voidcrew/sound/ambience/planet_snow_4.ogg') +#define PLANET_WASTELAND_AMBIENCE list( \ + 'sound/ambience/ruin/ambimine.ogg', 'sound/ambience/lavaland/ambicave.ogg', \ + 'sound/ambience/ruin/ambiruin.ogg', 'sound/ambience/ruin/ambiruin2.ogg', \ + 'sound/ambience/ruin/ambiruin3.ogg', 'sound/ambience/ruin/ambiruin4.ogg', \ + 'sound/ambience/ruin/ambiruin5.ogg', 'sound/ambience/ruin/ambiruin6.ogg', \ + 'sound/ambience/ruin/ambiruin7.ogg', 'sound/ambience/misc/ambidanger.ogg', \ + 'sound/ambience/misc/ambidanger2.ogg', 'sound/ambience/maintenance/ambimaint1.ogg', \ + 'voidcrew/sound/ambience/planet_wasteland.ogg') +#define PLANET_BEACH_AMBIENCE list( \ + 'sound/ambience/beach/shore.ogg', 'sound/ambience/beach/seag1.ogg', \ + 'sound/ambience/beach/seag2.ogg', 'sound/ambience/beach/seag2.ogg', \ + 'sound/ambience/misc/ambiodd.ogg', 'sound/ambience/medical/ambinice.ogg', \ + 'voidcrew/sound/ambience/planet_beach.ogg', 'voidcrew/sound/ambience/planet_beach_2.ogg', \ + 'voidcrew/sound/ambience/planet_beach_3.ogg') +#define PLANET_JUNGLE_AMBIENCE list( \ + 'sound/ambience/engineering/ambitech.ogg', 'sound/ambience/engineering/ambitech2.ogg', \ + 'sound/ambience/ruin/ambiruin.ogg', 'sound/ambience/ruin/ambiruin2.ogg', \ + 'sound/ambience/ruin/ambiruin3.ogg', 'sound/ambience/ruin/ambiruin4.ogg', \ + 'sound/ambience/ruin/ambiruin5.ogg', 'sound/ambience/ruin/ambiruin6.ogg', \ + 'sound/ambience/ruin/ambiruin7.ogg', 'sound/ambience/misc/ambidanger.ogg', \ + 'sound/ambience/misc/ambidanger2.ogg', 'sound/ambience/maintenance/ambimaint.ogg', \ + 'sound/ambience/engineering/ambiatmos.ogg', 'sound/ambience/engineering/ambiatmos2.ogg', \ + 'sound/ambience/misc/ambiodd.ogg', \ + 'voidcrew/sound/ambience/planet_jungle.ogg', 'voidcrew/sound/ambience/planet_jungle_2.ogg', \ + 'voidcrew/sound/ambience/planet_jungle_3.ogg') diff --git a/voidcrew/edits/area_ambience.dm b/voidcrew/edits/area_ambience.dm new file mode 100644 index 00000000000..7abb9003a17 --- /dev/null +++ b/voidcrew/edits/area_ambience.dm @@ -0,0 +1,20 @@ +/// Voidcrew tracks added to tg's open space ambience. +GLOBAL_LIST_INIT(voidcrew_space_ambience, list( + 'voidcrew/sound/ambience/space.ogg', +)) + +/// Voidcrew tracks added to tg's ruin ambience, for space ruins only. +GLOBAL_LIST_INIT(voidcrew_space_ruin_ambience, list( + 'voidcrew/sound/ambience/space_ruins.ogg', + 'voidcrew/sound/ambience/space_ruins_2.ogg', +)) + +/area/space/Initialize(mapload) + if(isnull(ambientsounds) && ambience_index == AMBIENCE_SPACE) + ambientsounds = GLOB.space_ambience + GLOB.voidcrew_space_ambience + return ..() + +/area/ruin/space/Initialize(mapload) + if(isnull(ambientsounds) && ambience_index == AMBIENCE_RUINS) + ambientsounds = GLOB.ruins_ambience + GLOB.voidcrew_space_ruin_ambience + return ..() diff --git a/voidcrew/modules/overmap/code/modules/overmap/dynamic_object_defines.dm b/voidcrew/modules/overmap/code/modules/overmap/dynamic_object_defines.dm index 63eafd6108b..b3f343091e8 100644 --- a/voidcrew/modules/overmap/code/modules/overmap/dynamic_object_defines.dm +++ b/voidcrew/modules/overmap/code/modules/overmap/dynamic_object_defines.dm @@ -455,34 +455,34 @@ GLOBAL_LIST_EMPTY(overmap_planets) */ /area/overmap_encounter/planetoid/lava name = "\improper Volcanic Planetoid" - ambientsounds = MINING + ambientsounds = PLANET_LAVA_AMBIENCE planet_type = /datum/planet/lava // was /turf/open/misc/asteroid/planetary_basalt/lava_land_surface/lit /area/overmap_encounter/planetoid/ice name = "\improper Frozen Planetoid" sound_environment = SOUND_ENVIRONMENT_CAVE - ambientsounds = SPOOKY + ambientsounds = PLANET_ICE_AMBIENCE planet_type = /datum/planet/snow // snow was lit colourless; only the frozen lakes were cyan, and they are a minority /area/overmap_encounter/planetoid/beach name = "\improper Beach Planetoid" sound_environment = SOUND_ENVIRONMENT_FOREST - ambientsounds = BEACH + ambientsounds = PLANET_BEACH_AMBIENCE planet_type = /datum/planet/beach // was /turf/open/misc/asteroid/sand/beach/lit, the bulk of a beach planet's ground /area/overmap_encounter/planetoid/jungle name = "\improper Jungle Planetoid" sound_environment = SOUND_ENVIRONMENT_FOREST - ambientsounds = AWAY_MISSION + ambientsounds = PLANET_JUNGLE_AMBIENCE planet_type = /datum/planet/jungle /area/overmap_encounter/planetoid/wasteland name = "\improper Apocalyptic Planetoid" sound_environment = SOUND_ENVIRONMENT_HANGAR - ambientsounds = MINING + ambientsounds = PLANET_WASTELAND_AMBIENCE planet_type = /datum/planet/wasteland // the fallout zone keeps its own green ground light on top of this - see // /datum/biome/nuclear. Those turfs are the one kind of surface ground that still diff --git a/voidcrew/sound/ambience/planet_beach.ogg b/voidcrew/sound/ambience/planet_beach.ogg new file mode 100644 index 00000000000..deec8c0db02 Binary files /dev/null and b/voidcrew/sound/ambience/planet_beach.ogg differ diff --git a/voidcrew/sound/ambience/planet_beach_2.ogg b/voidcrew/sound/ambience/planet_beach_2.ogg new file mode 100644 index 00000000000..52b0bd1d257 Binary files /dev/null and b/voidcrew/sound/ambience/planet_beach_2.ogg differ diff --git a/voidcrew/sound/ambience/planet_beach_3.ogg b/voidcrew/sound/ambience/planet_beach_3.ogg new file mode 100644 index 00000000000..872666aad43 Binary files /dev/null and b/voidcrew/sound/ambience/planet_beach_3.ogg differ diff --git a/voidcrew/sound/ambience/planet_jungle.ogg b/voidcrew/sound/ambience/planet_jungle.ogg new file mode 100644 index 00000000000..40fe6dbc976 Binary files /dev/null and b/voidcrew/sound/ambience/planet_jungle.ogg differ diff --git a/voidcrew/sound/ambience/planet_jungle_2.ogg b/voidcrew/sound/ambience/planet_jungle_2.ogg new file mode 100644 index 00000000000..12b5358f2e7 Binary files /dev/null and b/voidcrew/sound/ambience/planet_jungle_2.ogg differ diff --git a/voidcrew/sound/ambience/planet_jungle_3.ogg b/voidcrew/sound/ambience/planet_jungle_3.ogg new file mode 100644 index 00000000000..2b62d3f29ed Binary files /dev/null and b/voidcrew/sound/ambience/planet_jungle_3.ogg differ diff --git a/voidcrew/sound/ambience/planet_lava.ogg b/voidcrew/sound/ambience/planet_lava.ogg new file mode 100644 index 00000000000..85a7d143bc7 Binary files /dev/null and b/voidcrew/sound/ambience/planet_lava.ogg differ diff --git a/voidcrew/sound/ambience/planet_lava_2.ogg b/voidcrew/sound/ambience/planet_lava_2.ogg new file mode 100644 index 00000000000..c0f13ebe113 Binary files /dev/null and b/voidcrew/sound/ambience/planet_lava_2.ogg differ diff --git a/voidcrew/sound/ambience/planet_snow.ogg b/voidcrew/sound/ambience/planet_snow.ogg new file mode 100644 index 00000000000..82806a5e45c Binary files /dev/null and b/voidcrew/sound/ambience/planet_snow.ogg differ diff --git a/voidcrew/sound/ambience/planet_snow_2.ogg b/voidcrew/sound/ambience/planet_snow_2.ogg new file mode 100644 index 00000000000..e0ebb1e4e04 Binary files /dev/null and b/voidcrew/sound/ambience/planet_snow_2.ogg differ diff --git a/voidcrew/sound/ambience/planet_snow_3.ogg b/voidcrew/sound/ambience/planet_snow_3.ogg new file mode 100644 index 00000000000..dd09c70cb32 Binary files /dev/null and b/voidcrew/sound/ambience/planet_snow_3.ogg differ diff --git a/voidcrew/sound/ambience/planet_snow_4.ogg b/voidcrew/sound/ambience/planet_snow_4.ogg new file mode 100644 index 00000000000..7bc28e2570c Binary files /dev/null and b/voidcrew/sound/ambience/planet_snow_4.ogg differ diff --git a/voidcrew/sound/ambience/planet_wasteland.ogg b/voidcrew/sound/ambience/planet_wasteland.ogg new file mode 100644 index 00000000000..01e71624f65 Binary files /dev/null and b/voidcrew/sound/ambience/planet_wasteland.ogg differ diff --git a/voidcrew/sound/ambience/space.ogg b/voidcrew/sound/ambience/space.ogg new file mode 100644 index 00000000000..f9e55705973 Binary files /dev/null and b/voidcrew/sound/ambience/space.ogg differ diff --git a/voidcrew/sound/ambience/space_ruins.ogg b/voidcrew/sound/ambience/space_ruins.ogg new file mode 100644 index 00000000000..ae2fd5b1376 Binary files /dev/null and b/voidcrew/sound/ambience/space_ruins.ogg differ diff --git a/voidcrew/sound/ambience/space_ruins_2.ogg b/voidcrew/sound/ambience/space_ruins_2.ogg new file mode 100644 index 00000000000..7f9b0dcb97e Binary files /dev/null and b/voidcrew/sound/ambience/space_ruins_2.ogg differ