diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index 6fae2fadcb..0995f0e071 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -4,7 +4,7 @@ #define CHANNEL_VOX 1022 #define CHANNEL_JUKEBOX 1021 #define CHANNEL_HEARTBEAT 1020 //sound channel for heartbeats -#define CHANNEL_AMBIENCE_FORCED 1019 +#define CHANNEL_AMBIENCE_FORCED 1019 #define CHANNEL_AMBIENCE 1018 #define CHANNEL_BUZZ 1017 #define CHANNEL_BICYCLE 1016 @@ -54,3 +54,125 @@ #define SMALL_SOFTFLOOR ROOM #define ASTEROID CAVE #define SPACE UNDERWATER + +// Ambience presets. +// All you need to do to make an area play one of these is set their ambience var to one of these lists. +// You can even combine them by adding them together, since they're just lists, however you'd have to do that in initialization. + +// For weird alien places like the crashed UFO. +#define AMBIENCE_OTHERWORLDLY list(\ + 'sound/ambience/otherworldly/otherworldly1.ogg',\ + 'sound/ambience/otherworldly/otherworldly2.ogg',\ + 'sound/ambience/otherworldly/otherworldly3.ogg'\ + ) + +// Restricted, military, or mercenary aligned locations like the armory, the merc ship/base, BSD, etc. +#define AMBIENCE_HIGHSEC list(\ + 'sound/ambience/highsec/highsec1.ogg',\ + 'sound/ambience/highsec/highsec2.ogg'\ + ) + +// Ruined structures found on the surface or in the caves. +#define AMBIENCE_RUINS list(\ + 'sound/ambience/ruins/ruins1.ogg',\ + 'sound/ambience/ruins/ruins2.ogg',\ + 'sound/ambience/ruins/ruins3.ogg',\ + 'sound/ambience/ruins/ruins4.ogg',\ + 'sound/ambience/ruins/ruins5.ogg',\ + 'sound/ambience/ruins/ruins6.ogg'\ + ) + +// Similar to the above, but for more technology/signaling based ruins. +#define AMBIENCE_TECH_RUINS list(\ + 'sound/ambience/tech_ruins/tech_ruins1.ogg',\ + 'sound/ambience/tech_ruins/tech_ruins2.ogg',\ + 'sound/ambience/tech_ruins/tech_ruins3.ogg'\ + ) + +// The actual chapel room, and maybe some other places of worship. +#define AMBIENCE_CHAPEL list(\ + 'sound/ambience/chapel/chapel1.ogg',\ + 'sound/ambience/chapel/chapel2.ogg',\ + 'sound/ambience/chapel/chapel3.ogg',\ + 'sound/ambience/chapel/chapel4.ogg'\ + ) + +// For peaceful, serene areas, distinct from the Chapel. +#define AMBIENCE_HOLY list(\ + 'sound/ambience/holy/holy1.ogg',\ + 'sound/ambience/holy/holy2.ogg'\ + ) + +// Generic sounds for less special rooms. +#define AMBIENCE_GENERIC list(\ + 'sound/ambience/generic/generic1.ogg',\ + 'sound/ambience/generic/generic2.ogg',\ + 'sound/ambience/generic/generic3.ogg',\ + 'sound/ambience/generic/generic4.ogg'\ + ) + +// Sounds of PA announcements, presumably involving shuttles? +#define AMBIENCE_ARRIVALS list(\ + 'sound/ambience/arrivals/arrivals1.ogg',\ + 'sound/ambience/arrivals/arrivals2.ogg'\ + ) + +// Sounds suitable for being inside dark, tight corridors in the underbelly of the station. +#define AMBIENCE_MAINTENANCE list(\ + 'sound/ambience/maintenance/maintenance1.ogg',\ + 'sound/ambience/maintenance/maintenance2.ogg',\ + 'sound/ambience/maintenance/maintenance3.ogg',\ + 'sound/ambience/maintenance/maintenance4.ogg',\ + 'sound/ambience/maintenance/maintenance5.ogg',\ + 'sound/ambience/maintenance/maintenance6.ogg'\ + ) + +// Life support machinery at work, keeping everyone breathing. +#define AMBIENCE_ENGINEERING list(\ + 'sound/ambience/engineering/engineering1.ogg',\ + 'sound/ambience/engineering/engineering2.ogg',\ + 'sound/ambience/engineering/engineering3.ogg'\ + ) + +// Creepy AI/borg stuff. +#define AMBIENCE_AI list(\ + 'sound/ambience/ai/ai1.ogg'\ + ) + +// Peaceful sounds when floating in the void. +#define AMBIENCE_SPACE list(\ + 'sound/ambience/space/space_serithi.ogg',\ + 'sound/ambience/space/space1.ogg'\ + ) + +// Vaguely spooky sounds when around dead things. +#define AMBIENCE_GHOSTLY list(\ + 'sound/ambience/ghostly/ghostly1.ogg',\ + 'sound/ambience/ghostly/ghostly2.ogg'\ + ) + +// Concerning sounds, for when one discovers something horrible happened in a PoI. +#define AMBIENCE_FOREBODING list(\ + 'sound/ambience/foreboding/foreboding1.ogg',\ + 'sound/ambience/foreboding/foreboding2.ogg'\ + ) + +// Ambience heard when aboveground on Sif and not in a Point of Interest. +#define AMBIENCE_SIF list(\ + 'sound/ambience/sif/sif1.ogg'\ + ) + +// If we ever add geothermal PoIs or other places that are really hot, this will do. +#define AMBIENCE_LAVA list(\ + 'sound/ambience/lava/lava1.ogg'\ + ) + +// Cult-y ambience, for some PoIs, and maybe when the cultists darken the world with the ritual. +#define AMBIENCE_UNHOLY list(\ + 'sound/ambience/unholy/unholy1.ogg'\ + ) + +// For the memes. +#define AMBIENCE_AESTHETIC list(\ + 'sound/ambience/vaporwave.ogg'\ + ) \ No newline at end of file diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm old mode 100755 new mode 100644 index 873e720512..c7f64f225c --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -28,8 +28,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_light = 0 power_equip = 0 power_environ = 0 - ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg','sound/ambience/serspaceamb1.ogg') base_turf = /turf/space + ambience = AMBIENCE_SPACE /area/space/atmosalert() return @@ -74,6 +74,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/shuttle/arrival name = "\improper Arrival Shuttle" + ambience = AMBIENCE_ARRIVALS /area/shuttle/arrival/pre_game icon_state = "shuttle2" @@ -81,6 +82,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/shuttle/arrival/station icon_state = "shuttle" dynamic_lighting = 0 + ambience = AMBIENCE_ARRIVALS /area/shuttle/escape name = "\improper Emergency Shuttle" @@ -384,9 +386,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/centcom/terminal name = "\improper Docking Terminal" icon_state = "centcom_dock" + ambience = AMBIENCE_ARRIVALS /area/centcom/tram name = "\improper Tram Station" + ambience = AMBIENCE_ARRIVALS /area/centcom/security name = "\improper CentCom Security" @@ -399,6 +403,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/centcom/command name = "\improper CentCom Command" //Central Command Command totally isn't RAS Syndrome in action. icon_state = "centcom_command" + ambience = AMBIENCE_HIGHSEC /area/centcom/main_hall name = "\improper Main Hallway" @@ -423,6 +428,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "syndie-ship" requires_power = 0 dynamic_lighting = 0 + ambience = AMBIENCE_HIGHSEC /area/syndicate_mothership/control name = "\improper Mercenary Control Room" @@ -488,6 +494,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 0 flags = RAD_SHIELDED base_turf = /turf/space + ambience = AMBIENCE_HIGHSEC /area/syndicate_station/start name = "\improper Mercenary Forward Operating Base" @@ -542,12 +549,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "yellow" requires_power = 0 dynamic_lighting = 0 + ambience = AMBIENCE_OTHERWORLDLY /area/skipjack_station name = "\improper Skipjack" icon_state = "yellow" requires_power = 0 base_turf = /turf/space + ambience = AMBIENCE_HIGHSEC /area/skipjack_station/start name = "\improper Skipjack" @@ -581,6 +590,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/prison name = "\improper Prison Station" icon_state = "brig" + ambience = AMBIENCE_HIGHSEC /area/prison/arrival_airlock name = "\improper Prison Station Airlock" @@ -664,12 +674,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //SPACE STATION 13// //////////////////// +/area + ambience = AMBIENCE_GENERIC + //Maintenance /area/maintenance flags = RAD_SHIELDED sound_env = TUNNEL_ENCLOSED turf_initializer = new /datum/turf_initializer/maintenance() + ambience = AMBIENCE_MAINTENANCE /area/maintenance/aft name = "Aft Maintenance" @@ -896,6 +910,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hallway/primary/ sound_env = LARGE_ENCLOSED + ambience = AMBIENCE_GENERIC /area/hallway/primary/fore name = "\improper Fore Primary Hallway" @@ -1104,6 +1119,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Dormitories" icon_state = "Sleep" flags = RAD_SHIELDED + ambience = AMBIENCE_GENERIC /area/crew_quarters/toilet name = "\improper Dormitory Toilets" @@ -1362,10 +1378,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Library Conference Room" icon_state = "library_conference_room" +/area/chapel + ambience = AMBIENCE_CHAPEL + /area/chapel/main name = "\improper Chapel" icon_state = "chapel" - ambience = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/music/traitor.ogg') sound_env = LARGE_ENCLOSED /area/chapel/office @@ -1469,7 +1487,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/ name = "\improper Engineering" icon_state = "engineering" - ambience = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') + ambience = AMBIENCE_ENGINEERING /area/engineering/atmos name = "\improper Atmospherics" @@ -1553,6 +1571,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 1 always_unpowered = 1 dynamic_lighting = 0 + ambience = AMBIENCE_SPACE auxport name = "\improper Fore Port Solar Array" @@ -1638,7 +1657,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper AI Satellite Teleporter Room" icon_state = "teleporter" music = "signal" - ambience = list('sound/ambience/ambimalf.ogg') //MedBay @@ -1748,7 +1766,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/morgue name = "\improper Morgue" icon_state = "morgue" - ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg') /area/medical/chemistry name = "\improper Chemistry" @@ -1849,6 +1866,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/armoury name = "\improper Security - Armory" icon_state = "armory" + ambience = AMBIENCE_HIGHSEC /area/security/briefing_room name = "\improper Security - Briefing Room" @@ -1906,6 +1924,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/tactical name = "\improper Security - Tactical Equipment" icon_state = "Tactical" + ambience = AMBIENCE_HIGHSEC /* @@ -1928,6 +1947,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/nuke_storage name = "\improper Vault" icon_state = "nuke_storage" + ambience = AMBIENCE_HIGHSEC /area/security/checkpoint name = "\improper Security Checkpoint" @@ -1936,6 +1956,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/checkpoint2 name = "\improper Security - Arrival Checkpoint" icon_state = "security" + ambience = AMBIENCE_ARRIVALS /area/security/checkpoint/supply name = "Security Post - Cargo Bay" @@ -2166,16 +2187,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/djstation name = "\improper Listening Post" icon_state = "LP" + ambience = AMBIENCE_TECH_RUINS /area/djstation/solars name = "\improper Listening Post Solars" icon_state = "LPS" + ambience = AMBIENCE_TECH_RUINS //DERELICT /area/derelict name = "\improper Derelict Station" icon_state = "storage" + ambience = AMBIENCE_RUINS /area/derelict/hallway/primary name = "\improper Derelict Primary Hallway" @@ -2374,6 +2398,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/storage/secure name = "Secure Storage" icon_state = "storage" + ambience = AMBIENCE_HIGHSEC /area/ai_monitored/storage/emergency name = "Emergency Storage" @@ -2386,74 +2411,85 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_upload name = "\improper AI Upload Chamber" icon_state = "ai_upload" - ambience = list('sound/ambience/ambimalf.ogg') + ambience = AMBIENCE_AI /area/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" - ambience = list('sound/ambience/ambimalf.ogg') sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_AI /area/ai_server_room name = "Messaging Server Room" icon_state = "ai_server" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_AI /area/ai name = "\improper AI Chamber" icon_state = "ai_chamber" - ambience = list('sound/ambience/ambimalf.ogg') + ambience = AMBIENCE_AI /area/ai_cyborg_station name = "\improper Cyborg Station" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_AI /area/aisat name = "\improper AI Satellite" icon_state = "ai" + ambience = AMBIENCE_AI /area/aisat_interior name = "\improper AI Satellite" icon_state = "ai" + ambience = AMBIENCE_AI // The lack of inheritence hurts my soul. /area/AIsatextFP name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 dynamic_lighting = 0 + ambience = AMBIENCE_AI /area/AIsatextFS name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 dynamic_lighting = 0 + ambience = AMBIENCE_AI /area/AIsatextAS name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 dynamic_lighting = 0 + ambience = AMBIENCE_AI /area/AIsatextAP name = "\improper AI Sat Ext" icon_state = "storage" luminosity = 1 dynamic_lighting = 0 + ambience = AMBIENCE_AI /area/NewAIMain name = "\improper AI Main New" icon_state = "storage" + ambience = AMBIENCE_AI //Misc - +/area/wreck + ambience = AMBIENCE_RUINS /area/wreck/ai name = "\improper AI Chamber" icon_state = "ai" + ambience = AMBIENCE_TECH_RUINS /area/wreck/main name = "\improper Wreck" @@ -2462,10 +2498,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/wreck/engineering name = "\improper Power Room" icon_state = "engine" + ambience = AMBIENCE_TECH_RUINS /area/wreck/bridge name = "\improper Bridge" icon_state = "bridge" + ambience = AMBIENCE_TECH_RUINS /area/generic name = "Unknown" @@ -2475,7 +2513,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station // Telecommunications Satellite /area/tcommsat/ - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + ambience = AMBIENCE_ENGINEERING /area/tcommsat/entrance name = "\improper Telecomms Teleporter" @@ -2488,22 +2526,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/tcomsat name = "\improper Telecomms Satellite" icon_state = "tcomsatlob" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + ambience = AMBIENCE_ENGINEERING /area/tcomfoyer name = "\improper Telecomms Foyer" icon_state = "tcomsatfoyer" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + ambience = AMBIENCE_ENGINEERING /area/tcomwest name = "\improper Telecommunications Satellite West Wing" icon_state = "tcomsatwest" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + ambience = AMBIENCE_ENGINEERING /area/tcomeast name = "\improper Telecommunications Satellite East Wing" icon_state = "tcomsateast" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + ambience = AMBIENCE_ENGINEERING /area/tcommsat/computer name = "\improper Telecomms Control Room" @@ -2522,6 +2560,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/awaymission name = "\improper Strange Location" icon_state = "away" + ambience = AMBIENCE_FOREBODING /area/awaymission/example name = "\improper Strange Station" @@ -2615,56 +2654,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station luminosity = 1 dynamic_lighting = 0 requires_power = 0 - ambience = list() - var/sound/mysound = null - - New() - ..() - var/sound/S = new/sound() - mysound = S - S.file = 'sound/ambience/shore.ogg' - S.repeat = 1 - S.wait = 0 - S.channel = 123 - S.volume = 100 - S.priority = 255 - S.status = SOUND_UPDATE - process() - - Entered(atom/movable/Obj,atom/OldLoc) - if(ismob(Obj)) - if(Obj:client) - mysound.status = SOUND_UPDATE - Obj << mysound - return - - Exited(atom/movable/Obj) - if(ismob(Obj)) - if(Obj:client) - mysound.status = SOUND_PAUSED | SOUND_UPDATE - Obj << mysound - - proc/process() - set background = 1 - - var/sound/S = null - var/sound_delay = 0 - if(prob(25)) - S = sound(file=pick('sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag3.ogg'), volume=100) - sound_delay = rand(0, 50) - - for(var/mob/living/carbon/human/H in src) - if(H.s_tone > -55) - H.s_tone-- - H.update_icons_body() - if(H.client) - mysound.status = SOUND_UPDATE - H << mysound - if(S) - spawn(sound_delay) - H << S - - spawn(60) .() ///////////////////////////////////////////////////////////////////// /* @@ -2737,53 +2726,3 @@ var/list/the_station_areas = list ( luminosity = 1 dynamic_lighting = 0 requires_power = 0 - var/sound/mysound = null -/* - New() - ..() - var/sound/S = new/sound() - mysound = S - S.file = 'sound/ambience/shore.ogg' - S.repeat = 1 - S.wait = 0 - S.channel = 123 - S.volume = 100 - S.priority = 255 - S.status = SOUND_UPDATE - process() - - Entered(atom/movable/Obj,atom/OldLoc) - if(ismob(Obj)) - if(Obj:client) - mysound.status = SOUND_UPDATE - Obj << mysound - return - - Exited(atom/movable/Obj) - if(ismob(Obj)) - if(Obj:client) - mysound.status = SOUND_PAUSED | SOUND_UPDATE - Obj << mysound - - proc/process() - set background = 1 - - var/sound/S = null - var/sound_delay = 0 - if(prob(25)) - S = sound(file=pick('sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag3.ogg'), volume=100) - sound_delay = rand(0, 50) - - for(var/mob/living/carbon/human/H in src) -// if(H.s_tone > -55) //ugh...nice/novel idea but please no. -// H.s_tone-- -// H.update_icons_body() - if(H.client) - mysound.status = SOUND_UPDATE - H << mysound - if(S) - spawn(sound_delay) - H << S - - spawn(60) .() -*/ diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 98331ecfa8..31f6da1603 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -35,7 +35,7 @@ // var/list/lights // list of all lights on this area var/list/all_doors = null //Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area var/firedoors_closed = 0 - var/list/ambience = list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg') + var/list/ambience = list() var/list/forced_ambience = null var/sound_env = STANDARD_STATION var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf @@ -285,10 +285,6 @@ var/list/mob/living/forced_ambiance_list = new L << sound(null, channel = CHANNEL_AMBIENCE_FORCED) forced_ambiance_list -= L - if(!L.client.ambience_playing) - L.client.ambience_playing = 1 - L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_AMBIENCE) - if(forced_ambience) if(forced_ambience.len) forced_ambiance_list |= L @@ -299,10 +295,10 @@ var/list/mob/living/forced_ambiance_list = new else L << sound(null, channel = CHANNEL_AMBIENCE_FORCED) else if(src.ambience.len && prob(35)) - if((world.time >= L.client.played + 600)) + if((world.time >= L.client.time_last_ambience_played + 1 MINUTE)) var/sound = pick(ambience) - L << sound(sound, repeat = 0, wait = 0, volume = 25, channel = CHANNEL_AMBIENCE) - L.client.played = world.time + L << sound(sound, repeat = 0, wait = 0, volume = 50, channel = CHANNEL_AMBIENCE) + L.client.time_last_ambience_played = world.time /area/proc/gravitychange(var/gravitystate = 0, var/area/A) A.has_gravity = gravitystate diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm index 66a7e86913..e5f22a77d7 100644 --- a/code/game/area/asteroid_areas.dm +++ b/code/game/area/asteroid_areas.dm @@ -2,28 +2,23 @@ /area/mine icon_state = "mining" - music = 'sound/ambience/song_game.ogg' sound_env = ASTEROID /area/mine/explored name = "Mine" icon_state = "explored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') /area/mine/unexplored name = "Mine" icon_state = "unexplored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') /area/mine/explored/upper_level name = "Upper Level Mine" icon_state = "explored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') /area/mine/unexplored/upper_level name = "Upper Level Mine" icon_state = "unexplored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') // OUTPOSTS diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index caa71d7fb5..2117198ebd 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -37,7 +37,7 @@ datum/track/New(var/title_name, var/audio) new/datum/track("Part A", 'sound/misc/TestLoop1.ogg'), new/datum/track("Scratch", 'sound/music/title1.ogg'), new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'), - new/datum/track("Stellar Transit", 'sound/ambience/serspaceamb1.ogg'), + new/datum/track("Stellar Transit", 'sound/ambience/space/space_serithi.ogg'), ) // Only visible if hacked diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index f272fba459..d1412a2a12 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -29,8 +29,7 @@ /////////////// //SOUND STUFF// /////////////// - var/ambience_playing= null - var/played = 0 + var/time_last_ambience_played = 0 // world.time when ambience was played to this client, to space out ambience sounds. //////////// //SECURITY// diff --git a/html/changelogs/Neerti-ambience.yml b/html/changelogs/Neerti-ambience.yml new file mode 100644 index 0000000000..e711c67cfe --- /dev/null +++ b/html/changelogs/Neerti-ambience.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Neerti + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - soundadd: "Adds new ambience sounds for various areas, especially on the surface of Sif." + - sounddel: "Removes low and high-pitched droning from available ambience. Consider trying ambience again if you had turned it off to avoid those." diff --git a/maps/example/example_areas.dm b/maps/example/example_areas.dm index 8e01e14055..d66be8dea8 100644 --- a/maps/example/example_areas.dm +++ b/maps/example/example_areas.dm @@ -4,10 +4,12 @@ lift_floor_label = "Floor 2" lift_floor_name = "Top Floor" lift_announce_str = "Arriving at Top Floor." + ambience = AMBIENCE_AESTHETIC /area/turbolift/example_ground name = "lift (ground floor)" lift_floor_label = "Floor 1" lift_floor_name = "First Floor" lift_announce_str = "Arriving at First Floor." - base_turf = /turf/simulated/floor \ No newline at end of file + base_turf = /turf/simulated/floor + ambience = AMBIENCE_AESTHETIC \ No newline at end of file diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm index d65c2a9882..92766ce1ab 100644 --- a/maps/southern_cross/southern_cross_areas.dm +++ b/maps/southern_cross/southern_cross_areas.dm @@ -57,6 +57,9 @@ name = "Southern Shoreline" icon_state = "southeast" +/area/surface/outside + ambience = AMBIENCE_SIF + // The area near the outpost, so POIs don't show up right next to the outpost. /area/surface/outside/plains/outpost name = "Outpost Perimeter" @@ -122,7 +125,6 @@ flags = RAD_SHIELDED /area/surface/cave - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/serspaceamb1.ogg') // The bottom half that connects to the outpost and is safer. /area/surface/cave/explored/normal @@ -147,6 +149,7 @@ //Surface Outposts /area/surface/outpost + ambience = AMBIENCE_GENERIC // Main mining outpost /area/surface/outpost/mining_main @@ -281,6 +284,7 @@ /area/surface/outpost/main/gen_room name = "\improper Main Outpost SMES" icon_state = "substation" + ambience = AMBIENCE_ENGINEERING /area/surface/outpost/main/gen_room/smes name = "\improper Main Outpost Dorm SMES" @@ -345,9 +349,11 @@ name = "The Wall" icon_state = "red" requires_power = FALSE + ambience = AMBIENCE_HIGHSEC /area/surface/outpost/wall/checkpoint name = "Checkpoint" + ambience = AMBIENCE_HIGHSEC //Mining Station @@ -364,7 +370,6 @@ /area/outpost/mining_station/gen_station name = "Mining Station Generator Room" icon_state = "substation" - ambience = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') /area/outpost/mining_station/crew_area name = "Mining Station Crew Area" @@ -658,7 +663,6 @@ /area/tcomm/ icon_state = "tcomsatcham" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/tcomm/entrance @@ -668,7 +672,6 @@ /area/tcomm/tcomfoyer name = "\improper Telecomms Foyer" icon_state = "tcomsatfoyer" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/tcomm/chamber name = "\improper Telecomms Central Compartment" @@ -677,7 +680,6 @@ /area/tcomm/tcomstorage name = "\improper Telecomms Storage" icon_state = "tcomsatstore" - ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/tcomm/computer name = "\improper Telecomms Control Room" @@ -904,6 +906,7 @@ /area/ai holomap_color = HOLOMAP_AREACOLOR_COMMAND + ambience = AMBIENCE_AI /area/ai/ai_cyborg_station name = "\improper Cyborg Station" @@ -913,12 +916,10 @@ /area/ai/ai_upload name = "\improper AI Upload Chamber" icon_state = "ai_upload" - ambience = list('sound/ambience/ambimalf.ogg') /area/ai/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" - ambience = list('sound/ambience/ambimalf.ogg') sound_env = SMALL_ENCLOSED /area/ai/ai_server_room @@ -1011,6 +1012,7 @@ area/crew_quarters/heads/sc/hop/quarters /area/solar requires_power = 1 always_unpowered = 1 + ambience = AMBIENCE_SPACE /area/solar/aftportsolar name = "\improper Aft Port Solar Array" @@ -1031,6 +1033,7 @@ area/crew_quarters/heads/sc/hop/quarters /area/thirddeck/roof name = "\improper Third Deck Plating" dynamic_lighting = 0 + ambience = AMBIENCE_SPACE // Shuttles @@ -1041,6 +1044,7 @@ area/crew_quarters/heads/sc/hop/quarters icon_state = "centcom" requires_power = 0 flags = RAD_SHIELDED + ambience = AMBIENCE_HIGHSEC /area/shuttle/response_ship/start name = "\improper Response Team Base" @@ -1222,6 +1226,7 @@ area/crew_quarters/heads/sc/hop/quarters requires_power = 0 dynamic_lighting = 0 flags = RAD_SHIELDED + ambience = AMBIENCE_HIGHSEC /area/syndicate_station name = "\improper Mercenary Base" @@ -1229,6 +1234,7 @@ area/crew_quarters/heads/sc/hop/quarters requires_power = 0 dynamic_lighting = 0 flags = RAD_SHIELDED + ambience = AMBIENCE_HIGHSEC /area/syndicate_station/start name = "\improper Mercenary Ship" @@ -1289,6 +1295,7 @@ area/crew_quarters/heads/sc/hop/quarters requires_power = 0 dynamic_lighting = 0 flags = RAD_SHIELDED + ambience = AMBIENCE_HIGHSEC /area/skipjack_station/transit name = "transit" @@ -1342,6 +1349,7 @@ area/crew_quarters/heads/sc/hop/quarters icon_state = "green" requires_power = 0 flags = RAD_SHIELDED + ambience = AMBIENCE_HIGHSEC /area/ninja_dojo/dojo name = "\improper Clan Dojo" @@ -1571,7 +1579,9 @@ area/crew_quarters/heads/sc/hop/quarters /area/wreck/ufoship name = "\improper Wreck" icon_state = "storage" + ambience = AMBIENCE_OTHERWORLDLY /area/wreck/supplyshuttle name = "\improper Wreck" icon_state = "storage" + ambience = AMBIENCE_RUINS diff --git a/maps/submaps/surface_submaps/mountains/mountains_areas.dm b/maps/submaps/surface_submaps/mountains/mountains_areas.dm index f1045f22f0..9bcce0da1e 100644 --- a/maps/submaps/surface_submaps/mountains/mountains_areas.dm +++ b/maps/submaps/surface_submaps/mountains/mountains_areas.dm @@ -1,94 +1,123 @@ /area/submap/cave name = "Cave Submap Area" icon_state = "submap" + ambience = AMBIENCE_RUINS /area/submap/cave/deadBeacon name = "abandoned relay" + ambience = AMBIENCE_TECH_RUINS /area/submap/cave/prepper1 name = "Prepper Bunker" + ambience = AMBIENCE_FOREBODING /area/submap/cave/qShuttle name = "Quarantined Shuttle" + ambience = AMBIENCE_RUINS /area/submap/cave/AMine1 name = "Abandoned Mine" /area/submap/cave/Scave1 name = "Spider Cave 1" + ambience = AMBIENCE_FOREBODING /area/submap/cave/crashed_ufo name = "Crashed Alien Vessel" requires_power = FALSE + ambience = AMBIENCE_OTHERWORLDLY /area/submap/cave/crystal1 name = "Crystaline Cave" + ambience = AMBIENCE_SPACE /area/submap/cave/crystal2 name = "Crystaline Cave" + ambience = AMBIENCE_SPACE /area/submap/cave/crystal3 name = "Crystaline Cave" + ambience = AMBIENCE_SPACE /area/submap/cave/lost_explorer name = "Final Resting Place" + ambience = AMBIENCE_GHOSTLY /area/submap/Rockb1 name = "RockyBase1" + ambience = AMBIENCE_FOREBODING /area/submap/Cavelake name = "Cavelake" + ambience = AMBIENCE_SPACE /area/submap/CaveTrench name = "Cave River" + ambience = AMBIENCE_FOREBODING /area/submap/CorgiRitual name = "Dark Ritual" + ambience = AMBIENCE_UNHOLY /area/submap/AbandonedTemple name = "Abandoned Temple" + ambience = AMBIENCE_RUINS /area/submap/CrashedMedShuttle name = "Crashed Med Shuttle" + ambience = AMBIENCE_RUINS /area/submap/cave/digsite name = "Dig Site" + ambience = AMBIENCE_OTHERWORLDLY /area/submap/cave/vault1 name = "Mine Vault" + ambience = AMBIENCE_FOREBODING /area/submap/cave/vault2 name = "Mine Vault" + ambience = AMBIENCE_FOREBODING /area/submap/cave/vault3 name = "Mine Vault" + ambience = AMBIENCE_FOREBODING /area/submap/cave/vault4 name = "Mine Vault" + ambience = AMBIENCE_FOREBODING /area/submap/cave/vault5 name = "Mine Vault" + ambience = AMBIENCE_FOREBODING /area/submap/cave/IceCave1A name = "Ice Cave 1A" + ambience = AMBIENCE_SPACE /area/submap/cave/IceCave1B name = "Ice Cave 1B" + ambience = AMBIENCE_SPACE /area/submap/cave/IceCave1C name = "Ice Cave 1C" + ambience = AMBIENCE_SPACE /area/submap/cave/swordcave name = "Cursed Sword Cave" + ambience = AMBIENCE_UNHOLY /area/submap/cave/SupplyDrop1 name = "Supply Drop 1" + ambience = AMBIENCE_TECH_RUINS /area/submap/cave/BlastMine1 name = "Blast Mine 1" /area/submap/crashedcontainmentshuttle - name = "Crashed Containment Shuttle" + name = "Crashed Containment Shuttle" + ambience = AMBIENCE_HIGHSEC /area/submap/deadspy - name = "Dead Spy" \ No newline at end of file + name = "Dead Spy" + ambience = AMBIENCE_FOREBODING \ No newline at end of file diff --git a/maps/submaps/surface_submaps/plains/plains_areas.dm b/maps/submaps/surface_submaps/plains/plains_areas.dm index 771f063622..99f9fef12e 100644 --- a/maps/submaps/surface_submaps/plains/plains_areas.dm +++ b/maps/submaps/surface_submaps/plains/plains_areas.dm @@ -3,9 +3,11 @@ /area/submap/construction1 name = "construction site" + ambience = AMBIENCE_RUINS /area/submap/camp1 name = "camp site" + ambience = AMBIENCE_SIF /area/submap/house1 name = "old explorer's home" @@ -15,6 +17,7 @@ /area/submap/Epod1 name = "Epod1" + ambience = AMBIENCE_FOREBODING /area/submap/Rocky2 name = "Rocky2" @@ -24,6 +27,7 @@ /area/submap/PascalB name = "PascalB" + ambience = AMBIENCE_FOREBODING /area/submap/bonfire name = "abandoned bonfire" @@ -39,6 +43,7 @@ /area/submap/Thiefc name = "Thieves Cave" + ambience = AMBIENCE_FOREBODING /area/submap/smol2 name = "Small 2" @@ -54,30 +59,39 @@ /area/submap/PooledR name = "Pooled Rocks" + ambience = AMBIENCE_SIF /area/submap/Diner name = "Diner" + ambience = AMBIENCE_SIF /area/submap/snow1 name = "Snow1" + ambience = AMBIENCE_SIF /area/submap/snow2 name = "Snow2" + ambience = AMBIENCE_SIF /area/submap/snow3 name = "Snow3" + ambience = AMBIENCE_SIF /area/submap/snow4 name = "Snow4" + ambience = AMBIENCE_SIF /area/submap/snow5 name = "Snow5" + ambience = AMBIENCE_SIF /area/submap/SupplyDrop2 name = "Supply Drop 2" + ambience = AMBIENCE_TECH_RUINS /area/submap/RationCache name = "Ration Cache" /area/submap/Oldhouse name = "Oldhouse" + ambience = AMBIENCE_FOREBODING diff --git a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm index 5fecb8d0f4..8f48951167 100644 --- a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm +++ b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm @@ -1,83 +1,110 @@ /area/submap name = "Submap Area" icon_state = "submap" + ambience = AMBIENCE_RUINS /area/submap/spider1 name = "spider nest" + ambience = AMBIENCE_FOREBODING /area/submap/Field1 name = "Field 1" + ambience = AMBIENCE_SIF /area/submap/Lake1 name = "Lake 1" + ambience = AMBIENCE_SIF /area/submap/MilitaryCamp1 name = "Military Camp 1" + ambience = AMBIENCE_HIGHSEC /area/submap/Mudpit name = "Mudpit" + ambience = AMBIENCE_SIF /area/submap/Rocky1 name = "Rocky1" + ambience = AMBIENCE_SIF /area/submap/Rocky2 name = "Rocky2" + ambience = AMBIENCE_SIF /area/submap/Rocky3 name = "Rocky3" + ambience = AMBIENCE_SIF /area/submap/Shack1 name = "Shack1" + ambience = AMBIENCE_RUINS /area/submap/Small1 name = "Small1" + ambience = AMBIENCE_SIF /area/submap/SnowR1 name = "SnowR1" + ambience = AMBIENCE_SIF /area/submap/BoomBase name = "Boom1" + ambience = AMBIENCE_FOREBODING /area/submap/Blackshuttledown name = "BSD" requires_power = FALSE + ambience = AMBIENCE_HIGHSEC /area/submap/Cragzone1 name = "Craggy1" + ambience = AMBIENCE_SIF /area/submap/Lab1 name = "Lab1" + ambience = AMBIENCE_RUINS /area/submap/Rocky4 name = "Rocky4" + ambience = AMBIENCE_SIF /area/submap/DJOutpost1 name = "DJOutpost1" + ambience = AMBIENCE_TECH_RUINS /area/submap/DJOutpost2 name = "DJOutpost2" + ambience = AMBIENCE_GHOSTLY /area/submap/MHR name = "Manhack Rock" + ambience = AMBIENCE_FOREBODING /area/submap/Rockybase name = "Rockybase" + ambience = AMBIENCE_HIGHSEC /area/submap/GovPatrol name = "GovPatrol" + ambience = AMBIENCE_GHOSTLY /area/submap/DecoupledEngine name = "DecoupledEngine" + ambience = AMBIENCE_FOREBODING /area/submap/DoomP name = "DoomP" + ambience = AMBIENCE_HIGHSEC /area/submap/CaveS name = "CaveS" + ambience = AMBIENCE_FOREBODING /area/submap/Drugd name = "DrugDen" + ambience = AMBIENCE_FOREBODING /area/submap/Manor1 name = "Manor1" + ambience = AMBIENCE_FOREBODING diff --git a/polaris.dme b/polaris.dme index 1230fd45be..f350f40925 100644 --- a/polaris.dme +++ b/polaris.dme @@ -2473,7 +2473,6 @@ #include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\southern_cross\southern_cross.dm" -#include "maps\submaps\_readme.dm" #include "maps\submaps\space_submaps\space.dm" #include "maps\submaps\surface_submaps\mountains\mountains.dm" #include "maps\submaps\surface_submaps\mountains\mountains_areas.dm" diff --git a/sound/ambience/ambimalf.ogg b/sound/ambience/ai/ai1.ogg similarity index 100% rename from sound/ambience/ambimalf.ogg rename to sound/ambience/ai/ai1.ogg diff --git a/sound/ambience/ambigen2.ogg b/sound/ambience/ambigen2.ogg deleted file mode 100644 index 6a5a2d27c9..0000000000 Binary files a/sound/ambience/ambigen2.ogg and /dev/null differ diff --git a/sound/ambience/ambigen1.ogg b/sound/ambience/arrivals/arrivals1.ogg similarity index 100% rename from sound/ambience/ambigen1.ogg rename to sound/ambience/arrivals/arrivals1.ogg diff --git a/sound/ambience/ambigen14.ogg b/sound/ambience/arrivals/arrivals2.ogg similarity index 100% rename from sound/ambience/ambigen14.ogg rename to sound/ambience/arrivals/arrivals2.ogg diff --git a/sound/ambience/ambicha1.ogg b/sound/ambience/chapel/chapel1.ogg similarity index 100% rename from sound/ambience/ambicha1.ogg rename to sound/ambience/chapel/chapel1.ogg diff --git a/sound/ambience/ambicha2.ogg b/sound/ambience/chapel/chapel2.ogg similarity index 100% rename from sound/ambience/ambicha2.ogg rename to sound/ambience/chapel/chapel2.ogg diff --git a/sound/ambience/ambicha3.ogg b/sound/ambience/chapel/chapel3.ogg similarity index 100% rename from sound/ambience/ambicha3.ogg rename to sound/ambience/chapel/chapel3.ogg diff --git a/sound/ambience/ambicha4.ogg b/sound/ambience/chapel/chapel4.ogg similarity index 100% rename from sound/ambience/ambicha4.ogg rename to sound/ambience/chapel/chapel4.ogg diff --git a/sound/ambience/engineering/engineering1.ogg b/sound/ambience/engineering/engineering1.ogg new file mode 100644 index 0000000000..c832c677d5 Binary files /dev/null and b/sound/ambience/engineering/engineering1.ogg differ diff --git a/sound/ambience/engineering/engineering2.ogg b/sound/ambience/engineering/engineering2.ogg new file mode 100644 index 0000000000..9651049c25 Binary files /dev/null and b/sound/ambience/engineering/engineering2.ogg differ diff --git a/sound/ambience/engineering/engineering3.ogg b/sound/ambience/engineering/engineering3.ogg new file mode 100644 index 0000000000..63afd437a6 Binary files /dev/null and b/sound/ambience/engineering/engineering3.ogg differ diff --git a/sound/ambience/foreboding/foreboding1.ogg b/sound/ambience/foreboding/foreboding1.ogg new file mode 100644 index 0000000000..b6e65c0bf6 Binary files /dev/null and b/sound/ambience/foreboding/foreboding1.ogg differ diff --git a/sound/ambience/foreboding/foreboding2.ogg b/sound/ambience/foreboding/foreboding2.ogg new file mode 100644 index 0000000000..dde64a9858 Binary files /dev/null and b/sound/ambience/foreboding/foreboding2.ogg differ diff --git a/sound/ambience/ambigen3.ogg b/sound/ambience/generic/generic1.ogg similarity index 100% rename from sound/ambience/ambigen3.ogg rename to sound/ambience/generic/generic1.ogg diff --git a/sound/ambience/ambigen4.ogg b/sound/ambience/generic/generic2.ogg similarity index 100% rename from sound/ambience/ambigen4.ogg rename to sound/ambience/generic/generic2.ogg diff --git a/sound/ambience/ambigen5.ogg b/sound/ambience/generic/generic3.ogg similarity index 100% rename from sound/ambience/ambigen5.ogg rename to sound/ambience/generic/generic3.ogg diff --git a/sound/ambience/ambigen6.ogg b/sound/ambience/generic/generic4.ogg similarity index 100% rename from sound/ambience/ambigen6.ogg rename to sound/ambience/generic/generic4.ogg diff --git a/sound/ambience/ambimo1.ogg b/sound/ambience/ghostly/ghostly1.ogg similarity index 100% rename from sound/ambience/ambimo1.ogg rename to sound/ambience/ghostly/ghostly1.ogg diff --git a/sound/ambience/ambimo2.ogg b/sound/ambience/ghostly/ghostly2.ogg similarity index 100% rename from sound/ambience/ambimo2.ogg rename to sound/ambience/ghostly/ghostly2.ogg diff --git a/sound/ambience/highsec/highsec1.ogg b/sound/ambience/highsec/highsec1.ogg new file mode 100644 index 0000000000..265b51f2c9 Binary files /dev/null and b/sound/ambience/highsec/highsec1.ogg differ diff --git a/sound/ambience/highsec/highsec2.ogg b/sound/ambience/highsec/highsec2.ogg new file mode 100644 index 0000000000..761c63a480 Binary files /dev/null and b/sound/ambience/highsec/highsec2.ogg differ diff --git a/sound/ambience/holy/holy1.ogg b/sound/ambience/holy/holy1.ogg new file mode 100644 index 0000000000..cd53dc2789 Binary files /dev/null and b/sound/ambience/holy/holy1.ogg differ diff --git a/sound/ambience/holy/holy2.ogg b/sound/ambience/holy/holy2.ogg new file mode 100644 index 0000000000..4532dd0a81 Binary files /dev/null and b/sound/ambience/holy/holy2.ogg differ diff --git a/sound/ambience/lava/lava1.ogg b/sound/ambience/lava/lava1.ogg new file mode 100644 index 0000000000..b552965faa Binary files /dev/null and b/sound/ambience/lava/lava1.ogg differ diff --git a/sound/ambience/ambigen7.ogg b/sound/ambience/maintenance/maintenance1.ogg similarity index 100% rename from sound/ambience/ambigen7.ogg rename to sound/ambience/maintenance/maintenance1.ogg diff --git a/sound/ambience/ambigen8.ogg b/sound/ambience/maintenance/maintenance2.ogg similarity index 100% rename from sound/ambience/ambigen8.ogg rename to sound/ambience/maintenance/maintenance2.ogg diff --git a/sound/ambience/ambigen9.ogg b/sound/ambience/maintenance/maintenance3.ogg similarity index 100% rename from sound/ambience/ambigen9.ogg rename to sound/ambience/maintenance/maintenance3.ogg diff --git a/sound/ambience/ambigen10.ogg b/sound/ambience/maintenance/maintenance4.ogg similarity index 100% rename from sound/ambience/ambigen10.ogg rename to sound/ambience/maintenance/maintenance4.ogg diff --git a/sound/ambience/ambigen11.ogg b/sound/ambience/maintenance/maintenance5.ogg similarity index 100% rename from sound/ambience/ambigen11.ogg rename to sound/ambience/maintenance/maintenance5.ogg diff --git a/sound/ambience/ambigen12.ogg b/sound/ambience/maintenance/maintenance6.ogg similarity index 100% rename from sound/ambience/ambigen12.ogg rename to sound/ambience/maintenance/maintenance6.ogg diff --git a/sound/ambience/otherworldly/otherworldly1.ogg b/sound/ambience/otherworldly/otherworldly1.ogg new file mode 100644 index 0000000000..77599fac5b Binary files /dev/null and b/sound/ambience/otherworldly/otherworldly1.ogg differ diff --git a/sound/ambience/otherworldly/otherworldly2.ogg b/sound/ambience/otherworldly/otherworldly2.ogg new file mode 100644 index 0000000000..3bc051cf5a Binary files /dev/null and b/sound/ambience/otherworldly/otherworldly2.ogg differ diff --git a/sound/ambience/otherworldly/otherworldly3.ogg b/sound/ambience/otherworldly/otherworldly3.ogg new file mode 100644 index 0000000000..3ef1211897 Binary files /dev/null and b/sound/ambience/otherworldly/otherworldly3.ogg differ diff --git a/sound/ambience/ruins/ruins1.ogg b/sound/ambience/ruins/ruins1.ogg new file mode 100644 index 0000000000..ff4cef4a41 Binary files /dev/null and b/sound/ambience/ruins/ruins1.ogg differ diff --git a/sound/ambience/ruins/ruins2.ogg b/sound/ambience/ruins/ruins2.ogg new file mode 100644 index 0000000000..2dc408e2b6 Binary files /dev/null and b/sound/ambience/ruins/ruins2.ogg differ diff --git a/sound/ambience/ruins/ruins3.ogg b/sound/ambience/ruins/ruins3.ogg new file mode 100644 index 0000000000..ad56a915f9 Binary files /dev/null and b/sound/ambience/ruins/ruins3.ogg differ diff --git a/sound/ambience/ruins/ruins4.ogg b/sound/ambience/ruins/ruins4.ogg new file mode 100644 index 0000000000..2073b5a277 Binary files /dev/null and b/sound/ambience/ruins/ruins4.ogg differ diff --git a/sound/ambience/ruins/ruins5.ogg b/sound/ambience/ruins/ruins5.ogg new file mode 100644 index 0000000000..4b6c79a72d Binary files /dev/null and b/sound/ambience/ruins/ruins5.ogg differ diff --git a/sound/ambience/ruins/ruins6.ogg b/sound/ambience/ruins/ruins6.ogg new file mode 100644 index 0000000000..ed88fcd52d Binary files /dev/null and b/sound/ambience/ruins/ruins6.ogg differ diff --git a/sound/ambience/seag1.ogg b/sound/ambience/seag1.ogg deleted file mode 100644 index 8b26eeefc4..0000000000 Binary files a/sound/ambience/seag1.ogg and /dev/null differ diff --git a/sound/ambience/seag2.ogg b/sound/ambience/seag2.ogg deleted file mode 100644 index b0c714b77b..0000000000 Binary files a/sound/ambience/seag2.ogg and /dev/null differ diff --git a/sound/ambience/seag3.ogg b/sound/ambience/seag3.ogg deleted file mode 100644 index 6385e87e1d..0000000000 Binary files a/sound/ambience/seag3.ogg and /dev/null differ diff --git a/sound/ambience/shore.ogg b/sound/ambience/shore.ogg deleted file mode 100644 index d3edf17961..0000000000 Binary files a/sound/ambience/shore.ogg and /dev/null differ diff --git a/sound/ambience/sif/sif1.ogg b/sound/ambience/sif/sif1.ogg new file mode 100644 index 0000000000..6ce351521b Binary files /dev/null and b/sound/ambience/sif/sif1.ogg differ diff --git a/sound/ambience/space/space1.ogg b/sound/ambience/space/space1.ogg new file mode 100644 index 0000000000..44b4c62c36 Binary files /dev/null and b/sound/ambience/space/space1.ogg differ diff --git a/sound/ambience/serspaceamb1.ogg b/sound/ambience/space/space_serithi.ogg similarity index 100% rename from sound/ambience/serspaceamb1.ogg rename to sound/ambience/space/space_serithi.ogg diff --git a/sound/ambience/tech_ruins/tech_ruins1.ogg b/sound/ambience/tech_ruins/tech_ruins1.ogg new file mode 100644 index 0000000000..5f21514e5c Binary files /dev/null and b/sound/ambience/tech_ruins/tech_ruins1.ogg differ diff --git a/sound/ambience/tech_ruins/tech_ruins2.ogg b/sound/ambience/tech_ruins/tech_ruins2.ogg new file mode 100644 index 0000000000..bd6428bff3 Binary files /dev/null and b/sound/ambience/tech_ruins/tech_ruins2.ogg differ diff --git a/sound/ambience/tech_ruins/tech_ruins3.ogg b/sound/ambience/tech_ruins/tech_ruins3.ogg new file mode 100644 index 0000000000..effd23b132 Binary files /dev/null and b/sound/ambience/tech_ruins/tech_ruins3.ogg differ diff --git a/sound/ambience/unholy/unholy1.ogg b/sound/ambience/unholy/unholy1.ogg new file mode 100644 index 0000000000..d78dc46a4c Binary files /dev/null and b/sound/ambience/unholy/unholy1.ogg differ diff --git a/sound/ambience/vaporwave.ogg b/sound/ambience/vaporwave.ogg new file mode 100644 index 0000000000..4374f46710 Binary files /dev/null and b/sound/ambience/vaporwave.ogg differ