From a2a3d25dd4247fe9d727aaac3b6d33fdee37301d Mon Sep 17 00:00:00 2001 From: spessbro <51048066+spessbro@users.noreply.github.com> Date: Thu, 7 Jan 2021 17:24:57 -0500 Subject: [PATCH] [Performance] Refactors ambient sounds to use global lists instead of list macros (#55988) What it says on the tin really. If we want to be precise it changes how ambient sounds by giving areas an index define and then checks if they don't have a custom ambient sounds list if they don't then it applies the correct global list to ambientsounds --- code/__DEFINES/sound.dm | 73 ++++------------ code/_globalvars/lists/ambience.dm | 102 +++++++++++++++++++++++ code/game/area/Space_Station_13_areas.dm | 37 ++++---- code/game/area/areas.dm | 10 ++- code/game/area/areas/away_content.dm | 2 +- code/game/area/areas/centcom.dm | 2 +- code/game/area/areas/mining.dm | 14 ++-- code/game/area/areas/ruins/_ruins.dm | 2 +- code/game/area/areas/ruins/lavaland.dm | 4 +- code/game/area/areas/ruins/space.dm | 4 +- code/game/area/areas/shuttles.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- tgstation.dme | 1 + 13 files changed, 158 insertions(+), 97 deletions(-) create mode 100644 code/_globalvars/lists/ambience.dm diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 5a80276eb1c..abd4364dfb1 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -28,71 +28,26 @@ #define SOUND_MINIMUM_PRESSURE 10 - -//Ambience types - -#define GENERIC 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','sound/ambience/ambigen15.ogg') - -#define HOLY list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg',\ - 'sound/ambience/ambicha4.ogg', 'sound/ambience/ambiholy.ogg', 'sound/ambience/ambiholy2.ogg',\ - 'sound/ambience/ambiholy3.ogg') - -#define HIGHSEC list('sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg') - -#define RUINS list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\ - 'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\ - 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\ - 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambitech3.ogg',\ - 'sound/ambience/ambimystery.ogg', 'sound/ambience/ambimaint1.ogg') - -#define ENGINEERING list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg',\ - 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg') - -#define MINING list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\ - 'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\ - 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\ - 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg',\ - 'sound/ambience/ambilava1.ogg', 'sound/ambience/ambilava2.ogg', 'sound/ambience/ambilava3.ogg') - -#define MEDICAL list('sound/ambience/ambinice.ogg') - -#define SPOOKY list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/ambiruin7.ogg','sound/ambience/ambiruin6.ogg',\ - 'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg') - -#define SPACE list('sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', 'sound/ambience/title2.ogg', 'sound/ambience/ambiatmos.ogg') - -#define MAINTENANCE list('sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg',\ - 'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg', 'sound/ambience/ambitech2.ogg' ) - -#define AWAY_MISSION list('sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiruin.ogg',\ - 'sound/ambience/ambiruin2.ogg', 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg',\ - 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', 'sound/ambience/ambiruin7.ogg',\ - 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint.ogg',\ - 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', 'sound/ambience/ambiodd.ogg') - -#define REEBE list('sound/ambience/ambireebe1.ogg', 'sound/ambience/ambireebe2.ogg', 'sound/ambience/ambireebe3.ogg') - - - -#define CREEPY_SOUNDS list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/heart_beat.ogg', 'sound/effects/screech.ogg',\ - 'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\ - 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ - 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ - 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') - - #define INTERACTION_SOUND_RANGE_MODIFIER -3 #define EQUIP_SOUND_VOLUME 30 #define PICKUP_SOUND_VOLUME 15 #define DROP_SOUND_VOLUME 20 #define YEET_SOUND_VOLUME 90 - +#define AMBIENCE_GENERIC "generic" +#define AMBIENCE_HOLY "holy" +#define AMBIENCE_DANGER "danger" +#define AMBIENCE_RUINS "ruins" +#define AMBIENCE_ENGI "engi" +#define AMBIENCE_MINING "mining" +#define AMBIENCE_MEDICAL "med" +#define AMBIENCE_SPOOKY "spooky" +#define AMBIENCE_SPACE "space" +#define AMBIENCE_MAINT "maint" +#define AMBIENCE_AWAY "away" +#define AMBIENCE_REEBE "reebe" //unused +#define AMBIENCE_CREEPY "creepy" //not to be confused with spooky + //default byond sound environments #define SOUND_ENVIRONMENT_NONE -1 #define SOUND_ENVIRONMENT_GENERIC 0 diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm new file mode 100644 index 00000000000..3573c380a3c --- /dev/null +++ b/code/_globalvars/lists/ambience.dm @@ -0,0 +1,102 @@ +GLOBAL_LIST_INIT(generic_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', + 'sound/ambience/ambigen15.ogg')) + +GLOBAL_LIST_INIT(holy_ambience,list( + 'sound/ambience/ambicha1.ogg', 'sound/ambience/ambicha2.ogg', + 'sound/ambience/ambicha3.ogg', 'sound/ambience/ambicha4.ogg', + 'sound/ambience/ambiholy.ogg', 'sound/ambience/ambiholy2.ogg', + 'sound/ambience/ambiholy3.ogg')) + +GLOBAL_LIST_INIT(danger_ambience,list( + 'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg')) + +GLOBAL_LIST_INIT(ruins_ambience,list( + 'sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', + 'sound/ambience/ambiruin.ogg', 'sound/ambience/ambiruin2.ogg', + 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg', + 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', + 'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambidanger.ogg', + 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambitech3.ogg', + 'sound/ambience/ambimystery.ogg', 'sound/ambience/ambimaint1.ogg')) + +GLOBAL_LIST_INIT(engi_ambience,list( + 'sound/ambience/ambisin1.ogg', 'sound/ambience/ambisin2.ogg', + 'sound/ambience/ambisin3.ogg', 'sound/ambience/ambisin4.ogg', + 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', + 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', + 'sound/ambience/ambitech3.ogg')) + +GLOBAL_LIST_INIT(mining_ambience,list( + 'sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', + 'sound/ambience/ambiruin.ogg', 'sound/ambience/ambiruin2.ogg', + 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg', + 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', + 'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambidanger.ogg', + 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg', + 'sound/ambience/ambilava1.ogg', 'sound/ambience/ambilava2.ogg', + 'sound/ambience/ambilava3.ogg')) + +GLOBAL_LIST_INIT(medical_ambience,list('sound/ambience/ambinice.ogg')) + +GLOBAL_LIST_INIT(spooky_ambience,list( + 'sound/ambience/ambimo1.ogg', 'sound/ambience/ambimo2.ogg', + 'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambiruin6.ogg', + 'sound/ambience/ambiodd.ogg', 'sound/ambience/ambimystery.ogg')) + +GLOBAL_LIST_INIT(space_ambience,list( + 'sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', + 'sound/ambience/title2.ogg', 'sound/ambience/ambiatmos.ogg')) + +GLOBAL_LIST_INIT(maint_ambience,list( + 'sound/ambience/ambimaint1.ogg', 'sound/ambience/ambimaint2.ogg', + 'sound/ambience/ambimaint3.ogg', 'sound/ambience/ambimaint4.ogg', + 'sound/ambience/ambimaint5.ogg', 'sound/voice/lowHiss2.ogg', + 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg', + 'sound/ambience/ambitech2.ogg')) + +GLOBAL_LIST_INIT(away_ambience,list( + 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', + 'sound/ambience/ambiruin.ogg', 'sound/ambience/ambiruin2.ogg', + 'sound/ambience/ambiruin3.ogg', 'sound/ambience/ambiruin4.ogg', + 'sound/ambience/ambiruin5.ogg', 'sound/ambience/ambiruin6.ogg', + 'sound/ambience/ambiruin7.ogg', 'sound/ambience/ambidanger.ogg', + 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint.ogg', + 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg', + 'sound/ambience/ambiodd.ogg')) + +GLOBAL_LIST_INIT(reebe_ambience,list('sound/ambience/ambireebe1.ogg', 'sound/ambience/ambireebe2.ogg', 'sound/ambience/ambireebe3.ogg')) + +GLOBAL_LIST_INIT(creepy_ambience,list( + 'sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', + 'sound/effects/heart_beat.ogg', 'sound/effects/screech.ogg', + 'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', + 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', + 'sound/hallucinations/growl2.ogg', 'sound/hallucinations/growl3.ogg', + 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', + 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg', + 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', + 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', + 'sound/hallucinations/over_here3.ogg', 'sound/hallucinations/turn_around1.ogg', + 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', + 'sound/hallucinations/wail.ogg')) + +GLOBAL_LIST_INIT(ambience_assoc,list( + AMBIENCE_GENERIC = GLOB.generic_ambience, + AMBIENCE_HOLY = GLOB.holy_ambience, + AMBIENCE_DANGER = GLOB.danger_ambience, + AMBIENCE_RUINS = GLOB.ruins_ambience, + AMBIENCE_ENGI = GLOB.engi_ambience, + AMBIENCE_MINING = GLOB.mining_ambience, + AMBIENCE_MEDICAL = GLOB.medical_ambience, + AMBIENCE_SPOOKY = GLOB.spooky_ambience, + AMBIENCE_SPACE = GLOB.space_ambience, + AMBIENCE_MAINT = GLOB.maint_ambience, + AMBIENCE_AWAY = GLOB.away_ambience, + AMBIENCE_REEBE = GLOB.reebe_ambience, + AMBIENCE_CREEPY = GLOB.creepy_ambience)) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 5d84f6370e4..edefd6e6b79 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -7,7 +7,8 @@ icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi') icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) requires_power = FALSE (defaults to true) - ambientsounds = list() (defaults to GENERIC from sound.dm. override it as "ambientsounds = list('sound/ambience/signal.ogg')" or using another define. + ambience_index = AMBIENCE_GENERIC (picks the ambience from an assoc list in ambience.dm) + ambientsounds = list() (defaults to ambience_index's assoc on Initialize(). override it as "ambientsounds = list('sound/ambience/signal.ogg')" or by changing ambience_index) NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0 @@ -30,7 +31,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_environ = FALSE area_flags = UNIQUE_AREA | NO_ALERTS outdoors = TRUE - ambientsounds = SPACE + ambience_index = AMBIENCE_SPACE flags_1 = CAN_BE_DIRTY_1 sound_environment = SOUND_AREA_SPACE @@ -59,13 +60,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = FALSE has_gravity = STANDARD_GRAVITY area_flags = UNIQUE_AREA - ambientsounds = MINING + ambience_index = AMBIENCE_MINING flags_1 = CAN_BE_DIRTY_1 sound_environment = SOUND_AREA_ASTEROID /area/asteroid/nearstation dynamic_lighting = DYNAMIC_LIGHTING_FORCED - ambientsounds = RUINS + ambience_index = AMBIENCE_RUINS always_unpowered = FALSE requires_power = TRUE area_flags = UNIQUE_AREA | BLOBS_ALLOWED @@ -78,7 +79,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Maintenance /area/maintenance - ambientsounds = MAINTENANCE + ambience_index = AMBIENCE_MAINT area_flags = BLOBS_ALLOWED | UNIQUE_AREA airlock_wires = /datum/wires/airlock/maint sound_environment = SOUND_AREA_TUNNEL_ENCLOSED @@ -528,7 +529,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel icon_state = "chapel" - ambientsounds = HOLY + ambience_index = AMBIENCE_HOLY flags_1 = NONE sound_environment = SOUND_AREA_LARGE_ENCLOSED @@ -563,7 +564,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Engineering /area/engine - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI airlock_wires = /datum/wires/airlock/engineering sound_environment = SOUND_AREA_LARGE_ENCLOSED @@ -637,7 +638,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT area_flags = UNIQUE_AREA flags_1 = NONE - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI airlock_wires = /datum/wires/airlock/engineering sound_environment = SOUND_AREA_SPACE @@ -722,13 +723,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/teleporter name = "Teleporter Room" icon_state = "teleporter" - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI airlock_wires = /datum/wires/airlock/command /area/gateway name = "Gateway" icon_state = "gateway" - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI airlock_wires = /datum/wires/airlock/command sound_environment = SOUND_AREA_STANDARD_STATION @@ -737,7 +738,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical name = "Medical" icon_state = "medbay1" - ambientsounds = MEDICAL + ambience_index = AMBIENCE_MEDICAL airlock_wires = /datum/wires/airlock/medbay sound_environment = SOUND_AREA_STANDARD_STATION @@ -814,7 +815,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/morgue name = "Morgue" icon_state = "morgue" - ambientsounds = SPOOKY + ambience_index = AMBIENCE_SPOOKY sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/medical/chemistry @@ -861,7 +862,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security name = "Security" icon_state = "security" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER airlock_wires = /datum/wires/airlock/security sound_environment = SOUND_AREA_STANDARD_STATION @@ -1213,7 +1214,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/construction name = "Construction Area" icon_state = "construction" - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI sound_environment = SOUND_AREA_STANDARD_STATION /area/construction/mining/aux_base @@ -1229,7 +1230,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/vacant_room name = "Vacant Room" icon_state = "vacant_room" - ambientsounds = MAINTENANCE + ambience_index = AMBIENCE_MAINT /area/vacant_room/office name = "Vacant Office" @@ -1247,7 +1248,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/security/armory name = "Armory" icon_state = "armory" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER airlock_wires = /datum/wires/airlock/security /area/ai_monitored/security/armory/upper @@ -1256,7 +1257,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/storage/eva name = "EVA Storage" icon_state = "eva" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER /area/ai_monitored/storage/eva/upper name = "Upper EVA Storage" @@ -1264,7 +1265,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/storage/satellite name = "AI Satellite Maint" icon_state = "ai_storage" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER airlock_wires = /datum/wires/airlock/ai //Turret_protected diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 231f1088d58..a27f9dbf0d6 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -41,7 +41,7 @@ ///Will objects this area be needing power? var/requires_power = TRUE - /// This gets overridden to 1 for space in area/Initialize(). + /// This gets overridden to 1 for space in area/. var/always_unpowered = FALSE var/power_equip = TRUE @@ -51,8 +51,9 @@ var/has_gravity = FALSE var/parallax_movedir = 0 - - var/list/ambientsounds = GENERIC + + var/ambience_index = AMBIENCE_GENERIC + var/list/ambientsounds flags_1 = CAN_BE_DIRTY_1 | CULT_PERMITTED_1 var/list/firedoors @@ -134,7 +135,8 @@ GLOBAL_LIST_EMPTY(teleportlocs) */ /area/Initialize(mapload) icon_state = "" - + if(!ambientsounds) + ambientsounds = GLOB.ambience_assoc[ambience_index] if(requires_power) luminosity = 0 else diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index 83f098ef1f1..15a6c386da2 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -8,7 +8,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" name = "Strange Location" icon_state = "away" has_gravity = STANDARD_GRAVITY - ambientsounds = AWAY_MISSION + ambience_index = AMBIENCE_AWAY sound_environment = SOUND_ENVIRONMENT_ROOM /area/awaymission/beach diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index cfe8bc85203..3fee6da7e98 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -145,7 +145,7 @@ has_gravity = STANDARD_GRAVITY area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT flags_1 = NONE - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER network_root_id = SYNDICATE_NETWORK_ROOT /area/syndicate_mothership/control diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 4a1138d1f12..46fe5dac000 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -15,7 +15,7 @@ power_light = FALSE outdoors = TRUE flags_1 = NONE - ambientsounds = MINING + ambience_index = AMBIENCE_MINING area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS sound_environment = SOUND_AREA_STANDARD_STATION @@ -29,7 +29,7 @@ power_light = FALSE outdoors = TRUE flags_1 = NONE - ambientsounds = MINING + ambience_index = AMBIENCE_MINING area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED | NO_ALERTS /area/mine/lobby @@ -80,7 +80,7 @@ /area/mine/laborcamp/security name = "Labor Camp Security" icon_state = "security" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER @@ -102,7 +102,7 @@ power_equip = FALSE power_light = FALSE requires_power = TRUE - ambientsounds = MINING + ambience_index = AMBIENCE_MINING area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS /area/lavaland/underground @@ -113,7 +113,7 @@ power_environ = FALSE power_equip = FALSE power_light = FALSE - ambientsounds = MINING + ambience_index = AMBIENCE_MINING area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS @@ -153,7 +153,7 @@ power_equip = FALSE power_light = FALSE requires_power = TRUE - ambientsounds = MINING + ambience_index = AMBIENCE_MINING area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS /area/icemoon/surface/outdoors // weather happens here @@ -183,7 +183,7 @@ power_environ = FALSE power_equip = FALSE power_light = FALSE - ambientsounds = MINING + ambience_index = AMBIENCE_MINING area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS /area/icemoon/underground/unexplored // mobs and megafauna and ruins spawn here diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm index 11c72990ba2..42241bfb118 100644 --- a/code/game/area/areas/ruins/_ruins.dm +++ b/code/game/area/areas/ruins/_ruins.dm @@ -6,7 +6,7 @@ has_gravity = STANDARD_GRAVITY area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA | NO_ALERTS dynamic_lighting = DYNAMIC_LIGHTING_FORCED - ambientsounds = RUINS + ambience_index = AMBIENCE_RUINS flags_1 = CAN_BE_DIRTY_1 sound_environment = SOUND_ENVIRONMENT_STONEROOM diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index adc1a6c6292..6fe932d553e 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -46,12 +46,12 @@ /area/ruin/unpowered/syndicate_lava_base name = "Secret Base" icon_state = "dk_yellow" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER /area/ruin/unpowered/cultaltar name = "Cult Altar" flags_1 = CULT_PERMITTED_1 - ambientsounds = SPOOKY + ambience_index = AMBIENCE_SPOOKY //Syndicate lavaland base diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index b898e22c621..c68c2f2479c 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -228,7 +228,7 @@ /area/ruin/space/has_grav/ancientstation/atmo name = "Beta Station Atmospherics" icon_state = "red" - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI has_gravity = TRUE /area/ruin/space/has_grav/ancientstation/betacorridor @@ -238,7 +238,7 @@ /area/ruin/space/has_grav/ancientstation/engi name = "Charlie Station Engineering" icon_state = "engine" - ambientsounds = ENGINEERING + ambience_index = AMBIENCE_ENGI /area/ruin/space/has_grav/ancientstation/comm name = "Charlie Station Command" diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index ee041b25509..bb337be8fcb 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -29,7 +29,7 @@ /area/shuttle/syndicate name = "Syndicate Infiltrator" - ambientsounds = HIGHSEC + ambience_index = AMBIENCE_DANGER area_limited_icon_smoothing = /area/shuttle/syndicate /area/shuttle/syndicate/bridge diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 4c78e5be551..675550e1646 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -1024,7 +1024,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.playsound_local(source, pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg'), 50, 1) if("creepy") //These sounds are (mostly) taken from Hidden: Source - target.playsound_local(source, pick(CREEPY_SOUNDS), 50, 1) + target.playsound_local(source, pick(GLOB.creepy_ambience), 50, 1) if("tesla") //Tesla loose! target.playsound_local(source, 'sound/magic/lightningbolt.ogg', 35, 1) addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/magic/lightningbolt.ogg', 65, 1), 30) diff --git a/tgstation.dme b/tgstation.dme index cf74391978d..9fcf950f919 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -209,6 +209,7 @@ #include "code\_globalvars\lists\poll_ignore.dm" #include "code\_globalvars\lists\typecache.dm" #include "code\_globalvars\lists\xenobiology.dm" +#include "code\_globalvars\lists\ambience.dm" #include "code\_js\byjax.dm" #include "code\_js\menus.dm" #include "code\_onclick\adjacent.dm"