diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 3b4ddd3e7b0..3d0a80c1736 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -127,6 +127,7 @@ var/list/ghostteleportlocs = list() power_light = 0 power_equip = 0 power_environ = 0 + ambientsounds = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg') //These are shuttle areas, they must contain two areas in a subgroup if you want to move a shuttle from one //place to another. Look at escape shuttle for example. @@ -781,6 +782,8 @@ var/list/ghostteleportlocs = list() icon_state = "atmos" //Maintenance +/area/maintenance + ambientsounds = list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg', 'sound/ambience/ambimaint5.ogg') /area/maintenance/atmos_control name = "Atmospherics Maintenance" @@ -1072,6 +1075,7 @@ var/list/ghostteleportlocs = list() /area/chapel/main name = "\improper Chapel" icon_state = "chapel" + ambientsounds = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/music/traitor.ogg') /area/chapel/office name = "\improper Chapel Office" @@ -1201,6 +1205,8 @@ var/list/ghostteleportlocs = list() //Engineering +/area/engine + ambientsounds = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') /area/engine/engine_smes name = "\improper Engineering SMES" @@ -1321,6 +1327,7 @@ var/list/ghostteleportlocs = list() name = "\improper Abandoned Teleporter" icon_state = "teleporter" music = "signal" + ambientsounds = list('sound/ambience/ambimalf.ogg') /area/toxins/telesci name = "\improper Telescience Lab" @@ -1424,6 +1431,7 @@ var/list/ghostteleportlocs = list() /area/medical/morgue name = "\improper Morgue" icon_state = "morgue" + ambientsounds = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg') /area/medical/chemistry name = "\improper Chemistry" @@ -2065,6 +2073,9 @@ area/security/podbay name = "Emergency Storage" icon_state = "storage" +/area/turret_protected/ + ambientsounds = list('sound/ambience/ambimalf.ogg') + /area/turret_protected/ai_upload name = "\improper AI Upload Chamber" icon_state = "ai_upload" @@ -2153,6 +2164,9 @@ area/security/podbay // Telecommunications Satellite +/area/tcommsat + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') + /area/tcommsat/entrance name = "\improper Telecoms Teleporter" icon_state = "tcomsatentrance" @@ -2164,18 +2178,22 @@ area/security/podbay /area/turret_protected/tcomsat name = "\improper Telecoms Satellite" icon_state = "tcomsatlob" + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/turret_protected/tcomfoyer name = "\improper Telecoms Foyer" icon_state = "tcomsatentrance" + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/turret_protected/tcomwest name = "\improper Telecommunications Satellite West Wing" icon_state = "tcomsatwest" + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/turret_protected/tcomeast name = "\improper Telecommunications Satellite East Wing" icon_state = "tcomsateast" + ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') /area/tcommsat/computer name = "\improper Telecoms Control Room" @@ -2284,6 +2302,7 @@ area/security/podbay luminosity = 1 lighting_use_dynamic = 0 requires_power = 0 + ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg') ////////////////////////AWAY AREAS/////////////////////////////////// diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 70d2f84d4c4..44b562ecaed 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -4,6 +4,13 @@ /area var/global/global_uid = 0 var/uid + var/list/ambientsounds = 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') + /area/New() icon_state = "" @@ -336,8 +343,6 @@ /area/Entered(A) - var/musVolume = 25 - var/sound = 'sound/ambience/ambigen1.ogg' var/area/newarea var/area/oldarea @@ -370,31 +375,14 @@ else if (L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0 if(prob(35) && !newarea.media_source && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE)) - // TODO: This is dumb. - N3X - if(istype(src, /area/chapel)) - sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/music/traitor.ogg') - else if(istype(src, /area/medical/morgue)) - sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg') - else if(type == /area) - sound = pick('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg') - else if(istype(src, /area/engine)) - sound = pick('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') - else if(istype(src, /area/AIsattele) || istype(src, /area/turret_protected/ai) || istype(src, /area/turret_protected/ai_upload) || istype(src, /area/turret_protected/ai_upload_foyer)) - sound = pick('sound/ambience/ambimalf.ogg') - else if(istype(src, /area/mine/explored) || istype(src, /area/mine/unexplored)) - sound = pick('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') - musVolume = 25 - else if(istype(src, /area/tcommsat) || istype(src, /area/turret_protected/tcomwest) || istype(src, /area/turret_protected/tcomeast) || istype(src, /area/turret_protected/tcomfoyer) || istype(src, /area/turret_protected/tcomsat)) - sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') - else - sound = pick('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/sound = pick(ambientsounds) - if(!L.client.played) - L << sound(sound, repeat = 0, wait = 0, volume = musVolume, channel = 1) - L.client.played = 1 - spawn(600) //ewww - this is very very bad - if(L.&& L.client) - L.client.played = 0 + if(!L.client.played) + L << sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1) + L.client.played = 1 + spawn(600) //ewww - this is very very bad + if(L.&& L.client) + L.client.played = 0 /area/proc/gravitychange(var/gravitystate = 0, var/area/A) A.has_gravity = gravitystate diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm index 0a8b01bb194..a8b37f18d2e 100644 --- a/code/modules/mining/mine_areas.dm +++ b/code/modules/mining/mine_areas.dm @@ -7,10 +7,12 @@ /area/mine/explored name = "Mine" icon_state = "explored" + ambientsounds = list('sound/ambience/ambimine.ogg') /area/mine/unexplored name = "Mine" icon_state = "unexplored" + ambientsounds = list('sound/ambience/ambimine.ogg') /area/mine/lobby name = "Mining station" diff --git a/sound/ambience/ambimaint1.ogg b/sound/ambience/ambimaint1.ogg new file mode 100644 index 00000000000..0c18c46af68 Binary files /dev/null and b/sound/ambience/ambimaint1.ogg differ diff --git a/sound/ambience/ambimaint2.ogg b/sound/ambience/ambimaint2.ogg new file mode 100644 index 00000000000..655d940cda9 Binary files /dev/null and b/sound/ambience/ambimaint2.ogg differ diff --git a/sound/ambience/ambimaint3.ogg b/sound/ambience/ambimaint3.ogg new file mode 100644 index 00000000000..9891916010e Binary files /dev/null and b/sound/ambience/ambimaint3.ogg differ diff --git a/sound/ambience/ambimaint4.ogg b/sound/ambience/ambimaint4.ogg new file mode 100644 index 00000000000..1d01e2016ca Binary files /dev/null and b/sound/ambience/ambimaint4.ogg differ diff --git a/sound/ambience/ambimaint5.ogg b/sound/ambience/ambimaint5.ogg new file mode 100644 index 00000000000..7a065ecbcb3 Binary files /dev/null and b/sound/ambience/ambimaint5.ogg differ