From a392da16b0c5d7bee93d10fa42262f6255e8bb62 Mon Sep 17 00:00:00 2001 From: Cheridan Date: Tue, 6 May 2014 21:40:28 -0500 Subject: [PATCH] Area Ambiance Refactor --- code/game/area/Space Station 13 areas.dm | 56 ++++++++++++++++-------- code/game/area/areas.dm | 30 ++++--------- code/modules/mining/mine_areas.dm | 2 + 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index f91338962b6..2584ac98d1d 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -123,6 +123,7 @@ proc/process_ghost_teleport_locs() power_light = 0 power_equip = 0 power_environ = 0 + ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',) @@ -500,6 +501,7 @@ proc/process_ghost_teleport_locs() /area/prison/morgue name = "\improper Prison Morgue" icon_state = "morgue" + ambientsounds = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg') /area/prison/medical_research name = "\improper Prison Genetic Research" @@ -757,6 +759,7 @@ proc/process_ghost_teleport_locs() /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') /area/chapel/office name = "\improper Chapel Office" @@ -821,30 +824,32 @@ proc/process_ghost_teleport_locs() //Engineering /area/engine - engine_smes - name = "\improper Engineering SMES" - icon_state = "engine_smes" - requires_power = 0//This area only covers the batteries and they deal with their own power + ambientsounds = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') - engineering - name = "Engineering" - icon_state = "engine_smes" +/area/engine/engine_smes + name = "\improper Engineering SMES" + icon_state = "engine_smes" + requires_power = 0//This area only covers the batteries and they deal with their own power - break_room - name = "\improper Engineering Foyer" - icon_state = "engine" +/area/engine/engineering + name = "Engineering" + icon_state = "engine_smes" - chiefs_office - name = "\improper Chief Engineer's office" - icon_state = "engine_control" +/area/engine/break_room + name = "\improper Engineering Foyer" + icon_state = "engine" - secure_construction - name = "\improper Secure Construction Area" - icon_state = "engine" +/area/engine/chiefs_office + name = "\improper Chief Engineer's office" + icon_state = "engine_control" - gravity_generator - name = "Gravity Generator Room" - icon_state = "blue" +/area/engine/secure_construction + name = "\improper Secure Construction Area" + icon_state = "engine" + +/area/engine/gravity_generator + name = "Gravity Generator Room" + icon_state = "blue" //Solars @@ -930,6 +935,7 @@ proc/process_ghost_teleport_locs() name = "\improper AI Satellite Teleporter Room" icon_state = "teleporter" music = "signal" + ambientsounds = list('sound/ambience/ambimalf.ogg') //MedBay @@ -972,6 +978,7 @@ proc/process_ghost_teleport_locs() /area/medical/morgue name = "\improper Morgue" icon_state = "morgue" + ambientsounds = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg') /area/medical/chemistry name = "Chemistry" @@ -1372,6 +1379,10 @@ proc/process_ghost_teleport_locs() 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" @@ -1454,6 +1465,9 @@ proc/process_ghost_teleport_locs() // 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" @@ -1465,18 +1479,22 @@ proc/process_ghost_teleport_locs() /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" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index bd03bbf1207..614c6009fbc 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -17,6 +17,12 @@ /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 = "" @@ -249,9 +255,6 @@ /area/Entered(A) - var/musVolume = 25 - var/sound = 'sound/ambience/ambigen1.ogg' - if(!istype(A,/mob/living)) return var/mob/living/L = A @@ -271,27 +274,10 @@ L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) if(prob(35)) - - if(istype(src, /area/chapel)) - sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg') - else if(istype(src, /area/medical/morgue)) - sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/title2.ogg') - else if(type == /area) - sound = pick('sound/ambience/ambispace.ogg','sound/ambience/title2.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') - 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 << 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) diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm index 06ced5db488..07416fef985 100644 --- a/code/modules/mining/mine_areas.dm +++ b/code/modules/mining/mine_areas.dm @@ -14,6 +14,7 @@ power_environ = 0 power_equip = 0 power_light = 0 + ambientsounds = list('sound/ambience/ambimine.ogg') /area/mine/unexplored name = "Mine" @@ -25,6 +26,7 @@ power_environ = 0 power_equip = 0 power_light = 0 + ambientsounds = list('sound/ambience/ambimine.ogg') /area/mine/lobby name = "Mining station"