The Mapping Update

Cleans up the map (again) Makes mining code more better
2021-03-12 12:11:35 +08:00
parent cc81a6d65e
commit 935e46b492
149 changed files with 206322 additions and 206270 deletions
@@ -52,14 +52,46 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define BLOCK_FACE_ATOM_1			(1<<17)

 //turf-only flags
-#define NOJAUNT_1					(1<<0)
-#define UNUSED_RESERVATION_TURF_1	(1<<1)
-///If a turf can be made dirty at roundstart. This is also used in areas.
-#define CAN_BE_DIRTY_1				(1<<2)
-///Blocks lava rivers being generated on the turf.
-#define NO_LAVA_GEN_1				(1<<6)
-///Blocks ruins spawning on the turf.
-#define NO_RUINS_1					(1<<10)
+#define NOJAUNT_1 (1<<0)
+#define UNUSED_RESERVATION_TURF_1 (1<<1)
+/// If a turf can be made dirty at roundstart. This is also used in areas.
+#define CAN_BE_DIRTY_1 (1<<2)
+/// If blood cultists can draw runes or build structures on this turf
+#define CULT_PERMITTED_1 (1<<3)
+/// Blocks lava rivers being generated on the turf
+#define NO_LAVA_GEN_1 (1<<6)
+/// Blocks ruins spawning on the turf
+#define NO_RUINS_1 (1<<10)
+/// Should this tile be cleaned up and reinserted into an excited group?
+#define EXCITED_CLEANUP_1 (1 << 13)
+
+////////////////Area flags\\\\\\\\\\\\\\
+/// If it's a valid territory for cult summoning or the CRAB-17 phone to spawn
+#define VALID_TERRITORY (1<<0)
+/// If blobs can spawn there and if it counts towards their score.
+#define BLOBS_ALLOWED (1<<1)
+/// If mining tunnel generation is allowed in this area
+#define CAVES_ALLOWED (1<<2)
+/// If flora are allowed to spawn in this area randomly through tunnel generation
+#define FLORA_ALLOWED (1<<3)
+/// If mobs can be spawned by natural random generation
+#define MOB_SPAWN_ALLOWED (1<<4)
+/// If megafauna can be spawned by natural random generation
+#define MEGAFAUNA_SPAWN_ALLOWED (1<<5)
+/// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
+#define NOTELEPORT (1<<6)
+/// Hides area from player Teleport function.
+#define HIDDEN_AREA (1<<7)
+/// If false, loading multiple maps with this area type will create multiple instances.
+#define UNIQUE_AREA (1<<8)
+/// If people are allowed to suicide in it. Mostly for OOC stuff like minigames
+#define BLOCK_SUICIDE (1<<9)
+/// Can the Xenobio management console transverse this area by default?
+#define XENOBIOLOGY_COMPATIBLE (1<<10)
+/// If Abductors are unable to teleport in with their observation console
+#define ABDUCTOR_PROOF (1<<11)
+/// If an area should be hidden from power consoles, power/atmosphere alerts, etc.
+#define NO_ALERTS (1<<12)

 /*
 	These defines are used specifically with the atom/pass_flags bitmask
@@ -281,6 +281,9 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
 #define CALCULATE_ADJACENT_TURFS(T) SSadjacent_air.queue[T] = 1
 #endif

+//If you're doing spreading things related to atmos, DO NOT USE CANATMOSPASS, IT IS NOT CHEAP. use this instead, the info is cached after all. it's tweaked just a bit to allow for circular checks
+#define TURFS_CAN_SHARE(T1, T2) (LAZYACCESS(T2.atmos_adjacent_turfs, T1) || LAZYLEN(T1.atmos_adjacent_turfs & T2.atmos_adjacent_turfs))
+
 GLOBAL_VAR(atmos_extools_initialized) // this must be an uninitialized (null) one or init_monstermos will be called twice because reasons
 #define ATMOS_EXTOOLS_CHECK if(!GLOB.atmos_extools_initialized){\
 	GLOB.atmos_extools_initialized=TRUE;\
@@ -166,9 +166,15 @@
 #define COMSIG_AREA_EXITED "area_exited" 							//from base of area/Exited(): (atom/movable/M)

 // /turf signals
-#define COMSIG_TURF_CHANGE "turf_change"						//from base of turf/ChangeTurf(): (path, list/new_baseturfs, flags, list/transferring_comps)
-#define COMSIG_TURF_HAS_GRAVITY "turf_has_gravity"				//from base of atom/has_gravity(): (atom/asker, list/forced_gravities)
-#define COMSIG_TURF_MULTIZ_NEW "turf_multiz_new"				//from base of turf/New(): (turf/source, direction)
+
+///from base of turf/ChangeTurf(): (path, list/new_baseturfs, flags, list/transferring_comps)
+#define COMSIG_TURF_CHANGE "turf_change"
+///from base of atom/has_gravity(): (atom/asker, list/forced_gravities)
+#define COMSIG_TURF_HAS_GRAVITY "turf_has_gravity"
+///from base of turf/multiz_turf_del(): (turf/source, direction)
+#define COMSIG_TURF_MULTIZ_DEL "turf_multiz_del"
+///from base of turf/multiz_turf_new: (turf/source, direction)
+#define COMSIG_TURF_MULTIZ_NEW "turf_multiz_new"

 // /atom/movable signals
 #define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"					///from base of atom/movable/Moved(): (/atom)
@@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 	/turf/open/chasm,
 	/turf/open/lava,
 	/turf/open/water,
-	/turf/open/transparent/openspace
+	/turf/open/openspace
 	)))

 #define isgroundlessturf(A) (is_type_in_typecache(A, GLOB.turfs_without_ground))
@@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

 #define isplatingturf(A) (istype(A, /turf/open/floor/plating))

-#define istransparentturf(A) (istype(A, /turf/open/transparent)||istype(A, /turf/open/space/transparent))
+#define istransparentturf(A) (istype(A, /turf/open/openspace))

 //Mobs
 #define isliving(A) (istype(A, /mob/living))
@@ -106,6 +106,23 @@ require only minor tweaks.
 #define PLACE_LAVA_RUIN "lavaland" //On lavaland ruin z levels(s)
 #define PLACE_BELOW "below" //On z levl below - centered on same tile
 #define PLACE_ISOLATED "isolated" //On isolated ruin z level
+
+
+///Map generation defines
+#define PERLIN_LAYER_HEIGHT "perlin_height"
+#define PERLIN_LAYER_HUMIDITY "perlin_humidity"
+#define PERLIN_LAYER_HEAT "perlin_heat"
+
+#define BIOME_LOW_HEAT "low_heat"
+#define BIOME_LOWMEDIUM_HEAT "lowmedium_heat"
+#define BIOME_HIGHMEDIUM_HEAT "highmedium_heat"
+#define BIOME_HIGH_HEAT "high_heat"
+
+#define BIOME_LOW_HUMIDITY "low_humidity"
+#define BIOME_LOWMEDIUM_HUMIDITY "lowmedium_humidity"
+#define BIOME_HIGHMEDIUM_HUMIDITY "highmedium_humidity"
+#define BIOME_HIGH_HUMIDITY "high_humidity"
+
 //Map type stuff.
 #define MAP_TYPE_STATION "station"

@@ -340,3 +340,6 @@
 #define EXAMINE_MORE_TIME	1 SECONDS

 #define SILENCE_RANGED_MESSAGE	(1<<0)
+
+///Define for spawning megafauna instead of a mob for cave gen
+#define SPAWN_MEGAFAUNA "bluh bluh huge boss"
@@ -283,6 +283,7 @@
 #define SHOES_TRAIT "shoes" //inherited from your sweet kicks
 #define GLOVE_TRAIT "glove" //inherited by your cool gloves
 #define BOOK_TRAIT "granter (book)" // knowledge is power
+#define TURF_TRAIT "turf"

 // unique trait sources, still defines
 #define STATUE_TRAIT "statue"
@@ -329,6 +330,8 @@
 #define DEATHSQUAD_TRAIT "deathsquad"
 #define SLIMEPUDDLE_TRAIT "slimepuddle"
 #define CORRUPTED_SYSTEM "corrupted-system"
+///Turf trait for when a turf is transparent
+#define TURF_Z_TRANSPARENT_TRAIT "turf_z_transparent"
 /// This trait is added by the active directional block system.
 #define ACTIVE_BLOCK_TRAIT				"active_block"
 /// This trait is added by the parry system.
@@ -1,8 +1,8 @@
 #define BP_MAX_ROOM_SIZE 300

-GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/engineering, \
-															    /area/engine/supermatter, \
-															    /area/engine/atmospherics_engine, \
+GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engineering/main, \
+															    /area/engineering/supermatter, \
+															    /area/engineering/atmospherics_engine, \
 															    /area/ai_monitored/turret_protected/ai))

 //Repopulates sortedAreas list
@@ -85,13 +85,12 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 				if(target_z == 0 || target_z == T.z)
 					turfs += T
 	return turfs
-
 // Gets an atmos isolated contained space
 // Returns an associative list of turf|dirs pairs
 // The dirs are connected turfs in the same space
 // break_if_found is a typecache of turf/area types to return false if found
 // Please keep this proc type agnostic. If you need to restrict it do it elsewhere or add an arg.
-/proc/detect_room(turf/origin, list/break_if_found)
+/proc/detect_room(turf/origin, list/break_if_found, max_size=INFINITY)
 	if(origin.blocks_air)
 		return list(origin)

@@ -103,6 +102,8 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 		found_turfs.Cut(1, 2)
 		var/dir_flags = checked_turfs[sourceT]
 		for(var/dir in GLOB.alldirs)
+			if(length(.) > max_size)
+				return
 			if(dir_flags & dir) // This means we've checked this dir before, probably from the other turf
 				continue
 			var/turf/checkT = get_step(sourceT, dir)
@@ -115,7 +116,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 			if(break_if_found[checkT.type] || break_if_found[checkT.loc.type])
 				return FALSE
 			var/static/list/cardinal_cache = list("[NORTH]"=TRUE, "[EAST]"=TRUE, "[SOUTH]"=TRUE, "[WEST]"=TRUE)
-			if(!cardinal_cache["[dir]"] || checkT.blocks_air || !CANATMOSPASS(sourceT, checkT))
+			if(!cardinal_cache["[dir]"] || checkT.blocks_air || !TURFS_CAN_SHARE(sourceT, checkT))
 				continue
 			found_turfs += checkT // Since checkT is connected, add it to the list to be processed

@@ -130,25 +131,24 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 		/area/space,
 		))

-	if(creator)
-		if(creator.create_area_cooldown >= world.time)
-			to_chat(creator, "<span class='warning'>You're trying to create a new area a little too fast.</span>")
-			return
-		creator.create_area_cooldown = world.time + 10
+	if(creator?.create_area_cooldown >= world.time)
+		to_chat(creator, "<span class='warning'>You're trying to create a new area a little too fast.</span>")
+		return
+	creator.create_area_cooldown = world.time + 10

-	var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types)
+	var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2)
 	if(!turfs)
 		to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
 		return
 	if(turfs.len > BP_MAX_ROOM_SIZE)
-		to_chat(creator, "<span class='warning'>The room you're in is too big. It is [((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.</span>")
+		to_chat(creator, "<span class='warning'>The room you're in is too big. It is [turfs.len >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((turfs.len / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.</span>")
 		return
 	var/list/areas = list("New Area" = /area)
 	for(var/i in 1 to turfs.len)
 		var/area/place = get_area(turfs[i])
 		if(blacklisted_areas[place.type])
 			continue
-		if(!place.requires_power || place.noteleport || place.hidden)
+		if(!place.requires_power || (place.area_flags & NOTELEPORT) || (place.area_flags & HIDDEN_AREA))
 			continue // No expanding powerless rooms etc
 		areas[place.name] = place
 	var/area_choice = input(creator, "Choose an area to expand or make a new area.", "Area Expansion") as null|anything in areas
@@ -170,7 +170,6 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 		newA.setup(str)
 		newA.set_dynamic_lighting()
 		newA.has_gravity = oldA.has_gravity
-		newA.noteleport = oldA.noteleport
 	else
 		newA = area_choice

@@ -190,7 +189,6 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 	to_chat(creator, "<span class='notice'>You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
 	return TRUE

-
 /**
  * Returns the base area the target is located in if there is one.
  * Alternatively, returns the area as is.
@@ -1030,17 +1030,19 @@ B --><-- A
 	A.cut_overlay(O)

 /proc/get_random_station_turf()
-	return safepick(get_area_turfs(pick(GLOB.the_station_areas)))
+	var/list/turfs = get_area_turfs(pick(GLOB.the_station_areas))
+	if (length(turfs))
+		return pick(turfs)

-/proc/get_safe_random_station_turf() //excludes dense turfs (like walls) and areas that have valid_territory set to FALSE
+/proc/get_safe_random_station_turf(list/areas_to_pick_from = GLOB.the_station_areas) //excludes dense turfs (like walls) and areas that have valid_territory set to FALSE
 	for (var/i in 1 to 5)
-		var/list/L = get_area_turfs(pick(GLOB.the_station_areas))
+		var/list/L = get_area_turfs(pick(areas_to_pick_from))
 		var/turf/target
 		while (L.len && !target)
 			var/I = rand(1, L.len)
 			var/turf/T = L[I]
 			var/area/X = get_area(T)
-			if(!T.density && X.valid_territory)
+			if(!T.density && (X.area_flags & VALID_TERRITORY))
 				var/clear = TRUE
 				for(var/obj/O in T)
 					if(O.density)
@@ -48,6 +48,9 @@ GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area)

 GLOBAL_LIST_EMPTY(all_abstract_markers)

+/// Global list of megafauna spawns on cave gen
+GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 6))
+
 GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms

 ///Away missions, VR, random z levels stuff.
@@ -34,6 +34,9 @@ SUBSYSTEM_DEF(mapping)
 	var/list/reservation_ready = list()
 	var/clearing_reserved_turfs = FALSE

+	///All possible biomes in assoc list as type || instance
+	var/list/biomes = list()
+
 	// Z-manager stuff
 	var/station_start  // should only be used for maploading-related tasks
 	var/space_levels_so_far = 0
@@ -79,10 +82,12 @@ SUBSYSTEM_DEF(mapping)
 			config = old_config
 	GLOB.year_integer += config.year_offset
 	GLOB.announcertype = (config.announcertype == "standard" ? (prob(1) ? "medibot" : "classic") : config.announcertype)
+	initialize_biomes()
 	loadWorld()
 	repopulate_sorted_areas()
 	process_teleport_locs()			//Sets up the wizard teleport locations
 	preloadTemplates()
+
 #ifndef LOWMEMORYMODE
 	// Create space ruin levels
 	while (space_levels_so_far < config.space_ruin_levels)
@@ -92,15 +97,16 @@ SUBSYSTEM_DEF(mapping)
 	for (var/i in 1 to config.space_empty_levels)
 		++space_levels_so_far
 		empty_space = add_new_zlevel("Empty Area [space_levels_so_far]", list(ZTRAIT_LINKAGE = CROSSLINKED))
-	// and the transit level
-	transit = add_new_zlevel("Transit/Reserved", list(ZTRAIT_RESERVED = TRUE))

 	// Pick a random away mission.
 	if(CONFIG_GET(flag/roundstart_away))
 		createRandomZlevel()
-	// Pick a random VR level.
+
+	// Load the virtual reality hub
 	if(CONFIG_GET(flag/roundstart_vr))
+		to_chat(world, "<span class='boldannounce'>Loading virtual reality...</span>")
 		createRandomZlevel(VIRT_REALITY_NAME, list(ZTRAIT_AWAY = TRUE, ZTRAIT_VR = TRUE), GLOB.potential_vr_levels)
+		to_chat(world, "<span class='boldannounce'>Virtual reality loaded.</span>")

 	// Generate mining ruins
 	loading_ruins = TRUE
@@ -115,7 +121,7 @@ SUBSYSTEM_DEF(mapping)
 		// needs to be whitelisted for underground too so place_below ruins work
 		seedRuins(ice_ruins, CONFIG_GET(number/icemoon_budget), list(/area/icemoon/surface/outdoors/unexplored, /area/icemoon/underground/unexplored), ice_ruins_templates)
 		for (var/ice_z in ice_ruins)
-			spawn_rivers(ice_z, 4, /turf/open/transparent/openspace/icemoon, /area/icemoon/surface/outdoors/unexplored/rivers)
+			spawn_rivers(ice_z, 4, /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors/unexplored/rivers)

 	var/list/ice_ruins_underground = levels_by_trait(ZTRAIT_ICE_RUINS_UNDERGROUND)
 	if (ice_ruins_underground.len)
@@ -133,8 +139,13 @@ SUBSYSTEM_DEF(mapping)
 	if (station_ruins.len)
 		seedRuins(station_ruins, (SSmapping.config.station_ruin_budget < 0) ? CONFIG_GET(number/station_space_budget) : SSmapping.config.station_ruin_budget, list(/area/space/station_ruins), station_ruins_templates)
 	SSmapping.seedStation()
+
 	loading_ruins = FALSE
 #endif
+	// Run map generation after ruin generation to prevent issues
+	run_map_generation()
+	// Add the transit level
+	transit = add_new_zlevel("Transit/Reserved", list(ZTRAIT_RESERVED = TRUE))
 	repopulate_sorted_areas()
 	// Set up Z-level transitions.
 	setup_map_transitions()
@@ -320,7 +331,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	for(var/area/A in world)
 		if (is_type_in_typecache(A, station_areas_blacklist))
 			continue
-		if (!A.contents.len || !A.unique)
+		if (!A.contents.len || !(A.area_flags & UNIQUE_AREA))
 			continue
 		var/turf/picked = A.contents[1]
 		if (is_station_level(picked.z))
@@ -329,6 +340,10 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	if(!GLOB.the_station_areas.len)
 		log_world("ERROR: Station areas list failed to generate!")

+/datum/controller/subsystem/mapping/proc/run_map_generation()
+	for(var/area/A in world)
+		A.RunGeneration()
+
 /datum/controller/subsystem/mapping/proc/maprotate()
 	var/players = GLOB.clients.len
 	var/list/mapvotes = list()
@@ -584,6 +599,12 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	used_turfs.Cut()
 	reserve_turfs(clearing)

+///Initialize all biomes, assoc as type || instance
+/datum/controller/subsystem/mapping/proc/initialize_biomes()
+	for(var/biome_path in subtypesof(/datum/biome))
+		var/datum/biome/biome_instance = new biome_path()
+		biomes[biome_path] += biome_instance
+
 /datum/controller/subsystem/mapping/proc/reg_in_areas_in_z(list/areas)
 	for(var/B in areas)
 		var/area/A = B
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(min_spawns)
 	name = "Minimum Spawns" /// this hot steaming pile of garbage makes sure theres a minimum of tendrils scattered around
 	init_order = INIT_ORDER_DEFAULT
-	flags = SS_BACKGROUND | SS_NO_FIRE
+	flags = SS_NO_FIRE | SS_NO_INIT
 	wait = 2
 	var/where_we_droppin_boys_iterations = 0
 	var/snaxi_snowflake_check = FALSE
@@ -73,7 +73,7 @@

 /datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat)
 	var/meat_quality = 50 + (bonus_modifier/10) //increases through quality of butchering tool, and through if it was butchered in the kitchen or not
-	if(istype(get_area(butcher), /area/crew_quarters/kitchen))
+	if(istype(get_area(butcher), /area/service/kitchen))
 		meat_quality = meat_quality + 10
 	var/turf/T = meat.drop_location()
 	var/final_effectiveness = effectiveness - meat.butcher_difficulty
@@ -1,22 +1,24 @@
 /**
-  * A holder for simple behaviour that can be attached to many different types
-  *
-  * Only one element of each type is instanced during game init.
-  * Otherwise acts basically like a lightweight component.
-  */
+ * A holder for simple behaviour that can be attached to many different types
+ *
+ * Only one element of each type is instanced during game init.
+ * Otherwise acts basically like a lightweight component.
+ */
 /datum/element
 	/// Option flags for element behaviour
 	var/element_flags = NONE
 	/**
 	  * The index of the first attach argument to consider for duplicate elements
-	  * Is only used when flags contains ELEMENT_BESPOKE
+	  *
+	  * Is only used when flags contains [ELEMENT_BESPOKE]
+	  *
 	  * This is infinity so you must explicitly set this
 	  */
 	var/id_arg_index = INFINITY

 /// Activates the functionality defined by the element on the given target datum
 /datum/element/proc/Attach(datum/target)
-	SHOULD_CALL_PARENT(1)
+	SHOULD_CALL_PARENT(TRUE)
 	if(type == /datum/element)
 		return ELEMENT_INCOMPATIBLE
 	SEND_SIGNAL(target, COMSIG_ELEMENT_ATTACH, src)
@@ -25,8 +27,10 @@

 /// Deactivates the functionality defines by the element on the given datum
 /datum/element/proc/Detach(datum/source, force)
+	SIGNAL_HANDLER
+
 	SEND_SIGNAL(source, COMSIG_ELEMENT_DETACH, src)
-	SHOULD_CALL_PARENT(1)
+	SHOULD_CALL_PARENT(TRUE)
 	UnregisterSignal(source, COMSIG_PARENT_QDELETING)

 /datum/element/Destroy(force)
@@ -45,9 +49,9 @@
 		CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]")

 /**
-  * Finds the singleton for the element type given and detaches it from src
-  * You only need additional arguments beyond the type if you're using ELEMENT_BESPOKE
-  */
+ * Finds the singleton for the element type given and detaches it from src
+ * You only need additional arguments beyond the type if you're using [ELEMENT_BESPOKE]
+ */
 /datum/proc/_RemoveElement(list/arguments)
 	var/datum/element/ele = SSdcs.GetElement(arguments)
 	ele.Detach(src)
@@ -0,0 +1,75 @@
+/datum/element/turf_z_transparency
+	var/show_bottom_level = FALSE
+
+///This proc sets up the signals to handle updating viscontents when turfs above/below update. Handle plane and layer here too so that they don't cover other obs/turfs in Dream Maker
+/datum/element/turf_z_transparency/Attach(datum/target, show_bottom_level = TRUE)
+	. = ..()
+	if(!isturf(target))
+		return ELEMENT_INCOMPATIBLE
+
+	var/turf/our_turf = target
+
+	src.show_bottom_level = show_bottom_level
+
+	our_turf.plane = OPENSPACE_PLANE
+	our_turf.layer = OPENSPACE_LAYER
+
+	RegisterSignal(target, COMSIG_TURF_MULTIZ_DEL, .proc/on_multiz_turf_del)
+	RegisterSignal(target, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_turf_new)
+
+	ADD_TRAIT(our_turf, TURF_Z_TRANSPARENT_TRAIT, TURF_TRAIT)
+
+
+	update_multiz(our_turf, TRUE, TRUE)
+
+/datum/element/turf_z_transparency/Detach(datum/source, force)
+	. = ..()
+	var/turf/our_turf = source
+	our_turf.vis_contents.len = 0
+	REMOVE_TRAIT(our_turf, TURF_Z_TRANSPARENT_TRAIT, TURF_TRAIT)
+
+///Updates the viscontents or underlays below this tile.
+/datum/element/turf_z_transparency/proc/update_multiz(turf/our_turf, prune_on_fail = FALSE, init = FALSE)
+	var/turf/below_turf = our_turf.below()
+	if(!below_turf)
+		our_turf.vis_contents.len = 0
+		if(!show_bottom_level(our_turf) && prune_on_fail) //If we cant show whats below, and we prune on fail, change the turf to plating as a fallback
+			our_turf.ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+			return FALSE
+	if(init)
+		our_turf.vis_contents += below_turf
+	if(isclosedturf(our_turf)) //Show girders below closed turfs
+		var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = TURF_LAYER-0.01)
+		girder_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR
+		our_turf.underlays += girder_underlay
+		var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = TURF_LAYER-0.02)
+		plating_underlay = RESET_ALPHA | RESET_COLOR
+		our_turf.underlays += plating_underlay
+	return TRUE
+
+/datum/element/turf_z_transparency/proc/on_multiz_turf_del(turf/our_turf, turf/T, dir)
+	SIGNAL_HANDLER
+	if(dir != DOWN)
+		return
+	update_multiz(our_turf)
+
+/datum/element/turf_z_transparency/proc/on_multiz_turf_new(turf/our_turf, turf/T, dir)
+	SIGNAL_HANDLER
+	if(dir != DOWN)
+		return
+	update_multiz(our_turf)
+
+///Called when there is no real turf below this turf
+/datum/element/turf_z_transparency/proc/show_bottom_level(turf/our_turf)
+	if(!show_bottom_level)
+		return FALSE
+	var/turf/path = SSmapping.level_trait(our_turf.z, ZTRAIT_BASETURF) || /turf/open/space
+	if(!ispath(path))
+		path = text2path(path)
+		if(!ispath(path))
+			warning("Z-level [our_turf.z] has invalid baseturf '[SSmapping.level_trait(our_turf.z, ZTRAIT_BASETURF)]'")
+			path = /turf/open/space
+	var/mutable_appearance/underlay_appearance = mutable_appearance(initial(path.icon), initial(path.icon_state), layer = TURF_LAYER-0.02, plane = PLANE_SPACE)
+	underlay_appearance.appearance_flags = RESET_ALPHA | RESET_COLOR
+	our_turf.underlays += underlay_appearance
+	return TRUE
@@ -5,8 +5,8 @@
 // effectout: effect to show right after teleportation
 // asoundin: soundfile to play before teleportation
 // asoundout: soundfile to play after teleportation
-// no_effects: disable the default effectin/effectout of sparks
 // forceMove: if false, teleport will use Move() proc (dense objects will prevent teleportation)
+// no_effects: disable the default effectin/effectout of sparks
 // forced: whether or not to ignore no_teleport
 /proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, forceMove = TRUE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, forced = FALSE)
 	// teleporting most effects just deletes them
@@ -15,7 +15,8 @@
 		)) - typecacheof(list(
 		/obj/effect/dummy/chameleon,
 		/obj/effect/wisp,
-		/obj/effect/mob_spawn
+		/obj/effect/mob_spawn,
+		/obj/effect/immovablerod,
 		))
 	if(delete_atoms[teleatom.type])
 		qdel(teleatom)
@@ -66,7 +67,7 @@

 	var/area/A = get_area(curturf)
 	var/area/B = get_area(destturf)
-	if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT) || A.noteleport || B.noteleport))
+	if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT) || (A.area_flags & NOTELEPORT) || (B.area_flags & NOTELEPORT)))
 		return FALSE

 	if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf))
@@ -99,13 +100,13 @@
 /proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound)
 	if (location && !isobserver(teleatom))
 		if (sound)
-			playsound(location, sound, 60, 1)
+			playsound(location, sound, 60, TRUE)
 		if (effect)
 			effect.attach(location)
 			effect.start()

 // Safe location finder
-/proc/find_safe_turf(zlevel, list/zlevels, extended_safety_checks = FALSE)
+/proc/find_safe_turf(zlevel, list/zlevels, extended_safety_checks = FALSE, dense_atoms = TRUE)
 	if(!zlevels)
 		if (zlevel)
 			zlevels = list(zlevel)
@@ -122,12 +123,17 @@
 		if(!isfloorturf(random_location))
 			continue
 		var/turf/open/floor/F = random_location
+		var/area/destination_area = F.loc
+
+		if(cycle < 300 && destination_area.area_flags & NOTELEPORT)//if the area is mostly NOTELEPORT (centcom) we gotta give up on this fantasy at some point.
+			continue
 		if(!F.air)
 			continue

 		var/datum/gas_mixture/A = F.air
+		var/list/A_gases = A.get_gases()
 		var/trace_gases
-		for(var/id in A.get_gases())
+		for(var/id in A_gases)
 			if(id in GLOB.hardcoded_gases)
 				continue
 			trace_gases = TRUE
@@ -136,7 +142,7 @@
 		// Can most things breathe?
 		if(trace_gases)
 			continue
-		if(A.get_moles(/datum/gas/oxygen) < 16)
+		if(A.get_moles(/datum/gas/oxygen) >= 16)
 			continue
 		if(A.get_moles(/datum/gas/plasma))
 			continue
@@ -156,6 +162,16 @@
 				if(!L.is_safe())
 					continue

+		// Check that we're not warping onto a table or window
+		if(!dense_atoms)
+			var/density_found = FALSE
+			for(var/atom/movable/found_movable in F)
+				if(found_movable.density)
+					density_found = TRUE
+					break
+			if(density_found)
+				continue
+
 		// DING! You have passed the gauntlet, and are "probably" safe.
 		return F

@@ -167,9 +183,11 @@
 		if(T.is_transition_turf())
 			continue // Avoid picking these.
 		var/area/A = T.loc
-		if(!A.noteleport)
+		if(!(A.area_flags & NOTELEPORT))
 			posturfs.Add(T)
 	return posturfs

 /proc/get_teleport_turf(turf/center, precision = 0)
-	return safepick(get_teleport_turfs(center, precision))
+	var/list/turfs = get_teleport_turfs(center, precision)
+	if (length(turfs))
+		return pick(turfs)
@@ -0,0 +1,144 @@
+/datum/map_generator/cave_generator
+	var/name = "Cave Generator"
+	///Weighted list of the types that spawns if the turf is open
+	var/open_turf_types = list(/turf/open/floor/plating/asteroid/airless = 1)
+	///Weighted list of the types that spawns if the turf is closed
+	var/closed_turf_types =  list(/turf/closed/mineral/random = 1)
+
+
+	///Weighted list of mobs that can spawn in the area.
+	var/list/mob_spawn_list
+	// Weighted list of Megafauna that can spawn in the caves
+	var/list/megafauna_spawn_list
+	///Weighted list of flora that can spawn in the area.
+	var/list/flora_spawn_list
+	///Weighted list of extra features that can spawn in the area, such as geysers.
+	var/list/feature_spawn_list
+
+
+	///Base chance of spawning a mob
+	var/mob_spawn_chance = 6
+	///Base chance of spawning flora
+	var/flora_spawn_chance = 2
+	///Base chance of spawning features
+	var/feature_spawn_chance = 0.1
+	///Unique ID for this spawner
+	var/string_gen
+
+	///Chance of cells starting closed
+	var/initial_closed_chance = 45
+	///Amount of smoothing iterations
+	var/smoothing_iterations = 20
+	///How much neighbours does a dead cell need to become alive
+	var/birth_limit = 4
+	///How little neighbours does a alive cell need to die
+	var/death_limit = 3
+
+/datum/map_generator/cave_generator/New()
+	. = ..()
+	if(!mob_spawn_list)
+		mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
+	if(!megafauna_spawn_list)
+		megafauna_spawn_list = GLOB.megafauna_spawn_list
+	if(!flora_spawn_list)
+		flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
+	if(!feature_spawn_list)
+		feature_spawn_list = list(/obj/structure/geyser/random = 1)
+
+/datum/map_generator/cave_generator/generate_terrain(list/turfs)
+	. = ..()
+	var/start_time = REALTIMEOFDAY
+	string_gen = rustg_cnoise_generate("[initial_closed_chance]", "[smoothing_iterations]", "[birth_limit]", "[death_limit]", "[world.maxx]", "[world.maxy]") //Generate the raw CA data
+
+	for(var/i in turfs) //Go through all the turfs and generate them
+		var/turf/gen_turf = i
+
+		var/area/A = gen_turf.loc
+		if(!(A.area_flags & CAVES_ALLOWED))
+			continue
+
+		var/closed = text2num(string_gen[world.maxx * (gen_turf.y - 1) + gen_turf.x])
+
+		var/stored_flags
+		if(gen_turf.flags_1 & NO_RUINS_1)
+			stored_flags |= NO_RUINS_1
+
+		var/turf/new_turf = pickweight(closed ? closed_turf_types : open_turf_types)
+
+		new_turf = gen_turf.ChangeTurf(new_turf, initial(new_turf.baseturfs), CHANGETURF_DEFER_CHANGE)
+
+		new_turf.flags_1 |= stored_flags
+
+		if(!closed)//Open turfs have some special behavior related to spawning flora and mobs.
+
+			var/turf/open/new_open_turf = new_turf
+
+			///Spawning isn't done in procs to save on overhead on the 60k turfs we're going through.
+
+			//FLORA SPAWNING HERE
+			var/atom/spawned_flora
+			if(flora_spawn_list && prob(flora_spawn_chance))
+				var/can_spawn = TRUE
+
+				if(!(A.area_flags & FLORA_ALLOWED))
+					can_spawn = FALSE
+				if(can_spawn)
+					spawned_flora = pickweight(flora_spawn_list)
+					spawned_flora = new spawned_flora(new_open_turf)
+
+			//FEATURE SPAWNING HERE
+			var/atom/spawned_feature
+			if(feature_spawn_list && prob(feature_spawn_chance))
+				var/can_spawn = TRUE
+
+				if(!(A.area_flags & FLORA_ALLOWED)) //checks the same flag because lol dunno
+					can_spawn = FALSE
+
+				var/atom/picked_feature = pickweight(feature_spawn_list)
+
+				for(var/obj/structure/F in range(7, new_open_turf))
+					if(istype(F, picked_feature))
+						can_spawn = FALSE
+
+				if(can_spawn)
+					spawned_feature = new picked_feature(new_open_turf)
+
+			//MOB SPAWNING HERE
+
+			if(mob_spawn_list && !spawned_flora && !spawned_feature && prob(mob_spawn_chance))
+				var/can_spawn = TRUE
+
+				if(!(A.area_flags & MOB_SPAWN_ALLOWED))
+					can_spawn = FALSE
+
+				var/atom/picked_mob = pickweight(mob_spawn_list)
+
+				if(picked_mob == SPAWN_MEGAFAUNA) //
+					if((A.area_flags & MEGAFAUNA_SPAWN_ALLOWED) && megafauna_spawn_list?.len) //this is danger. it's boss time.
+						picked_mob = pickweight(megafauna_spawn_list)
+					else //this is not danger, don't spawn a boss, spawn something else
+						picked_mob = pickweight(mob_spawn_list - SPAWN_MEGAFAUNA) //What if we used 100% of the brain...and did something (slightly) less shit than a while loop?
+
+				for(var/thing in urange(12, new_open_turf)) //prevents mob clumps
+					if(!ishostile(thing) && !istype(thing, /obj/structure/spawner))
+						continue
+					if((ispath(picked_mob, /mob/living/simple_animal/hostile/megafauna) || ismegafauna(thing)) && get_dist(new_open_turf, thing) <= 7)
+						can_spawn = FALSE //if there's a megafauna within standard view don't spawn anything at all
+						break
+					if(ispath(picked_mob, /mob/living/simple_animal/hostile/asteroid) || istype(thing, /mob/living/simple_animal/hostile/asteroid))
+						can_spawn = FALSE //if the random is a standard mob, avoid spawning if there's another one within 12 tiles
+						break
+					if((ispath(picked_mob, /obj/structure/spawner/lavaland) || istype(thing, /obj/structure/spawner/lavaland)) && get_dist(new_open_turf, thing) <= 2)
+						can_spawn = FALSE //prevents tendrils spawning in each other's collapse range
+						break
+
+				if(can_spawn)
+					if(ispath(picked_mob, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it
+						megafauna_spawn_list.Remove(picked_mob)
+
+					new picked_mob(new_open_turf)
+		CHECK_TICK
+
+	var/message = "[name] finished in [(REALTIMEOFDAY - start_time)/10]s!"
+	to_chat(world, "<span class='boldannounce'>[message]</span>")
+	log_world(message)
@@ -0,0 +1,28 @@
+/datum/map_generator/cave_generator/icemoon
+	open_turf_types =  list(/turf/open/floor/plating/asteroid/snow/icemoon = 19, /turf/open/floor/plating/ice/icemoon = 1)
+	closed_turf_types =  list(/turf/closed/mineral/random/snow = 1)
+
+
+	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/wolf = 50, /obj/structure/spawner/ice_moon = 3, \
+						  /mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \
+						  /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10, \
+						  /mob/living/simple_animal/hostile/asteroid/lobstrosity = 15)
+	flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6, /obj/structure/flora/ash = 2)
+	feature_spawn_list = list(/obj/structure/geyser/random = 1)
+
+/datum/map_generator/cave_generator/icemoon/surface
+	flora_spawn_chance = 4
+	mob_spawn_list = null
+	initial_closed_chance = 53
+	birth_limit = 5
+	death_limit = 4
+	smoothing_iterations = 10
+
+/datum/map_generator/cave_generator/icemoon/deep
+	closed_turf_types = list(/turf/closed/mineral/random/snow/underground = 1)
+	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/ice_demon = 50, /obj/structure/spawner/ice_moon/demonic_portal = 3, \
+						  /mob/living/simple_animal/hostile/asteroid/ice_whelp = 30, /obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 3, \
+						  /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 3, \
+						  SPAWN_MEGAFAUNA = 2)
+	megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/colossus = 1)
+	flora_spawn_list = list(/obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6, /obj/structure/flora/ash = 1)
@@ -0,0 +1,16 @@
+/datum/map_generator/cave_generator/lavaland
+	open_turf_types = list(/turf/open/floor/plating/asteroid/basalt/lava_land_surface = 1)
+	closed_turf_types =  list(/turf/closed/mineral/random/volcanic = 1)
+
+
+	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \
+		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \
+		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \
+		SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
+	flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
+	feature_spawn_list = list(/obj/structure/geyser/random = 1)
+
+	initial_closed_chance = 45
+	smoothing_iterations = 50
+	birth_limit = 4
+	death_limit = 3
@@ -0,0 +1,91 @@
+//the random offset applied to square coordinates, causes intermingling at biome borders
+#define BIOME_RANDOM_SQUARE_DRIFT 2
+
+/datum/map_generator/jungle_generator
+	///2D list of all biomes based on heat and humidity combos.
+	var/list/possible_biomes = list(
+	BIOME_LOW_HEAT = list(
+		BIOME_LOW_HUMIDITY = /datum/biome/plains,
+		BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/mudlands,
+		BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/mudlands,
+		BIOME_HIGH_HUMIDITY = /datum/biome/water
+		),
+	BIOME_LOWMEDIUM_HEAT = list(
+		BIOME_LOW_HUMIDITY = /datum/biome/plains,
+		BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/jungle,
+		BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/jungle,
+		BIOME_HIGH_HUMIDITY = /datum/biome/mudlands
+		),
+	BIOME_HIGHMEDIUM_HEAT = list(
+		BIOME_LOW_HUMIDITY = /datum/biome/plains,
+		BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/plains,
+		BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/jungle/deep,
+		BIOME_HIGH_HUMIDITY = /datum/biome/jungle
+		),
+	BIOME_HIGH_HEAT = list(
+		BIOME_LOW_HUMIDITY = /datum/biome/wasteland,
+		BIOME_LOWMEDIUM_HUMIDITY = /datum/biome/plains,
+		BIOME_HIGHMEDIUM_HUMIDITY = /datum/biome/jungle,
+		BIOME_HIGH_HUMIDITY = /datum/biome/jungle/deep
+		)
+	)
+	///Used to select "zoom" level into the perlin noise, higher numbers result in slower transitions
+	var/perlin_zoom = 65
+
+///Seeds the rust-g perlin noise with a random number.
+/datum/map_generator/jungle_generator/generate_terrain(list/turfs)
+	. = ..()
+	var/height_seed = rand(0, 50000)
+	var/humidity_seed = rand(0, 50000)
+	var/heat_seed = rand(0, 50000)
+
+	for(var/t in turfs) //Go through all the turfs and generate them
+		var/turf/gen_turf = t
+		var/drift_x = (gen_turf.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom
+		var/drift_y = (gen_turf.y + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom
+
+		var/height = text2num(rustg_noise_get_at_coordinates("[height_seed]", "[drift_x]", "[drift_y]"))
+
+
+		var/datum/biome/selected_biome
+		if(height <= 0.85) //If height is less than 0.85, we generate biomes based on the heat and humidity of the area.
+			var/humidity = text2num(rustg_noise_get_at_coordinates("[humidity_seed]", "[drift_x]", "[drift_y]"))
+			var/heat = text2num(rustg_noise_get_at_coordinates("[heat_seed]", "[drift_x]", "[drift_y]"))
+			var/heat_level //Type of heat zone we're in LOW-MEDIUM-HIGH
+			var/humidity_level  //Type of humidity zone we're in LOW-MEDIUM-HIGH
+
+			switch(heat)
+				if(0 to 0.25)
+					heat_level = BIOME_LOW_HEAT
+				if(0.25 to 0.5)
+					heat_level = BIOME_LOWMEDIUM_HEAT
+				if(0.5 to 0.75)
+					heat_level = BIOME_HIGHMEDIUM_HEAT
+				if(0.75 to 1)
+					heat_level = BIOME_HIGH_HEAT
+			switch(humidity)
+				if(0 to 0.25)
+					humidity_level = BIOME_LOW_HUMIDITY
+				if(0.25 to 0.5)
+					humidity_level = BIOME_LOWMEDIUM_HUMIDITY
+				if(0.5 to 0.75)
+					humidity_level = BIOME_HIGHMEDIUM_HUMIDITY
+				if(0.75 to 1)
+					humidity_level = BIOME_HIGH_HUMIDITY
+			selected_biome = possible_biomes[heat_level][humidity_level]
+		else //Over 0.85; It's a mountain
+			selected_biome = /datum/biome/mountain
+		selected_biome = SSmapping.biomes[selected_biome] //Get the instance of this biome from SSmapping
+		selected_biome.generate_turf(gen_turf)
+		CHECK_TICK
+
+/turf/open/genturf
+	name = "ungenerated turf"
+	desc = "If you see this, and you're not a ghost, yell at coders"
+	icon = 'icons/turf/debug.dmi'
+	icon_state = "genturf"
+
+/area/mine/planetgeneration
+	name = "planet generation area"
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+	map_generator = /datum/map_generator/jungle_generator
@@ -0,0 +1,6 @@
+///This type is responsible for any map generation behavior that is done in areas, override this to allow for area-specific map generation. This generation is ran by areas in initialize.
+/datum/map_generator
+
+///This proc will be ran by areas on Initialize, and provides the areas turfs as argument to allow for generation.
+/datum/map_generator/proc/generate_terrain(list/turfs)
+	return
@@ -0,0 +1,53 @@
+///This datum handles the transitioning from a turf to a specific biome, and handles spawning decorative structures and mobs.
+/datum/biome
+	///Type of turf this biome creates
+	var/turf_type
+	///Chance of having a structure from the flora types list spawn
+	var/flora_density = 0
+	///Chance of having a mob from the fauna types list spawn
+	var/fauna_density = 0
+	///list of type paths of objects that can be spawned when the turf spawns flora
+	var/list/flora_types = list(/obj/structure/flora/grass/jungle)
+	///list of type paths of mobs that can be spawned when the turf spawns fauna
+	var/list/fauna_types = list()
+
+///This proc handles the creation of a turf of a specific biome type
+/datum/biome/proc/generate_turf(turf/gen_turf)
+	gen_turf.ChangeTurf(turf_type, null, CHANGETURF_DEFER_CHANGE)
+	if(length(fauna_types) && prob(fauna_density))
+		var/mob/fauna = pick(fauna_types)
+		new fauna(gen_turf)
+
+	if(length(flora_types) && prob(flora_density))
+		var/obj/structure/flora = pick(flora_types)
+		new flora(gen_turf)
+
+/datum/biome/mudlands
+	// turf_type = /turf/open/floor/plating/dirt/jungle/dark
+	turf_type = /turf/open/floor/plating/dirt/jungle
+	flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/rock/jungle, /obj/structure/flora/rock/pile/largejungle)
+	flora_density = 3
+
+/datum/biome/plains
+	// turf_type = /turf/open/floor/plating/grass/jungle
+	turf_type = /turf/open/floor/grass
+	flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/large, /obj/structure/flora/rock/pile/largejungle)
+	flora_density = 15
+
+/datum/biome/jungle
+	// turf_type = /turf/open/floor/plating/grass/jungle
+	turf_type = /turf/open/floor/grass
+	flora_types = list(/obj/structure/flora/grass/jungle,/obj/structure/flora/grass/jungle/b, /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/large, /obj/structure/flora/rock/pile/largejungle)
+	flora_density = 40
+
+/datum/biome/jungle/deep
+	flora_density = 65
+
+/datum/biome/wasteland
+	// turf_type = /turf/open/floor/plating/dirt/jungle/wasteland
+	turf_type = /turf/open/floor/plating/dirt/jungle
+/datum/biome/water
+	turf_type = /turf/open/water/jungle
+
+/datum/biome/mountain
+	turf_type = /turf/closed/mineral/random //jungle
@@ -175,7 +175,7 @@
 		return TRUE
 	if(CHECK_MOBILITY(D, MOBILITY_MOVE) || !restraining)
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-		if(damage >= stunthreshold)	
+		if(damage >= stunthreshold)
 			I = D.get_active_held_item()
 			D.visible_message("<span class='warning'>[A] strikes [D]'s jaw with their hand!</span>", \
 							"<span class='userdanger'>[A] strikes your jaw, disorienting you!</span>")
@@ -222,9 +222,10 @@
 ///Subtype of CQC. Only used for the chef.
 /datum/martial_art/cqc/under_siege
 	name = "Close Quarters Cooking"
+	var/list/valid_areas = list(/area/service/kitchen)

 ///Prevents use if the cook is not in the kitchen.
-/datum/martial_art/cqc/under_siege/can_use(mob/living/carbon/human/H) //this is used to make chef CQC only work in kitchen
-	if(!istype(get_area(H), /area/crew_quarters/kitchen))
+/datum/martial_art/cqc/under_siege/can_use(mob/living/owner) //this is used to make chef CQC only work in kitchen
+	if(!is_type_in_list(get_area(owner), valid_areas))
 		return FALSE
 	return ..()
@@ -18,11 +18,11 @@

 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation, /area/icemoon)
+	/area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle, /area/security/prison/safe, /area/security/prison/toilet)
 	target_trait = ZTRAIT_STATION

 	immunity_type = "rad"
-	
+
 	var/radiation_intensity = 100

 /datum/weather/rad_storm/telegraph()
@@ -30,3 +30,7 @@
 			var/obj/machinery/camera/cam = X
 			cam.lostTargetRef(WEAKREF(O))
 			return
+
+/area/ai_monitored/turret_protected/ai/Initialize()
+	. = ..()
+	src.area_flags |= ABDUCTOR_PROOF
@@ -13,6 +13,8 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	invisibility = INVISIBILITY_LIGHTING

+	var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA
+
 	var/fire = null
 	///Whether there is an atmos alarm in this area
 	var/atmosalm = FALSE
@@ -60,7 +62,7 @@


 	///This datum, if set, allows terrain generation behavior to be ran on Initialize()
-	// var/datum/map_generator/map_generator
+	var/datum/map_generator/map_generator

 	///Used to decide what kind of reverb the area makes sound have
 	var/sound_environment = SOUND_ENVIRONMENT_NONE
@@ -70,12 +72,8 @@
 	/// Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
 	var/map_name

-	/// If it's valid territory for gangs/cults to summon
-	var/valid_territory = TRUE
 	/// malf ais can hack this
 	var/valid_malf_hack = TRUE
-	/// if blobs can spawn there and if it counts towards their score.
-	var/blob_allowed = TRUE
 	/// whether servants can warp into this area from Reebe
 	var/clockwork_warp_allowed = TRUE
 	/// Message to display when the clockwork warp fails
@@ -107,14 +105,10 @@
 	var/static_light = 0
 	var/static_environ

-	/// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
-	var/noteleport = FALSE
 	/// Hides area from player Teleport function.
 	var/hidden = FALSE
 	/// Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers
 	var/safe = FALSE
-	/// If false, loading multiple maps with this area type will create multiple instances.
-	var/unique = TRUE

 	var/no_air = null

@@ -157,7 +151,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 /proc/process_teleport_locs()
 	for(var/V in GLOB.sortedAreas)
 		var/area/AR = V
-		if(istype(AR, /area/shuttle) || AR.noteleport)
+		if(istype(AR, /area/shuttle) || (AR.area_flags & NOTELEPORT))
 			continue
 		if(GLOB.teleportlocs[AR.name])
 			continue
@@ -177,7 +171,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 /area/New()
 	// This interacts with the map loader, so it needs to be set immediately
 	// rather than waiting for atoms to initialize.
-	if (unique)
+	if (area_flags & UNIQUE_AREA)
 		GLOB.areas_by_type[type] = src

 	if(!minimap_color) // goes in New() because otherwise it doesn't fucking work
@@ -228,7 +222,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	reg_in_areas_in_z()

 	//so far I'm only implementing it on mapped unique areas, it's easier this way.
-	if(unique && sub_areas)
+	if((area_flags & UNIQUE_AREA) && sub_areas)
 		if(type in sub_areas)
 			WARNING("\"[src]\" typepath found inside its own sub-areas list, please make sure it doesn't share its parent type initial sub-areas value.")
 			sub_areas = null
@@ -261,21 +255,20 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		power_change()		// all machines set to current power level, also updates icon
 	update_beauty()

-/// 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)
+	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)
+	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
@@ -327,6 +320,8 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world
 */
 /area/proc/poweralert(state, obj/source)
+	if (area_flags & NO_ALERTS)
+		return
 	if (state != poweralm)
 		poweralm = state
 		if(istype(source))	//Only report power alarms on the z-level where the source is located.
@@ -358,6 +353,8 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 					p.triggerAlarm("Power", src, cameras, source)

 /area/proc/atmosalert(danger_level, obj/source)
+	if (area_flags & NO_ALERTS)
+		return
 	if(danger_level != atmosalm)
 		if (danger_level==2)

@@ -420,19 +417,19 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	if (!fire)
 		set_fire_alarm_effects(TRUE)
 		ModifyFiredoors(FALSE)
-
-	for (var/item in GLOB.alert_consoles)
-		var/obj/machinery/computer/station_alert/a = item
-		a.triggerAlarm("Fire", src, cameras, source)
-	for (var/item in GLOB.silicon_mobs)
-		var/mob/living/silicon/aiPlayer = item
-		aiPlayer.triggerAlarm("Fire", src, cameras, source)
-	for (var/item in GLOB.drones_list)
-		var/mob/living/simple_animal/drone/D = item
-		D.triggerAlarm("Fire", src, cameras, source)
-	for(var/item in GLOB.alarmdisplay)
-		var/datum/computer_file/program/alarm_monitor/p = item
-		p.triggerAlarm("Fire", src, cameras, source)
+	if (!(area_flags & NO_ALERTS)) //Check here instead at the start of the proc so that fire alarms can still work locally even in areas that don't send alerts
+		for (var/item in GLOB.alert_consoles)
+			var/obj/machinery/computer/station_alert/a = item
+			a.triggerAlarm("Fire", src, cameras, source)
+		for (var/item in GLOB.silicon_mobs)
+			var/mob/living/silicon/aiPlayer = item
+			aiPlayer.triggerAlarm("Fire", src, cameras, source)
+		for (var/item in GLOB.drones_list)
+			var/mob/living/simple_animal/drone/D = item
+			D.triggerAlarm("Fire", src, cameras, source)
+		for(var/item in GLOB.alarmdisplay)
+			var/datum/computer_file/program/alarm_monitor/p = item
+			p.triggerAlarm("Fire", src, cameras, source)

 	START_PROCESSING(SSobj, src)

@@ -441,18 +438,19 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		set_fire_alarm_effects(FALSE)
 		ModifyFiredoors(TRUE)

-	for (var/item in GLOB.silicon_mobs)
-		var/mob/living/silicon/aiPlayer = item
-		aiPlayer.cancelAlarm("Fire", src, source)
-	for (var/item in GLOB.alert_consoles)
-		var/obj/machinery/computer/station_alert/a = item
-		a.cancelAlarm("Fire", src, source)
-	for (var/item in GLOB.drones_list)
-		var/mob/living/simple_animal/drone/D = item
-		D.cancelAlarm("Fire", src, source)
-	for(var/item in GLOB.alarmdisplay)
-		var/datum/computer_file/program/alarm_monitor/p = item
-		p.cancelAlarm("Fire", src, source)
+	if (!(area_flags & NO_ALERTS)) //Check here instead at the start of the proc so that fire alarms can still work locally even in areas that don't send alerts
+		for (var/item in GLOB.silicon_mobs)
+			var/mob/living/silicon/aiPlayer = item
+			aiPlayer.cancelAlarm("Fire", src, source)
+		for (var/item in GLOB.alert_consoles)
+			var/obj/machinery/computer/station_alert/a = item
+			a.cancelAlarm("Fire", src, source)
+		for (var/item in GLOB.drones_list)
+			var/mob/living/simple_animal/drone/D = item
+			D.cancelAlarm("Fire", src, source)
+		for(var/item in GLOB.alarmdisplay)
+			var/datum/computer_file/program/alarm_monitor/p = item
+			p.cancelAlarm("Fire", src, source)

 	STOP_PROCESSING(SSobj, src)

@@ -467,7 +465,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 		DOOR.lock()

 /area/proc/burglaralert(obj/trigger)
-	if(always_unpowered) //no burglar alarms in space/asteroid
+	if (area_flags & NO_ALERTS)
 		return

 	//Trigger alarm effect
@@ -675,9 +673,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	power_light = FALSE
 	power_environ = FALSE
 	always_unpowered = FALSE
-	valid_territory = FALSE
 	valid_malf_hack = FALSE
-	blob_allowed = FALSE
+	area_flags &= ~VALID_TERRITORY
+	area_flags &= ~BLOBS_ALLOWED
 	addSorted()

 /area/proc/update_areasize()
@@ -8,6 +8,7 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
 	name = "Strange Location"
 	icon_state = "away"
 	has_gravity = STANDARD_GRAVITY
+	// ambience_index = AMBIENCE_AWAY
 	ambientsounds = AWAY_MISSION
 	sound_environment = SOUND_ENVIRONMENT_ROOM

@@ -27,3 +28,8 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
 /area/awaymission/vr
 	name = "Virtual Reality"
 	icon_state = "awaycontent1"
+	requires_power = FALSE
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+	var/pacifist = TRUE // if when you enter this zone, you become a pacifist or not
+	var/death = FALSE // if when you enter this zone, you die
+	// network_root_id = "VR"
@@ -1,14 +1,17 @@

 // CENTCOM

+// Side note, be sure to change the network_root_id of any areas that are not a part of centcom
+// and just using the z space as safe harbor.  It shouldn't matter much as centcom z is isolated
+// from everything anyway
+
 /area/centcom
 	name = "CentCom"
 	icon_state = "centcom"
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
-	noteleport = TRUE
-	blob_allowed = FALSE //Should go without saying, no blobs should take over centcom as a win condition.
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT
 	flags_1 = NONE

 /area/centcom/control
@@ -33,6 +36,7 @@
 	name = "VIP Zone"
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED

+// dear mappers who make winterball: THROW YOUR AREAS IN A DIFFERENT MAP, THIS IS DEFAULT GAME STUFF NOT EVENT STUFF
 /area/centcom/winterball
 	name = "winterball Zone"
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
@@ -56,7 +60,7 @@
 	var/loading_id = ""

 /area/centcom/supplypod/loading/Initialize()
-	. = ..() 
+	. = ..()
 	if(!loading_id)
 		CRASH("[type] created without a loading_id")
 	if(GLOB.supplypod_loading_bays[loading_id])
@@ -128,17 +132,19 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
-	noteleport = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT
 	flags_1 = NONE
+	// network_root_id = "MAGIC_NET"

 //Abductors
 /area/abductor_ship
 	name = "Abductor Ship"
 	icon_state = "yellow"
 	requires_power = FALSE
-	noteleport = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT
 	has_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
+	// network_root_id = "ALIENS"

 //Syndicates
 /area/syndicate_mothership
@@ -146,26 +152,28 @@
 	icon_state = "syndie-ship"
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
-	noteleport = TRUE
-	blob_allowed = FALSE //Not... entirely sure this will ever come up... but if the bus makes blobs AND ops, it shouldn't aim for the ops to win.
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NOTELEPORT
 	flags_1 = NONE
+	// ambience_index = AMBIENCE_DANGER
 	ambientsounds = HIGHSEC
+	// network_root_id = SYNDICATE_NETWORK_ROOT

 /area/syndicate_mothership/control
 	name = "Syndicate Control Room"
 	icon_state = "syndie-control"
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+	// network_root_id = SYNDICATE_NETWORK_ROOT

 /area/syndicate_mothership/elite_squad
 	name = "Syndicate Elite Squad"
 	icon_state = "syndie-elite"
+	// network_root_id = SYNDICATE_NETWORK_ROOT

 /area/fabric_of_reality
 	name = "Tear in the Fabric of Reality"
 	requires_power = FALSE
 	has_gravity = TRUE
-	noteleport = TRUE
-	blob_allowed = FALSE
+	area_flags = UNIQUE_AREA | NOTELEPORT

 //CAPTURE THE FLAG

@@ -174,6 +182,7 @@
 	icon_state = "yellow"
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
+	flags_1 = NONE

 /area/ctf/control_room
 	name = "Control Room A"
@@ -209,11 +218,10 @@
 	icon_state = "yellow"
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
-	noteleport = TRUE
-	hidden = TRUE
+	area_flags = HIDDEN_AREA | NOTELEPORT | UNIQUE_AREA
 	ambientsounds = REEBE

 /area/reebe/city_of_cogs
 	name = "City of Cogs"
 	icon_state = "purple"
-	hidden = FALSE
+	area_flags = NOTELEPORT | UNIQUE_AREA
@@ -2,12 +2,13 @@
 	name = "Holodeck"
 	icon_state = "Holodeck"
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-	flags_1 = 0
-	hidden = TRUE
+	flags_1 = NONE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA
 	sound_environment = SOUND_ENVIRONMENT_PADDED_CELL

 	var/obj/machinery/computer/holodeck/linked
-	var/restricted = 0 // if true, program goes on emag list
+	var/restricted = FALSE // if true, program goes on emag list
+	// network_root_id = "HOLODECK"

 /*
 	Power tracking: Use the holodeck computer's power grid
@@ -3,44 +3,49 @@
 /area/mine
 	icon_state = "mining"
 	has_gravity = STANDARD_GRAVITY
-	flora_allowed = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED

 /area/mine/explored
 	name = "Mine"
 	icon_state = "explored"
-	music = null
 	always_unpowered = TRUE
 	requires_power = TRUE
-	poweralm = FALSE
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
 	outdoors = TRUE
 	flags_1 = NONE
+	// ambience_index = AMBIENCE_MINING
 	ambientsounds = MINING
-	flora_allowed = FALSE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS
 	sound_environment = SOUND_AREA_STANDARD_STATION
+	// min_ambience_cooldown = 70 SECONDS
+	// max_ambience_cooldown = 220 SECONDS

 /area/mine/unexplored
 	name = "Mine"
 	icon_state = "unexplored"
-	music = null
 	always_unpowered = TRUE
 	requires_power = TRUE
-	poweralm = FALSE
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
 	outdoors = TRUE
 	flags_1 = NONE
+	// ambience_index = AMBIENCE_MINING
 	ambientsounds = MINING
-	tunnel_allowed = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
+	map_generator = /datum/map_generator/cave_generator
+	// min_ambience_cooldown = 70 SECONDS
+	// max_ambience_cooldown = 220 SECONDS

 /area/mine/lobby
 	name = "Mining Station"
+	icon_state = "mining_lobby"

 /area/mine/storage
 	name = "Mining Station Storage"
+	icon_state = "mining_storage"

 /area/mine/production
 	name = "Mining Station Starboard Wing"
@@ -62,19 +67,27 @@

 /area/mine/cafeteria
 	name = "Mining Station Cafeteria"
+	icon_state = "mining_labor_cafe"

 /area/mine/hydroponics
 	name = "Mining Station Hydroponics"
+	icon_state = "mining_labor_hydro"

 /area/mine/sleeper
 	name = "Mining Station Emergency Sleeper"

+/area/mine/mechbay
+	name = "Mining Station Mech Bay"
+	icon_state = "mechbay"
+
 /area/mine/laborcamp
 	name = "Labor Camp"
+	icon_state = "mining_labor"

 /area/mine/laborcamp/security
 	name = "Labor Camp Security"
 	icon_state = "security"
+	// ambience_index = AMBIENCE_DANGER
 	ambientsounds = HIGHSEC


@@ -86,33 +99,36 @@
 	icon_state = "mining"
 	has_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	flora_allowed = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED
 	sound_environment = SOUND_AREA_LAVALAND

 /area/lavaland/surface
 	name = "Lavaland"
 	icon_state = "explored"
-	music = null
 	always_unpowered = TRUE
-	poweralm = FALSE
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
 	requires_power = TRUE
+	// ambience_index = AMBIENCE_MINING
 	ambientsounds = MINING
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS
+	// min_ambience_cooldown = 70 SECONDS
+	// max_ambience_cooldown = 220 SECONDS

 /area/lavaland/underground
 	name = "Lavaland Caves"
 	icon_state = "unexplored"
-	music = null
 	always_unpowered = TRUE
 	requires_power = TRUE
-	poweralm = FALSE
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
+	// ambience_index = AMBIENCE_MINING
 	ambientsounds = MINING
-
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS
+	// min_ambience_cooldown = 70 SECONDS
+	// max_ambience_cooldown = 220 SECONDS

 /area/lavaland/surface/outdoors
 	name = "Lavaland Wastes"
@@ -120,16 +136,16 @@

 /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here
 	icon_state = "unexplored"
-	tunnel_allowed = TRUE
-	mob_spawn_allowed = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | NO_ALERTS
+	map_generator = /datum/map_generator/cave_generator/lavaland

 /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here
 	icon_state = "danger"
-	megafauna_spawn_allowed = TRUE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED | NO_ALERTS

 /area/lavaland/surface/outdoors/explored
 	name = "Lavaland Labor Camp"
-	flora_allowed = FALSE
+	area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS



@@ -139,61 +155,68 @@
 	icon_state = "mining"
 	has_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	flora_allowed = TRUE
-	blob_allowed = FALSE
+	area_flags = UNIQUE_AREA | FLORA_ALLOWED
 	sound_environment = SOUND_AREA_ICEMOON

 /area/icemoon/surface
 	name = "Icemoon"
 	icon_state = "explored"
 	always_unpowered = TRUE
-	poweralm = FALSE
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
 	requires_power = TRUE
+	// ambience_index = AMBIENCE_MINING
 	ambientsounds = MINING
+	area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS
+	// min_ambience_cooldown = 70 SECONDS
+	// max_ambience_cooldown = 220 SECONDS
+
+/area/icemoon/surface/outdoors // weather happens here
+	name = "Icemoon Wastes"
+	outdoors = TRUE
+
+/area/icemoon/surface/outdoors/labor_camp
+	name = "Icemoon Labor Camp"
+	area_flags = UNIQUE_AREA | NO_ALERTS
+
+/area/icemoon/surface/outdoors/unexplored //monsters and ruins spawn here
+	icon_state = "unexplored"
+	area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED | NO_ALERTS
+
+/area/icemoon/surface/outdoors/unexplored/rivers // rivers spawn here
+	icon_state = "danger"
+	map_generator = /datum/map_generator/cave_generator/icemoon/surface
+
+/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters
+	area_flags = UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED | NO_ALERTS

 /area/icemoon/underground
 	name = "Icemoon Caves"
 	outdoors = TRUE
 	always_unpowered = TRUE
 	requires_power = TRUE
-	poweralm = FALSE
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
+	// ambience_index = AMBIENCE_MINING
 	ambientsounds = MINING
+	area_flags = UNIQUE_AREA | FLORA_ALLOWED | NO_ALERTS
+	// min_ambience_cooldown = 70 SECONDS
+	// max_ambience_cooldown = 220 SECONDS

 /area/icemoon/underground/unexplored // mobs and megafauna and ruins spawn here
 	name = "Icemoon Caves"
 	icon_state = "unexplored"
-	tunnel_allowed = TRUE
-	mob_spawn_allowed = TRUE
-	megafauna_spawn_allowed = TRUE
+	area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED | NO_ALERTS

 /area/icemoon/underground/unexplored/rivers // rivers spawn here
 	icon_state = "danger"
+	map_generator = /datum/map_generator/cave_generator/icemoon

-/area/icemoon/underground/explored
+/area/icemoon/underground/unexplored/rivers/deep
+	map_generator = /datum/map_generator/cave_generator/icemoon/deep
+
+/area/icemoon/underground/explored // ruins can't spawn here
 	name = "Icemoon Underground"
-	flora_allowed = FALSE
-
-/area/icemoon/surface/outdoors
-	name = "Icemoon Wastes"
-	outdoors = TRUE
-
-/area/icemoon/surface/outdoors/labor_camp
-	name = "Icemoon Labor Camp"
-	flora_allowed = FALSE
-
-/area/icemoon/surface/outdoors/unexplored //monsters and ruins spawn here
-	icon_state = "unexplored"
-	tunnel_allowed = TRUE
-	mob_spawn_allowed = TRUE
-
-/area/icemoon/surface/outdoors/unexplored/rivers // rivers spawn here
-	icon_state = "danger"
-
-/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters
-	mob_spawn_allowed = FALSE
+	area_flags = UNIQUE_AREA | NO_ALERTS
@@ -2,9 +2,7 @@

 /area/ruin/space
 	has_gravity = FALSE
-	blob_allowed = FALSE //Nope, no winning in space as a blob. Gotta eat the station.
-	outdoors = TRUE
-	ambientsounds = SPACE
+	area_flags = UNIQUE_AREA

 /area/ruin/space/has_grav
 	has_gravity = STANDARD_GRAVITY
@@ -12,7 +10,6 @@
 /area/ruin/space/has_grav/powered
 	requires_power = FALSE

-
 /area/ruin/fakespace
 	icon_state = "space"
 	requires_power = TRUE
@@ -22,10 +19,8 @@
 	power_light = FALSE
 	power_equip = FALSE
 	power_environ = FALSE
-	valid_territory = FALSE
 	outdoors = TRUE
 	ambientsounds = SPACE
-	blob_allowed = FALSE

 /////////////

@@ -133,22 +128,20 @@

 /area/ruin/space/diner
 	name = "Space Diner"
+	area_flags = UNIQUE_AREA

 /area/ruin/space/diner/interior
 	name = "Space Diner"
 	icon_state = "maintbar"
 	has_gravity = STANDARD_GRAVITY
-	blob_allowed = FALSE //Nope, no winning in the diner as a blob. Gotta eat the main station.

 /area/ruin/space/diner/solars
-	requires_power = FALSE
-	dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
-	valid_territory = FALSE
-	blob_allowed = FALSE
-	flags_1 = NONE
-	ambientsounds = ENGINEERING
 	name = "Space Diner Solar Array"
 	icon_state = "yellow"
+	requires_power = FALSE
+	dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
+	flags_1 = NONE
+	ambientsounds = ENGINEERING

 //Ruin of "Skelter" ship

@@ -257,7 +250,7 @@
 //Ruin of old teleporter

 /area/ruin/space/oldteleporter
-	name = "Old teleporter"
+	name = "Old Teleporter"
 	icon_state = "teleporter"


@@ -301,7 +294,7 @@
 	icon_state = "storage_wing"

 /area/ruin/space/has_grav/deepstorage/dorm
-	name = "Deep Storage Dormory"
+	name = "Deep Storage Dormitory"
 	icon_state = "crew_quarters"

 /area/ruin/space/has_grav/deepstorage/kitchen
@@ -339,7 +332,9 @@
 /area/ruin/space/has_grav/ancientstation/atmo
 	name = "Beta Station Atmospherics"
 	icon_state = "red"
-	has_gravity = FALSE
+	// ambience_index = AMBIENCE_ENGI
+	ambientsounds = ENGINEERING
+	has_gravity = TRUE

 /area/ruin/space/has_grav/ancientstation/betanorth
 	name = "Beta Station North Corridor"
@@ -349,9 +344,15 @@
 	name = "Station Solar Array"
 	icon_state = "panelsAP"

+/area/ruin/space/has_grav/ancientstation/betacorridor
+	name = "Beta Station Main Corridor"
+	icon_state = "bluenew"
+
 /area/ruin/space/has_grav/ancientstation/engi
 	name = "Charlie Station Engineering"
 	icon_state = "engine"
+	// ambience_index = AMBIENCE_ENGI
+	ambientsounds = ENGINEERING

 /area/ruin/space/has_grav/ancientstation/comm
 	name = "Charlie Station Command"
@@ -385,6 +386,27 @@
 	name = "Hivebot Mothership"
 	icon_state = "teleporter"

+/area/ruin/space/has_grav/ancientstation/deltaai
+	name = "Delta Station AI Core"
+	icon_state = "ai"
+	ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg')
+
+/area/ruin/space/has_grav/ancientstation/mining
+	name = "Beta Station Mining Equipment"
+	icon_state = "mining"
+
+/area/ruin/space/has_grav/ancientstation/medbay
+	name = "Beta Station Medbay"
+	icon_state = "medbay"
+
+/area/ruin/space/has_grav/ancientstation/betastorage
+	name = "Beta Station Storage"
+	icon_state = "storage"
+
+/area/solars/ancientstation
+	name = "Charlie Station Solar Array"
+	icon_state = "panelsP"
+
 //DERELICT

 /area/ruin/space/derelict
@@ -469,11 +491,11 @@
 	name = "Abandoned Ship"
 	icon_state = "yellow"

-/area/solar/derelict_starboard
+/area/solars/derelict_starboard
 	name = "Derelict Starboard Solar Array"
 	icon_state = "panelsS"

-/area/solar/derelict_aft
+/area/solars/derelict_aft
 	name = "Derelict Aft Solar Array"
 	icon_state = "yellow"

@@ -496,28 +518,24 @@
 	power_light = FALSE
 	power_environ = FALSE

-
 //DJSTATION

 /area/ruin/space/djstation
 	name = "Ruskie DJ Station"
 	icon_state = "DJ"
 	has_gravity = STANDARD_GRAVITY
-	blob_allowed = FALSE //Nope, no winning on the DJ station as a blob. Gotta eat the main station.

 /area/ruin/space/djstation/solars
 	name = "DJ Station Solars"
 	icon_state = "DJ"
 	has_gravity = STANDARD_GRAVITY

-
 //ABANDONED TELEPORTER

 /area/ruin/space/abandoned_tele
 	name = "Abandoned Teleporter"
 	icon_state = "teleporter"
-	music = "signal"
-	ambientsounds = list('sound/ambience/ambimalf.ogg')
+	ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/signal.ogg')

 //OLD AI SAT

@@ -561,3 +579,13 @@
 /area/ruin/space/has_grav/powered/advancedlab
 	name = "Abductor Replication Lab"
 	icon_state = "yellow"
+
+//HELL'S FACTORY OPERATING FACILITY
+// /area/ruin/space/has_grav/hellfactory
+// 	name = "Hell Factory"
+// 	icon_state = "yellow"
+
+// /area/ruin/space/has_grav/hellfactoryoffice
+// 	name = "Hell Factory Office"
+// 	icon_state = "red"
+// 	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | NOTELEPORT
@@ -8,10 +8,11 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	has_gravity = STANDARD_GRAVITY
 	always_unpowered = FALSE
-	valid_territory = FALSE
-	icon_state = "shuttle"
 	// Loading the same shuttle map at a different time will produce distinct area instances.
-	unique = FALSE
+	area_flags = NO_ALERTS
+	icon_state = "shuttle"
+	flags_1 = CAN_BE_DIRTY_1
+	// area_limited_icon_smoothing = /area/shuttle
 	sound_environment = SOUND_ENVIRONMENT_ROOM

 /area/shuttle/Initialize()
@@ -32,7 +33,8 @@

 /area/shuttle/syndicate
 	name = "Syndicate Infiltrator"
-	blob_allowed = FALSE
+	// ambience_index = AMBIENCE_DANGER
+	// area_limited_icon_smoothing = /area/shuttle/syndicate
 	ambientsounds = HIGHSEC
 	canSmoothWithAreas = /area/shuttle/syndicate

@@ -57,7 +59,6 @@

 /area/shuttle/pirate
 	name = "Pirate Shuttle"
-	blob_allowed = FALSE
 	requires_power = TRUE
 	canSmoothWithAreas = /area/shuttle/pirate

@@ -65,12 +66,22 @@
 	name = "Pirate Shuttle Vault"
 	requires_power = FALSE

+/area/shuttle/pirate/flying_dutchman
+	name = "Flying Dutchman"
+	requires_power = FALSE
+
+////////////////////////////Bounty Hunter Shuttles////////////////////////////
+
+/area/shuttle/hunter
+	name = "Hunter Shuttle"
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
 ////////////////////////////White Ship////////////////////////////

 /area/shuttle/abandoned
 	name = "Abandoned Ship"
-	blob_allowed = FALSE
 	requires_power = TRUE
+	// area_limited_icon_smoothing = /area/shuttle/abandoned
 	canSmoothWithAreas = /area/shuttle/abandoned

 /area/shuttle/abandoned/bridge
@@ -94,13 +105,6 @@
 /area/shuttle/abandoned/pod
 	name = "Abandoned Ship Pod"

-////////////////////////////Bounty Hunter Shuttles////////////////////////////
-/area/shuttle/hunter
-	name = "Hunter Shuttle"
-	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-	blob_allowed = FALSE
-	canSmoothWithAreas = /area/shuttle/hunter
-
 ////////////////////////////Single-area shuttles////////////////////////////

 /area/shuttle/transit
@@ -117,44 +121,67 @@

 /area/shuttle/arrival
 	name = "Arrival Shuttle"
-	unique = TRUE  // SSjob refers to this area for latejoiners
+	area_flags = UNIQUE_AREA// SSjob refers to this area for latejoiners

 /area/shuttle/pod_1
 	name = "Escape Pod One"
+	area_flags = BLOBS_ALLOWED

 /area/shuttle/pod_2
 	name = "Escape Pod Two"
+	area_flags = BLOBS_ALLOWED

 /area/shuttle/pod_3
 	name = "Escape Pod Three"
+	area_flags = BLOBS_ALLOWED

 /area/shuttle/pod_4
 	name = "Escape Pod Four"
+	area_flags = BLOBS_ALLOWED

 /area/shuttle/mining
 	name = "Mining Shuttle"
-	blob_allowed = FALSE
+	area_flags = NONE //Set this so it doesn't inherit NO_ALERTS
+
+/area/shuttle/mining/large
+	name = "Mining Shuttle"
+	requires_power = TRUE

 /area/shuttle/labor
 	name = "Labor Camp Shuttle"
-	blob_allowed = FALSE
+	area_flags = NONE //Set this so it doesn't inherit NO_ALERTS

 /area/shuttle/supply
 	name = "Supply Shuttle"
-	blob_allowed = FALSE
+	area_flags = NOTELEPORT

 /area/shuttle/escape
 	name = "Emergency Shuttle"
+	area_flags = BLOBS_ALLOWED
+	// area_limited_icon_smoothing = /area/shuttle/escape
+	canSmoothWithAreas = /area/shuttle/escape
+	flags_1 = CAN_BE_DIRTY_1 // | CULT_PERMITTED_1

 /area/shuttle/escape/backup
 	name = "Backup Emergency Shuttle"

+/area/shuttle/escape/brig
+	name = "Escape Shuttle Brig"
+	icon_state = "shuttlered"
+
 /area/shuttle/escape/luxury
 	name = "Luxurious Emergency Shuttle"
+	// area_flags = NOTELEPORT
+
+/area/shuttle/escape/simulation
+	name = "Medieval Reality Simulation Dome"
+	icon_state = "shuttlectf"
+	area_flags = NOTELEPORT
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED

 /area/shuttle/escape/arena
 	name = "The Arena"
-	noteleport = TRUE
+	area_flags = NOTELEPORT

 /area/shuttle/escape/meteor
 	name = "\proper a meteor with engines strapped to it"
@@ -162,34 +189,26 @@

 /area/shuttle/transport
 	name = "Transport Shuttle"
-	blob_allowed = FALSE

 /area/shuttle/assault_pod
 	name = "Steel Rain"
-	blob_allowed = FALSE

 /area/shuttle/sbc_starfury
 	name = "SBC Starfury"
-	blob_allowed = FALSE

 /area/shuttle/sbc_fighter1
 	name = "SBC Fighter 1"
-	blob_allowed = FALSE

 /area/shuttle/sbc_fighter2
 	name = "SBC Fighter 2"
-	blob_allowed = FALSE

 /area/shuttle/sbc_corvette
 	name = "SBC corvette"
-	blob_allowed = FALSE

 /area/shuttle/syndicate_scout
 	name = "Syndicate Scout"
-	blob_allowed = FALSE

 /area/shuttle/caravan
-	blob_allowed = FALSE
 	requires_power = TRUE

 /area/shuttle/caravan/syndicate1
@@ -5,28 +5,16 @@
 			continue
 		S.charge = 0
 		S.output_level = 0
-		S.output_attempt = 0
+		S.output_attempt = FALSE
 		S.update_icon()
 		S.power_change()

-	var/list/skipped_areas = list(/area/engine/engineering, /area/engine/supermatter, /area/engine/atmospherics_engine, /area/ai_monitored/turret_protected/ai)
-
-	for(var/area/A in world)
-		if( !A.requires_power || A.always_unpowered || A.base_area)
+	for(var/area/A in GLOB.the_station_areas)
+		if(!A.requires_power || A.always_unpowered )
+			continue
+		if(GLOB.typecache_powerfailure_safe_areas[A.type])
 			continue

-		var/skip = 0
-		for(var/area_type in skipped_areas)
-			if(istype(A,area_type))
-				skip = 1
-				break
-		if(A.contents)
-			for(var/atom/AT in A.contents)
-				if(!is_station_level(AT.z)) //Only check one, it's enough.
-					skip = 1
-				break
-		if(skip)
-			continue
 		A.power_light = FALSE
 		A.power_equip = FALSE
 		A.power_environ = FALSE
@@ -35,13 +23,7 @@
 	for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
 		if(C.cell && is_station_level(C.z))
 			var/area/A = C.area
-
-			var/skip = 0
-			for(var/area_type in skipped_areas)
-				if(istype(A,area_type))
-					skip = 1
-					break
-			if(skip)
+			if(GLOB.typecache_powerfailure_safe_areas[A.type])
 				continue

 			C.cell.charge = 0
@@ -413,7 +413,7 @@
 	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION)) //First, collect all area types on the station zlevel
 		for(var/ar in SSmapping.areas_in_z["[z]"])
 			var/area/A = ar
-			if(!(A.type in valid_territories) && A.valid_territory)
+			if(!(A.type in valid_territories) && (A.area_flags & VALID_TERRITORY))
 				valid_territories |= A.type
 	return valid_territories.len

@@ -1240,7 +1240,7 @@ GLOBAL_LIST_EMPTY(possible_sabotages)
 	var/payout_bonus = 0
 	var/area/dropoff = null
 	var/static/list/blacklisted_areas = typecacheof(list(/area/ai_monitored/turret_protected,
-														/area/solar/,
+														/area/solarss/,
 														/area/ruin/,	//thank you station space ruins
 														/area/science/test_area/,
 														/area/shuttle/))
@@ -200,6 +200,6 @@
 	if(is_centcom_level(T.z) || is_away_level(T.z))
 		return FALSE
 	var/area/A = get_area(T)
-	if(!A || A.noteleport)
+	if(!A || (A.area_flags & NOTELEPORT))
 		return FALSE
 	return TRUE
@@ -443,7 +443,7 @@
 	// Check area validity.
 	// Reject space, player-created areas, and non-station z-levels.
 	var/area/A = get_base_area(target)
-	if(!A || (!is_station_level(A.z)) || !A.valid_territory)
+	if(!A || (!is_station_level(A.z)) || !(A.area_flags & VALID_TERRITORY))
 		to_chat(user, "<span class='warning'>[A] is unsuitable for tagging.</span>")
 		return FALSE

@@ -592,7 +592,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 		return
 	var/turf/T = get_turf(user) //we may have moved. adjust as needed...
 	var/area/A = get_area(user)
-	if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !A.blob_allowed))
+	if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !(A.flags_1 & CULT_PERMITTED_1)))
 		to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
 		return FALSE
 	return ..()
@@ -139,14 +139,14 @@
 /obj/item/hand_tele/attack_self(mob/user)
 	var/turf/current_location = get_turf(user)//What turf is the user on?
 	var/area/current_area = current_location.loc
-	if(!current_location || current_area.noteleport || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
+	if(!current_location || (current_area.area_flags & NOTELEPORT) || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
 		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
 		return
 	var/list/L = list(  )
 	for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
 		if(com.target)
 			var/area/A = get_area(com.target)
-			if(!A || A.noteleport)
+			if(!A || (A.area_flags & NOTELEPORT))
 				continue
 			if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
 				L["[get_area(com.target)] (Active)"] = com.target
@@ -159,7 +159,7 @@
 		if(T.y>world.maxy-8 || T.y<8)
 			continue
 		var/area/A = T.loc
-		if(A.noteleport)
+		if(A.area_flags & NOTELEPORT)
 			continue
 		turfs += T
 	if(turfs.len)
@@ -172,12 +172,12 @@
 		return
 	var/atom/T = L[t1]
 	var/area/A = get_area(T)
-	if(A.noteleport)
-		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
+	if (A.area_flags & NOTELEPORT)
+		to_chat(user, "<span class='notice'>[src] is malfunctioning.</span>")
 		return
 	current_location = get_turf(user)	//Recheck.
 	current_area = current_location.loc
-	if(!current_location || current_area.noteleport || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
+	if (!current_location || (current_area.area_flags & NOTELEPORT) || is_away_level(current_location.z) || !isturf(user.loc))
 		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
 		return
 	user.show_message("<span class='notice'>Locked In.</span>", MSG_AUDIBLE)
@@ -50,7 +50,7 @@
 		return FALSE
 	var/turf/T = get_turf(src)
 	var/area/A = get_area(src)
-	if(!A.blob_allowed)
+	if(!(A.area_flags & BLOBS_ALLOWED))
 		return FALSE
 	if(!A.powered(EQUIP))
 		return FALSE
@@ -3,7 +3,7 @@
 #define STAIR_TERMINATOR_YES 2

 // dir determines the direction of travel to go upwards (due to lack of sprites, currently only 1 and 2 make sense)
-// stairs require /turf/open/transparent/openspace as the tile above them to work
+// stairs require /turf/open/openspace as the tile above them to work
 // multiple stair objects can be chained together; the Z level transition will happen on the final stair object in the chain

 /obj/structure/stairs
@@ -12,7 +12,7 @@
 	icon_state = "stairs"
 	anchored = TRUE

-	var/force_open_above = FALSE // replaces the turf above this stair obj with /turf/open/transparent/openspace
+	var/force_open_above = FALSE // replaces the turf above this stair obj with /turf/open/openspace
 	var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC
 	var/turf/listeningTo

@@ -107,23 +107,23 @@
 /obj/structure/stairs/proc/build_signal_listener()
 	if(listeningTo)
 		UnregisterSignal(listeningTo, COMSIG_TURF_MULTIZ_NEW)
-	var/turf/open/transparent/openspace/T = get_step_multiz(get_turf(src), UP)
+	var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 	RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_new)
 	listeningTo = T

 /obj/structure/stairs/proc/force_open_above()
-	var/turf/open/transparent/openspace/T = get_step_multiz(get_turf(src), UP)
+	var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 	if(T && !istype(T))
-		T.ChangeTurf(/turf/open/transparent/openspace, flags = CHANGETURF_INHERIT_AIR)
+		T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)

 /obj/structure/stairs/proc/on_multiz_new(turf/source, dir)
 	//SIGNAL_HANDLER
 	SHOULD_NOT_SLEEP(TRUE) //the same thing.

 	if(dir == UP)
-		var/turf/open/transparent/openspace/T = get_step_multiz(get_turf(src), UP)
+		var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 		if(T && !istype(T))
-			T.ChangeTurf(/turf/open/transparent/openspace, flags = CHANGETURF_INHERIT_AIR)
+			T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)

 /obj/structure/stairs/intercept_zImpact(atom/movable/AM, levels = 1)
 	. = ..()
@@ -1,100 +0,0 @@
-/turf/open/transparent
-	baseturfs = /turf/open/transparent/openspace
-	intact = FALSE //this means wires go on top
-
-/turf/open/transparent/Initialize() // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
-	. = ..()
-	plane = OPENSPACE_PLANE
-	layer = OPENSPACE_LAYER
-
-	return INITIALIZE_HINT_LATELOAD
-
-/turf/open/transparent/LateInitialize()
-	update_multiz(TRUE, TRUE)
-
-/turf/open/transparent/Destroy()
-	vis_contents.len = 0
-	return ..()
-
-/turf/open/transparent/update_multiz(prune_on_fail = FALSE, init = FALSE)
-	. = ..()
-	var/turf/T = below()
-	if(!T)
-		vis_contents.len = 0
-		if(!show_bottom_level() && prune_on_fail) //If we cant show whats below, and we prune on fail, change the turf to plating as a fallback
-			ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
-		return FALSE
-	if(init)
-		vis_contents += T
-	return TRUE
-
-/turf/open/transparent/multiz_turf_del(turf/T, dir)
-	if(dir != DOWN)
-		return
-	update_multiz()
-
-/turf/open/transparent/multiz_turf_new(turf/T, dir)
-	if(dir != DOWN)
-		return
-	update_multiz()
-
-///Called when there is no real turf below this turf
-/turf/open/transparent/proc/show_bottom_level()
-	var/turf/path = SSmapping.level_trait(z, ZTRAIT_BASETURF) || /turf/open/space
-	if(!ispath(path))
-		path = text2path(path)
-		if(!ispath(path))
-			warning("Z-level [z] has invalid baseturf '[SSmapping.level_trait(z, ZTRAIT_BASETURF)]'")
-			path = /turf/open/space
-	var/mutable_appearance/underlay_appearance = mutable_appearance(initial(path.icon), initial(path.icon_state), layer = TURF_LAYER, plane = PLANE_SPACE)
-	underlays += underlay_appearance
-	return TRUE
-
-
-/turf/open/transparent/glass
-	name = "Glass floor"
-	desc = "Dont jump on it, or do, I'm not your mom."
-	icon = 'icons/turf/floors/glass.dmi'
-	icon_state = "floor_glass"
-	smooth = SMOOTH_MORE
-	var/floor_tile = /obj/item/stack/sheet/glass
-	canSmoothWith = list(/turf/open/transparent/glass, /turf/open/transparent/glass/reinforced)
-	footstep = FOOTSTEP_PLATING
-	barefootstep = FOOTSTEP_HARD_BAREFOOT
-	clawfootstep = FOOTSTEP_HARD_CLAW
-	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-
-/turf/open/transparent/glass/Initialize()
-	icon_state = "" //Prevent the normal icon from appearing behind the smooth overlays
-	..()
-	return INITIALIZE_HINT_LATELOAD
-
-/turf/open/floor/glass/LateInitialize()
-	. = ..()
-	// AddElement(/datum/element/turf_z_transparency, TRUE)
-
-/turf/open/transparent/glass/wrench_act(mob/living/user, obj/item/I)
-	to_chat(user, "<span class='notice'>You begin removing glass...</span>")
-	if(I.use_tool(src, user, 30, volume=80))
-		if(!istype(src, /turf/open/transparent/glass))
-			return TRUE
-		if(floor_tile)
-			new floor_tile(src, 2)
-		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
-	return TRUE
-
-/turf/open/transparent/glass/reinforced
-	name = "Reinforced glass floor"
-	desc = "Do jump on it, it can take it."
-	icon = 'icons/turf/floors/reinf_glass.dmi'
-	floor_tile = /obj/item/stack/sheet/rglass
-
-/turf/open/transparent/glass/reinforced/wrench_act(mob/living/user, obj/item/I)
-	to_chat(user, "<span class='notice'>You begin removing reinforced glass...</span>")
-	if(I.use_tool(src, user, 30, volume=80))
-		if(!istype(src, /turf/open/transparent/glass/reinforced))
-			return TRUE
-		if(floor_tile)
-			new floor_tile(src, 2)
-		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
-	return TRUE
@@ -8,12 +8,10 @@
 //Making the station dirty, one tile at a time. Called by master controller's setup_objects

 /turf/open/floor/proc/MakeDirty()
+	// We start with a 1/3 chance of having this proc called by Initialize()
 	if(CONFIG_GET(flag/persistent_debris_only))
 		return

-	if(prob(66))	//fastest possible exit 2/3 of the time
-		return
-
 	if(!(flags_1 & CAN_BE_DIRTY_1))
 		return

@@ -31,22 +29,23 @@
 	var/static/list/high_dirt_areas = typecacheof(list(/area/science/test_area,
 														/area/mine/production,
 														/area/mine/living_quarters,
+														/area/commons/vacant_room/office,
 														/area/ruin/space))
 	if(is_type_in_typecache(A, high_dirt_areas))
-		new /obj/effect/decal/cleanable/dirt(src)	//vanilla, but it works
+		new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works
 		return


-	if(prob(80))	//mid dirt  - 1/15
+	if(prob(80)) //mid dirt  - 1/15
 		return

 		//Construction zones. Blood, sweat, and oil.  Oh, and dirt.
-	var/static/list/engine_dirt_areas = typecacheof(list(/area/engine,
-														/area/crew_quarters/heads/chief,
-														/area/ruin/space/derelict/assembly_line,
+	var/static/list/engine_dirt_areas = typecacheof(list(/area/engineering,
+														/area/command/heads_quarters/ce,
 														/area/science/robotics,
 														/area/maintenance,
 														/area/construction,
+														/area/commons/vacant_room/commissary,
 														/area/survivalpod))
 	if(is_type_in_typecache(A, engine_dirt_areas))
 		if(prob(3))
@@ -62,7 +61,7 @@
 		return

 		//Bathrooms. Blood, vomit, and shavings in the sinks.
-	var/static/list/bathroom_dirt_areas = typecacheof(list(	/area/crew_quarters/toilet,
+	var/static/list/bathroom_dirt_areas = typecacheof(list( /area/commons/toilet,
 															/area/awaymission/research/interior/bathroom))
 	if(is_type_in_typecache(A, bathroom_dirt_areas))
 		if(prob(40))
@@ -72,21 +71,24 @@
 				new /obj/effect/decal/cleanable/blood/old(src)
 		return

-		//Hangars and pods covered in oil.
-	var/static/list/oily_areas = typecacheof(/area/quartermaster)
+	// Cargo bays covered in oil.
+	var/static/list/oily_areas = typecacheof(/area/cargo)
 	if(is_type_in_typecache(A, oily_areas))
 		if(prob(25))
 			new /obj/effect/decal/cleanable/oil(src)
+		// else if(prob(20))
+		// 	// or occasionally the signs of opened packages
+		// 	new /obj/effect/decal/cleanable/wrapping(src)
 		return


-	if(prob(75))	//low dirt  - 1/60
+	if(prob(75)) //low dirt  - 1/60
 		return

 		//Areas where gibs will be present. Robusting probably happened some time ago.
 	var/static/list/gib_covered_areas = typecacheof(list(/area/ai_monitored/turret_protected,
 														/area/security,
-														/area/crew_quarters/heads/hos))
+														/area/command/heads_quarters/hos))
 	if(is_type_in_typecache(A, gib_covered_areas))
 		if(prob(20))
 			if(prob(5))
@@ -96,8 +98,8 @@
 		return

 		//Kitchen areas. Broken eggs, flour, spilled milk (no crying allowed.)
-	var/static/list/kitchen_dirt_areas = typecacheof(list(/area/crew_quarters/kitchen,
-														/area/crew_quarters/cafeteria))
+	var/static/list/kitchen_dirt_areas = typecacheof(list(/area/service/kitchen,
+														/area/service/cafeteria))
 	if(is_type_in_typecache(A, kitchen_dirt_areas))
 		if(prob(60))
 			if(prob(50))
@@ -108,7 +110,7 @@

 		//Medical areas. Mostly clean by space-OSHA standards, but has some blood and oil spread about.
 	var/static/list/medical_dirt_areas = typecacheof(list(/area/medical,
-														/area/crew_quarters/heads/cmo))
+														/area/command/heads_quarters/cmo))
 	if(is_type_in_typecache(A, medical_dirt_areas))
 		if(prob(66))
 			if(prob(5))
@@ -124,10 +126,10 @@

 		//Science messes. Mostly green glowy stuff -WHICH YOU SHOULD NOT INJEST-.
 	var/static/list/science_dirt_areas = typecacheof(list(/area/science,
-														/area/crew_quarters/heads/hor))
-	if(is_type_in_typecache(A, medical_dirt_areas))
+														/area/command/heads_quarters/rd))
+	if(is_type_in_typecache(A, science_dirt_areas))
 		if(prob(20))
-			new /obj/effect/decal/cleanable/greenglow(src)	//this cleans itself up but it might startle you when you see it.
+			new /obj/effect/decal/cleanable/greenglow(src) //this cleans itself up but it might startle you when you see it.
 		return

 	return TRUE
@@ -56,7 +56,7 @@
 		icon_regular_floor = "floor"
 	else
 		icon_regular_floor = icon_state
-	if(mapload)
+	if(mapload && prob(66)) // 2/3 instead of 1/3 (default)
 		MakeDirty()

 /turf/open/floor/ex_act(severity, target)
@@ -80,11 +80,11 @@
 		else
 			to_chat(user, "<span class='notice'>You begin adding glass to the floor...</span>")
 			if(do_after(user, 5, target = src))
-				if (G.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass))
+				if (G.get_amount() >= 2 && !istype(src, /turf/open/floor/glass))
 					for(var/obj/effect/decal/cleanable/decal in src)
 						if(decal.wiped_by_floor_change)
 							qdel(decal)
-					PlaceOnTop(/turf/open/transparent/glass, flags = CHANGETURF_INHERIT_AIR)
+					PlaceOnTop(/turf/open/floor/glass, flags = CHANGETURF_INHERIT_AIR)
 					playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
 					G.use(2)
 					to_chat(user, "<span class='notice'>You add glass to the floor.</span>")
@@ -100,11 +100,11 @@
 		else
 			to_chat(user, "<span class='notice'>You begin adding reinforced glass to the floor...</span>")
 			if(do_after(user, 10, target = src))
-				if (RG.get_amount() >= 2 && !istype(src, /turf/open/transparent/glass/reinforced))
+				if (RG.get_amount() >= 2 && !istype(src, /turf/open/floor/glass/reinforced))
 					for(var/obj/effect/decal/cleanable/decal in src)
 						if(decal.wiped_by_floor_change)
 							qdel(decal)
-					PlaceOnTop(/turf/open/transparent/glass/reinforced, flags = CHANGETURF_INHERIT_AIR)
+					PlaceOnTop(/turf/open/floor/glass/reinforced, flags = CHANGETURF_INHERIT_AIR)
 					playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
 					RG.use(2)
 					to_chat(user, "<span class='notice'>You add reinforced glass to the floor.</span>")
@@ -8,7 +8,6 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "asteroid"
 	icon_plating = "asteroid"
-	postdig_icon_change = TRUE
 	footstep = FOOTSTEP_SAND
 	barefootstep = FOOTSTEP_SAND
 	clawfootstep = FOOTSTEP_SAND
@@ -16,13 +15,19 @@
 	/// Environment type for the turf
 	var/environment_type = "asteroid"
 	/// Base turf type to be created by the tunnel
-	var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
-	/// Probability the floor has a different icon state
+	var/turf_type = /turf/open/floor/plating/asteroid
+	/// Probability floor has a different icon state
 	var/floor_variance = 20
 	attachment_holes = FALSE
+	/// Itemstack to drop when dug by a shovel
 	var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt
 	/// Whether the turf has been dug or not
 	var/dug
+	/// Whether to change the turf's icon_state to "[base_icon_state]_dug" when its dugged up
+	postdig_icon_change = TRUE
+
+// /turf/open/floor/plating/asteroid/setup_broken_states()
+// 	return list("asteroid_dug")

 /turf/open/floor/plating/asteroid/Initialize()
 	var/proper_name = name
@@ -33,19 +38,18 @@

 /// Drops itemstack when dug and changes icon
 /turf/open/floor/plating/asteroid/proc/getDug()
+	dug = TRUE
 	new digResult(src, 5)
 	if(postdig_icon_change)
-		if(!postdig_icon)
-			icon_plating = "[environment_type]_dug"
-			icon_state = "[environment_type]_dug"
-	dug = TRUE
+		icon_plating = "[environment_type]_dug"
+		icon_state = "[environment_type]_dug"

 /// If the user can dig the turf
 /turf/open/floor/plating/asteroid/proc/can_dig(mob/user)
 	if(!dug)
 		return TRUE
 	if(user)
-		to_chat(user, "<span class='notice'>Looks like someone has dug here already.</span>")
+		to_chat(user, "<span class='warning'>Looks like someone has dug here already!</span>")

 /turf/open/floor/plating/asteroid/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return
@@ -59,6 +63,9 @@
 /turf/open/floor/plating/asteroid/MakeDry()
 	return

+// /turf/open/floor/plating/asteroid/crush()
+// 	return
+
 /turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
 	. = ..()
 	if(!.)
@@ -99,6 +106,9 @@
 	floor_variance = 15
 	digResult = /obj/item/stack/ore/glass/basalt

+// /turf/open/floor/plating/asteroid/basalt/setup_broken_states()
+// 	return list("basalt_dug")
+
 /turf/open/floor/plating/asteroid/basalt/lava //lava underneath
 	baseturfs = /turf/open/lava/smooth

@@ -128,280 +138,16 @@
 	planetary_atmos = TRUE
 	baseturfs = /turf/open/lava/smooth/lava_land_surface

-
-
+// /turf/open/floor/plating/asteroid/lowpressure
+// 	initial_gas_mix = OPENTURF_LOW_PRESSURE
+// 	baseturfs = /turf/open/floor/plating/asteroid/lowpressure
+// 	turf_type = /turf/open/floor/plating/asteroid/lowpressure

 /turf/open/floor/plating/asteroid/airless
 	initial_gas_mix = AIRLESS_ATMOS
 	baseturfs = /turf/open/floor/plating/asteroid/airless
 	turf_type = /turf/open/floor/plating/asteroid/airless

-
-#define SPAWN_MEGAFAUNA "bluh bluh huge boss"
-#define SPAWN_BUBBLEGUM 6
-
-/turf/open/floor/plating/asteroid/airless/cave
-	/// Length of the tunnel
-	var/length = 100
-	/// Mobs that can spawn in the tunnel, weighted list
-	var/list/mob_spawn_list
-	/// Megafauna that can spawn in the tunnel, weighted list
-	var/list/megafauna_spawn_list
-	/// Flora that can spawn in the tunnel, weighted list
-	var/list/flora_spawn_list
-	//terrain to spawn weighted list
-	var/list/terrain_spawn_list
-	/// Turf type to choose when spawning in tunnel at 1% chance, weighted list
-	var/list/choose_turf_type
-	/// if the tunnel should keep being created
-	var/sanity = 1
-	/// Cave direction to move
-	var/forward_cave_dir = 1
-	/// Backwards cave direction for tracking
-	var/backward_cave_dir = 2
-	/// If the tunnel is moving backwards
-	var/going_backwards = TRUE
-	/// If this is a cave creating type
-	var/has_data = FALSE
-	/// The non-cave creating type
-	var/data_having_type = /turf/open/floor/plating/asteroid/airless/cave/has_data
-	/// Option tunnel width, wegihted list
-	var/list/pick_tunnel_width
-	turf_type = /turf/open/floor/plating/asteroid/airless
-
-/turf/open/floor/plating/asteroid/airless/cave/has_data //subtype for producing a tunnel with given data
-	has_data = TRUE
-
-/turf/open/floor/plating/asteroid/airless/cave/volcanic
-	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \
-		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \
-		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \
-		SPAWN_MEGAFAUNA = 6, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
-
-	data_having_type = /turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-
-/turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data //subtype for producing a tunnel with given data
-	has_data = TRUE
-
-/turf/open/floor/plating/asteroid/airless/cave/snow
-	gender = PLURAL
-	name = "snow"
-	desc = "Looks cold."
-	icon = 'icons/turf/snow.dmi'
-	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
-	icon_state = "snow"
-	icon_plating = "snow"
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-	slowdown = 2
-	environment_type = "snow"
-	flags_1 = NONE
-	planetary_atmos = TRUE
-	burnt_states = list("snow_dug")
-	bullet_sizzle = TRUE
-	bullet_bounce_sound = null
-	digResult = /obj/item/stack/sheet/mineral/snow
-	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/wolf = 50, /obj/structure/spawner/ice_moon = 3, \
-						  /mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \
-						  /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10, \
-						  /mob/living/simple_animal/hostile/asteroid/lobstrosity = 15)
-	flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/grass/both = 12, /obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6)
-	data_having_type = /turf/open/floor/plating/asteroid/airless/cave/snow/has_data
-	turf_type = /turf/open/floor/plating/asteroid/snow/icemoon
-	choose_turf_type = list(/turf/open/floor/plating/asteroid/snow/icemoon = 19, /turf/open/floor/plating/ice/icemoon = 1)
-	pick_tunnel_width = list("1" = 6, "2" = 1)
-
-/turf/open/floor/plating/asteroid/airless/cave/snow/underground
-	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/ice_demon = 50, /obj/structure/spawner/ice_moon/demonic_portal = 3, \
-						  /mob/living/simple_animal/hostile/asteroid/ice_whelp = 30, /obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 3, \
-						  /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 3)
-	flora_spawn_list = list(/obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6)
-	data_having_type = /turf/open/floor/plating/asteroid/airless/cave/snow/underground/has_data
-	choose_turf_type = null
-
-/turf/open/floor/plating/asteroid/airless/cave/snow/has_data //subtype for producing a tunnel with given data
-	has_data = TRUE
-
-/turf/open/floor/plating/asteroid/airless/cave/snow/underground/has_data //subtype for producing a tunnel with given data
-	has_data = TRUE
-
-/turf/open/floor/plating/asteroid/airless/cave/Initialize()
-	if (!mob_spawn_list)
-		mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
-	if (!megafauna_spawn_list)
-		megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM)
-	if (!flora_spawn_list)
-		flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
-	if(!terrain_spawn_list)
-		terrain_spawn_list = list(/obj/structure/geyser/random = 1)
-	. = ..()
-	if(!has_data)
-		produce_tunnel_from_data()
-
-/// Sets the tunnel length and direction
-/turf/open/floor/plating/asteroid/airless/cave/proc/get_cave_data(set_length, exclude_dir = -1)
-	// If set_length (arg1) isn't defined, get a random length; otherwise assign our length to the length arg.
-	if(!set_length)
-		length = rand(25, 50)
-	else
-		length = set_length
-
-	// Get our directiosn
-	forward_cave_dir = pick(GLOB.alldirs - exclude_dir)
-	// Get the opposite direction of our facing direction
-	backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
-
-/// Gets the tunnel length and direction then makes the tunnel
-/turf/open/floor/plating/asteroid/airless/cave/proc/produce_tunnel_from_data(tunnel_length, excluded_dir = -1)
-	get_cave_data(tunnel_length, excluded_dir)
-	// Make our tunnels
-	make_tunnel(forward_cave_dir)
-	if(going_backwards)
-		make_tunnel(backward_cave_dir)
-	// Kill ourselves by replacing ourselves with a normal floor.
-	SpawnFloor(src)
-
-/**
-  * Makes the tunnel and spawns things inside of it
-  *
-  * Picks a tunnel width for the tunnel and then starts spawning turfs in the direction it moves in
-  * Can randomly change directions of the tunnel, stops if it hits the edge of the map, or a no tunnel area
-  * Can randomly make new tunnels out of itself
-  *
-  */
-/turf/open/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir)
-	var/turf/closed/mineral/tunnel = src
-	var/next_angle = pick(45, -45)
-
-	var/tunnel_width = 1
-	if(pick_tunnel_width)
-		tunnel_width = text2num(pickweight(pick_tunnel_width))
-
-	for(var/i = 0; i < length; i++)
-		if(!sanity)
-			break
-
-		var/list/L = list(45)
-		if(ISODD(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
-			L += -45
-
-		// Expand the edges of our tunnel
-		for(var/edge_angle in L)
-			var/turf/closed/mineral/edge = tunnel
-			for(var/current_tunnel_width = 1 to tunnel_width)
-				edge = get_step(edge, angle2dir(dir2angle(dir) + edge_angle))
-				if(istype(edge))
-					SpawnFloor(edge)
-
-		if(!sanity)
-			break
-
-		// Move our tunnel forward
-		tunnel = get_step(tunnel, dir)
-
-		if(istype(tunnel))
-			// Small chance to have forks in our tunnel; otherwise dig our tunnel.
-			if(i > 3 && prob(20))
-				if(isarea(tunnel.loc))
-
-					var/area/A = tunnel.loc
-					if(!A.tunnel_allowed)
-						sanity = 0
-						break
-				var/turf/open/floor/plating/asteroid/airless/cave/C = tunnel.ChangeTurf(data_having_type, null, CHANGETURF_IGNORE_AIR)
-				C.going_backwards = FALSE
-				C.produce_tunnel_from_data(rand(10, 15), dir)
-			else
-				SpawnFloor(tunnel)
-		else //if(!istype(tunnel, parent)) // We hit space/normal/wall, stop our tunnel.
-			break
-
-		// Chance to change our direction left or right.
-		if(i > 2 && prob(33))
-			// We can't go a full loop though
-			next_angle = -next_angle
-			setDir(angle2dir(dir2angle(dir) )+ next_angle)
-
-
-/// Spawns the floor of the tunnel and any type of structure or mob it can have
-/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T)
-	var/area/A = T.loc
-	if(!A.tunnel_allowed)
-		sanity = 0
-		return
-	if(choose_turf_type)
-		turf_type = pickweight(choose_turf_type)
-	if(turf_type == initial(turf_type)) // Don't spawn different turf types under flora or terrain
-		var/spawned_flora = FALSE
-		if(is_mining_level(z))
-			spawned_flora = SpawnFlora(T)
-		if(!spawned_flora) // no rocks beneath mob spawners / mobs.
-			SpawnMonster(T)
-			SpawnTerrain(T)
-	T.ChangeTurf(turf_type, null, CHANGETURF_IGNORE_AIR)
-
-/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnTerrain(turf/T)
-	if(prob(1))
-		if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored))
-			return
-		var/randumb = pickweight(terrain_spawn_list)
-		for(var/obj/structure/geyser/F in range(7, T))
-			if(istype(F, randumb))
-				return
-		new randumb(T)
-
-/// Spawns a random mob or megafauna in the tunnel
-/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T)
-	if(!isarea(loc))
-		return
-	var/area/A = loc
-	if(prob(30))
-		if(!A.mob_spawn_allowed)
-			return
-		var/randumb = pickweight(mob_spawn_list)
-		if(!randumb)
-			return
-		while(randumb == SPAWN_MEGAFAUNA)
-			if(A.megafauna_spawn_allowed && megafauna_spawn_list && megafauna_spawn_list.len) //this is danger. it's boss time.
-				var/maybe_boss = pickweight(megafauna_spawn_list)
-				if(megafauna_spawn_list[maybe_boss])
-					randumb = maybe_boss
-					if(ispath(maybe_boss, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it
-						megafauna_spawn_list[maybe_boss] = 0
-			else //this is not danger, don't spawn a boss, spawn something else
-				randumb = pickweight(mob_spawn_list)
-
-		for(var/mob/living/simple_animal/hostile/H in urange(12,T)) //prevents mob clumps
-			if((ispath(randumb, /mob/living/simple_animal/hostile/megafauna) || ismegafauna(H)) && get_dist(src, H) <= 7)
-				return //if there's a megafauna within standard view don't spawn anything at all
-			if(ispath(randumb, /mob/living/simple_animal/hostile/asteroid) || istype(H, /mob/living/simple_animal/hostile/asteroid))
-				return //if the random is a standard mob, avoid spawning if there's another one within 12 tiles
-			if((ispath(randumb, /obj/structure/spawner/lavaland) || istype(H, /obj/structure/spawner/lavaland)) && get_dist(src, H) <= 2)
-				return //prevents tendrils spawning in each other's collapse range
-
-		new randumb(T)
-	return TRUE
-
-#undef SPAWN_MEGAFAUNA
-#undef SPAWN_BUBBLEGUM
-
-/// Spawns a random flora in the tunnel, can spawn clumps of them.
-/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnFlora(turf/T)
-	if(prob(12))
-		if(isarea(loc))
-			var/area/A = loc
-			if(!A.flora_allowed)
-				return
-		var/randumb = pickweight(flora_spawn_list)
-		if(!randumb)
-			return
-		for(var/obj/structure/flora/F in range(4, T)) // Allows for growing patches, but not ridiculous stacks of flora
-			if(!istype(F, randumb))
-				return
-		new randumb(T)
-		return TRUE
-
 /turf/open/floor/plating/asteroid/snow
 	gender = PLURAL
 	name = "snow"
@@ -420,6 +166,9 @@
 	bullet_bounce_sound = null
 	digResult = /obj/item/stack/sheet/mineral/snow

+// /turf/open/floor/plating/asteroid/snow/setup_broken_states()
+// 	return list("snow_dug")
+
 /turf/open/floor/plating/asteroid/snow/burn_tile()
 	if(!burnt)
 		visible_message("<span class='danger'>[src] melts away!.</span>")
@@ -430,8 +179,9 @@
 	return FALSE

 /turf/open/floor/plating/asteroid/snow/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
+	baseturfs = /turf/open/openspace/icemoon
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+	slowdown = 0

 /turf/open/lava/plasma/ice_moon
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
@@ -442,24 +192,22 @@
 	name = "icy snow"
 	desc = "Looks colder."
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120"
+	initial_gas_mix = "n2=82;plasma=24;TEMP=120"
 	floor_variance = 0
 	icon_state = "snow-ice"
-	icon_plating = "snow-ice"
-	environment_type = "snow_cavern"
+	environment_type = "snow-ice"
 	footstep = FOOTSTEP_FLOOR
 	barefootstep = FOOTSTEP_HARD_BAREFOOT
 	clawfootstep = FOOTSTEP_HARD_CLAW
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY

+// /turf/open/floor/plating/asteroid/snow/ice/setup_broken_states()
+// 	return list("snow-ice")
 /turf/open/floor/plating/asteroid/snow/ice/icemoon
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
 	planetary_atmos = TRUE
-
-/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "solarpanel"
+	slowdown = 0

 /turf/open/floor/plating/asteroid/snow/ice/burn_tile()
 	return FALSE
@@ -0,0 +1,61 @@
+/turf/open/floor/glass
+	name = "Glass floor"
+	desc = "Dont jump on it, or do, I'm not your mom."
+	icon = 'icons/turf/floors/glass.dmi'
+	icon_state = "floor_glass"
+	baseturfs = /turf/open/openspace
+	intact = FALSE //this means wires go on top
+	smooth = SMOOTH_MORE
+	canSmoothWith = list(/turf/open/floor/glass, /turf/open/floor/glass/reinforced)
+	footstep = FOOTSTEP_PLATING
+	barefootstep = FOOTSTEP_HARD_BAREFOOT
+	clawfootstep = FOOTSTEP_HARD_CLAW
+	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+	floor_tile = /obj/item/stack/sheet/glass
+
+// /turf/open/floor/glass/setup_broken_states()
+// 	return list("glass-damaged1", "glass-damaged2", "glass-damaged3")
+
+
+/turf/open/floor/glass/Initialize()
+	icon_state = "" //Prevent the normal icon from appearing behind the smooth overlays
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/turf/open/floor/glass/LateInitialize()
+	. = ..()
+	AddElement(/datum/element/turf_z_transparency, TRUE)
+
+/// n(omegalul)
+/turf/open/floor/glass/crowbar_act(mob/living/user, obj/item/I)
+	return TRUE
+
+/turf/open/floor/glass/wrench_act(mob/living/user, obj/item/I)
+	to_chat(user, "<span class='notice'>You begin removing glass...</span>")
+	if(I.use_tool(src, user, 30, volume=80))
+		if(!istype(src, /turf/open/floor/glass))
+			return TRUE
+		if(floor_tile)
+			new floor_tile(src, 2)
+		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+	return TRUE
+
+/turf/open/floor/glass/reinforced
+	name = "Reinforced glass floor"
+	desc = "Do jump on it, it can take it."
+	icon = 'icons/turf/floors/reinf_glass.dmi'
+	icon_state = "floor_glass"
+	// base_icon_state = "reinf_glass"
+
+// /turf/open/floor/glass/reinforced/setup_broken_states()
+// 	return list("reinf_glass-damaged1", "reinf_glass-damaged2", "reinf_glass-damaged3")
+
+/turf/open/floor/glass/reinforced/wrench_act(mob/living/user, obj/item/I)
+	to_chat(user, "<span class='notice'>You begin removing reinforced glass...</span>")
+	if(I.use_tool(src, user, 30, volume=80))
+		if(!istype(src, /turf/open/floor/glass/reinforced))
+			return TRUE
+		if(floor_tile)
+			new floor_tile(src, 2)
+		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+	return TRUE
@@ -1,43 +1,59 @@
+#define MINING_MESSAGE_COOLDOWN 20
+
 /**********************Mineral deposits**************************/

 /turf/closed/mineral //wall piece
 	name = "rock"
 	icon = 'icons/turf/mining.dmi'
 	icon_state = "rock"
-	var/smooth_icon = 'icons/turf/smoothrocks.dmi'
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = null
 	baseturfs = /turf/open/floor/plating/asteroid/airless
 	initial_gas_mix = AIRLESS_ATMOS
-	opacity = 1
+	opacity = TRUE
 	density = TRUE
-	blocks_air = 1
+	blocks_air = TRUE
 	layer = EDGED_TURF_LAYER
+	// base_icon_state = "smoothrocks"
 	temperature = TCMB
+	var/smooth_icon = 'icons/turf/smoothrocks.dmi'
 	var/environment_type = "asteroid"
 	var/turf/open/floor/plating/turf_type = /turf/open/floor/plating/asteroid/airless
-	var/mineralType = null
+	var/obj/item/stack/ore/mineralType = null
 	var/mineralAmt = 3
-	var/spread = 0 //will the seam spread?
-	var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
 	var/last_act = 0
 	var/scan_state = "" //Holder for the image we display when we're pinged by a mining scanner
 	var/defer_change = 0
+	// If true you can mine the mineral turf with your hands
+	var/weak_turf = FALSE

 /turf/closed/mineral/Initialize()
 	if (!canSmoothWith)
 		canSmoothWith = list(/turf/closed/mineral, /turf/closed/indestructible)
+	. = ..()
 	var/matrix/M = new
 	M.Translate(-4, -4)
 	transform = M
 	icon = smooth_icon
-	. = ..()
-	if (mineralType && mineralAmt && spread && spreadChance)
+
+
+/turf/closed/mineral/proc/Spread_Vein()
+	var/spreadChance = initial(mineralType.spreadChance)
+	if(spreadChance)
 		for(var/dir in GLOB.cardinals)
 			if(prob(spreadChance))
 				var/turf/T = get_step(src, dir)
-				if(istype(T, /turf/closed/mineral/random))
-					Spread(T)
+				var/turf/closed/mineral/random/M = T
+				if(istype(M) && !M.mineralType)
+					M.Change_Ore(mineralType)
+
+/turf/closed/mineral/proc/Change_Ore(ore_type, random = 0)
+	if(random)
+		mineralAmt = rand(1, 5)
+	if(ispath(ore_type, /obj/item/stack/ore)) //If it has a scan_state, switch to it
+		var/obj/item/stack/ore/the_ore = ore_type
+		scan_state = initial(the_ore.scan_state) // I SAID. SWITCH. TO. IT.
+		mineralType = ore_type // Everything else assumes that this is typed correctly so don't set it to non-ores thanks.

 /turf/closed/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
 	if(turf_type)
@@ -48,7 +64,6 @@


 /turf/closed/mineral/attackby(obj/item/pickaxe/I, mob/user, params)
-	var/stored_dir = user.dir
 	if (!user.IsAdvancedToolUser())
 		to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
@@ -69,7 +84,7 @@
 			if(ismineralturf(src))
 				if(I.digrange > 0)
 					for(var/turf/closed/mineral/M in range(user,range))
-						if(get_dir(user,M)&stored_dir)
+						if(get_dir(user,M) & user.dir)
 							M.gets_drilled(user)
 							dug_tiles += M
 				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
@@ -79,30 +94,63 @@
 	else
 		return attack_hand(user)

-/turf/closed/mineral/proc/gets_drilled()
+/turf/closed/mineral/attack_hand(mob/user)
+	if(!weak_turf)
+		return ..()
+	var/turf/user_turf = user.loc
+	if (!isturf(user_turf))
+		return
+	if(last_act + MINING_MESSAGE_COOLDOWN > world.time)//prevents message spam
+		return
+	last_act = world.time
+	to_chat(user, "<span class='notice'>You start pulling out pieces of [src] with your hands...</span>")
+	if(!do_after(user, 15 SECONDS, target = src))
+		return
+	if(ismineralturf(src))
+		to_chat(user, "<span class='notice'>You finish pulling apart [src].</span>")
+		gets_drilled(user)
+
+/turf/closed/mineral/proc/gets_drilled(user, give_exp = FALSE)
 	if (mineralType && (mineralAmt > 0))
 		new mineralType(src, mineralAmt)
 		SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType)
+	// if(ishuman(user))
+	// 	var/mob/living/carbon/human/H = user
+	// 	if(give_exp)
+	// 		if (mineralType && (mineralAmt > 0))
+	// 			H.mind.adjust_experience(/datum/skill/mining, initial(mineralType.mine_experience) * mineralAmt)
+	// 		else
+	// 			H.mind.adjust_experience(/datum/skill/mining, 4)
+
 	for(var/obj/effect/temp_visual/mining_overlay/M in src)
 		qdel(M)
 	var/flags = NONE
 	if(defer_change) // TODO: make the defer change var a var for any changeturf flag
 		flags = CHANGETURF_DEFER_CHANGE
-	ScrapeAway(null, flags)
+	var/turf/open/mined = ScrapeAway(null, flags)
 	addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
-	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
+	playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
+	mined.update_visuals()

-/turf/closed/mineral/attack_animal(mob/living/simple_animal/user)
+/turf/closed/mineral/attack_animal(mob/living/simple_animal/user, list/modifiers)
 	if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS))
-		gets_drilled()
+		gets_drilled(user)
 	..()

-/turf/closed/mineral/attack_alien(mob/living/carbon/alien/M)
-	to_chat(M, "<span class='notice'>You start digging into the rock...</span>")
-	playsound(src, 'sound/effects/break_stone.ogg', 50, 1)
-	if(do_after(M, 40, target = src))
-		to_chat(M, "<span class='notice'>You tunnel into the rock.</span>")
-		gets_drilled(M)
+/turf/closed/mineral/attack_alien(mob/living/carbon/alien/user, list/modifiers)
+	to_chat(user, "<span class='notice'>You start digging into the rock...</span>")
+	playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE)
+	if(do_after(user, 4 SECONDS, target = src))
+		to_chat(user, "<span class='notice'>You tunnel into the rock.</span>")
+		gets_drilled(user)
+
+/turf/closed/mineral/attack_hulk(mob/living/carbon/human/H)
+	..()
+	if(do_after(H, 50, target = src))
+		playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+		H.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
+		gets_drilled(H)
+	return TRUE

 /turf/closed/mineral/Bumped(atom/movable/AM)
 	..()
@@ -128,72 +176,57 @@
 	switch(severity)
 		if(3)
 			if (prob(75))
-				gets_drilled(null, 1)
+				gets_drilled(null, FALSE)
 		if(2)
 			if (prob(90))
-				gets_drilled(null, 1)
+				gets_drilled(null, FALSE)
 		if(1)
-			gets_drilled(null, 1)
+			gets_drilled(null, FALSE)
 	return

-/turf/closed/mineral/Spread(turf/T)
-	T.ChangeTurf(type)
-
 /turf/closed/mineral/random
-	var/list/mineralSpawnChanceList = list(/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
-		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
-		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
+	var/list/mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10,
+		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40, /obj/item/stack/ore/titanium = 11,
+		/turf/closed/mineral/gibtonite = 4, /obj/item/stack/ore/bluespace_crystal = 1)
 		//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 13
-	var/display_icon_state = "rock"
-
-/turf/closed/mineral/random/more_caves
-	mineralSpawnChanceList = list(/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
-		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
-		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 15, /turf/closed/mineral/bscrystal = 1)

 /turf/closed/mineral/random/Initialize()

 	mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList)

-	if (display_icon_state)
-		icon_state = display_icon_state
 	. = ..()
 	if (prob(mineralChance))
 		var/path = pickweight(mineralSpawnChanceList)
-		var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR)
+		if(ispath(path, /turf))
+			var/stored_flags = 0
+			if(flags_1 & NO_RUINS_1)
+				stored_flags |= NO_RUINS_1
+			var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR)
+			T.flags_1 |= stored_flags

-		if(T && ismineralturf(T))
-			var/turf/closed/mineral/M = T
-			M.mineralAmt = rand(1, 5)
-			M.environment_type = src.environment_type
-			M.turf_type = src.turf_type
-			M.baseturfs = src.baseturfs
-			src = M
-			M.levelupdate()
+			T.baseturfs = src.baseturfs
+			if(ismineralturf(T))
+				var/turf/closed/mineral/M = T
+				M.turf_type = src.turf_type
+				M.mineralAmt = rand(1, 5)
+				M.environment_type = src.environment_type
+				src = M
+				M.levelupdate()
+			else
+				src = T
+				T.levelupdate()

-
-/turf/closed/mineral/random/no_caves
-	mineralSpawnChanceList = list(/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
-		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
-		/turf/closed/mineral/gibtonite = 4, /turf/closed/mineral/bscrystal = 1)
-
-/turf/closed/mineral/random/no_caves/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	mineralSpawnChanceList = list(/turf/closed/mineral/uranium/earth_like = 5, /turf/closed/mineral/diamond/earth_like = 1, /turf/closed/mineral/gold/earth_like = 10,
-		/turf/closed/mineral/silver/earth_like = 12, /turf/closed/mineral/plasma/earth_like = 20, /turf/closed/mineral/iron/earth_like = 40,
-		/turf/closed/mineral/titanium/earth_like = 11, /turf/closed/mineral/gibtonite/earth_like = 4, /turf/closed/mineral/bscrystal/earth_like = 1)
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
+		else
+			Change_Ore(path, 1)
+			Spread_Vein(path)

 /turf/closed/mineral/random/high_chance
 	icon_state = "rock_highchance"
 	mineralChance = 25
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/gold = 45, /turf/closed/mineral/titanium = 45,
-		/turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bscrystal = 20)
+		/obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45,
+		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20)

 /turf/closed/mineral/random/high_chance/volcanic
 	environment_type = "basalt"
@@ -202,55 +235,16 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = TRUE
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 35, /turf/closed/mineral/diamond/volcanic = 30, /turf/closed/mineral/gold/volcanic = 45, /turf/closed/mineral/titanium/volcanic = 45,
-		/turf/closed/mineral/silver/volcanic = 50, /turf/closed/mineral/plasma/volcanic = 50, /turf/closed/mineral/bscrystal/volcanic = 20)
-
-/turf/closed/mineral/random/high_chance/snow
-	name = "snowy mountainside"
-	icon = 'icons/turf/mining.dmi'
-	smooth_icon = 'icons/turf/walls/mountain_wall.dmi'
-	icon_state = "mountainrock"
-	smooth = SMOOTH_MORE|SMOOTH_BORDER
-	canSmoothWith = list (/turf/closed)
-	defer_change = TRUE
-	environment_type = "snow"
-	turf_type = /turf/open/floor/plating/asteroid/snow/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/ice/icemoon = 35, /turf/closed/mineral/diamond/ice/icemoon = 30, /turf/closed/mineral/gold/ice/icemoon = 45, /turf/closed/mineral/titanium/ice/icemoon = 45,
-		/turf/closed/mineral/silver/ice/icemoon = 50, /turf/closed/mineral/plasma/ice/icemoon = 50, /turf/closed/mineral/bscrystal/ice/icemoon = 20)
-
-/turf/closed/mineral/random/high_chance/earth_like
-	icon_state = "rock_highchance_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/earth_like = 35, /turf/closed/mineral/diamond/earth_like = 30, /turf/closed/mineral/gold/earth_like = 45,
-		/turf/closed/mineral/titanium/earth_like = 45, /turf/closed/mineral/silver/earth_like = 50, /turf/closed/mineral/plasma/earth_like = 50,
-		/turf/closed/mineral/bscrystal/earth_like = 20)
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
+		/obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45,
+		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal)

 /turf/closed/mineral/random/low_chance
 	icon_state = "rock_lowchance"
 	mineralChance = 6
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4, /turf/closed/mineral/titanium = 4,
-		/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
-		/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
-
-/turf/closed/mineral/random/low_chance/earth_like
-	icon_state = "rock_lowchance_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/earth_like = 2, /turf/closed/mineral/diamond/earth_like = 1, /turf/closed/mineral/gold/earth_like = 4,
-		/turf/closed/mineral/titanium/earth_like = 4, /turf/closed/mineral/silver/earth_like = 6, /turf/closed/mineral/plasma/earth_like = 15,
-		/turf/closed/mineral/iron/earth_like = 40, /turf/closed/mineral/gibtonite/earth_like = 2, /turf/closed/mineral/bscrystal/earth_like = 1)
-	defer_change = TRUE
+		/obj/item/stack/ore/uranium = 2, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 4, /obj/item/stack/ore/titanium = 4,
+		/obj/item/stack/ore/silver = 6, /obj/item/stack/ore/plasma = 15, /obj/item/stack/ore/iron = 40,
+		/turf/closed/mineral/gibtonite = 2, /obj/item/stack/ore/bluespace_crystal = 1)

 /turf/closed/mineral/random/volcanic
 	environment_type = "basalt"
@@ -261,15 +255,9 @@

 	mineralChance = 10
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 5, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 10, /turf/closed/mineral/titanium/volcanic = 11,
-		/turf/closed/mineral/silver/volcanic = 12, /turf/closed/mineral/plasma/volcanic = 20, /turf/closed/mineral/iron/volcanic = 40,
-		/turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 1, /turf/closed/mineral/bscrystal/volcanic = 1)
-
-/turf/closed/mineral/random/volcanic/more_caves
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 5, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 10, /turf/closed/mineral/titanium/volcanic = 11,
-		/turf/closed/mineral/silver/volcanic = 12, /turf/closed/mineral/plasma/volcanic = 20, /turf/closed/mineral/iron/volcanic = 40,
-		/turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 15, /turf/closed/mineral/bscrystal/volcanic = 1)
+		/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10, /obj/item/stack/ore/titanium = 11,
+		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40,
+		/turf/closed/mineral/gibtonite/volcanic = 4, /obj/item/stack/ore/bluespace_crystal = 1)

 /turf/closed/mineral/random/snow
 	name = "snowy mountainside"
@@ -283,38 +271,43 @@
 	turf_type = /turf/open/floor/plating/asteroid/snow/icemoon
 	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+	weak_turf = TRUE

-	mineralChance = 10
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/ice/icemoon = 5, /turf/closed/mineral/diamond/ice/icemoon = 1, /turf/closed/mineral/gold/ice/icemoon = 10, /turf/closed/mineral/titanium/ice/icemoon = 11,
-		/turf/closed/mineral/silver/ice/icemoon = 12, /turf/closed/mineral/plasma/ice/icemoon = 20, /turf/closed/mineral/iron/ice/icemoon = 40,
-		/turf/closed/mineral/gibtonite/ice/icemoon = 4, /turf/open/floor/plating/asteroid/airless/cave/snow = 1, /turf/closed/mineral/bscrystal/ice/icemoon = 1)
+/turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0)
+	. = ..()
+	if(mineralType)
+		smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+		icon = 'icons/turf/walls/icerock_wall.dmi'
+		icon_state = "icerock_wall-0"
+		// base_icon_state = "icerock_wall"
+		smooth = SMOOTH_MORE|SMOOTH_BORDER

-/turf/closed/mineral/random/snow/no_caves
+/turf/closed/mineral/random/snow
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/ice/icemoon = 5, /turf/closed/mineral/diamond/ice/icemoon = 1, /turf/closed/mineral/gold/ice/icemoon = 10, /turf/closed/mineral/titanium/ice/icemoon = 11,
-		/turf/closed/mineral/silver/ice/icemoon = 12, /turf/closed/mineral/plasma/ice/icemoon = 20, /turf/closed/mineral/iron/ice/icemoon = 40,
-		/turf/closed/mineral/gibtonite/ice/icemoon = 4, /turf/closed/mineral/bscrystal/ice/icemoon = 1)
-
-/turf/closed/mineral/random/labormineral
-	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 3, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 8, /turf/closed/mineral/titanium = 8,
-		/turf/closed/mineral/silver = 20, /turf/closed/mineral/plasma = 30, /turf/closed/mineral/iron = 95,
-		/turf/closed/mineral/gibtonite = 2)
-	icon_state = "rock_labor"
+		/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10, /obj/item/stack/ore/titanium = 11,
+		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40,
+		/turf/closed/mineral/gibtonite/ice/icemoon = 4, /obj/item/stack/ore/bluespace_crystal = 1)

 /turf/closed/mineral/random/snow/underground
+	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
+	// abundant ore
+	mineralChance = 20
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/ice/icemoon = 5, /turf/closed/mineral/diamond/ice/icemoon = 1, /turf/closed/mineral/gold/ice/icemoon = 10, /turf/closed/mineral/titanium/ice/icemoon = 11,
-		/turf/closed/mineral/silver/ice/icemoon = 12, /turf/closed/mineral/plasma/ice/icemoon = 20, /turf/closed/mineral/iron/ice/icemoon = 40,
-		/turf/closed/mineral/gibtonite/ice/icemoon = 4, /turf/open/floor/plating/asteroid/airless/cave/snow/underground = 1, /turf/closed/mineral/bscrystal/ice/icemoon = 1)
+		/obj/item/stack/ore/uranium = 10, /obj/item/stack/ore/diamond = 4, /obj/item/stack/ore/gold = 20, /obj/item/stack/ore/titanium = 22,
+		/obj/item/stack/ore/silver = 24, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 20, /obj/item/stack/ore/bananium = 1,
+		/turf/closed/mineral/gibtonite/ice/icemoon = 8, /obj/item/stack/ore/bluespace_crystal = 2)

-/turf/closed/mineral/random/snow/more_caves
+/turf/closed/mineral/random/snow/high_chance
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/ice/icemoon = 5, /turf/closed/mineral/diamond/ice/icemoon = 1, /turf/closed/mineral/gold/ice/icemoon = 10, /turf/closed/mineral/titanium/ice/icemoon = 11,
-		/turf/closed/mineral/silver/ice/icemoon = 12, /turf/closed/mineral/plasma/ice/icemoon = 20, /turf/closed/mineral/iron/ice/icemoon = 40,
-		/turf/closed/mineral/gibtonite/ice/icemoon = 4, /turf/open/floor/plating/asteroid/airless/cave/snow = 15, /turf/closed/mineral/bscrystal/ice/icemoon = 1)
+		/obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond  = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45,
+		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20)

+/turf/closed/mineral/random/labormineral
+	icon_state = "rock_labor"
+	mineralSpawnChanceList = list(
+		/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 8, /obj/item/stack/ore/titanium = 8,
+		/obj/item/stack/ore/silver = 20, /obj/item/stack/ore/plasma = 30, /obj/item/stack/ore/iron = 95,
+		/turf/closed/mineral/gibtonite = 2)

 /turf/closed/mineral/random/labormineral/volcanic
 	environment_type = "basalt"
@@ -323,16 +316,17 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = TRUE
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 3, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 8, /turf/closed/mineral/titanium/volcanic = 8,
-		/turf/closed/mineral/silver/volcanic = 20, /turf/closed/mineral/plasma/volcanic = 30, /turf/closed/mineral/bscrystal/volcanic = 1, /turf/closed/mineral/gibtonite/volcanic = 2,
-		/turf/closed/mineral/iron/volcanic = 95)
+		/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 8, /obj/item/stack/ore/titanium = 8,
+		/obj/item/stack/ore/silver = 20, /obj/item/stack/ore/plasma = 30, /obj/item/stack/ore/bluespace_crystal = 1, /turf/closed/mineral/gibtonite/volcanic = 2,
+		/obj/item/stack/ore/iron = 95)

-//Subtypes for placing ores manually.
+// Subtypes for mappers placing ores manually.
 /turf/closed/mineral/random/labormineral/ice
 	name = "snowy mountainside"
 	icon = 'icons/turf/mining.dmi'
 	smooth_icon = 'icons/turf/walls/mountain_wall.dmi'
 	icon_state = "mountainrock"
+	// base_icon_state = "mountain_wall"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)
 	defer_change = TRUE
@@ -340,124 +334,57 @@
 	turf_type = /turf/open/floor/plating/asteroid/snow/icemoon
 	baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
 	defer_change = TRUE
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/ice/icemoon = 3, /turf/closed/mineral/diamond/ice/icemoon = 1, /turf/closed/mineral/gold/ice/icemoon = 8, /turf/closed/mineral/titanium/ice/icemoon = 8,
-		/turf/closed/mineral/silver/ice/icemoon = 20, /turf/closed/mineral/plasma/ice/icemoon = 30, /turf/closed/mineral/bscrystal/ice/icemoon = 1, /turf/closed/mineral/gibtonite/ice/icemoon = 2,
-		/turf/closed/mineral/iron/ice/icemoon = 95)
-
+		/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 8, /obj/item/stack/ore/titanium = 8,
+		/obj/item/stack/ore/silver = 20, /obj/item/stack/ore/plasma = 30, /obj/item/stack/ore/bluespace_crystal = 1, /turf/closed/mineral/gibtonite/volcanic = 2,
+		/obj/item/stack/ore/iron = 95)

+/turf/closed/mineral/random/labormineral/ice/Change_Ore(ore_type, random = 0)
+	. = ..()
+	if(mineralType)
+		smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+		icon = 'icons/turf/walls/icerock_wall.dmi'
+		icon_state = "icerock_wall-0"
+		// base_icon_state = "icerock_wall"
+		smooth = SMOOTH_MORE|SMOOTH_BORDER

 /turf/closed/mineral/iron
 	mineralType = /obj/item/stack/ore/iron
-	spreadChance = 20
-	spread = 1
 	scan_state = "rock_Iron"

-/turf/closed/mineral/iron/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = 1
-
-/turf/closed/mineral/iron/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
 /turf/closed/mineral/iron/ice
 	environment_type = "snow_cavern"
 	icon_state = "icerock_iron"
 	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+	// base_icon_state = "icerock_wall"
+	// smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
 	turf_type = /turf/open/floor/plating/asteroid/snow/ice
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
 	initial_gas_mix = FROZEN_ATMOS
 	defer_change = TRUE

-/turf/closed/mineral/iron/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
-
 /turf/closed/mineral/uranium
 	mineralType = /obj/item/stack/ore/uranium
-	spreadChance = 5
-	spread = 1
 	scan_state = "rock_Uranium"

-/turf/closed/mineral/uranium/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/uranium/ice
-	environment_type = "snow_cavern"
-	icon_state = "icerock_Uranium"
-	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = FROZEN_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/uranium/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
-/turf/closed/mineral/uranium/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-
 /turf/closed/mineral/diamond
 	mineralType = /obj/item/stack/ore/diamond
-	spreadChance = 0
-	spread = 1
 	scan_state = "rock_Diamond"

-/turf/closed/mineral/diamond/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/diamond/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
 /turf/closed/mineral/diamond/ice
 	environment_type = "snow_cavern"
 	icon_state = "icerock_diamond"
 	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+	// base_icon_state = "icerock_wall"
+	// smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
 	turf_type = /turf/open/floor/plating/asteroid/snow/ice
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
 	initial_gas_mix = FROZEN_ATMOS
 	defer_change = TRUE

-/turf/closed/mineral/diamond/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
-
 /turf/closed/mineral/gold
 	mineralType = /obj/item/stack/ore/gold
-	spreadChance = 5
-	spread = 1
 	scan_state = "rock_Gold"

 /turf/closed/mineral/gold/volcanic
@@ -467,56 +394,10 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = TRUE

-/turf/closed/mineral/gold/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/gold/ice
-	environment_type = "snow_cavern"
-	icon_state = "icerock_gold"
-	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = FROZEN_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/gold/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
 /turf/closed/mineral/silver
 	mineralType = /obj/item/stack/ore/silver
-	spreadChance = 5
-	spread = 1
 	scan_state = "rock_Silver"

-/turf/closed/mineral/silver/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/silver/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/silver/ice
-	environment_type = "snow_cavern"
-	icon_state = "icerock_silver"
-	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = FROZEN_ATMOS
-	defer_change = TRUE
-
 /turf/closed/mineral/silver/ice/icemoon
 	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
@@ -524,107 +405,31 @@

 /turf/closed/mineral/titanium
 	mineralType = /obj/item/stack/ore/titanium
-	spreadChance = 5
-	spread = 1
 	scan_state = "rock_Titanium"

-/turf/closed/mineral/titanium/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/titanium/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/titanium/ice
-	environment_type = "snow_cavern"
-	icon_state = "icerock_titanium"
-	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = FROZEN_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/titanium/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
 /turf/closed/mineral/plasma
 	mineralType = /obj/item/stack/ore/plasma
-	spreadChance = 8
-	spread = 1
 	scan_state = "rock_Plasma"

-/turf/closed/mineral/plasma/volcanic
-	environment_type = "basalt"
-	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/plasma/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
 /turf/closed/mineral/plasma/ice
 	environment_type = "snow_cavern"
 	icon_state = "icerock_plasma"
 	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+	// base_icon_state = "icerock_wall"
+	// smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
 	turf_type = /turf/open/floor/plating/asteroid/snow/ice
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
 	initial_gas_mix = FROZEN_ATMOS
 	defer_change = TRUE

-/turf/closed/mineral/plasma/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
-
 /turf/closed/mineral/bananium
 	mineralType = /obj/item/stack/ore/bananium
 	mineralAmt = 3
-	spreadChance = 0
-	spread = 0
 	scan_state = "rock_Bananium"

-/turf/closed/mineral/bananium/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/bananium/ice
-	environment_type = "snow_cavern"
-	icon_state = "icerock_Bananium"
-	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = FROZEN_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/bananium/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
-
 /turf/closed/mineral/bscrystal
 	mineralType = /obj/item/stack/ore/bluespace_crystal
 	mineralAmt = 1
-	spreadChance = 0
-	spread = 0
 	scan_state = "rock_BScrystal"

 /turf/closed/mineral/bscrystal/volcanic
@@ -634,27 +439,6 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = TRUE

-/turf/closed/mineral/bscrystal/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/bscrystal/ice
-	environment_type = "snow_cavern"
-	icon_state = "icerock_BScrystal"
-	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
-	initial_gas_mix = FROZEN_ATMOS
-	defer_change = TRUE
-
-/turf/closed/mineral/bscrystal/ice/icemoon
-	turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
-	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
 /turf/closed/mineral/volcanic
 	environment_type = "basalt"
 	turf_type = /turf/open/floor/plating/asteroid/basalt
@@ -667,18 +451,12 @@
 	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
 	defer_change = TRUE

-/turf/closed/mineral/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
 /turf/closed/mineral/ash_rock //wall piece
 	name = "rock"
 	icon = 'icons/turf/mining.dmi'
 	smooth_icon = 'icons/turf/walls/rock_wall.dmi'
 	icon_state = "rock2"
+	// base_icon_state = "rock_wall"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)
 	baseturfs = /turf/open/floor/plating/ashplanet/wateryrock
@@ -692,6 +470,7 @@
 	icon = 'icons/turf/mining.dmi'
 	smooth_icon = 'icons/turf/walls/mountain_wall.dmi'
 	icon_state = "mountainrock"
+	// base_icon_state = "mountain_wall"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)
 	baseturfs = /turf/open/floor/plating/asteroid/snow
@@ -710,6 +489,7 @@
 	icon = 'icons/turf/mining.dmi'
 	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
 	icon_state = "icerock"
+	// base_icon_state = "icerock_wall"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
@@ -725,8 +505,6 @@

 /turf/closed/mineral/gibtonite
 	mineralAmt = 1
-	spreadChance = 0
-	spread = 0
 	scan_state = "rock_Gibtonite"
 	var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it
 	var/stage = GIBTONITE_UNSTRUCK //How far into the lifecycle of gibtonite we are
@@ -746,21 +524,15 @@

 /turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
 	if(stage == GIBTONITE_UNSTRUCK)
-		activated_overlay = mutable_appearance('icons/turf/smoothrocks.dmi', "rock_Gibtonite_active", ON_EDGED_TURF_LAYER)
+		activated_overlay = mutable_appearance('icons/turf/smoothrocks.dmi', "rock_Gibtonite_inactive", ON_EDGED_TURF_LAYER) //shows in gaps between pulses if there are any
 		add_overlay(activated_overlay)
 		name = "gibtonite deposit"
 		desc = "An active gibtonite reserve. Run!"
 		stage = GIBTONITE_ACTIVE
-		visible_message("<span class='danger'>There was gibtonite inside! It's going to explode!</span>")
-		var/turf/bombturf = get_turf(src)
+		visible_message("<span class='danger'>There's gibtonite inside! It's going to explode!</span>")

-		var/notify_admins = 0
-		if(z != 5)
-			notify_admins = 1
-			if(!triggered_by_explosion)
-				message_admins("[ADMIN_LOOKUPFLW(user)] has triggered a gibtonite deposit reaction at [ADMIN_VERBOSEJMP(bombturf)].")
-			else
-				message_admins("An explosion has triggered a gibtonite deposit reaction at [ADMIN_VERBOSEJMP(bombturf)].")
+		var/turf/bombturf = get_turf(src)
+		var/notify_admins = !is_mining_level(z)

 		if(!triggered_by_explosion)
 			log_game("[key_name(user)] has triggered a gibtonite deposit reaction at [AREACOORD(bombturf)].")
@@ -769,9 +541,10 @@

 		countdown(notify_admins)

-/turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0)
-	set waitfor = 0
+/turf/closed/mineral/gibtonite/proc/countdown(notify_admins = FALSE)
+	set waitfor = FALSE
 	while(istype(src, /turf/closed/mineral/gibtonite) && stage == GIBTONITE_ACTIVE && det_time > 0 && mineralAmt >= 1)
+		flick_overlay_view(image('icons/turf/smoothrocks.dmi', src, "rock_Gibtonite_active"), src, 5) //makes the animation pulse one time per tick
 		det_time--
 		sleep(5)
 	if(istype(src, /turf/closed/mineral/gibtonite))
@@ -790,18 +563,18 @@
 		stage = GIBTONITE_STABLE
 		if(det_time < 0)
 			det_time = 0
-		visible_message("<span class='notice'>The chain reaction was stopped! The gibtonite had [det_time] reactions left till the explosion!</span>")
+		visible_message("<span class='notice'>The chain reaction stopped! The gibtonite had [det_time] reactions left till the explosion!</span>")

-/turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0)
+/turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = FALSE)
 	if(stage == GIBTONITE_UNSTRUCK && mineralAmt >= 1) //Gibtonite deposit is activated
-		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
+		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,TRUE)
 		explosive_reaction(user, triggered_by_explosion)
 		return
 	if(stage == GIBTONITE_ACTIVE && mineralAmt >= 1) //Gibtonite deposit goes kaboom
 		var/turf/bombturf = get_turf(src)
 		mineralAmt = 0
 		stage = GIBTONITE_DETONATE
-		explosion(bombturf,1,2,5, adminlog = 0)
+		explosion(bombturf,1,2,5, adminlog = FALSE)
 	if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
 		var/obj/item/gibtonite/G = new (src)
 		if(det_time <= 0)
@@ -825,18 +598,12 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = TRUE

-/turf/closed/mineral/gibtonite/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
-
 /turf/closed/mineral/gibtonite/ice
 	environment_type = "snow_cavern"
 	icon_state = "icerock_Gibtonite"
 	smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
+	// base_icon_state = "icerock_wall"
+	// smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
 	turf_type = /turf/open/floor/plating/asteroid/snow/ice
 	baseturfs = /turf/open/floor/plating/asteroid/snow/ice
 	initial_gas_mix = FROZEN_ATMOS
@@ -856,18 +623,18 @@
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = 1
 	smooth_icon = 'icons/turf/walls/rock_wall.dmi'
+	// base_icon_state = "rock_wall"
+	// smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
+
+// /turf/closed/mineral/strong/attackby(obj/item/I, mob/user, params)
+// 	if(!ishuman(user))
+// 		to_chat(usr, "<span class='warning'>Only a more advanced species could break a rock such as this one!</span>")
+// 		return FALSE
+// 	if(user.mind?.get_skill_level(/datum/skill/mining) >= SKILL_LEVEL_MASTER)
+// 		. = ..()
+// 	else
+// 		to_chat(usr, "<span class='warning'>The rock seems to be too strong to destroy. Maybe I can break it once I become a master miner.</span>")

-/*
-/turf/closed/mineral/strong/attackby(obj/item/I, mob/user, params)
-	if(!ishuman(user))
-		to_chat(usr, "<span class='warning'>Only a more advanced species could break a rock such as this one!</span>")
-		return FALSE
-	var/mob/living/carbon/human/H = user
-	if(H.mind.get_skill_level(/datum/skill/mining) >= SKILL_LEVEL_MASTER)
-		. = ..()
-	else
-		to_chat(usr, "<span class='warning'>The rock seems to be too strong to destroy. Maybe I can break it once I become a master miner.</span>")
-*/

 /turf/closed/mineral/strong/gets_drilled(mob/user)
 	if(!ishuman(user))
@@ -896,3 +663,5 @@

 /turf/closed/mineral/strong/ex_act(severity, target)
 	return
+
+#undef MINING_MESSAGE_COOLDOWN
@@ -1,39 +1,40 @@
 GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdrop, new)

 /atom/movable/openspace_backdrop
-	name			= "openspace_backdrop"
+	name = "openspace_backdrop"

-	anchored		= TRUE
+	anchored = TRUE

 	icon            = 'icons/turf/floors.dmi'
 	icon_state      = "grey"
 	plane           = OPENSPACE_BACKDROP_PLANE
-	mouse_opacity 	= MOUSE_OPACITY_TRANSPARENT
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	layer           = SPLASHSCREEN_LAYER
 	//I don't know why the others are aligned but I shall do the same.
-	vis_flags		= VIS_INHERIT_ID
+	vis_flags = VIS_INHERIT_ID

-/turf/open/transparent/openspace
+/turf/open/openspace
 	name = "open space"
 	desc = "Watch your step!"
 	icon_state = "transparent"
-	baseturfs = /turf/open/transparent/openspace
+	baseturfs = /turf/open/openspace
 	CanAtmosPassVertical = ATMOS_PASS_YES
+	baseturfs = /turf/open/openspace
 	intact = FALSE //this means wires go on top
-	//mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/can_cover_up = TRUE
 	var/can_build_on = TRUE

-/turf/open/transparent/openspace/airless
+/turf/open/openspace/airless
 	initial_gas_mix = AIRLESS_ATMOS

-/turf/open/transparent/openspace/debug/update_multiz()
-	..()
-	return TRUE
+// /turf/open/transparent/openspace/debug/update_multiz()
+// 	..()
+// 	return TRUE

-///No bottom level for openspace.
-/turf/open/transparent/openspace/show_bottom_level()
-	return FALSE
+// ///No bottom level for openspace.
+// /turf/open/transparent/openspace/show_bottom_level()
+// 	return FALSE

 /turf/open/openspace/Initialize() // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
 	. = ..()
@@ -42,20 +43,20 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr

 /turf/open/openspace/LateInitialize()
 	. = ..()
-	// AddElement(/datum/element/turf_z_transparency, FALSE)
+	AddElement(/datum/element/turf_z_transparency, FALSE)

-/turf/open/transparent/openspace/can_have_cabling()
+/turf/open/openspace/can_have_cabling()
 	if(locate(/obj/structure/lattice/catwalk, src))
 		return TRUE
 	return FALSE

-/turf/open/transparent/openspace/zAirIn()
+/turf/open/openspace/zAirIn()
 	return TRUE

-/turf/open/transparent/openspace/zAirOut()
+/turf/open/openspace/zAirOut()
 	return TRUE

-/turf/open/transparent/openspace/zPassIn(atom/movable/A, direction, turf/source)
+/turf/open/openspace/zPassIn(atom/movable/A, direction, turf/source)
 	if(direction == DOWN)
 		for(var/obj/O in contents)
 			if(O.obj_flags & BLOCK_Z_IN_DOWN)
@@ -68,7 +69,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 		return TRUE
 	return FALSE

-/turf/open/transparent/openspace/zPassOut(atom/movable/A, direction, turf/destination)
+/turf/open/openspace/zPassOut(atom/movable/A, direction, turf/destination)
 	if(A.anchored)
 		return FALSE
 	if(direction == DOWN)
@@ -83,13 +84,13 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 		return TRUE
 	return FALSE

-/turf/open/transparent/openspace/proc/CanCoverUp()
+/turf/open/openspace/proc/CanCoverUp()
 	return can_cover_up

-/turf/open/transparent/openspace/proc/CanBuildHere()
+/turf/open/openspace/proc/CanBuildHere()
 	return can_build_on

-/turf/open/transparent/openspace/attackby(obj/item/C, mob/user, params)
+/turf/open/openspace/attackby(obj/item/C, mob/user, params)
 	..()
 	if(!CanBuildHere())
 		return
@@ -130,9 +131,9 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 			else
 				to_chat(user, "<span class='warning'>You need one floor tile to build a floor!</span>")
 		else
-			to_chat(user, "<span class='warning'>The plating is going to need some support! Place metal rods first.</span>")
+			to_chat(user, "<span class='warning'>The plating is going to need some support! Place iron rods first.</span>")

-/turf/open/transparent/openspace/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
+/turf/open/openspace/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	if(!CanBuildHere())
 		return FALSE

@@ -145,7 +146,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 				return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3)
 	return FALSE

-/turf/open/transparent/openspace/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
+/turf/open/openspace/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
 	switch(passed_mode)
 		if(RCD_FLOORWALL)
 			to_chat(user, "<span class='notice'>You build a floor.</span>")
@@ -153,25 +154,33 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 			return TRUE
 	return FALSE

-/turf/open/transparent/openspace/icemoon
+/turf/open/openspace/icemoon
 	name = "ice chasm"
-	baseturfs = /turf/open/transparent/openspace/icemoon
+	baseturfs = /turf/open/openspace/icemoon
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 	var/replacement_turf = /turf/open/floor/plating/asteroid/snow/icemoon
+	/// Replaces itself with replacement_turf if the turf below this one is in a no ruins allowed area (usually ruins themselves)
+	var/protect_ruin = TRUE
+	/// If true mineral turfs below this openspace turf will be mined automatically
+	var/drill_below = TRUE

-/turf/open/transparent/openspace/icemoon/Initialize()
+/turf/open/openspace/icemoon/Initialize()
 	. = ..()
 	var/turf/T = below()
-	// if(T.flags_1 & NO_RUINS_1)
-	// 	ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR)
-	// 	return
-	// if(!ismineralturf(T))
-	// 	return
+	if(T.flags_1 & NO_RUINS_1 && protect_ruin)
+		ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR)
+		return
+	if(!ismineralturf(T) || !drill_below)
+		return
 	var/turf/closed/mineral/M = T
 	M.mineralAmt = 0
 	M.gets_drilled()
-	baseturfs = /turf/open/transparent/openspace/icemoon //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace.
+	baseturfs = /turf/open/openspace/icemoon //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace.

-/turf/open/transparent/openspace/icemoon/can_zFall(atom/movable/A, levels = 1, turf/target)
-	return TRUE
+/turf/open/openspace/icemoon/keep_below
+	drill_below = FALSE
+
+/turf/open/openspace/icemoon/ruins
+	protect_ruin = FALSE
+	drill_below = FALSE
@@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
 	user.Move_Pulled(src)

 /turf/proc/multiz_turf_del(turf/T, dir)
-	// SEND_SIGNAL(src, COMSIG_TURF_MULTIZ_DEL, T, dir)
+	SEND_SIGNAL(src, COMSIG_TURF_MULTIZ_DEL, T, dir)

 /turf/proc/multiz_turf_new(turf/T, dir)
 	SEND_SIGNAL(src, COMSIG_TURF_MULTIZ_NEW, T, dir)
@@ -308,10 +308,10 @@
 	var/list/areas_with_LS = list()
 	var/list/areas_with_intercom = list()
 	var/list/areas_with_camera = list()
-	var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engine/supermatter, /area/science/test_area, /area/space, /area/solar, /area/mine, /area/ruin, /area/asteroid))
+	var/list/station_areas_blacklist = typecacheof(list(/area/holodeck/rec_center, /area/shuttle, /area/engineering/supermatter, /area/science/test_area, /area/space, /area/solars, /area/mine, /area/ruin, /area/asteroid))

 	if(SSticker.current_state == GAME_STATE_STARTUP)
-		to_chat(usr, "Game still loading, please hold!")
+		to_chat(usr, "Game still loading, please hold!", confidential = TRUE)
 		return

 	var/log_message
@@ -326,8 +326,11 @@

 	for(var/area/A in world)
 		if(on_station)
-			var/turf/picked = safepick(get_area_turfs(A.type))
-			if(picked && is_station_level(picked.z))
+			var/list/area_turfs = get_area_turfs(A.type)
+			if (!length(area_turfs))
+				continue
+			var/turf/picked = pick(area_turfs)
+			if(is_station_level(picked.z))
 				if(!(A.type in areas_all) && !is_type_in_typecache(A, station_areas_blacklist))
 					areas_all.Add(A.type)
 		else if(!(A.type in areas_all))
@@ -349,7 +349,7 @@
 				return
 			SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Egalitarian Station"))
 			for(var/obj/machinery/door/airlock/W in GLOB.machines)
-				if(is_station_level(W.z) && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
+				if(is_station_level(W.z) && !istype(get_area(W), /area/command) && !istype(get_area(W), /area/commons) && !istype(get_area(W), /area/service) && !istype(get_area(W), /area/command/heads_quarters) && !istype(get_area(W), /area/security/prison))
 					W.req_access = list()
 			message_admins("[key_name_admin(holder)] activated Egalitarian Station mode")
 			priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, "commandreport")
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)

 /mob/camera/blob/proc/is_valid_turf(turf/T)
 	var/area/A = get_area(T)
-	if((A && !A.blob_allowed) || !T || !is_station_level(T.z) || isspaceturf(T))
+	if((A && !(A.area_flags & BLOBS_ALLOWED)) || !T || !is_station_level(T.z) || isspaceturf(T))
 		return FALSE
 	return TRUE

@@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)

 		var/area/Ablob = get_area(T)

-		if(!Ablob.blob_allowed)
+		if(!(Ablob.area_flags & BLOBS_ALLOWED))
 			continue

 		if(!(ROLE_BLOB in L.faction))
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 		for(var/area/A in GLOB.sortedAreas)
 			if(!(A.type in GLOB.the_station_areas))
 				continue
-			if(!A.blob_allowed)
+			if(!(A.area_flags & BLOBS_ALLOWED))
 				continue
 			A.color = blobstrain.color
 			A.name = "blob"
@@ -211,7 +211,7 @@
 		to_chat(src, "<span class='userdanger'>You have no core and are about to die! May you rest in peace.</span>")
 		return
 	var/area/A = get_area(T)
-	if(isspaceturf(T) || A && !A.blob_allowed)
+	if(isspaceturf(T) || A && !(A.area_flags & BLOBS_ALLOWED))
 		to_chat(src, "<span class='warning'>You cannot relocate your core here!</span>")
 		return
 	if(!can_buy(80))
@@ -25,7 +25,7 @@
 	if(owner_overmind)
 		overmind = owner_overmind
 		var/area/Ablob = get_area(src)
-		if(Ablob.blob_allowed) //Is this area allowed for winning as blob?
+		if(Ablob.area_flags & BLOBS_ALLOWED) //Is this area allowed for winning as blob?
 			overmind.blobs_legit += src
 	GLOB.blobs += src //Keep track of the blob in the normal list either way
 	setDir(pick(GLOB.cardinals))
@@ -37,7 +37,7 @@
 					lastWarning = world.time
 					to_chat(src, "<span class='warning'>This turf is consecrated and can't be crossed!</span>")
 				return
-			if(istype(get_area(T), /area/chapel))
+			if(istype(get_area(T), /area/service/chapel))
 				if((world.time - lastWarning) >= 30)
 					lastWarning = world.time
 					to_chat(src, "<span class='warning'>The Chapel is hallowed ground under a heretical deity, and can't be accessed!</span>")
@@ -24,7 +24,8 @@

 /datum/clockwork_scripture/create_object/stargazer/check_special_requirements()
 	var/area/A = get_area(invoker)
-	if(A.outdoors || A.map_name == "Space" || !A.blob_allowed)
+	var/turf/T = get_turf(invoker)
+	if(!is_station_level(invoker.z) || isspaceturf(T) || !(A.area_flags & VALID_TERRITORY))
 		to_chat(invoker, "<span class='danger'>Stargazers can't be built off-station.</span>")
 		return
 	return ..()
@@ -34,7 +34,7 @@
 			return FALSE
 		var/area/A = get_area(invoker)
 		var/turf/T = get_turf(invoker)
-		if(!T || !is_station_level(T.z) || istype(A, /area/shuttle) || !A.blob_allowed)
+		if(!is_station_level(T.z) || isspaceturf(T) || !(A.area_flags & VALID_TERRITORY) || isshuttleturf(T))
 			to_chat(invoker, "<span class='warning'>You must be on the station to activate the Ark!</span>")
 			return FALSE
 		if(GLOB.clockwork_gateway_activated)
@@ -52,7 +52,7 @@
 				break
 	if(has_starlight && anchored)
 		var/area/A = get_area(src)
-		if(A.outdoors || A.map_name == "Space" || !A.blob_allowed)
+		if(A.outdoors || A.map_name == "Space" || !(A.area_flags & VALID_TERRITORY))
 			has_starlight = FALSE
 	if(old_status != has_starlight)
 		if(has_starlight)
@@ -419,7 +419,7 @@
 	var/sanity = 0
 	while(summon_spots.len < SUMMON_POSSIBILITIES && sanity < 100)
 		var/area/summon = pick(GLOB.sortedAreas - summon_spots)
-		if(summon && is_station_level(summon.z) && summon.valid_territory)
+		if(summon && is_station_level(summon.z) && !(summon.area_flags & VALID_TERRITORY))
 			summon_spots += summon
 		sanity++
 	update_explanation_text()
@@ -148,7 +148,7 @@ This file contains the cult dagger and rune list code
 		to_chat(user, "<span class='cult'>There is already a rune here.</span>")
 		return FALSE
 	var/area/A = get_area(T)
-	if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !A.blob_allowed))
+	if((!is_station_level(T.z) && !is_mining_level(T.z)) || !(A?.area_flags & VALID_TERRITORY))
 		to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
 		return FALSE
 	return TRUE
@@ -261,19 +261,26 @@
 	S.DisIntegrate(src)
 	return TRUE

-/obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	var/isonshuttle = istype(get_area(src), /area/shuttle)
-	for(var/turf/T in range(1, src))
-		var/area/A = get_area(T)
-		if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
-			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
-			S.target = null
+/obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
+	var/is_on_shuttle = istype(get_area(src), /area/shuttle)
+	for(var/turf/turf_in_range in range(1, src))
+		var/area/turf_area = get_area(turf_in_range)
+		//Check for dangerous pressure differences
+		// if (turf_in_range.return_turf_delta_p() > DANGEROUS_DELTA_P)
+		// 	to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause an explosive pressure release. Aborting.</span>")
+		// 	actor.target = null
+		// 	return TRUE
+		//Check if breaking this door will expose the station to space/planetary atmos
+		if(isspaceturf(turf_in_range) || (!is_on_shuttle && (istype(turf_area, /area/shuttle) || istype(turf_area, /area/space))) || (is_on_shuttle && !istype(turf_area, /area/shuttle)))
+			to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
+			actor.target = null
 			return FALSE
-		else if(istype(A, /area/engine/supermatter))
-			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
-			S.target = null
+		//Check if this door is important in supermatter containment
+		else if(istype(turf_area, /area/engineering/supermatter))
+			to_chat(actor, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
+			actor.target = null
 			return FALSE
-	S.DisIntegrate(src)
+	actor.DisIntegrate(src)
 	return TRUE

 /obj/machinery/camera/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
@@ -342,31 +349,40 @@
 	to_chat(S, "<span class='warning'>This bluespace source will be important to us later. Aborting.</span>")
 	return FALSE

-/turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	var/isonshuttle = istype(loc, /area/shuttle)
-	for(var/turf/T in range(1, src))
-		var/area/A = get_area(T)
-		if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
-			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
-			S.target = null
+/turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
+	var/is_on_shuttle = istype(loc, /area/shuttle)
+	for(var/turf/turf_in_range in range(1, src))
+		var/area/turf_area = get_area(turf_in_range)
+		// if (turf_in_range.return_turf_delta_p() > DANGEROUS_DELTA_P)
+		// 	to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause an explosive pressure release. Aborting.</span>")
+		// 	actor.target = null
+		// 	return TRUE
+		if(isspaceturf(turf_in_range) || (!is_on_shuttle && (istype(turf_area, /area/shuttle) || istype(turf_area, /area/space))) || (is_on_shuttle && !istype(turf_area, /area/shuttle)))
+			to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
+			actor.target = null
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
-			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
-			S.target = null
+		else if(istype(turf_area, /area/engineering/supermatter))
+			to_chat(actor, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
+			actor.target = null
 			return TRUE
 	return ..()

-/obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	var/isonshuttle = istype(get_area(src), /area/shuttle)
-	for(var/turf/T in range(1, src))
-		var/area/A = get_area(T)
-		if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
-			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
-			S.target = null
+/obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
+	var/is_on_shuttle = istype(get_area(src), /area/shuttle)
+	for(var/t in RANGE_TURFS(1, src))
+		var/turf/turf_in_range = t
+		var/area/turf_area = get_area(turf_in_range)
+		// if (turf_in_range.return_turf_delta_p() > DANGEROUS_DELTA_P)
+		// 	to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause an explosive pressure release. Aborting.</span>")
+		// 	actor.target = null
+		// 	return TRUE
+		if(isspaceturf(turf_in_range) || (!is_on_shuttle && (istype(turf_area, /area/shuttle) || istype(turf_area, /area/space))) || (is_on_shuttle && !istype(turf_area, /area/shuttle)))
+			to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
+			actor.target = null
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
-			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
-			S.target = null
+		else if(istype(turf_area, /area/engineering/supermatter))
+			to_chat(actor, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
+			actor.target = null
 			return TRUE
 	return ..()

@@ -385,14 +385,10 @@
 /obj/item/warpwhistle/attack_self(mob/living/carbon/user)
 	if(!istype(user) || on_cooldown)
 		return
-	var/turf/T = get_turf(user)
-	var/area/A = get_area(user)
-	if(!T || !A || A.noteleport)
-		to_chat(user, "<span class='warning'>You play \the [src], yet no sound comes out of it... Looks like it won't work here.</span>")
-		return
 	on_cooldown = TRUE
 	last_user = user
-	playsound(T,'sound/magic/warpwhistle.ogg', 200, 1)
+	var/turf/T = get_turf(user)
+	playsound(T,'sound/magic/warpwhistle.ogg', 200, TRUE)
 	ADD_TRAIT(user, TRAIT_MOBILITY_NOMOVE, src)
 	ADD_TRAIT(user, TRAIT_MOBILITY_NOUSE, src)
 	ADD_TRAIT(user, TRAIT_MOBILITY_NOPICKUP, src)
@@ -400,6 +396,10 @@
 	new /obj/effect/temp_visual/tornado(T)
 	sleep(20)
 	if(interrupted(user))
+		REMOVE_TRAIT(user, TRAIT_MOBILITY_NOMOVE, src)
+		REMOVE_TRAIT(user, TRAIT_MOBILITY_NOUSE, src)
+		REMOVE_TRAIT(user, TRAIT_MOBILITY_NOPICKUP, src)
+		user.update_mobility()
 		return
 	user.invisibility = INVISIBILITY_MAXIMUM
 	user.status_flags |= GODMODE
@@ -427,8 +427,7 @@
 	if(interrupted(user))
 		return
 	on_cooldown = 2
-	sleep(40)
-	on_cooldown = 0
+	addtimer(VARSET_CALLBACK(src, on_cooldown, 0), 4 SECONDS)

 /obj/item/warpwhistle/Destroy()
 	if(on_cooldown == 1 && last_user) //Flute got dunked somewhere in the teleport
@@ -20,7 +20,7 @@
 	var/printed_beacons = 0 //number of beacons printed. Used to determine beacon names.
 	var/list/meme_pack_data
 	var/obj/item/supplypod_beacon/beacon //the linked supplypod beacon
-	var/area/landingzone = /area/quartermaster/storage //where we droppin boys
+	var/area/landingzone = /area/cargo/storage //where we droppin boys
 	var/podType = /obj/structure/closet/supplypod
 	var/cooldown = 0 //cooldown to prevent printing supplypod beacon spam
 	var/locked = TRUE //is the console locked? unlock with ID
@@ -177,9 +177,9 @@
 						LZ = get_turf(beacon)
 						beacon.update_status(SP_LAUNCH)
 					else if (!usingBeacon)//find a suitable supplypod landing zone in cargobay
-						landingzone = GLOB.areas_by_type[/area/quartermaster/storage]
+						landingzone = GLOB.areas_by_type[/area/cargo/storage]
 						if (!landingzone)
-							WARNING("[src] couldnt find a Quartermaster/Storage (aka cargobay) area on the station, and as such it has set the supplypod landingzone to the area it resides in.")
+							WARNING("[src] couldnt find \"/area/cargo/storage\" (aka cargobay) area on the station, and as such it has set the supplypod landingzone to the area it resides in.")
 							landingzone = get_area(src)
 						for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
 							if(is_blocked_turf(T))
@@ -19,18 +19,21 @@
 		var/list/safe_area_types = typecacheof(list(
 		/area/ai_monitored/turret_protected/ai,
 		/area/ai_monitored/turret_protected/ai_upload,
-		/area/engine,
-		/area/solar,
+		/area/engineering,
+		/area/solars,
 		/area/holodeck,
-		/area/shuttle)
+		/area/shuttle,
+		/area/maintenance,
+		/area/science/test_area)
 		)

 		//Subtypes from the above that actually should explode.
-		var/list/unsafe_area_subtypes = typecacheof(list(/area/engine/break_room))
+		var/list/unsafe_area_subtypes = typecacheof(list(/area/engineering/break_room))

 		allowed_areas = make_associative(GLOB.the_station_areas) - safe_area_types + unsafe_area_subtypes
-
-	return safepick(typecache_filter_list(GLOB.sortedAreas,allowed_areas))
+	var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas)
+	if (length(possible_areas))
+		return pick(possible_areas)

 /datum/round_event/anomaly/setup()
 	impact_area = findEventArea()
@@ -8,15 +8,14 @@
 	announceWhen = 50
 	endWhen = 20
 	var/list/area/areasToOpen = list()
-	var/list/potential_areas = list(/area/bridge,
-									/area/engine,
+	var/list/potential_areas = list(/area/command,
+									/area/engineering,
 									/area/medical,
 									/area/security,
-									/area/quartermaster,
+									/area/cargo,
 									/area/science)
 	var/severity = 1

-
 /datum/round_event/grey_tide/setup()
 	announceWhen = rand(50, 60)
 	endWhen = rand(20, 30)
@@ -71,12 +71,12 @@
 		var/list/safe_area_types = typecacheof(list(
 		/area/ai_monitored/turret_protected/ai,
 		/area/ai_monitored/turret_protected/ai_upload,
-		/area/engine,
+		/area/engineering,
 		/area/shuttle)
 		)

 		///Subtypes from the above that actually should explode.
-		var/list/unsafe_area_subtypes = typecacheof(list(/area/engine/break_room))
+		var/list/unsafe_area_subtypes = typecacheof(list(/area/engineering/break_room))
 		allowed_areas = make_associative(GLOB.the_station_areas) - safe_area_types + unsafe_area_subtypes
 	var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas)
 	if (length(possible_areas))
@@ -5,7 +5,8 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
-	valid_territory = FALSE
+	area_flags = BLOBS_ALLOWED | UNIQUE_AREA
+	flags_1 = CAN_BE_DIRTY_1

 //Survival Capsule
 /obj/item/survivalcapsule
@@ -16,29 +16,36 @@
 	singular_name = "ore chunk"
 	var/points = 0 //How many points this ore gets you from the ore redemption machine
 	var/refined_type = null //What this ore defaults to being refined into
+	var/mine_experience = 5 //How much experience do you get for mining this ore?
 	novariants = TRUE // Ore stacks handle their icon updates themselves to keep the illusion that there's more going
 	var/list/stack_overlays
+	var/scan_state = "" //Used by mineral turfs for their scan overlay.
+	var/spreadChance = 0 //Also used by mineral turfs for spreading veins

 /obj/item/stack/ore/update_overlays()
 	. = ..()
 	var/difference = min(ORESTACK_OVERLAYS_MAX, amount) - (LAZYLEN(stack_overlays)+1)
-	if(difference == 0)
+	if(!difference)
 		return
-	else if(difference < 0 && LAZYLEN(stack_overlays))			//amount < stack_overlays, remove excess.
-		if (LAZYLEN(stack_overlays)-difference <= 0)
+
+	if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess.
+		if(LAZYLEN(stack_overlays)-difference <= 0)
 			stack_overlays = null
-		else
-			stack_overlays.len += difference
-	else if(difference > 0)			//amount > stack_overlays, add some.
+			return
+		stack_overlays.len += difference
+
+	else //amount > stack_overlays, add some.
 		for(var/i in 1 to difference)
 			var/mutable_appearance/newore = mutable_appearance(icon, icon_state)
 			newore.pixel_x = rand(-8,8)
 			newore.pixel_y = rand(-8,8)
 			LAZYADD(stack_overlays, newore)
-	if (stack_overlays)
+
+	if(stack_overlays)
 		. += stack_overlays

 /obj/item/stack/ore/welder_act(mob/living/user, obj/item/I)
+	..()
 	if(!refined_type)
 		return TRUE

@@ -65,11 +72,16 @@
 /obj/item/stack/ore/uranium
 	name = "uranium ore"
 	icon_state = "Uranium ore"
-	item_state = "Uranium ore"
+	// inhand_icon_state = "Uranium ore"
 	singular_name = "uranium ore chunk"
 	points = 30
+	// material_flags = MATERIAL_NO_EFFECTS
 	custom_materials = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/uranium
+	mine_experience = 6
+	scan_state = "rock_Uranium"
+	spreadChance = 5
+	// merge_type = /obj/item/stack/ore/uranium

 /obj/item/stack/ore/iron
 	name = "iron ore"
@@ -79,6 +91,10 @@
 	points = 1
 	custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/metal
+	mine_experience = 1
+	scan_state = "rock_Iron"
+	spreadChance = 20
+	// merge_type = /obj/item/stack/ore/metal

 /obj/item/stack/ore/glass
 	name = "sand pile"
@@ -89,10 +105,13 @@
 	custom_materials = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/glass
 	w_class = WEIGHT_CLASS_TINY
+	mine_experience = 0 //its sand
+	// merge_type = /obj/item/stack/ore/glass

 GLOBAL_LIST_INIT(sand_recipes, list(\
-	new/datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50),\
-	))
+		new /datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50)
+))
+

 /obj/item/stack/ore/glass/get_main_recipes()
 	. = ..()
@@ -111,7 +130,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 		return ..()
 	var/mob/living/carbon/human/poorsod = M
 	visible_message("<span class='danger'>[user] throws the sand at [poorsod]'s face!</span>")
-	if(ishuman(user))
+	if(ishuman(user) && prob(80))
 		var/mob/living/carbon/human/sayer = user
 		sayer.forcesay("POCKET SAAND!!")
 	eyesand(poorsod)
@@ -133,7 +152,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	C.forcesay("*scream")
 	qdel(src)

-
 /obj/item/stack/ore/glass/ex_act(severity, target)
 	if (severity == EXPLODE_NONE)
 		return
@@ -144,15 +162,21 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "volcanic_sand"
 	icon_state = "volcanic_sand"
 	singular_name = "volcanic ash pile"
+	mine_experience = 0
+	// merge_type = /obj/item/stack/ore/glass/basalt

 /obj/item/stack/ore/plasma
 	name = "plasma ore"
 	icon_state = "Plasma ore"
-	item_state = "Plasma ore"
+	icon_state = "Plasma ore"
 	singular_name = "plasma ore chunk"
 	points = 15
 	custom_materials = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/plasma
+	mine_experience = 5
+	scan_state = "rock_Plasma"
+	spreadChance = 8
+	// merge_type = /obj/item/stack/ore/plasma

 /obj/item/stack/ore/plasma/welder_act(mob/living/user, obj/item/I)
 	to_chat(user, "<span class='warning'>You can't hit a high enough temperature to smelt [src] properly!</span>")
@@ -164,8 +188,12 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	item_state = "Silver ore"
 	singular_name = "silver ore chunk"
 	points = 16
+	mine_experience = 3
 	custom_materials = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/silver
+	scan_state = "rock_Silver"
+	spreadChance = 5
+	// merge_type = /obj/item/stack/ore/silver

 /obj/item/stack/ore/gold
 	name = "gold ore"
@@ -173,8 +201,12 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "Gold ore"
 	singular_name = "gold ore chunk"
 	points = 18
+	mine_experience = 5
 	custom_materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/gold
+	scan_state = "rock_Gold"
+	spreadChance = 5
+	// merge_type = /obj/item/stack/ore/gold

 /obj/item/stack/ore/diamond
 	name = "diamond ore"
@@ -184,6 +216,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	points = 50
 	custom_materials = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/diamond
+	mine_experience = 10
+	scan_state = "rock_Diamond"
+	// merge_type = /obj/item/stack/ore/diamond

 /obj/item/stack/ore/bananium
 	name = "bananium ore"
@@ -193,6 +228,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	points = 60
 	custom_materials = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/bananium
+	mine_experience = 15
+	scan_state = "rock_Bananium"
+	// merge_type = /obj/item/stack/ore/bananium

 /obj/item/stack/ore/titanium
 	name = "titanium ore"
@@ -202,6 +240,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	points = 50
 	custom_materials = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/titanium
+	mine_experience = 3
+	scan_state = "rock_Titanium"
+	spreadChance = 5
+	// merge_type = /obj/item/stack/ore/titanium

 /obj/item/stack/ore/slag
 	name = "slag"
@@ -209,6 +251,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "slag"
 	item_state = "slag"
 	singular_name = "slag chunk"
+	// merge_type = /obj/item/stack/ore/slag

 /obj/item/gibtonite
 	name = "gibtonite ore"
@@ -235,7 +278,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\

 /obj/item/gibtonite/attackby(obj/item/I, mob/user, params)
 	if(!wires && istype(I, /obj/item/assembly/igniter))
-		user.visible_message("[user] attaches [I] to [src].", "<span class='notice'>You attach [I] to [src].</span>")
+		user.visible_message("<span class='notice'>[user] attaches [I] to [src].</span>", "<span class='notice'>You attach [I] to [src].</span>")
 		wires = new /datum/wires/explosive/gibtonite(src)
 		attacher = key_name(user)
 		qdel(I)
@@ -255,7 +298,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 			primed = FALSE
 			if(det_timer)
 				deltimer(det_timer)
-			user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "<span class='notice'>You stopped the chain reaction. ...The ore's quality looks diminished.</span>")
+			user.visible_message("<span class='notice'>The chain reaction stopped! ...The ore's quality looks diminished.</span>", "<span class='notice'>You stopped the chain reaction. ...The ore's quality looks diminished.</span>")
 			icon_state = "Gibtonite ore"
 			quality = GIBTONITE_QUALITY_LOW
 			return
@@ -269,34 +312,29 @@ GLOBAL_LIST_INIT(sand_recipes, list(\

 /obj/item/gibtonite/bullet_act(obj/item/projectile/P)
 	GibtoniteReaction(P.firer)
-	return ..()
+	. = ..()

 /obj/item/gibtonite/ex_act()
 	GibtoniteReaction(null, 1)

-
-
 /obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0)
 	if(!primed)
 		primed = TRUE
-		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
+		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,TRUE)
 		icon_state = "Gibtonite active"
 		var/turf/bombturf = get_turf(src)
-		var/notify_admins = 0
+		var/notify_admins = FALSE
 		if(z != 5)//Only annoy the admins ingame if we're triggered off the mining zlevel
-			notify_admins = 1
+			notify_admins = TRUE

-		if(notify_admins)
-			if(triggered_by == 1)
-				message_admins("An explosion has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)].")
-			else if(triggered_by == 2)
-				message_admins("A signal has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)]. Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]")
-			else
-				message_admins("[ADMIN_LOOKUPFLW(attacher)] has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)].")
 		if(triggered_by == 1)
-			log_game("An explosion has primed a [name] for detonation at [AREACOORD(bombturf)]")
+			message_admins("An explosion has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)].")
 		else if(triggered_by == 2)
-			log_game("A signal has primed a [name] for detonation at [AREACOORD(bombturf)]. Igniter attacher: [key_name(attacher)].")
+			if(notify_admins)
+				message_admins("A signal has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)]. Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]")
+			var/bomb_message = "A signal has primed a [name] for detonation at [AREACOORD(bombturf)]. Igniter attacher: [key_name(attacher)]."
+			log_game(bomb_message)
+			GLOB.bombers += bomb_message
 		else
 			user.visible_message("<span class='warning'>[user] strikes \the [src], causing a chain reaction!</span>", "<span class='danger'>You strike \the [src], causing a chain reaction.</span>")
 			log_game("[key_name(user)] has primed a [name] for detonation at [AREACOORD(bombturf)]")
@@ -313,10 +351,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 				explosion(src,0,1,3,adminlog = notify_admins)
 		qdel(src)

-/obj/item/stack/ore/Initialize()
+/obj/item/stack/ore/Initialize(mapload, new_amount, merge = TRUE)
 	. = ..()
-	pixel_x = rand(0,16)-8
-	pixel_y = rand(0,8)-8
+	pixel_x = initial(pixel_x) + rand(0, 16) - 8
+	pixel_y = initial(pixel_y) + rand(0, 8) - 8

 /obj/item/stack/ore/ex_act(severity, target)
 	if (!severity || severity >= 2)
@@ -350,8 +388,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	. = ..()
 	coinflip = pick(sideslist)
 	icon_state = "coin_[coinflip]"
-	pixel_x = rand(0,16)-8
-	pixel_y = rand(0,8)-8
+	pixel_x = initial(pixel_x) + rand(0, 16) - 8
+	pixel_y = initial(pixel_y) + rand(0, 8) - 8

 /obj/item/coin/set_custom_materials(list/materials, multiplier = 1)
 	. = ..()
@@ -377,6 +415,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 		user.visible_message("<span class='suicide'>\the [src] lands on [coinflip]! [user] promptly falls over, dead!</span>")
 		user.adjustOxyLoss(200)
 		user.death(0)
+		// user.set_suicide(TRUE)
+		user.suicide_log()
 	else
 		user.visible_message("<span class='suicide'>\the [src] lands on [coinflip]! [user] keeps on living!</span>")

@@ -386,11 +426,12 @@ GLOBAL_LIST_INIT(sand_recipes, list(\

 /obj/item/coin/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/cable_coil))
+		var/obj/item/stack/cable_coil/CC = W
 		if(string_attached)
 			to_chat(user, "<span class='warning'>There already is a string attached to this coin!</span>")
 			return

-		if (W.use_tool(src, user, 0, 1, skill_gain_mult = BARE_USE_TOOL_MULT))
+		if (CC.use(1))
 			add_overlay("coin_string_overlay")
 			string_attached = 1
 			to_chat(user, "<span class='notice'>You attach a string to the coin.</span>")
@@ -412,6 +453,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 		..()

 /obj/item/coin/wirecutter_act(mob/living/user, obj/item/I)
+	..()
 	if(!string_attached)
 		return TRUE

@@ -430,13 +472,13 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 		flick("coin_[coinflip]_flip", src)
 		coinflip = pick(sideslist)
 		icon_state = "coin_[coinflip]"
-		playsound(user.loc, 'sound/items/coinflip.ogg', 50, 1)
+		playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
 		var/oldloc = loc
 		sleep(15)
 		if(loc == oldloc && user && !user.incapacitated())
-			user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
- 							 "<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
-							 "<span class='italics'>You hear the clattering of loose change.</span>")
+			user.visible_message("<span class='notice'>[user] flips [src]. It lands on [coinflip].</span>", \
+				"<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
+				"<span class='hear'>You hear the clattering of loose change.</span>")
 	return TRUE//did the coin flip? useful for suicide_act

 /obj/item/coin/gold
@@ -486,4 +528,29 @@ GLOBAL_LIST_INIT(sand_recipes, list(\

 /obj/item/coin/iron

+/obj/item/coin/gold/debug
+	custom_materials = list(/datum/material/gold = 400)
+	desc = "If you got this somehow, be aware that it will dust you. Almost certainly."
+
+/obj/item/coin/gold/debug/attack_self(mob/user)
+	if(cooldown < world.time)
+		if(string_attached) //does the coin have a wire attached
+			to_chat(user, "<span class='warning'>The coin won't flip very well with something attached!</span>" )
+			return FALSE//do not flip the coin
+		cooldown = world.time + 15
+		flick("coin_[coinflip]_flip", src)
+		coinflip = pick(sideslist)
+		icon_state = "coin_[coinflip]"
+		playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
+		var/oldloc = loc
+		sleep(15)
+		if(loc == oldloc && user && !user.incapacitated())
+			user.visible_message("<span class='notice'>[user] flips [src]. It lands on [coinflip].</span>", \
+				"<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
+				"<span class='hear'>You hear the clattering of loose change.</span>")
+		SSeconomy.fire()
+		// to_chat(user,"<span class='bounty'>[SSeconomy.inflation_value()] is the inflation value.</span>")
+		to_chat(user, "<span class='bounty'>Luckily, economical inflation is not yet included. So no, you cannot predict the market with this.</span>")
+	return TRUE//did the coin flip? useful for suicide_act
+
 #undef ORESTACK_OVERLAYS_MAX
@@ -58,7 +58,7 @@
 		to_chat(C, "<span class='danger'>You ran out of blood!</span>")
 		C.dust()
 	var/area/A = get_area(C)
-	if(istype(A, /area/chapel) && C.mind?.assigned_role != "Chaplain")
+	if(istype(A, /area/service/chapel) && C.mind?.assigned_role != "Chaplain")
 		to_chat(C, "<span class='danger'>You don't belong here!</span>")
 		C.adjustFireLoss(5)
 		C.adjust_fire_stacks(6)
@@ -92,12 +92,9 @@
 	name = "ai_multicam_room"
 	icon_state = "ai_camera_room"
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-	valid_territory = FALSE
-	ambientsounds = list()
-	blob_allowed = FALSE
-	noteleport = TRUE
-	hidden = TRUE
-	safe = TRUE
+	area_flags = NOTELEPORT | HIDDEN_AREA | UNIQUE_AREA
+	ambientsounds = null
+	flags_1 = NONE

 GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)

@@ -1,4 +1,4 @@
-/area/engine/engineering/poweralert(state, source)
+/area/engineering/main/poweralert(state, source)
 	if (state != poweralm)
 		investigate_log("has a power alarm!", INVESTIGATE_SINGULO)
 	..()
@@ -329,9 +329,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
 	icon_state = "hilbertshotel"
 	requires_power = FALSE
 	has_gravity = TRUE
-	noteleport = TRUE
-	hidden = TRUE
-	unique = FALSE
+	area_flags = NOTELEPORT | HIDDEN_AREA
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	ambientsounds = list('sound/ambience/servicebell.ogg')
 	var/roomnumber = 0
@@ -408,8 +406,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
 	icon_state = "hilbertshotel"
 	requires_power = FALSE
 	has_gravity = TRUE
-	noteleport = TRUE
-	hidden = TRUE
+	area_flags = NOTELEPORT | HIDDEN_AREA

 /obj/item/abstracthotelstorage
 	anchored = TRUE
@@ -21,10 +21,12 @@

 /obj/effect/proc_holder/spell/targeted/area_teleport/before_cast(list/targets)
 	var/area/U = get_area(usr)
-	if(U.noteleport && !istype(U, /area/wizard_station)) // Wizard den special check for those complaining about being unable to tele on station.
+	if((U.area_flags & NOTELEPORT) && !istype(U, /area/wizard_station)) // Wizard den special check for those complaining about being unable to tele on station.
 		to_chat(usr, "<span class='warning'>Unseen forces prevent you from casting this spell in this area</span>")
 		return
-	var/A
+
+	var/A = null
+
 	if(!randomise_selection)
 		A = input("Area to teleport to", "Teleport", A) as null|anything in GLOB.teleportlocs
 	else