Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
41 changes: 41 additions & 0 deletions voidcrew/_DEFINES/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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')
20 changes: 20 additions & 0 deletions voidcrew/edits/area_ambience.dm
Original file line number Diff line number Diff line change
@@ -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 ..()
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added voidcrew/sound/ambience/planet_beach.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_beach_2.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_beach_3.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_jungle.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_jungle_2.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_jungle_3.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_lava.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_lava_2.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_snow.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_snow_2.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_snow_3.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_snow_4.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/planet_wasteland.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/space.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/space_ruins.ogg
Binary file not shown.
Binary file added voidcrew/sound/ambience/space_ruins_2.ogg
Binary file not shown.
Loading