Skip to content

Commit

Permalink
Get rid of sound environment effects. #465 (#487)
Browse files Browse the repository at this point in the history
  • Loading branch information
@LethalGhost @fluorescent-net
LethalGhost authored and fluorescent-net committed Feb 11, 2017
1 parent abb36d7 commit a23c317
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 122 deletions.
56 changes: 1 addition & 55 deletions code/game/area/Space Station 13 areas.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/air_doors_activated = 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/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

/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
Expand Down Expand Up @@ -141,7 +140,6 @@ area/space/atmosalert()

/area/shuttle
requires_power = 0
sound_env = SMALL_ENCLOSED
base_turf = /turf/space

/area/shuttle/arrival
Expand Down Expand Up @@ -412,18 +410,15 @@ area/space/atmosalert()
name = "\improper Moon"
icon_state = "asteroid"
requires_power = 0
sound_env = ASTEROID

/area/asteroid/cave // -- TLE
name = "\improper Moon - Underground"
icon_state = "cave"
requires_power = 0
sound_env = ASTEROID

/area/asteroid/artifactroom
name = "\improper Moon - Artifact"
icon_state = "cave"
sound_env = SMALL_ENCLOSED



Expand All @@ -449,7 +444,6 @@ area/space/atmosalert()
icon_state = "thunder"
requires_power = 0
dynamic_lighting = 0
sound_env = ARENA

/area/tdome/tdome1
name = "\improper Thunderdome (Team 1)"
Expand Down Expand Up @@ -672,7 +666,6 @@ area/space/atmosalert()

/area/maintenance
flags = RAD_SHIELDED
sound_env = TUNNEL_ENCLOSED
turf_initializer = new /datum/turf_initializer/maintenance()

/area/maintenance/aft
Expand Down Expand Up @@ -808,7 +801,6 @@ area/space/atmosalert()
/area/maintenance/substation
name = "Substation"
icon_state = "substation"
sound_env = SMALL_ENCLOSED

/area/maintenance/substation/engineering // Probably will be connected to engineering SMES room, as wires cannot be crossed properly without them sharing powernets.
name = "Engineering Substation"
Expand Down Expand Up @@ -840,8 +832,7 @@ area/space/atmosalert()

//Hallway

/area/hallway/primary/
sound_env = LARGE_ENCLOSED
/area/hallway/primary

/area/hallway/primary/fore
name = "\improper Fore Primary Hallway"
Expand Down Expand Up @@ -909,12 +900,10 @@ area/space/atmosalert()
name = "\improper Heads of Staff Meeting Room"
icon_state = "bridge"
ambience = list()
sound_env = MEDIUM_SOFTFLOOR

/area/crew_quarters/captain
name = "\improper Command - Captain's Office"
icon_state = "captain"
sound_env = MEDIUM_SOFTFLOOR

/area/crew_quarters/heads/hop
name = "\improper Command - HoP's Office"
Expand Down Expand Up @@ -972,7 +961,6 @@ area/space/atmosalert()
/area/crew_quarters/toilet
name = "\improper Dormitory Toilets"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

/area/crew_quarters/sleep
name = "\improper Dormitories"
Expand All @@ -981,13 +969,10 @@ area/space/atmosalert()
/area/crew_quarters/sleep/engi_wash
name = "\improper Engineering Washroom"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

/area/crew_quarters/sleep/bedrooms
name = "\improper Dormitory Bedroom One"
icon_state = "Sleep"
sound_env = SMALL_SOFTFLOOR

/area/crew_quarters/sleep/cryo
name = "\improper Cryogenic Storage"
icon_state = "Sleep"
Expand All @@ -999,7 +984,6 @@ area/space/atmosalert()
/area/crew_quarters/sleep_male/toilet_male
name = "\improper Male Toilets"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

/area/crew_quarters/sleep_female
name = "\improper Female Dorm"
Expand All @@ -1008,7 +992,6 @@ area/space/atmosalert()
/area/crew_quarters/sleep_female/toilet_female
name = "\improper Female Toilets"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

/area/crew_quarters/locker
name = "\improper Locker Room"
Expand All @@ -1017,7 +1000,6 @@ area/space/atmosalert()
/area/crew_quarters/locker/locker_toilet
name = "\improper Locker Toilets"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED

/area/crew_quarters/fitness
name = "\improper Fitness Room"
Expand All @@ -1034,23 +1016,19 @@ area/space/atmosalert()
/area/crew_quarters/bar
name = "\improper Bar"
icon_state = "bar"
sound_env = LARGE_SOFTFLOOR

/area/crew_quarters/theatre
name = "\improper Theatre"
icon_state = "Theatre"
sound_env = LARGE_SOFTFLOOR

/area/library
name = "\improper Library"
icon_state = "library"
sound_env = LARGE_SOFTFLOOR

/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
name = "\improper Chapel Office"
Expand All @@ -1067,7 +1045,6 @@ area/space/atmosalert()
name = "\improper Holodeck"
icon_state = "Holodeck"
dynamic_lighting = 0
sound_env = LARGE_ENCLOSED

/area/holodeck/alphadeck
name = "\improper Holodeck Alpha"
Expand All @@ -1077,27 +1054,21 @@ area/space/atmosalert()

/area/holodeck/source_emptycourt
name = "\improper Holodeck - Empty Court"
sound_env = ARENA

/area/holodeck/source_boxingcourt
name = "\improper Holodeck - Boxing Court"
sound_env = ARENA

/area/holodeck/source_basketball
name = "\improper Holodeck - Basketball Court"
sound_env = ARENA

/area/holodeck/source_thunderdomecourt
name = "\improper Holodeck - Thunderdome Court"
sound_env = ARENA

/area/holodeck/source_courtroom
name = "\improper Holodeck - Courtroom"
sound_env = AUDITORIUM

/area/holodeck/source_beach
name = "\improper Holodeck - Beach"
sound_env = PLAIN

/area/holodeck/source_burntest
name = "\improper Holodeck - Atmospheric Burn Test"
Expand All @@ -1107,28 +1078,22 @@ area/space/atmosalert()

/area/holodeck/source_meetinghall
name = "\improper Holodeck - Meeting Hall"
sound_env = AUDITORIUM

/area/holodeck/source_theatre
name = "\improper Holodeck - Theatre"
sound_env = CONCERT_HALL

/area/holodeck/source_picnicarea
name = "\improper Holodeck - Picnic Area"
sound_env = PLAIN

/area/holodeck/source_snowfield
name = "\improper Holodeck - Snow Field"
sound_env = FOREST

/area/holodeck/source_desert
name = "\improper Holodeck - Desert"
sound_env = PLAIN

/area/holodeck/source_space
name = "\improper Holodeck - Space"
has_gravity = 0
sound_env = SPACE

//Engineering

Expand All @@ -1144,32 +1109,26 @@ area/space/atmosalert()
/area/engineering/atmos
name = "\improper Atmospherics"
icon_state = "atmos"
sound_env = LARGE_ENCLOSED

/area/engineering/atmos/monitoring
name = "\improper Atmospherics Monitoring Room"
icon_state = "atmos_monitoring"
sound_env = STANDARD_STATION

/area/engineering/atmos/storage
name = "\improper Atmospherics Storage"
icon_state = "atmos_storage"
sound_env = SMALL_ENCLOSED

/area/engineering/drone_fabrication
name = "\improper Engineering Drone Fabrication"
icon_state = "drone_fab"
sound_env = SMALL_ENCLOSED

/area/engineering/engine_smes
name = "\improper Engineering SMES"
icon_state = "engine_smes"
sound_env = SMALL_ENCLOSED

/area/engineering/engine_room
name = "\improper Engine Room"
icon_state = "engine"
sound_env = LARGE_ENCLOSED

/area/engineering/engine_airlock
name = "\improper Engine Room Airlock"
Expand Down Expand Up @@ -1198,7 +1157,6 @@ area/space/atmosalert()
/area/engineering/break_room
name = "\improper Engineering Break Room"
icon_state = "engineering_break"
sound_env = MEDIUM_SOFTFLOOR

/area/engineering/engine_eva
name = "\improper Engine EVA"
Expand Down Expand Up @@ -1249,27 +1207,22 @@ area/space/atmosalert()
/area/maintenance/auxsolarport
name = "Solar Maintenance - Fore Port"
icon_state = "SolarcontrolP"
sound_env = SMALL_ENCLOSED

/area/maintenance/starboardsolar
name = "Solar Maintenance - Aft Starboard"
icon_state = "SolarcontrolS"
sound_env = SMALL_ENCLOSED

/area/maintenance/portsolar
name = "Solar Maintenance - Aft Port"
icon_state = "SolarcontrolP"
sound_env = SMALL_ENCLOSED

/area/maintenance/auxsolarstarboard
name = "Solar Maintenance - Fore Starboard"
icon_state = "SolarcontrolS"
sound_env = SMALL_ENCLOSED

/area/maintenance/foresolar
name = "Solar Maintenance - Fore"
icon_state = "SolarcontrolA"
sound_env = SMALL_ENCLOSED

/area/assembly/chargebay
name = "\improper Mech Bay"
Expand Down Expand Up @@ -1478,7 +1431,6 @@ area/space/atmosalert()
/area/security/detectives_office
name = "\improper Security - Forensic Office"
icon_state = "detective"
sound_env = MEDIUM_SOFTFLOOR

/area/security/range
name = "\improper Security - Firing Range"
Expand Down Expand Up @@ -1553,7 +1505,6 @@ area/space/atmosalert()
/area/quartermaster/storage
name = "\improper Cargo Bay"
icon_state = "quartstorage"
sound_env = LARGE_ENCLOSED

/area/quartermaster/qm
name = "\improper Cargo - Quartermaster's Office"
Expand Down Expand Up @@ -1786,7 +1737,6 @@ area/space/atmosalert()
//Eris Hallways

/area/eris/hallway
sound_env = LARGE_ENCLOSED
icon_state = "erisgreen"

/area/eris/hallway/main/section1
Expand Down Expand Up @@ -1903,7 +1853,6 @@ area/space/atmosalert()
/area/eris/engineering/substation
name = "Substation"
icon_state = "substation"
sound_env = SMALL_ENCLOSED

/area/eris/engineering/substation/engineering
name = "Engineering Substation"
Expand Down Expand Up @@ -2299,12 +2248,10 @@ area/space/atmosalert()
name = "AI Upload Access"
icon_state = "ai_foyer"
ambience = list('sound/ambience/ambimalf.ogg')
sound_env = SMALL_ENCLOSED

/area/turret_protected/ai_server_room
name = "Messaging Server Room"
icon_state = "ai_server"
sound_env = SMALL_ENCLOSED

/area/turret_protected/ai
name = "\improper AI Chamber"
Expand All @@ -2314,7 +2261,6 @@ area/space/atmosalert()
/area/turret_protected/ai_cyborg_station
name = "\improper Cyborg Station"
icon_state = "ai_cyborg"
sound_env = SMALL_ENCLOSED

/area/turret_protected/aisat
name = "\improper AI Satellite"
Expand Down
1 change: 0 additions & 1 deletion code/game/area/asteroid_areas.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/area/mine
icon_state = "mining"
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
sound_env = ASTEROID

/area/mine/explored
name = "Mine"
Expand Down

0 comments on commit a23c317

Please sign in to comment.