ImmursionAudio(TM)

code/game/area/Space_Station_13_areas.dm

@@ -44,6 +44,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	ambientsounds = SPACE
 	blob_allowed = FALSE //Eating up space doesn't count for victory as a blob.
 	considered_hull_exterior = TRUE
+	sound_environment = SOUND_AREA_SPACE
 
 /area/space/nearstation
 	icon_state = "space_near"
@@ -69,6 +70,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	blob_allowed = FALSE //Nope, no winning on the asteroid as a blob. Gotta eat the station.
 	valid_territory = FALSE
 	ambientsounds = MINING
+	sound_environment = SOUND_AREA_ASTEROID
 
 /area/asteroid/nearstation
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
@@ -106,7 +108,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/maintenance
 	ambientsounds = MAINTENANCE
 	valid_territory = FALSE
-
+	sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
 
 //Departments
 
@@ -121,6 +123,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/maintenance/department/crew_quarters/bar
 	name = "Bar Maintenance"
 	icon_state = "maint_bar"
+	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/maintenance/department/crew_quarters/dorms
 	name = "Dormitory Maintenance"
@@ -264,6 +267,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/hallway
 	nightshift_public_area = NIGHTSHIFT_AREA_PUBLIC
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/hallway/primary/aft
 	name = "Aft Primary Hallway"
@@ -336,30 +340,36 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Bridge"
 	icon_state = "bridge"
 	music = "signal"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/bridge/meeting_room
 	name = "Heads of Staff Meeting Room"
 	icon_state = "meeting"
 	music = null
+	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
 
 /area/bridge/meeting_room/council
 	name = "Council Chamber"
 	icon_state = "meeting"
 	music = null
+	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
 
 /area/bridge/showroom/corporate
 	name = "Corporate Showroom"
 	icon_state = "showroom"
 	music = null
+	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
 
 /area/crew_quarters/heads/captain
 	name = "Captain's Office"
 	icon_state = "captain"
 	clockwork_warp_allowed = FALSE
+	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/heads/captain/private
 	name = "Captain's Quarters"
 	icon_state = "captain"
+	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/heads/chief
 	name = "Chief Engineer's Office"
@@ -404,10 +414,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/comms
 	name = "Communications Relay"
 	icon_state = "tcomsatcham"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/server
 	name = "Messaging Server Room"
 	icon_state = "server"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 //Crew
 
@@ -416,6 +428,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "Sleep"
 	safe = TRUE
 	nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/crew_quarters/dorms/male
 	name = "Male Dorm"
@@ -434,6 +447,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/crew_quarters/toilet
 	name = "Dormitory Toilets"
 	icon_state = "toilet"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/crew_quarters/toilet/auxiliary
 	name = "Auxiliary Restrooms"
@@ -468,6 +482,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Lounge"
 	icon_state = "yellow"
 	nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/crew_quarters/fitness
 	name = "Fitness Room"
@@ -496,15 +511,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/crew_quarters/kitchen/backroom
 	name = "Kitchen Coldroom"
 	icon_state = "kitchen"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/crew_quarters/bar
 	name = "Bar"
 	icon_state = "bar"
 	nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/bar/atrium
 	name = "Atrium"
 	icon_state = "bar"
+	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/electronic_marketing_den
 	name = "Electronic Marketing Den"
@@ -520,6 +538,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/crew_quarters/theatre
 	name = "Theatre"
 	icon_state = "Theatre"
+	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/theatre/abandoned
 	name = "Abandoned Theatre"
@@ -540,10 +559,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "library"
 	flags_1 = NONE
 	nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+	sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
 
 /area/library/lounge
 	name = "Library Lounge"
 	icon_state = "library"
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/library/abandoned
 	name = "Abandoned Library"
@@ -558,6 +579,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	clockwork_warp_allowed = FALSE
 	clockwork_warp_fail = "The consecration here prevents you from warping in."
 	nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/chapel/main
 	name = "Chapel"
@@ -573,6 +595,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/chapel/asteroid
 	name = "Chapel Asteroid"
 	icon_state = "explored"
+	sound_environment = SOUND_AREA_ASTEROID
 
 /area/chapel/asteroid/monastery
 	name = "Monastery Asteroid"
@@ -584,12 +607,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/lawoffice
 	name = "Law Office"
 	icon_state = "law"
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 
 //Engineering
 
 /area/engine
 	ambientsounds = ENGINEERING
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/engine/engine_smes
 	name = "Engineering SMES"
@@ -607,14 +632,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/engine/atmospherics_engine
 	name = "Atmospherics Engine"
 	icon_state = "atmos_engine"
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/engine/supermatter
 	name = "Supermatter Engine"
 	icon_state = "engine_sm"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/engine/break_room
 	name = "Engineering Foyer"
 	icon_state = "engine_foyer"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/engine/gravity_generator
 	name = "Gravity Generator Room"
@@ -629,6 +657,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/engine/storage
 	name = "Engineering Storage"
 	icon_state = "engi_storage"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/engine/storage_shared
 	name = "Shared Engineering Storage"
@@ -648,10 +677,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	blob_allowed = FALSE
 	flags_1 = NONE
 	ambientsounds = ENGINEERING
+	sound_environment = SOUND_AREA_SPACE
 
 /area/solar/fore
 	name = "Fore Solar Array"
 	icon_state = "yellow"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/solar/aft
 	name = "Aft Solar Array"
@@ -757,6 +788,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "gateway"
 	music = "signal"
 	ambientsounds = ENGINEERING
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 //MedBay
 
@@ -764,11 +796,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Medical"
 	icon_state = "medbay3"
 	ambientsounds = MEDICAL
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/medical/abandoned
 	name = "Abandoned Medbay"
 	icon_state = "medbay3"
 	music = 'sound/ambience/signal.ogg'
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/medical/medbay/central
 	name = "Medbay Central"
@@ -810,6 +844,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/medical/patients_rooms
 	name = "Patients' Rooms"
 	icon_state = "patients"
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/medical/patients_rooms/room_a
 	name = "Patient Room A"
@@ -828,6 +863,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Morgue"
 	icon_state = "morgue"
 	ambientsounds = SPOOKY
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/medical/chemistry
 	name = "Chemistry"
@@ -868,6 +904,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Security"
 	icon_state = "security"
 	ambientsounds = HIGHSEC
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/security/main
 	name = "Security Office"
@@ -880,6 +917,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/courtroom
 	name = "Courtroom"
 	icon_state = "courtroom"
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/security/prison
 	name = "Prison Wing"
@@ -892,10 +930,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/processing/cremation
 	name = "Security Crematorium"
 	icon_state = "sec_prison"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/security/warden
 	name = "Brig Control"
 	icon_state = "Warden"
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/security/armory
 	name = "Armory"
@@ -909,6 +949,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/detectives_office/private_investigators_office
 	name = "Private Investigator's Office"
 	icon_state = "detective"
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/security/range
 	name = "Firing Range"
@@ -986,18 +1027,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/quartermaster
 	name = "Quartermasters"
 	icon_state = "quart"
-
-///////////WORK IN PROGRESS//////////
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/quartermaster/sorting
 	name = "Delivery Office"
 	icon_state = "cargo_delivery"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/quartermaster/warehouse
 	name = "Warehouse"
 	icon_state = "cargo_warehouse"
-
-////////////WORK IN PROGRESS//////////
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/quartermaster/office
 	name = "Cargo Office"
@@ -1006,6 +1046,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/quartermaster/storage
 	name = "Cargo Bay"
 	icon_state = "cargo_bay"
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/quartermaster/qm
 	name = "Quartermaster's Office"
@@ -1035,10 +1076,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Custodial Closet"
 	icon_state = "janitor"
 	flags_1 = NONE
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/hydroponics
 	name = "Hydroponics"
 	icon_state = "hydro"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/hydroponics/garden
 	name = "Garden"
@@ -1047,6 +1090,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/hydroponics/garden/abandoned
 	name = "Abandoned Garden"
 	icon_state = "abandoned_garden"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/hydroponics/garden/monastery
 	name = "Monastery Garden"
@@ -1057,6 +1101,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/science
 	name = "Science Division"
 	icon_state = "toxlab"
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/science/lab
 	name = "Research and Development"
@@ -1139,12 +1184,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/science/research/abandoned
 	name = "Abandoned Research Lab"
 	icon_state = "medresearch"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/science/nanite
 	name = "Nanite Lab"
 	icon_state = "toxmisc"
 
 //Storage
+/area/storage
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/storage/tools
 	name = "Auxiliary Tool Storage"
@@ -1210,6 +1258,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Construction Area"
 	icon_state = "yellow"
 	ambientsounds = ENGINEERING
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/construction/minisat_exterior
 	name = "Minisat Exterior"
@@ -1218,6 +1267,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/construction/mining/aux_base
 	name = "Auxiliary Base Construction"
 	icon_state = "yellow"
+	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
 
 /area/construction/mining/aux_base/closet
 	name = "Auxiliary Closet Construction"
@@ -1273,6 +1323,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 
 //AI
+/area/ai_monitored
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/ai_monitored/security/armory
 	name = "Armory"
@@ -1297,10 +1349,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/ai_monitored/turret_protected/ai_upload
 	name = "AI Upload Chamber"
 	icon_state = "ai_upload"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/ai_monitored/turret_protected/ai_upload_foyer
 	name = "AI Upload Access"
 	icon_state = "ai_foyer"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/ai_monitored/turret_protected/ai
 	name = "AI Chamber"
@@ -1309,6 +1363,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/ai_monitored/turret_protected/aisat
 	name = "AI Satellite"
 	icon_state = "ai"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
 
 /area/ai_monitored/turret_protected/aisat/atmos
 	name = "AI Satellite Atmos"
@@ -1333,6 +1388,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/ai_monitored/turret_protected/aisat_interior
 	name = "AI Satellite Antechamber"
 	icon_state = "ai"
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/ai_monitored/turret_protected/AIsatextFP
 	name = "AI Sat Ext"
@@ -1386,6 +1442,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/tcommsat/computer
 	name = "Telecomms Control Room"
 	icon_state = "tcomsatcomp"
+	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
 
 /area/tcommsat/server
 	name = "Telecomms Server Room"

code/game/area/ai_monitored.dm

@@ -3,6 +3,7 @@
 	clockwork_warp_allowed = FALSE
 	var/list/obj/machinery/camera/motioncameras = list()
 	var/list/datum/weakref/motionTargets = list()
+	sound_environment = SOUND_ENVIRONMENT_ROOM
 
 /area/ai_monitored/Initialize(mapload)
 	. = ..()

code/game/area/areas.dm

@@ -1,16 +1,72 @@
-// Areas.dm
-
-
+/**
+ * # area
+ *
+ * A grouping of tiles into a logical space, mostly used by map editors
+ */
 /area
-	level = null
 	name = "Space"
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "unknown"
 	layer = AREA_LAYER
-	plane = BLACKNESS_PLANE //Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE.
+	//Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE.
+	plane = BLACKNESS_PLANE
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	invisibility = INVISIBILITY_LIGHTING
 
+	var/fire = null
+	///Whether there is an atmos alarm in this area
+	var/atmosalm = FALSE
+	var/poweralm = FALSE
+	var/lightswitch = TRUE
+
+	/// All beauty in this area combined, only includes indoor area.
+	var/totalbeauty = 0
+	/// Beauty average per open turf in the area
+	var/beauty = 0
+	/// If a room is too big it doesn't have beauty.
+	var/beauty_threshold = 150
+
+	/// For space, the asteroid, lavaland, etc. Used with blueprints or with weather to determine if we are adding a new area (vs editing a station room)
+	var/outdoors = FALSE
+
+	/// Size of the area in open turfs, only calculated for indoors areas.
+	var/areasize = 0
+
+	/// Bonus mood for being in this area
+	var/mood_bonus = 0
+	/// Mood message for being here, only shows up if mood_bonus != 0
+	var/mood_message = "<span class='nicegreen'>This area is pretty nice!\n</span>"
+
+	///Will objects this area be needing power?
+	var/requires_power = TRUE
+	/// This gets overridden to 1 for space in area/Initialize().
+	var/always_unpowered = FALSE
+
+	var/power_equip = TRUE
+	var/power_light = TRUE
+	var/power_environ = TRUE
+
+	var/has_gravity = FALSE
+
+	var/parallax_movedir = 0
+
+	var/list/ambientsounds = GENERIC
+	flags_1 = CAN_BE_DIRTY_1
+
+	var/list/firedoors
+	var/list/cameras
+	var/list/firealarms
+	var/firedoors_last_closed_on = 0
+
+
+	///This datum, if set, allows terrain generation behavior to be ran on Initialize()
+	// var/datum/map_generator/map_generator
+
+	///Used to decide what kind of reverb the area makes sound have
+	var/sound_environment = SOUND_ENVIRONMENT_NONE
+
+	/// CIT SPECIFIC VARS
+
 	/// Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
 	var/map_name
 
@@ -37,29 +93,8 @@
 	/// Considered space for hull shielding
 	var/considered_hull_exterior = FALSE
 
-	var/fire = null
 	var/atmos = TRUE
-	var/atmosalm = FALSE
-	var/poweralm = TRUE
-	var/lightswitch = TRUE
 
-	var/totalbeauty = 0 //All beauty in this area combined, only includes indoor area.
-	var/beauty = 0 // Beauty average per open turf in the area
-	var/beauty_threshold = 150 //If a room is too big it doesn't have beauty.
-
-	var/requires_power = TRUE
-	/// This gets overridden to 1 for space in area/Initialize().
-	var/always_unpowered = FALSE
-
-	/// For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
-	var/outdoors = FALSE
-
-	/// Size of the area in open turfs, only calculated for indoors areas.
-	var/areasize = 0
-
-	var/power_equip = TRUE
-	var/power_light = TRUE
-	var/power_environ = TRUE
 	var/music = null
 	var/used_equip = 0
 	var/used_light = 0
@@ -68,7 +103,6 @@
 	var/static_light = 0
 	var/static_environ
 
-	var/has_gravity = 0
 	/// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
 	var/noteleport = FALSE
 	/// Hides area from player Teleport function.
@@ -80,15 +114,6 @@
 
 	var/no_air = null
 
-	var/parallax_movedir = 0
-
-	var/list/ambientsounds = GENERIC
-	flags_1 = CAN_BE_DIRTY_1
-
-	var/list/firedoors
-	var/list/cameras
-	var/list/firealarms
-	var/firedoors_last_closed_on = 0
 	var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default?
 	var/list/canSmoothWithAreas //typecache to limit the areas that atoms in this area can smooth with
 
@@ -107,10 +132,24 @@
 
 	var/nightshift_public_area = NIGHTSHIFT_AREA_NONE		//considered a public area for nightshift
 
-/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
-/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
+
+/**
+ * A list of teleport locations
+ *
+ * Adding a wizard area teleport list because motherfucking lag -- Urist
+ * I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game
+ */
 GLOBAL_LIST_EMPTY(teleportlocs)
 
+/**
+ * Generate a list of turfs you can teleport to from the areas list
+ *
+ * Includes areas if they're not a shuttle or not not teleport or have no contents
+ *
+ * The chosen turf is the first item in the areas contents that is a station level
+ *
+ * The returned list of turfs is sorted by name
+ */
 /proc/process_teleport_locs()
 	for(var/V in GLOB.sortedAreas)
 		var/area/AR = V
@@ -124,11 +163,19 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		if (picked && is_station_level(picked.z))
 			GLOB.teleportlocs[AR.name] = AR
 
-	sortTim(GLOB.teleportlocs, /proc/cmp_text_dsc)
-
-// ===
+	sortTim(GLOB.teleportlocs, /proc/cmp_text_asc)
 
+/**
+ * Called when an area loads
+ *
+ *  Adds the item to the GLOB.areas_by_type list based on area type
+ */
 /area/New()
+	// This interacts with the map loader, so it needs to be set immediately
+	// rather than waiting for atoms to initialize.
+	if (unique)
+		GLOB.areas_by_type[type] = src
+
 	if(!minimap_color) // goes in New() because otherwise it doesn't fucking work
 		// generate one using the icon_state
 		if(icon_state && icon_state != "unknown")
@@ -137,14 +184,18 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 			minimap_color = I.GetPixel(1,1)
 		else // no icon state? use random.
 			minimap_color = rgb(rand(50,70),rand(50,70),rand(50,70))	// This interacts with the map loader, so it needs to be set immediately
-	// rather than waiting for atoms to initialize.
-	if (unique)
-		GLOB.areas_by_type[type] = src
 	return ..()
 
+/**
+ * Initalize this area
+ *
+ * intializes the dynamic area lighting and also registers the area with the z level via
+ * reg_in_areas_in_z
+ *
+ * returns INITIALIZE_HINT_LATELOAD
+ */
 /area/Initialize()
 	icon_state = ""
-	layer = AREA_LAYER
 	map_name = name // Save the initial (the name set in the map) name of the area.
 	canSmoothWithAreas = typecacheof(canSmoothWithAreas)
 
@@ -198,29 +249,55 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 
 	return INITIALIZE_HINT_LATELOAD
 
+/**
+ * Sets machine power levels in the area
+ */
 /area/LateInitialize()
 	if(!base_area) //we don't want to run it twice.
 		power_change()		// all machines set to current power level, also updates icon
 	update_beauty()
 
-/area/proc/reg_in_areas_in_z()
-	if(contents.len)
-		var/list/areas_in_z = SSmapping.areas_in_z
-		var/z
-		update_areasize()
-		for(var/i in 1 to contents.len)
-			var/atom/thing = contents[i]
-			if(!thing)
-				continue
-			z = thing.z
-			break
-		if(!z)
-			WARNING("No z found for [src]")
-			return
-		if(!areas_in_z["[z]"])
-			areas_in_z["[z]"] = list()
-		areas_in_z["[z]"] += src
+/// Soon &trade;
+/area/proc/RunGeneration()
+	// if(map_generator)
+	// 	map_generator = new map_generator()
+	// 	var/list/turfs = list()
+	// 	for(var/turf/T in contents)
+	// 		turfs += T
+	// 	map_generator.generate_terrain(turfs)
 
+/area/proc/test_gen()
+	// if(map_generator)
+	// 	var/list/turfs = list()
+	// 	for(var/turf/T in contents)
+	// 		turfs += T
+	// 	map_generator.generate_terrain(turfs)
+
+/**
+ * Register this area as belonging to a z level
+ *
+ * Ensures the item is added to the SSmapping.areas_in_z list for this z
+ */
+/area/proc/reg_in_areas_in_z()
+	if(!length(contents))
+		return
+	var/list/areas_in_z = SSmapping.areas_in_z
+	update_areasize()
+	if(!z)
+		WARNING("No z found for [src]")
+		return
+	if(!areas_in_z["[z]"])
+		areas_in_z["[z]"] = list()
+	areas_in_z["[z]"] += src
+
+/**
+ * Destroy an area and clean it up
+ *
+ * Removes the area from GLOB.areas_by_type and also stops it processing on SSobj
+ *
+ * This is despite the fact that no code appears to put it on SSobj, but
+ * who am I to argue with old coders
+ */
 /area/Destroy()
 	if(GLOB.areas_by_type[type] == src)
 		GLOB.areas_by_type[type] = null
@@ -240,6 +317,11 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	STOP_PROCESSING(SSobj, src)
 	return ..()
 
+/**
+ * Generate a power alert for this area
+ *
+ * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world
+ */
 /area/proc/poweralert(state, obj/source)
 	if (state != poweralm)
 		poweralm = state
@@ -521,6 +603,13 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 			used_environ += amount
 
 
+/**
+ * Call back when an atom enters an area
+ *
+ * Sends signals COMSIG_AREA_ENTERED and COMSIG_ENTER_AREA (to the atom)
+ *
+ * If the area has ambience, then it plays some ambience music to the ambience channel
+ */
 /area/Entered(atom/movable/M, atom/OldLoc)
 	set waitfor = FALSE
 	SEND_SIGNAL(src, COMSIG_AREA_ENTERED, M)
@@ -563,6 +652,12 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		return FALSE //Too big
 	beauty = totalbeauty / areasize
 
+
+/**
+ * Called when an atom exits an area
+ *
+ * Sends signals COMSIG_AREA_EXITED and COMSIG_EXIT_AREA (to the atom)
+ */
 /area/Exited(atom/movable/M)
 	SEND_SIGNAL(src, COMSIG_AREA_EXITED, M)
 	SEND_SIGNAL(M, COMSIG_EXIT_AREA, src) //The atom that exits the area

code/game/area/areas/away_content.dm

@@ -9,6 +9,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
 	icon_state = "away"
 	has_gravity = STANDARD_GRAVITY
 	ambientsounds = AWAY_MISSION
+	sound_environment = SOUND_ENVIRONMENT_ROOM
 
 /area/awaymission/beach
 	name = "Beach"

code/game/area/areas/holodeck.dm

@@ -4,6 +4,7 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
 	flags_1 = 0
 	hidden = TRUE
+	sound_environment = SOUND_ENVIRONMENT_PADDED_CELL
 
 	var/obj/machinery/computer/holodeck/linked
 	var/restricted = 0 // if true, program goes on emag list

code/game/area/areas/mining.dm

@@ -19,6 +19,7 @@
 	flags_1 = NONE
 	ambientsounds = MINING
 	flora_allowed = FALSE
+	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/mine/unexplored
 	name = "Mine"
@@ -86,6 +87,7 @@
 	has_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
 	flora_allowed = TRUE
+	sound_environment = SOUND_AREA_LAVALAND
 
 /area/lavaland/surface
 	name = "Lavaland"
@@ -139,6 +141,7 @@
 	flags_1 = NONE
 	flora_allowed = TRUE
 	blob_allowed = FALSE
+	sound_environment = SOUND_AREA_ICEMOON
 
 /area/icemoon/surface
 	name = "Icemoon"

code/game/area/areas/ruins/_ruins.dm

@@ -7,6 +7,7 @@
 	hidden = TRUE
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	ambientsounds = RUINS
+	sound_environment = SOUND_ENVIRONMENT_STONEROOM
 
 
 /area/ruin/unpowered

code/game/area/areas/shuttles.dm

@@ -12,6 +12,7 @@
 	icon_state = "shuttle"
 	// Loading the same shuttle map at a different time will produce distinct area instances.
 	unique = FALSE
+	sound_environment = SOUND_ENVIRONMENT_ROOM
 
 /area/shuttle/Initialize()
 	if(!canSmoothWithAreas)