diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index 22ddf9a305..9f18dd3711 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -70,7 +70,9 @@ // 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'\ + 'sound/ambience/highsec/highsec2.ogg',\ + 'sound/ambience/highsec/highsec3.ogg',\ + 'sound/ambience/highsec/highsec4.ogg'\ ) // Ruined structures found on the surface or in the caves. @@ -109,22 +111,39 @@ 'sound/ambience/generic/generic1.ogg',\ 'sound/ambience/generic/generic2.ogg',\ 'sound/ambience/generic/generic3.ogg',\ - 'sound/ambience/generic/generic4.ogg'\ + 'sound/ambience/generic/generic4.ogg',\ + 'sound/ambience/generic/generic5.ogg',\ + 'sound/ambience/generic/generic6.ogg',\ + 'sound/ambience/generic/generic7.ogg',\ + 'sound/ambience/generic/generic8.ogg'\ ) // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ 'sound/ambience/arrivals/arrivals1.ogg',\ - 'sound/ambience/arrivals/arrivals2.ogg'\ + 'sound/ambience/arrivals/arrivals2.ogg',\ + 'sound/ambience/arrivals/arrivals3.ogg',\ + 'sound/ambience/arrivals/arrivals4.ogg',\ + 'sound/ambience/arrivals/arrivals5.ogg',\ + 'sound/ambience/arrivals/arrivals6.ogg',\ + 'sound/ambience/arrivals/arrivals7.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/maintenance5.ogg',\ + 'sound/ambience/maintenance/maintenance6.ogg',\ + 'sound/ambience/maintenance/maintenance7.ogg',\ + 'sound/ambience/maintenance/maintenance8.ogg',\ + 'sound/ambience/maintenance/maintenance9.ogg',\ + 'sound/ambience/maintenance/maintenance10.ogg',\ + 'sound/ambience/maintenance/maintenance11.ogg',\ + 'sound/ambience/maintenance/maintenance12.ogg'\ ) // Life support machinery at work, keeping everyone breathing. @@ -154,11 +173,7 @@ // 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',\ - 'sound/ambience/foreboding/foreboding3.ogg',\ - 'sound/ambience/foreboding/foreboding4.ogg',\ - 'sound/ambience/foreboding/foreboding5.ogg',\ - 'sound/ambience/foreboding/foreboding6.ogg'\ + 'sound/ambience/foreboding/foreboding2.ogg'\ ) // Ambience heard when aboveground on Sif and not in a Point of Interest. @@ -187,4 +202,35 @@ 'sound/ambience/expoutpost/expoutpost2.ogg',\ 'sound/ambience/expoutpost/expoutpost3.ogg',\ 'sound/ambience/expoutpost/expoutpost4.ogg'\ -) \ No newline at end of file + ) + +//CHOMP Edit Sounds for Substation rooms. Just electrical sounds, really. +#define AMBIENCE_SUBSTATION list(\ + 'sound/ambience/substation/substation1.ogg',\ + 'sound/ambience/substation/substation2.ogg',\ + 'sound/ambience/substation/substation3.ogg',\ + 'sound/ambience/substation/substation4.ogg',\ + 'sound/ambience/substation/substation5.ogg',\ + 'sound/ambience/substation/substation6.ogg',\ + 'sound/ambience/substation/substation7.ogg',\ + 'sound/ambience/substation/substation8.ogg'\ + ) + +//CHOMP Edit Sounds for hangars +#define AMBIENCE_HANGAR list(\ + 'sound/ambience/hangar/hangar1.ogg',\ + 'sound/ambience/hangar/hangar2.ogg',\ + 'sound/ambience/hangar/hangar3.ogg',\ + 'sound/ambience/hangar/hangar4.ogg',\ + 'sound/ambience/hangar/hangar5.ogg',\ + 'sound/ambience/hangar/hangar6.ogg'\ + ) + +//CHOMP Edit Sounds for atmos +#define AMBIENCE_ATMOS list(\ + 'sound/ambience/engineering/engineering1.ogg',\ + 'sound/ambience/engineering/engineering2.ogg',\ + 'sound/ambience/engineering/engineering3.ogg',\ + 'sound/ambience/atmospherics/atmospherics1.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 index 2c26406b35..823c4ae44c 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1399,9 +1399,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambience = AMBIENCE_ENGINEERING /area/engineering/atmos - name = "\improper Atmospherics" - icon_state = "atmos" - sound_env = LARGE_ENCLOSED + name = "\improper Atmospherics" + icon_state = "atmos" + sound_env = LARGE_ENCLOSED + ambience = AMBIENCE_ATMOS /area/engineering/atmos/monitoring name = "\improper Atmospherics Monitoring Room" @@ -2651,6 +2652,12 @@ var/list/the_station_areas = list ( //CHOMPSTATION AREAS //Moved hangars to here from Southern cross areas. +/area/hangar + name = "\improper First Deck Hangar" + icon_state = "hangar" + sound_env = LARGE_ENCLOSED + ambience = AMBIENCE_HANGAR + /area/hangar/one name = "\improper Hangar One" @@ -2671,3 +2678,4 @@ var/list/the_station_areas = list ( /area/hangar/lockerroomthree name = "\improper Exploration Locker Room Three" icon_state = "hangarcontrol" + \ 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 d26069b1db..3cae645f90 100644 --- a/maps/southern_cross/southern_cross_areas.dm +++ b/maps/southern_cross/southern_cross_areas.dm @@ -185,6 +185,7 @@ /area/surface/outpost/mining_main/gen_room name = "North Mining Generator Room" icon_state = "substation" + ambience = AMBIENCE_SUBSTATION //CHOMP Addition /area/surface/outpost/mining_main/emergencystorage name = "\improper North Mining Emergency Storage" @@ -219,6 +220,7 @@ name = "\improper Xenoresearch SMES Maintenance" icon_state = "substation" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_SUBSTATION //CHOMP Addition /area/surface/outpost/research/xenoresearch/emergencystorage name = "\improper Xenoresearch Emergency Storage" @@ -259,6 +261,7 @@ name = "\improper Xenoarcheology SMES Maintenance" icon_state = "substation" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_SUBSTATION //CHOMP Addition /area/surface/outpost/research/xenoarcheology/emergencystorage name = "\improper Xenoarcheology Emergency Storage" @@ -310,7 +313,7 @@ /area/surface/outpost/main/gen_room name = "\improper Main Outpost SMES" icon_state = "substation" - ambience = AMBIENCE_ENGINEERING + ambience = AMBIENCE_SUBSTATION //CHOMP Edit /area/surface/outpost/main/gen_room/smes_left name = "\improper Main Outpost Left Wing SMES" @@ -320,7 +323,7 @@ /area/surface/outpost/main/gen_room/smes name = "\improper Main Outpost Dorm SMES" - icon_state = "substation" + icon_state = "substation" /area/surface/outpost/main/pool name = "\improper Main Outpost Pool" @@ -527,7 +530,7 @@ /area/surface/outpost/security/smes name = "\improper Security Outpost SMES" icon_state = "substation" - ambience = AMBIENCE_ENGINEERING + ambience = AMBIENCE_SUBSTATION //CHOMP Edit //Mining Station @@ -544,6 +547,7 @@ /area/outpost/mining_station/gen_station name = "Mining Station Generator Room" icon_state = "substation" + ambience = AMBIENCE_SUBSTATION //CHOMP Edit /area/outpost/mining_station/crew_area name = "Mining Station Crew Area" @@ -875,6 +879,7 @@ /area/maintenance/substation/atmospherics name = "Atmospherics Substation" + ambience = AMBIENCE_SUBSTATION //CHOMP Addition /area/maintenance/emergencyeva name = "\improper Emergency EVA Maintenance" @@ -882,6 +887,7 @@ /area/maintenance/substation/central // n/a name = "Central Substation" + ambience = AMBIENCE_SUBSTATION //CHOMP Addition //CHOMPStation Edit Start TFF 6/2/20 - Added substation @@ -889,6 +895,7 @@ name = "Substation" icon_state = "substation" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_SUBSTATION //CHOMP Addition //CHOMPStation Edit End @@ -1816,6 +1823,7 @@ area/crew_quarters/heads/sc/hop/quarters /area/surface/outpost/fishing/smes name = "\improper Fishing SMES Maintenance" icon_state = "substation" + ambience = AMBIENCE_SUBSTATION //CHOMP Addition //Shuttle 3 CHOMPedit diff --git a/sound/ambience/ai/ai2.ogg b/sound/ambience/ai/ai2.ogg new file mode 100644 index 0000000000..691b437f49 Binary files /dev/null and b/sound/ambience/ai/ai2.ogg differ diff --git a/sound/ambience/ai/ai3.ogg b/sound/ambience/ai/ai3.ogg new file mode 100644 index 0000000000..b20e79fdde Binary files /dev/null and b/sound/ambience/ai/ai3.ogg differ diff --git a/sound/ambience/arrivals/arrivals3.ogg b/sound/ambience/arrivals/arrivals3.ogg new file mode 100644 index 0000000000..d396599d2d Binary files /dev/null and b/sound/ambience/arrivals/arrivals3.ogg differ diff --git a/sound/ambience/arrivals/arrivals4.ogg b/sound/ambience/arrivals/arrivals4.ogg new file mode 100644 index 0000000000..7736157472 Binary files /dev/null and b/sound/ambience/arrivals/arrivals4.ogg differ diff --git a/sound/ambience/arrivals/arrivals5.ogg b/sound/ambience/arrivals/arrivals5.ogg new file mode 100644 index 0000000000..0e56fa439e Binary files /dev/null and b/sound/ambience/arrivals/arrivals5.ogg differ diff --git a/sound/ambience/arrivals/arrivals6.ogg b/sound/ambience/arrivals/arrivals6.ogg new file mode 100644 index 0000000000..d0241cc0e2 Binary files /dev/null and b/sound/ambience/arrivals/arrivals6.ogg differ diff --git a/sound/ambience/arrivals/arrivals7.ogg b/sound/ambience/arrivals/arrivals7.ogg new file mode 100644 index 0000000000..3a609012d9 Binary files /dev/null and b/sound/ambience/arrivals/arrivals7.ogg differ diff --git a/sound/ambience/atmospherics/atmospherics1.ogg b/sound/ambience/atmospherics/atmospherics1.ogg new file mode 100644 index 0000000000..006de1c9cc Binary files /dev/null and b/sound/ambience/atmospherics/atmospherics1.ogg differ diff --git a/sound/ambience/foreboding/foreboding1.ogg b/sound/ambience/foreboding/foreboding1.ogg index be3cf1b703..b6e65c0bf6 100644 Binary files a/sound/ambience/foreboding/foreboding1.ogg and b/sound/ambience/foreboding/foreboding1.ogg differ diff --git a/sound/ambience/foreboding/foreboding2.ogg b/sound/ambience/foreboding/foreboding2.ogg index 9562178a2b..dde64a9858 100644 Binary files a/sound/ambience/foreboding/foreboding2.ogg and b/sound/ambience/foreboding/foreboding2.ogg differ diff --git a/sound/ambience/hangar/hangar1.ogg b/sound/ambience/hangar/hangar1.ogg new file mode 100644 index 0000000000..6fea9fc0f5 Binary files /dev/null and b/sound/ambience/hangar/hangar1.ogg differ diff --git a/sound/ambience/hangar/hangar2.ogg b/sound/ambience/hangar/hangar2.ogg new file mode 100644 index 0000000000..1c8a63424c Binary files /dev/null and b/sound/ambience/hangar/hangar2.ogg differ diff --git a/sound/ambience/hangar/hangar3.ogg b/sound/ambience/hangar/hangar3.ogg new file mode 100644 index 0000000000..4518a70a94 Binary files /dev/null and b/sound/ambience/hangar/hangar3.ogg differ diff --git a/sound/ambience/hangar/hangar4.ogg b/sound/ambience/hangar/hangar4.ogg new file mode 100644 index 0000000000..a28c914c9e Binary files /dev/null and b/sound/ambience/hangar/hangar4.ogg differ diff --git a/sound/ambience/hangar/hangar5.ogg b/sound/ambience/hangar/hangar5.ogg new file mode 100644 index 0000000000..cef20f5628 Binary files /dev/null and b/sound/ambience/hangar/hangar5.ogg differ diff --git a/sound/ambience/hangar/hangar6.ogg b/sound/ambience/hangar/hangar6.ogg new file mode 100644 index 0000000000..938cb83f19 Binary files /dev/null and b/sound/ambience/hangar/hangar6.ogg differ diff --git a/sound/ambience/highsec/highsec3.ogg b/sound/ambience/highsec/highsec3.ogg new file mode 100644 index 0000000000..87318e6203 Binary files /dev/null and b/sound/ambience/highsec/highsec3.ogg differ diff --git a/sound/ambience/highsec/highsec4.ogg b/sound/ambience/highsec/highsec4.ogg new file mode 100644 index 0000000000..9fb613e031 Binary files /dev/null and b/sound/ambience/highsec/highsec4.ogg differ diff --git a/sound/ambience/maintenance/maintenance1.ogg b/sound/ambience/maintenance/maintenance1.ogg index 0c18c46af6..be3cf1b703 100644 Binary files a/sound/ambience/maintenance/maintenance1.ogg and b/sound/ambience/maintenance/maintenance1.ogg differ diff --git a/sound/ambience/maintenance/maintenance10.ogg b/sound/ambience/maintenance/maintenance10.ogg new file mode 100644 index 0000000000..13b07ee803 Binary files /dev/null and b/sound/ambience/maintenance/maintenance10.ogg differ diff --git a/sound/ambience/maintenance/maintenance11.ogg b/sound/ambience/maintenance/maintenance11.ogg new file mode 100644 index 0000000000..dc3cd9a589 Binary files /dev/null and b/sound/ambience/maintenance/maintenance11.ogg differ diff --git a/sound/ambience/maintenance/maintenance12.ogg b/sound/ambience/maintenance/maintenance12.ogg new file mode 100644 index 0000000000..728049f3ed Binary files /dev/null and b/sound/ambience/maintenance/maintenance12.ogg differ diff --git a/sound/ambience/maintenance/maintenance2.ogg b/sound/ambience/maintenance/maintenance2.ogg index 655d940cda..9562178a2b 100644 Binary files a/sound/ambience/maintenance/maintenance2.ogg and b/sound/ambience/maintenance/maintenance2.ogg differ diff --git a/sound/ambience/maintenance/maintenance3.ogg b/sound/ambience/maintenance/maintenance3.ogg index 9891916010..4214afd9b8 100644 Binary files a/sound/ambience/maintenance/maintenance3.ogg and b/sound/ambience/maintenance/maintenance3.ogg differ diff --git a/sound/ambience/maintenance/maintenance4.ogg b/sound/ambience/maintenance/maintenance4.ogg index 1d01e2016c..2a8177f274 100644 Binary files a/sound/ambience/maintenance/maintenance4.ogg and b/sound/ambience/maintenance/maintenance4.ogg differ diff --git a/sound/ambience/maintenance/maintenance5.ogg b/sound/ambience/maintenance/maintenance5.ogg index 7a065ecbcb..604a013a5e 100644 Binary files a/sound/ambience/maintenance/maintenance5.ogg and b/sound/ambience/maintenance/maintenance5.ogg differ diff --git a/sound/ambience/maintenance/maintenance6.ogg b/sound/ambience/maintenance/maintenance6.ogg new file mode 100644 index 0000000000..522aec4afe Binary files /dev/null and b/sound/ambience/maintenance/maintenance6.ogg differ diff --git a/sound/ambience/maintenance/maintenance7.ogg b/sound/ambience/maintenance/maintenance7.ogg new file mode 100644 index 0000000000..1fd30f252f Binary files /dev/null and b/sound/ambience/maintenance/maintenance7.ogg differ diff --git a/sound/ambience/maintenance/maintenance8.ogg b/sound/ambience/maintenance/maintenance8.ogg new file mode 100644 index 0000000000..5d8feb5fd6 Binary files /dev/null and b/sound/ambience/maintenance/maintenance8.ogg differ diff --git a/sound/ambience/maintenance/maintenance9.ogg b/sound/ambience/maintenance/maintenance9.ogg new file mode 100644 index 0000000000..4a8078b344 Binary files /dev/null and b/sound/ambience/maintenance/maintenance9.ogg differ diff --git a/sound/ambience/substation/substation1.ogg b/sound/ambience/substation/substation1.ogg new file mode 100644 index 0000000000..5aa2dd36c1 Binary files /dev/null and b/sound/ambience/substation/substation1.ogg differ diff --git a/sound/ambience/substation/substation2.ogg b/sound/ambience/substation/substation2.ogg new file mode 100644 index 0000000000..837fbe1b91 Binary files /dev/null and b/sound/ambience/substation/substation2.ogg differ diff --git a/sound/ambience/substation/substation3.ogg b/sound/ambience/substation/substation3.ogg new file mode 100644 index 0000000000..02c6899f4d Binary files /dev/null and b/sound/ambience/substation/substation3.ogg differ diff --git a/sound/ambience/substation/substation4.ogg b/sound/ambience/substation/substation4.ogg new file mode 100644 index 0000000000..1220751a18 Binary files /dev/null and b/sound/ambience/substation/substation4.ogg differ diff --git a/sound/ambience/substation/substation5.ogg b/sound/ambience/substation/substation5.ogg new file mode 100644 index 0000000000..23f55a302d Binary files /dev/null and b/sound/ambience/substation/substation5.ogg differ diff --git a/sound/ambience/substation/substation6.ogg b/sound/ambience/substation/substation6.ogg new file mode 100644 index 0000000000..ee39656907 Binary files /dev/null and b/sound/ambience/substation/substation6.ogg differ diff --git a/sound/ambience/substation/substation7.ogg b/sound/ambience/substation/substation7.ogg new file mode 100644 index 0000000000..fd2b7372b6 Binary files /dev/null and b/sound/ambience/substation/substation7.ogg differ diff --git a/sound/ambience/substation/substation8.ogg b/sound/ambience/substation/substation8.ogg new file mode 100644 index 0000000000..770ca2c8a3 Binary files /dev/null and b/sound/ambience/substation/substation8.ogg differ