WIP vaults

modify all the maps, replace restaurant with icecream truck add rewards to ice cream truck and satelite, defines fix maps remove cursed satelite of doom Add hivebot factory to replace haunted satelite. Fix minimaps for good maploader lighting woops Adds clown base remove exclamation marks nerd Adds a ruined R-UST vault. Remove vaults from z1, fix hivebot factory
2025-12-10 18:32:03 +00:00 · 2016-03-06 15:37:12 +01:00
parent f9253904c5
commit 0d70cb3943
29 changed files with 2173 additions and 1409 deletions
--- a/code/ATMOSPHERICS/components/binary_devices/MSGS.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/MSGS.dm
@@ -25,8 +25,6 @@
 	var/tmp/last_pressure

 /obj/machinery/atmospherics/binary/msgs/New()
-	. = ..()
-
 	html_machines += src

 	interface = new(src, sanitize(name), 500, 520)
@@ -36,7 +34,7 @@
 	air = new
 	air.volume = internal_volume

-	update_icon()
+	return ..()

 //Here we set the content of the interface.
 /obj/machinery/atmospherics/binary/msgs/proc/init_ui()
@@ -216,7 +214,7 @@
 	if((update_flags & MSGS_ON) != !(stat & (NOPOWER | BROKEN)))
 		update = 1

-	var/pressure = air.return_pressure()
+	var/pressure = air.return_pressure() // null ref error here.
 	var/i = Clamp(round(pressure / (max_pressure / 5)), 0, 5)
 	if(i != last_pressure)
 		update = 1
--- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dm
@@ -2,13 +2,14 @@
 /obj/item/weapon/fuel_assembly
 	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "fuel_assembly"
-	name = "Fuel Rod Assembly"
+	name = "fuel rod assembly"
 	var/list/rod_quantities
 	var/percent_depleted = 1
 	layer = 3.1
-	//
-	New()
-		rod_quantities = new/list
+
+/obj/item/weapon/fuel_assembly/New()
+	. = ..()
+	rod_quantities = list()

 //these can be abstracted away for now
 /*
--- a/code/__HELPERS/_macros.dm
+++ b/code/__HELPERS/_macros.dm
@@ -136,6 +136,9 @@

 #define isspace(A) (A.type == /area)

+//This one returns the "space" area
+#define get_space_area (get_area(locate(1,1,2))) //xd
+
 //1 line helper procs compressed into defines.
 #define Clamp(x, y, z) 	(x <= y ? y : (x >= z ? z : x))
 //x is the number you want to clamp
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -168,6 +168,7 @@
 	var/mommi_static = 0 //Scrambling mobs for mommis or not

 	var/skip_minimap_generation = 0 //If 1, don't generate minimaps
+	var/skip_vault_generation = 0 //If 1, don't generate vaults

 /datum/configuration/New()
 	. = ..()
@@ -528,6 +529,8 @@
 					mommi_static = 1
 				if("skip_minimap_generation")
 					skip_minimap_generation = 1
+				if("skip_vault_generation")
+					skip_vault_generation = 1
 				else
 					diary << "Unknown setting in configuration: '[name]'"

--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -179,6 +179,14 @@ datum/controller/game_controller/proc/cachedamageicons()
 	populate_asset_cache()
 	log_startup_progress("  Populated [asset_cache.len] assets in [stop_watch(watch)]s.")

+	if(!config.skip_vault_generation)
+		watch = start_watch()
+		log_startup_progress("Placing random space structures...")
+		generate_vaults()
+		log_startup_progress("  Finished placing structures in [stop_watch(watch)]s.")
+	else
+		log_startup_progress("Not generating vaults - SKIP_VAULT_GENERATION found in config/config.txt")
+
 	watch = start_watch()
 	log_startup_progress("Initializing objects...")
 	//sleep(-1) // Why
--- a/code/datums/shuttle.dm
+++ b/code/datums/shuttle.dm
@@ -484,7 +484,7 @@

 	var/area/space

-	space = get_area( locate(1,1,2) ) //xd
+	space = get_space_area
 	if(!space)
 		warning("There is no area at 1,1,2!")

@@ -531,7 +531,7 @@
 		if(!A)
 			message_admins("<span class='notice'>WARNING: Unable to find an area at [new_coords.x_pos];[new_coords.y_pos];[new_center.z]. [src.name] ([src.type]) will not be moved.")
 			return
-		if(!destroy_everything && !(A.type in list(/area, /area/station/custom))) //Breaking blueprint areas and space is fine, breaking the station is not
+		if(!destroy_everything && !(A.type in list(/area, /area/station/custom)) && !istype(A, /area/random_vault) && !istype(A, /area/vault)) //Breaking blueprint areas and space is fine, breaking the station is not. Breaking randomly generated vaults is fine, in case they spawn in a bad spot!
 			message_admins("<span class='notice'>WARNING: [src.name] ([src.type]) attempted to destroy [A] ([A.type]).</span> If you want [src.name] to be able to move freely and destroy areas, change its \"destroy_everything\" variable to 1.")
 			return
 		//If any of the new turfs are in the moved shuttle's current area, EMERGENCY ABORT (this leads to the shuttle destroying itself & potentially gibbing everybody inside)
--- a/code/game/area/Space
+++ b/code/game/area/Space
@@ -67,7 +67,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/general_area = /area/station	// the highest parent bellow /area,
 	var/general_area_name = "Station"

-
 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
 /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
 var/list/teleportlocs = list()
--- a/code/game/objects/items/weapons/grenades/clowngrenade.dm
+++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -63,6 +63,8 @@
 	throw_speed = 4
 	throw_range = 20

+	var/slip_power = 4
+
 /obj/item/weapon/bananapeel/traitorpeel/Crossed(AM as mob|obj)
 	var/burned = rand(2,5)
 	if(istype(AM, /mob/living))
@@ -83,10 +85,10 @@
 		if(!istype(M, /mob/living/carbon/slime) && !isrobot(M))
 			M.stop_pulling()
 			step(M, M.dir)
-			spawn(1) step(M, M.dir)
-			spawn(2) step(M, M.dir)
-			spawn(3) step(M, M.dir)
-			spawn(4) step(M, M.dir)
+			spawn(1)
+				for(var/i = 1 to slip_power)
+					step(M, M.dir)
+					sleep(1)
 			M.take_organ_damage(2) // Was 5 -- TLE
 			M.simple_message("<span class='notice'>You slipped on \the [name]!</span>",\
 				"<span class='userdanger'>Please, just end the pain!</span>")
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -61,6 +61,13 @@
 	icon_opened = "chestopen"
 	icon_closed = "chest"

+/obj/structure/closet/crate/chest/potential_mimic/New()
+	..()
+
+	if(prob(33))
+		var/mob/living/simple_animal/hostile/mimic/crate/chest/C = new(src.loc)
+		forceMove(C)
+
 /*these aren't needed anymore
 /obj/structure/closet/crate/hat
 	desc = "A crate filled with Valuable Collector's Hats!."
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -323,6 +323,27 @@
 	floor_tile = getFromPool(/obj/item/stack/tile/arcade, null)
 	..()

+/turf/simulated/floor/damaged
+	icon_state = "damaged1"
+
+/turf/simulated/floor/damaged/New()
+	broken = prob(71) // 5 of the icon states are "damaged" icons, 2 are burned.
+	burnt  = !broken
+
+	if(broken)
+		icon_state = pick("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
+
+	else // Burnt states.
+		icon_state = pick("floorscorched1", "floorscorched2")
+
+	. = ..()
+
+/turf/simulated/floor/damaged/airless
+	name        = "airless floor"
+	oxygen      = 0.01
+	nitrogen    = 0.01
+	temperature = TCMB
+
 /turf/simulated/floor/plating/ironsand/New()
 	..()
 	name = "Iron Sand"
@@ -342,6 +363,21 @@
 /turf/simulated/floor/plating/snow/ex_act(severity)
 	return

+/turf/simulated/floor/plating/airless/damaged
+	icon_state = "platingdmg1"
+
+/turf/simulated/floor/plating/airless/damaged/New()
+	broken = prob(75) // 3 of the icon states are "damaged" icons, 1 is burned.
+	burnt  = !broken
+
+	if(broken)
+		icon_state = pick("platingdmg1", "platingdmg2", "platigndmg3")
+
+	else // Burnt state.
+		icon_state = "panelscorched"
+
+	. = ..()
+
 // VOX SHUTTLE SHIT
 /turf/simulated/shuttle/floor/vox
 	oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON
--- a/code/modules/awaymissions/maploader/dmm_suite.dm
+++ b/code/modules/awaymissions/maploader/dmm_suite.dm
@@ -53,7 +53,7 @@ dmm_suite{

 		*/

-	verb/load_map(var/dmm_file as file, var/z_offset as num){
+	verb/load_map(var/dmm_file as file, var/z_offset as num, var/x_offset as num, var/y_offset as num){
 		// dmm_file: A .dmm file to load (Required).
 		// z_offset: A number representing the z-level on which to start loading the map (Optional).
 		}
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -15,11 +15,17 @@ var/global/dmm_suite/preloader/_preloader = null
 *		e.g aa = /turf/unsimulated/wall{icon_state = "rock"}
 * 2) Read the map line by line, parsing the result (using parse_grid)
 *
+ * RETURNS :
+ *
+ * A list of all atoms created
+ *
 */
-/dmm_suite/load_map(var/dmm_file as file, var/z_offset as num)
+/dmm_suite/load_map(var/dmm_file as file, var/z_offset as num, var/x_offset as num, var/y_offset as num)
 	if(!z_offset)//what z_level we are creating the map on
 		z_offset = world.maxz+1

+	var/list/spawned_atoms = list()
+
 	var/quote = ascii2text(34)
 	var/tfile = file2text(dmm_file)//the map file we're creating
 	var/tfile_len = length(tfile)
@@ -47,8 +53,8 @@ var/global/dmm_suite/preloader/_preloader = null

 	//position of the currently processed square
 	var/zcrd=-1
-	var/ycrd=0
-	var/xcrd=0
+	var/ycrd=x_offset
+	var/xcrd=y_offset

 	for(var/zpos=findtext(tfile,"\n(1,1,",lpos,0);zpos!=0;zpos=findtext(tfile,"\n(1,1,",zpos+1,0))	//in case there's several maps to load

@@ -70,17 +76,17 @@ var/global/dmm_suite/preloader/_preloader = null
 			world.maxy=y_depth

 		//then proceed it line by line, starting from top
-		ycrd = y_depth
+		ycrd = y_offset + y_depth

 		for(var/gpos=1;gpos!=0;gpos=findtext(zgrid,"\n",gpos,0)+1)
 			var/grid_line = copytext(zgrid,gpos,findtext(zgrid,"\n",gpos,0))

 			//fill the current square using the model map
-			xcrd=0
+			xcrd=x_offset
 			for(var/mpos=1;mpos<=x_depth;mpos+=key_len)
 				xcrd++
 				var/model_key = copytext(grid_line,mpos,mpos+key_len)
-				parse_grid(grid_models[model_key],xcrd,ycrd,zcrd+z_offset)
+				spawned_atoms += parse_grid(grid_models[model_key],xcrd,ycrd,zcrd+z_offset)

 			//reached end of current map
 			if(gpos+x_depth+1>z_depth)
@@ -95,6 +101,8 @@ var/global/dmm_suite/preloader/_preloader = null
 			break
 		sleep(-1)

+	return spawned_atoms
+
 /**
 * Fill a given tile with its area/turf/objects/mobs
 * Variable model is one full map line (e.g /turf/unsimulated/wall{icon_state = "rock"},/area/mine/explored)
@@ -111,6 +119,10 @@ var/global/dmm_suite/preloader/_preloader = null
 *
 * 4) Instanciates the atom with its variables
 *
+ * RETURNS :
+ *
+ * A list with all spawned atoms
+ *
 */
 /dmm_suite/proc/parse_grid(var/model as text,var/xcrd as num,var/ycrd as num,var/zcrd as num)
 	/*Method parse_grid()
@@ -121,6 +133,7 @@ var/global/dmm_suite/preloader/_preloader = null
 	var/list/members = list()//will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored)
 	var/list/members_attributes = list()//will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())

+	var/list/spawned_atoms = list()

 	/////////////////////////////////////////////////////////
 	//Constructing members and corresponding variables lists
@@ -196,9 +209,13 @@ var/global/dmm_suite/preloader/_preloader = null
 		T = UT
 		index++

+	spawned_atoms.Add(T)
+
 	//finally instance all remainings objects/mobs
 	for(index=1,index < first_turf_index,index++)
-		instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)
+		spawned_atoms.Add(instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd))
+
+	return spawned_atoms

 ////////////////
 //Helpers procs
@@ -211,7 +228,11 @@ var/global/dmm_suite/preloader/_preloader = null
 	var/atom/instance
 	_preloader = new(attributes, path)

-	instance = new path (locate(x,y,z))//first preloader pass
+	if(ispath(path, /turf)) //Turfs use ChangeTurf
+		var/turf/oldTurf = locate(x,y,z)
+		instance = oldTurf.ChangeTurf(path, allow = 1)
+	else
+		instance = new path (locate(x,y,z))//first preloader pass

 	if(_preloader && instance)//second preloader pass, for those atoms that don't ..() in New()
 		_preloader.load(instance)
--- a/code/modules/awaymissions/maploader/writer.dm
+++ b/code/modules/awaymissions/maploader/writer.dm
@@ -40,7 +40,8 @@
 		fdel("[map_name].dmm")

 	var/saved_map = file("[map_name].dmm")
-	to_chat(saved_map, file_text)
+	saved_map << file_text
+
 	return saved_map

 /dmm_suite/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num)
--- a/code/modules/html_interface/map/interactive_map.dm
+++ b/code/modules/html_interface/map/interactive_map.dm
@@ -168,7 +168,9 @@ var/const/ALLOW_CENTCOMM = FALSE
 		for(var/s = x1 to x2)
 			for(var/r = y1 to y2)
 				var/turf/tile = locate(s, r, z)
-				if (tile.loc.type != /area/start && (tile.type != /turf/space || (locate(/obj/structure/lattice) in tile) || (locate(/obj/structure/transit_tube) in tile)) && !istype(tile, /turf/space/transit))
+				if (tile.flags & NO_MINIMAP) continue
+
+				if (tile.loc.type != /area/start && (tile.type != /turf/space || (locate(/obj/structure/lattice) in tile) || (locate(/obj/structure/transit_tube) in tile)) && !istype(tile, /turf/space/transit) && !istype(tile.loc, /area/vault))
 					if (istype(tile.loc, /area/asteroid) || istype(tile.loc, /area/mine/unexplored) || istype(tile, /turf/unsimulated/mineral) || (isspace(tile.loc) && istype(tile, /turf/unsimulated/floor/asteroid)))
 						new_icon = 'icons/turf/walls.dmi'
 						new_icon_state = "rock"
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -125,7 +125,7 @@
 			var/mob/dead/observer/observer = new()

 			spawning = 1
-			to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo
+			src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo


 			observer.started_as_observer = 1
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -94,8 +94,17 @@

 	var/is_critical = 0 // Endgame scenarios will not destroy this APC.

+	var/make_alerts = TRUE // Should this APC make power alerts to the area?
+
 	machine_flags = WIREJACK

+// Frame only.
+/obj/machinery/power/apc/frame
+	icon_state = "apcmaint"
+
+/obj/machinery/power/apc/frame/New()
+	return ..(loc, dir, 1)
+
 /obj/machinery/power/apc/New(loc, var/ndir, var/building=0)
 	..(loc)
 	wires = new(src)
@@ -1105,25 +1114,25 @@
 			equipment = autoset(equipment, 0)
 			lighting = autoset(lighting, 0)
 			environ = autoset(environ, 0)
-			if(areaMaster.poweralm)
+			if(areaMaster.poweralm && make_alerts)
 				areaMaster.poweralert(0, src)
 		else if(cell.percent() < 15 && longtermpower < 0)	// <15%, turn off lighting & equipment
 			equipment = autoset(equipment, 2)
 			lighting = autoset(lighting, 2)
 			environ = autoset(environ, 1)
-			if(areaMaster.poweralm)
+			if(areaMaster.poweralm && make_alerts)
 				areaMaster.poweralert(0, src)
 		else if(cell.percent() < 30 && longtermpower < 0)			// <30%, turn off equipment
 			equipment = autoset(equipment, 2)
 			lighting = autoset(lighting, 1)
 			environ = autoset(environ, 1)
-			if(areaMaster.poweralm)
+			if(areaMaster.poweralm && make_alerts)
 				areaMaster.poweralert(0, src)
 		else									// otherwise all can be on
 			equipment = autoset(equipment, 1)
 			lighting = autoset(lighting, 1)
 			environ = autoset(environ, 1)
-			if(cell.percent() > 75 && !areaMaster.poweralm)
+			if(cell.percent() > 75 && !areaMaster.poweralm && !make_alerts)
 				areaMaster.poweralert(1, src)

 		// now trickle-charge the cell
@@ -1168,7 +1177,8 @@
 		equipment = autoset(equipment, 0)
 		lighting = autoset(lighting, 0)
 		environ = autoset(environ, 0)
-		areaMaster.poweralert(0, src)
+		if(!make_alerts)
+			areaMaster.poweralert(0, src)

 	// update icon & area power if anything changed
 	if(last_lt != lighting || last_eq != equipment || last_en != environ)
--- a/code/modules/randomMaps/vaults.dm
+++ b/code/modules/randomMaps/vaults.dm
@@ -0,0 +1,103 @@
+//Vaults are structures that are randomly spawned as a part of the main map
+//They're stored in maps/randomVaults/ as .dmm files
+
+//HOW TO ADD YOUR OWN VAULTS:
+//1. make a map in the maps/randomVaults/ folder (1 zlevel only please)
+//2. add the map's name to the vault_map_names list
+//3. the game will handle the rest
+
+#define MINIMUM_VAULT_AMOUNT 1 //Amount of guaranteed vault spawns
+
+//#define SPAWN_ALL_VAULTS //Uncomment to spawn all existing vaults (otherwise only some will spawn)!
+
+var/const/vault_map_directory = "maps/randomVaults/"
+
+
+var/list/vault_map_names = list( //Add your vaults' map names to this list. Don't include the .dmm prefix
+	"icetruck_crash",
+	"asteroid_temple",
+	//"doomed_satelite", WARNING: this map is possessed. Uncommenting will cause bugs and general spookiness. Don't uncomment
+	"hivebot_factory",
+	"clown_base",
+	"rust"
+)
+
+/area/random_vault
+	name = "random vault area"
+	desc = "Spawn a vault in there somewhere"
+	icon_state = "random_vault"
+
+//Because areas are shit and it's easier that way!
+
+//Each of these areas can only create ONE vault. Only using /area/random_vault/v1 for the entire map will result in ONE vault being created.
+//Placing them over (or even near) shuttle docking ports will sometimes result in a vault spawning on top of a shuttle docking port. This isn't a big problem, since
+//shuttles can destroy the vaults, but it's better to avoid that
+//If you want more vaults, feel free to add more subtypes of /area/random_vault. You don't have to add these subtypes to any lists or anything - just map it and the game will handle the rest.
+
+//"/area/random_vault" DOESN'T spawn any vaults!!!
+/area/random_vault/v1
+/area/random_vault/v2
+/area/random_vault/v3
+/area/random_vault/v4
+/area/random_vault/v5
+/area/random_vault/v6
+/area/random_vault/v7
+/area/random_vault/v8
+/area/random_vault/v9
+/area/random_vault/v10
+
+/proc/generate_vaults()
+	var/area/space = get_space_area
+
+	var/list/list_of_vaults = shuffle(typesof(/area/random_vault) - /area/random_vault)
+	var/failures = 0
+	var/successes = 0
+	var/vault_number = rand(MINIMUM_VAULT_AMOUNT, min(vault_map_names.len, list_of_vaults.len))
+
+	#ifdef SPAWN_ALL_VAULTS
+	#warning Spawning all vaults!
+	vault_number = min(vault_map_names.len, list_of_vaults.len)
+	#endif
+
+	message_admins("<span class='info'>Spawning [vault_number] vaults (in [list_of_vaults.len] areas)...</span>")
+
+	for(var/T in list_of_vaults) //Go through all subtypes of /area/random_vault
+		var/area/A = locate(T) //Find the area
+
+		if(!A || !A.contents.len) //Area is empty and doesn't exist - skip
+			continue
+
+		if(vault_map_names.len > 0 && vault_number>0)
+			vault_number--
+
+			var/vault_x
+			var/vault_y
+			var/vault_z
+
+			var/turf/TURF = get_turf(pick(A.contents))
+
+			vault_x = TURF.x
+			vault_y = TURF.y
+			vault_z = TURF.z
+
+			var/map_name = pick(vault_map_names)
+			vault_map_names.Remove(map_name)
+
+			var/path_file = "[vault_map_directory][pick(map_name)].dmm"
+
+			if(fexists(path_file))
+				var/list/L = maploader.load_map(file(path_file), vault_z, vault_x, vault_y)
+				for(var/turf/new_turf in L)
+					new_turf.flags |= NO_MINIMAP //f u c k minimaps
+
+				message_admins("<span class='info'>Loaded [path_file]: [formatJumpTo(locate(vault_x, vault_y, vault_z))].")
+				successes++
+			else
+				message_admins("<span class='danger'>Can't find [path_file]!</span>")
+				failures++
+
+		for(var/turf/TURF in A) //Replace all of the temporary areas with space
+			space.contents.Add(TURF)
+			TURF.change_area(A, space)
+
+	message_admins("<span class='info'>Loaded [successes] vaults successfully, [failures] failures.</span>")
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -284,6 +284,7 @@ var/MAX_EXPLOSION_RANGE = 14

 //turf-only flags
 #define NOJAUNT		1
+#define NO_MINIMAP  2 //Invisible to minimaps (fuck minimaps)


 //slots
--- a/html/changelogs/unid-shit.yml
+++ b/html/changelogs/unid-shit.yml
@@ -0,0 +1,6 @@
+author: Unid
+
+delete-after: True
+
+changes: 
+- rscadd: Randomly selected structures will now generate somewhere on the map on the beginning of each round. Currently there are only 5 structures that can be generated, but it's very easy to make more!
--- a/icons/turf/areas.dmi
+++ b/icons/turf/areas.dmi
--- a/maps/randomvaults/asteroid_temple.dmm
+++ b/maps/randomvaults/asteroid_temple.dmm
@@ -0,0 +1,35 @@
+"a" = (/turf/space,/area)
+"b" = (/turf/unsimulated/floor/asteroid,/area/vault/asteroid)
+"c" = (/turf/unsimulated/mineral,/area/vault/asteroid)
+"d" = (/obj/structure/toilet,/obj/item/toy/gasha/minibutt,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"e" = (/obj/structure/window/reinforced/tinted{dir = 8},/obj/structure/window/reinforced/tinted{dir = 4},/obj/structure/grille,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"f" = (/obj/structure/closet/crate/chest/potential_mimic,/obj/item/weapon/spacecash/c1000,/obj/item/clothing/head/batman,/obj/item/weapon/reagent_containers/food/snacks/baguette,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"g" = (/obj/structure/closet/crate/chest/potential_mimic,/obj/item/weapon/spacecash/c1000,/obj/item/clothing/head/wizard/necro,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"h" = (/obj/structure/closet/crate/chest/potential_mimic,/obj/item/weapon/spacecash/c1000,/obj/item/clothing/head/wizard/magus,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"i" = (/obj/structure/closet/crate/chest/potential_mimic,/obj/item/weapon/spacecash/c1000,/obj/item/clothing/head/tinfoil,/obj/item/toy/syndicateballoon,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"j" = (/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"k" = (/obj/structure/window/reinforced/tinted{dir = 4},/obj/structure/window/reinforced/tinted{dir = 8},/obj/structure/window/reinforced/tinted,/obj/structure/grille,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"l" = (/obj/structure/table,/obj/item/toy/gun,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"m" = (/obj/item/target/alien,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"n" = (/obj/machinery/door/mineral/wood,/turf/unsimulated/floor/airless,/area/vault/asteroid)
+"o" = (/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"; dir = 9},/area/vault/asteroid)
+"p" = (/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"; dir = 5},/area/vault/asteroid)
+"q" = (/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"; dir = 8},/area/vault/asteroid)
+"r" = (/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"; dir = 4},/area/vault/asteroid)
+"s" = (/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"; dir = 10},/area/vault/asteroid)
+"t" = (/turf/unsimulated/floor/airless{icon_state = "asteroidwarning"; dir = 6},/area/vault/asteroid)
+
+(1,1,1) = {"
+aaabccaaaaaa
+acccccccccaa
+bccdefghiccc
+bccjkjjjjccc
+accjjjljmcca
+abcjjjljmcbb
+abccnnccccca
+acccopccccca
+acccqrccccaa
+acccqrccccaa
+aaacstbcaaaa
+aaaabbbaaaaa
+"}
--- a/maps/randomvaults/clown_base.dmm
+++ b/maps/randomvaults/clown_base.dmm
@@ -0,0 +1,64 @@
+"a" = (/turf/space,/area)
+"b" = (/turf/unsimulated/mineral/random,/area)
+"c" = (/turf/unsimulated/mineral,/area)
+"d" = (/obj/structure/disposalpipe/segment,/turf/unsimulated/mineral,/area)
+"e" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/mineral/clown,/area/vault/clownbase)
+"f" = (/turf/simulated/wall/mineral/clown,/area/vault/clownbase)
+"g" = (/obj/structure/disposalpipe/segment,/obj/structure/disposalpipe/segment,/turf/simulated/wall/mineral/clown,/area/vault/clownbase)
+"h" = (/turf/simulated/wall/mineral/plastic,/area/vault/clownbase)
+"i" = (/turf/simulated/floor/wood,/area/vault/clownbase)
+"j" = (/obj/structure/bed/chair,/mob/living/simple_animal/hostile/retaliate/clown,/turf/simulated/floor/wood,/area/vault/clownbase)
+"k" = (/obj/structure/table/holotable,/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar,/turf/simulated/floor/wood,/area/vault/clownbase)
+"l" = (/obj/machinery/disposal/deliveryChute,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/grass,/area/vault/clownbase)
+"m" = (/turf/simulated/floor/arcade,/area/vault/clownbase)
+"n" = (/obj/machinery/computer/arcade,/turf/simulated/floor/arcade,/area/vault/clownbase)
+"o" = (/obj/machinery/door/window/plasma/secure{dir = 1},/turf/simulated/floor/wood,/area/vault/clownbase)
+"p" = (/obj/structure/table/holotable,/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar,/turf/simulated/floor/wood,/area/vault/clownbase)
+"q" = (/obj/structure/table/holotable,/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/creampie_mortar,/turf/simulated/floor/wood,/area/vault/clownbase)
+"r" = (/obj/machinery/door/airlock/clown,/turf/simulated/floor/wood,/area/vault/clownbase)
+"s" = (/obj/item/weapon/bananapeel/traitorpeel/curse,/turf/simulated/floor/grass,/area/vault/clownbase)
+"t" = (/obj/machinery/door/airlock/clown,/turf/simulated/floor/grass,/area/vault/clownbase)
+"u" = (/obj/effect/gibspawner/human,/obj/structure/bed/chair/comfy/brown{dir = 1},/turf/simulated/floor/arcade,/area/vault/clownbase)
+"v" = (/turf/simulated/floor/grass,/area/vault/clownbase)
+"w" = (/obj/machinery/sweet,/turf/simulated/floor/wood,/area/vault/clownbase)
+"x" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/vault/clownbase)
+"y" = (/obj/machinery/vending/autodrobe,/turf/simulated/floor/wood,/area/vault/clownbase)
+"z" = (/obj/machinery/vending/magivend,/turf/simulated/floor/arcade,/area/vault/clownbase)
+"A" = (/obj/machinery/bot/buttbot,/obj/machinery/light/small,/turf/simulated/floor/arcade,/area/vault/clownbase)
+"B" = (/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"C" = (/obj/item/weapon/reagent_containers/food/snacks/assburger,/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"D" = (/obj/item/device/pda/clown{desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings. This one has been stepped on for too many times, and appears to be completely unresponsible."; mode = -12345; name = "Antique Clown PDA"},/turf/unsimulated/mineral/random,/area)
+"E" = (/mob/living/simple_animal/hostile/retaliate/cluwne,/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"F" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma,/obj/structure/window{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"G" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/plasma{dir = 1},/obj/structure/window,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"H" = (/obj/item/weapon/reagent_containers/food/snacks/baguette,/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"I" = (/obj/machinery/light/small,/turf/simulated/floor/light/floor_tile,/area/vault/clownbase)
+"J" = (/obj/machinery/door/mineral/gold,/turf/simulated/floor/grass,/area/vault/clownbase)
+"K" = (/turf/unsimulated/mineral/random/high_chance,/area)
+"L" = (/turf/unsimulated/mineral/random/high_chance_clown,/area)
+"M" = (/turf/unsimulated/mineral/cytine,/area)
+
+(1,1,1) = {"
+aaaaabbaacddccaaaaaaaa
+aaabbbbbcceeccaaaabaaa
+aaabbbbbcfegfcccaaaaaa
+aaabaaccffeeffcccaaaaa
+aaaaaccfffeefffccccaaa
+acccccffffeeffffccccca
+acffffffffeeffffffffca
+acfhhhhhhfeefhhhhhhfca
+bcfhijkihfllfhmnnnhfca
+bcfhopqiirsstmmuuuhfcb
+acfhiiiihfvvfhmmmmhfcb
+bcfhwxiyhfssfhzmAmhfca
+bcfhhhhhhfvvfhhhhhhfca
+bcffffffffssffffffffca
+bccccfffffvvfffffcccca
+abbbcfBCBfssfBBBfcDbaa
+abbbcfBEBFvvGBEHfcbbaa
+aaabcfBIBfssfBIBfcbbaa
+aabbbfffffJJfffffcbaaa
+aaabbcKKLLMMLLKKccaaaa
+aaabbbKKLLLLLLKKaaaaaa
+aaaabbbKKLLLLKKaaabaaa
+"}
--- a/maps/randomvaults/doomed_satelite.dmm
+++ b/maps/randomvaults/doomed_satelite.dmm
@@ -0,0 +1,45 @@
+"a" = (/turf/space,/area)
+"b" = (/turf/simulated/wall,/area/vault/satelite)
+"c" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/carpet,/area/vault/satelite)
+"d" = (/obj/structure/reagent_dispensers/beerkeg,/obj/structure/window/reinforced/plasma,/turf/simulated/floor/carpet,/area/vault/satelite)
+"e" = (/obj/effect/decal/cleanable/vomit,/mob/living/simple_animal/hostile/humanoid/russian/ranged{name = "Sergei Molotov"},/turf/simulated/floor/carpet,/area/vault/satelite)
+"f" = (/turf/simulated/floor/carpet,/area/vault/satelite)
+"g" = (/obj/structure/lattice,/obj/item/weapon/caution,/turf/space,/area)
+"h" = (/obj/structure/lattice,/turf/space,/area)
+"i" = (/obj/structure/bookcase{name = "bookcase (Communism)"},/turf/simulated/floor/plating,/area/vault/satelite)
+"j" = (/obj/item/weapon/reagent_containers/glass/rag,/obj/item/weapon/crossbow,/turf/simulated/floor/plating,/area/vault/satelite)
+"k" = (/mob/living/simple_animal/hostile/necro/skeleton,/turf/simulated/floor/plating,/area/vault/satelite)
+"l" = (/turf/simulated/floor/plating,/area/vault/satelite)
+"m" = (/obj/item/broken_device,/turf/simulated/floor/plating,/area/vault/satelite)
+"n" = (/obj/machinery/vending/sovietvend,/turf/simulated/floor/plating,/area/vault/satelite)
+"o" = (/obj/item/weapon/paper,/turf/simulated/floor/plating,/area/vault/satelite)
+"p" = (/obj/structure/bed/chair,/obj/item/weapon/dice,/turf/simulated/floor/plating,/area/vault/satelite)
+"q" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/plating,/area/vault/satelite)
+"r" = (/obj/structure/table,/obj/item/weapon/paper,/obj/item/weapon/paper_bin,/turf/simulated/floor/plating,/area/vault/satelite)
+"s" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/beetsoup,/obj/item/weapon/coin/adamantine,/obj/item/weapon/coin/adamantine{pixel_x = -4; pixel_y = 2},/obj/item/weapon/coin/phazon{pixel_y = -7},/turf/simulated/floor/plating,/area/vault/satelite)
+"t" = (/obj/structure/bed/chair{dir = 4},/obj/effect/landmark/corpse/russian,/turf/simulated/floor/plating,/area/vault/satelite)
+"u" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/harpoon,/turf/simulated/floor/plating,/area/vault/satelite)
+"v" = (/obj/effect/decal/cleanable/crayon/fuckyou,/obj/machinery/door/airlock/external,/turf/simulated/wall,/area/vault/satelite)
+
+(1,1,1) = {"
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+aaaaaabbbbbbbbbaaaaa
+aaaaaabcccccccbaaaaa
+aaaaaabcccccccbaaaaa
+aaaaaabddddeddbaaaaa
+aaaaaabbbbbfbbbaaaaa
+aaghhhbiiiiiiibhhhha
+aaahaabjklllkmbaahaa
+aahhhhbnlolllpbhhhha
+aaaaaabqllllrsbaaaaa
+aaaaaabbllltubbaaaaa
+aaaaaaabbbvbbbaaaaaa
+aaaaaaaaaaaaaaaaaaaa
+"}
--- a/maps/randomvaults/hivebot_factory.dmm
+++ b/maps/randomvaults/hivebot_factory.dmm
@@ -0,0 +1,108 @@
+"aa" = (/turf/space,/area)
+"ab" = (/obj/item/robot_parts/robot_component/diagnosis_unit,/turf/space,/area)
+"ac" = (/obj/structure/lattice,/turf/space,/area)
+"ad" = (/turf/unsimulated/mineral,/area)
+"ae" = (/turf/simulated/wall,/area)
+"af" = (/turf/simulated/wall,/area/vault/factory)
+"ag" = (/obj/item/device/robotanalyzer,/obj/item/weapon/weldingtool,/turf/simulated/floor/plating,/area/vault/factory)
+"ah" = (/obj/structure/computerframe,/turf/simulated/floor/plating,/area/vault/factory)
+"ai" = (/obj/machinery/computer/aifixer,/turf/simulated/floor/plating,/area/vault/factory)
+"aj" = (/obj/item/robot_parts/head,/turf/simulated/floor/plating,/area/vault/factory)
+"ak" = (/obj/item/robot_parts/robot_suit,/obj/item/weapon/gun/projectile/automatic/xcom,/turf/simulated/floor/plating,/area/vault/factory)
+"al" = (/turf/unsimulated/floor,/area)
+"am" = (/mob/living/simple_animal/hostile/hivebot/range{anchored = 1; canmove = 0; name = "Hivebot Sentry"},/turf/unsimulated/floor,/area)
+"an" = (/obj/item/robot_parts/robot_component/binary_communication_device,/mob/living/simple_animal/hostile/hivebot/strong,/turf/simulated/floor/plating,/area/vault/factory)
+"ao" = (/turf/simulated/floor/plating,/area/vault/factory)
+"ap" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/vault/factory)
+"aq" = (/obj/structure/reagent_dispensers/silicate,/turf/simulated/floor/plating,/area/vault/factory)
+"ar" = (/obj/item/robot_parts/robot_suit,/obj/item/clothing/glasses/welding,/turf/simulated/floor/plating,/area/vault/factory)
+"as" = (/obj/item/robot_parts/robot_suit,/mob/living/simple_animal/hostile/hivebot/strong,/turf/simulated/floor/plating,/area/vault/factory)
+"at" = (/turf/simulated/wall/r_wall,/area/vault/factory)
+"au" = (/obj/item/robot_parts/robot_component/camera,/obj/structure/window/barricade{dir = 4},/turf/unsimulated/floor,/area)
+"av" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/plating,/area/vault/factory)
+"aw" = (/obj/structure/window/barricade{dir = 8},/obj/structure/sign/securearea{desc = "A warning sign which reads 'VACUUM'"; icon_state = "space"; layer = 4; name = "VACUUM"; pixel_x = -32; pixel_y = -32},/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plating,/area/vault/factory)
+"ax" = (/obj/structure/window/barricade{dir = 4},/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/plating,/area/vault/factory)
+"ay" = (/obj/structure/window/barricade{dir = 8},/mob/living/simple_animal/hostile/hivebot/strong,/turf/simulated/floor/plating,/area/vault/factory)
+"az" = (/obj/effect/gibspawner/robot,/obj/item/weapon/wirecutters,/turf/simulated/floor/plating,/area/vault/factory)
+"aA" = (/mob/living/simple_animal/hostile/hivebot/range,/turf/simulated/floor/plating,/area/vault/factory)
+"aB" = (/obj/item/robot_parts/robot_suit,/turf/simulated/floor/plating,/area/vault/factory)
+"aC" = (/obj/structure/crematorium,/turf/simulated/floor/plating,/area/vault/factory)
+"aD" = (/obj/item/weapon/fireaxe,/obj/item/weapon/gun/projectile/flare/syndicate,/mob/living/simple_animal/hostile/monster/cyber_horror/quiet{name = "Kevin the cremator"},/turf/simulated/floor/plating,/area/vault/factory)
+"aE" = (/obj/machinery/floodlight,/turf/unsimulated/floor,/area)
+"aF" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/vault/factory)
+"aG" = (/mob/living/simple_animal/hostile/hivebot/strong,/turf/simulated/floor/plating,/area/vault/factory)
+"aH" = (/obj/item/weapon/circuitboard/conveyor,/turf/simulated/floor/plating,/area/vault/factory)
+"aI" = (/obj/item/weapon/circuitboard/conveyor,/obj/item/weapon/weldingtool,/turf/simulated/floor/plating,/area/vault/factory)
+"aJ" = (/obj/item/robot_parts/robot_suit,/obj/item/weapon/weldingtool,/turf/simulated/floor/plating,/area/vault/factory)
+"aK" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/vault/factory)
+"aL" = (/obj/item/weapon/barricade_kit,/turf/simulated/floor/plating,/area/vault/factory)
+"aM" = (/obj/structure/reagent_dispensers,/obj/item/clothing/head/welding,/turf/simulated/floor/plating,/area/vault/factory)
+"aN" = (/obj/structure/disposaloutlet{dir = 1},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plating,/area/vault/factory)
+"aO" = (/obj/item/device/silicate_sprayer/advanced,/mob/living/simple_animal/hostile/hivebot/rapid,/turf/simulated/floor/plating,/area/vault/factory)
+"aP" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/vault/factory)
+"aQ" = (/obj/machinery/conveyor,/turf/simulated/floor/plating,/area/vault/factory)
+"aR" = (/obj/item/weapon/wrench,/obj/effect/gibspawner/human,/mob/living/simple_animal/hostile/hivebot/strong,/turf/simulated/floor/plating,/area/vault/factory)
+"aS" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/vault/factory)
+"aT" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/unsimulated/mineral,/area)
+"aU" = (/obj/structure/disposalpipe/segment{dir = 4; step_x = 0; step_y = 0},/turf/unsimulated/mineral,/area)
+"aV" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/unsimulated/mineral,/area)
+"aW" = (/obj/structure/sign/examroom,/turf/simulated/wall,/area/vault/factory)
+"aX" = (/obj/machinery/conveyor,/obj/structure/window/barricade,/turf/simulated/floor/plating,/area/vault/factory)
+"aY" = (/obj/structure/disposalpipe/segment,/turf/unsimulated/mineral,/area)
+"aZ" = (/obj/machinery/conveyor,/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor/plating,/area/vault/factory)
+"ba" = (/obj/machinery/conveyor,/turf/simulated/floor/engine,/area/vault/factory)
+"bb" = (/obj/structure/window/reinforced/plasma{dir = 8},/turf/simulated/floor/engine,/area/vault/factory)
+"bc" = (/obj/machinery/power/emitter/energycannon{dir = 8},/turf/simulated/floor/engine,/area/vault/factory)
+"bd" = (/obj/structure/lattice,/obj/item/weapon/shard/plasma,/turf/space,/area)
+"be" = (/obj/machinery/power/emitter/energycannon{dir = 4},/turf/simulated/floor/engine,/area/vault/factory)
+"bf" = (/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor/engine,/area/vault/factory)
+"bg" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/vault/factory)
+"bh" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/vault/factory)
+"bi" = (/obj/effect/gibspawner/robot,/turf/space,/area)
+"bj" = (/obj/item/robot_parts/robot_component/radio,/turf/space,/area)
+"bk" = (/obj/machinery/conveyor,/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bl" = (/obj/structure/sign/fire,/turf/simulated/wall/r_wall,/area/vault/factory)
+"bm" = (/obj/structure/disposalpipe/broken,/obj/structure/disposalpipe/broken{dir = 4},/obj/effect/gibspawner/robot,/turf/space,/area)
+"bn" = (/obj/structure/disposalpipe/segment{dir = 4; step_x = 0; step_y = 0},/obj/structure/window/reinforced/plasma{dir = 1},/turf/space,/area)
+"bo" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/window/reinforced/plasma{dir = 1},/turf/space,/area)
+"bp" = (/mob/living/simple_animal/hostile/monster/cyber_horror/quiet{name = "factory overseer"},/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bq" = (/obj/machinery/conveyor,/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"br" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bs" = (/obj/machinery/disposal{desc = "A pneumatic waste disposal unit. This one is used to transport malfunctioning hivebots."; name = "recycling"},/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bt" = (/obj/structure/disposalpipe/segment,/obj/structure/lattice,/obj/structure/window/reinforced/plasma{dir = 4},/turf/space,/area)
+"bu" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bv" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bw" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/rack,/obj/item/weapon/glue{pixel_y = 6},/obj/item/weapon/glue,/obj/item/weapon/glue{pixel_y = -6},/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bx" = (/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced/plasma{dir = 4},/turf/space,/area)
+"by" = (/obj/machinery/disposal{desc = "A pneumatic device that sends you to the nearest Hivebot Transport Unit."; name = "pipe-based transportation unit"},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/vault/factory)
+"bz" = (/obj/structure/disposalpipe/segment{dir = 4; step_x = 0; step_y = 0},/turf/simulated/wall/r_wall,/area/vault/factory)
+"bA" = (/obj/structure/lattice,/obj/structure/window/reinforced/plasma,/turf/space,/area)
+"bB" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/lattice,/obj/structure/window/reinforced/plasma,/obj/structure/window/reinforced/plasma{dir = 4},/turf/space,/area)
+
+(1,1,1) = {"
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaacacacacacacacacaaaaaaaaaaaa
+aaaaaaaaacacacadadadadadadacacacacaaaaaa
+aaaaacacacadadadadadadadadadadadacaaaaaa
+aaacacadadadadadadadadadadadadadacacaaaa
+aaacaeadadadafafafafafafafafadadadacacaa
+aaacaeaeadadafagahaiahajakafadadadadacac
+acalamafafafafanaoapaqarasafatatatatadac
+aaalauavawaxavayaoazaAaBasafataCaDatadac
+aaalaEafaFafafaGaHaIaAaJasafataKaoatadac
+acalamafaLaMafafafaHaAafafafataNatatadac
+aaacaeafaOaPafadafaQaRafadadataSatadadac
+aaacaeafafafafadafaQaAafaTaUaUaVadadadac
+aaacadadadadadadaWaXaGafaYadadadadacacac
+aaacacacadadacacataZatataSacadadacacaaaa
+aaaaaaacacacatatatbabbbcaSacbdacacaaaaaa
+aaaaaaaaaaaaatbebfbaatbgbhbibjaaaaaaaaaa
+aaaaaaaaaaaaatatatbkataSblatbmbnboaaaaaa
+aaaaaaaaaaaaadatbpbqbpbrbsataYacbtaaaaaa
+aaaaaaaaaaadadatbubqbubvbwataYadbxaaaaaa
+aaaaaaaaaaadadatbububububybzaVbAbBaaaaaa
+aaaaaaaaaaaaadatatatatatatataaaaaaaaaaaa
+aaaaaaaaaaaaaaaaadadadadadaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaadadadaaaaaaaaaaaaaaaa
+"}
--- a/maps/randomvaults/icetruck_crash.dmm
+++ b/maps/randomvaults/icetruck_crash.dmm
@@ -0,0 +1,63 @@
+"a" = (/turf/space,/area)
+"b" = (/turf/unsimulated/mineral,/area)
+"c" = (/turf/unsimulated/mineral,/area/vault/icetruck)
+"d" = (/obj/item/weapon/rack_parts,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"e" = (/obj/item/weapon/barricade_kit,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"f" = (/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"g" = (/mob/living/simple_animal/hostile/bear/polarbear,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"h" = (/obj/item/weapon/reagent_containers/food/snacks/icecream,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"i" = (/obj/effect/landmark/corpse/doctor,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"j" = (/obj/effect/decal/cleanable/cobweb2,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"k" = (/obj/item/weapon/paper,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"l" = (/obj/effect/landmark/corpse/doctor,/obj/item/weapon/folder/white,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"m" = (/obj/effect/decal/cleanable/campfire,/obj/item/toy/gasha/snowflake,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"n" = (/obj/effect/landmark/corpse/scientist,/obj/item/weapon/lighter,/obj/item/weapon/lipstick/purple,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"o" = (/obj/item/weapon/crowbar,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"p" = (/obj/item/weapon/extinguisher/foam,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"q" = (/obj/item/weapon/ore/diamond,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"r" = (/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"s" = (/turf/unsimulated/floor/asteroid,/area/vault/icetruck)
+"t" = (/obj/item/weapon/rack_parts,/turf/unsimulated/floor/asteroid,/area/vault/icetruck)
+"u" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "swall_f6"},/area/vault/icetruck)
+"v" = (/obj/machinery/space_heater/air_conditioner,/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/icetruck)
+"w" = (/turf/simulated/shuttle/wall{icon_state = "swall3"},/area/vault/icetruck)
+"x" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/icetruck)
+"y" = (/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/icetruck)
+"z" = (/obj/structure/sink{dir = 4; pixel_x = 11},/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/icetruck)
+"A" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/item/weapon/reagent_containers/food/drinks/ice,/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/icetruck)
+"B" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/shuttle/floor{icon_state = "floor2"},/area/vault/icetruck)
+"C" = (/obj/item/weapon/reagent_containers/food/drinks/ice,/obj/item/weapon/reagent_containers/food/drinks/ice,/obj/item/weapon/reagent_containers/food/drinks/ice,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"D" = (/obj/machinery/cooking/icemachine,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"E" = (/obj/machinery/cooking/icemachine,/obj/item/weapon/reagent_containers/food/snacks/icecream,/obj/item/weapon/gun/energy/temperature,/obj/item/weapon/gun/energy/temperature,/obj/item/weapon/gun/energy/temperature,/turf/unsimulated/floor/snow,/area/vault/icetruck)
+"F" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "swall_f5"},/area/vault/icetruck)
+"G" = (/turf/simulated/shuttle/wall{icon_state = "swall12"},/area/vault/icetruck)
+"H" = (/turf/simulated/shuttle/wall{icon_state = "swall13"},/area/vault/icetruck)
+"I" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "swall_f9"},/area/vault/icetruck)
+
+(1,1,1) = {"
+aaaaaaaaaaaaaaaaaaaaaaaaa
+abaaaaaaaccccccccaaabbaaa
+aaaaaacccccccccccaaaabaaa
+aaaaccccccccddccccaaaaaaa
+aaaacccefffgfffhccccaaaaa
+aaaccccfffgiffffjcccccaaa
+aaaccccffkfffgfffcaaaaaaa
+aaaccffflgmffngfocccaaaaa
+aaaccpffgfffffffqccccaaaa
+aaaccfffffffffffcccccaaaa
+aaaacccrffssfffcccccaaaaa
+aaaccccccctdccccccccaabaa
+aaaaaccauvffvccccaaaaaaaa
+aaaaaccawxfyzwcaaaaaaaaaa
+aaaaaaaawxyyAwaaaabbaaaaa
+aaaaaaaawBfwCwaaaabbaaaaa
+aaaaaaaawDDwEwaaaaaaaaaaa
+aaaaaaaaFGGHGIaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaa
+aaabbaaaaaaaaaaaaaaaaaaaa
+aaabbaaaaaaaaaaaaaaaaaaaa
+aaaabaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaabaaaaaaaaabaa
+aaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaabaaaaaa
+"}
--- a/maps/randomvaults/objects.dm
+++ b/maps/randomvaults/objects.dm
@@ -0,0 +1,76 @@
+//Object and area definitions go here
+/area/vault //Please make all areas used in vaults a subtype of this!
+	name = "mysterious structure"
+	requires_power = 0
+	icon_state = "firingrange"
+	lighting_use_dynamic = 1
+
+/area/vault/icetruck
+
+/area/vault/asteroid
+
+/area/vault/satelite
+
+/area/vault/factory
+
+/area/vault/clownbase
+
+/area/vault/rust
+	requires_power = 1
+
+/mob/living/simple_animal/hostile/monster/cyber_horror/quiet
+	speak_chance = 1 //shut the fuck up
+
+/obj/item/weapon/bananapeel/traitorpeel/curse
+	name = "cursed banana peel"
+	desc = "A peel from a banana, surrounded by an evil aura of trickery and mischief. "
+
+	anchored = 1
+	cant_drop = 1
+
+	slip_power = 10
+
+
+/obj/machinery/door/poddoor/vault_rust
+	id_tag = "tokamak_yadro_ventilyatsionnyy" // Russian for "tokamak_core_vent"
+
+/obj/machinery/door_control/vault_rust
+	name   = "tokamak yadro ventilyatsionnyy"
+	id_tag = "tokamak_yadro_ventilyatsionnyy"
+
+/obj/item/weapon/fuel_assembly/trilithium
+	name = "trilithium fuel rod assembly"
+
+/obj/item/weapon/fuel_assembly/trilithium/New()
+	. = ..()
+	rod_quantities["Trilithium"] = 300
+
+/obj/machinery/power/apc/frame/rust_vault
+	make_alerts = FALSE
+
+/obj/machinery/power/apc/frame/rust_vault/initialize()
+	. = ..()
+	name = "regulyator moshchnosti oblast'"
+
+/obj/machinery/power/generator/rust_vault
+	name = "termoelektricheskiy generator metki dva"
+
+	thermal_efficiency = 0.90
+
+/obj/machinery/power/battery_port/rust_vault
+	name = "raz\"yem pitaniya"
+
+/obj/machinery/power/rust_core/rust_vault
+	name = "\improper Razmnozitel' Ustojcivogo Sostojanija Termojadernyj versija sem' tokamak yadro"
+
+/obj/machinery/vending/engineering/rust_vault
+	name = "\improper Robco instrumental'shchik"
+
+/obj/item/device/rcd/rpd/rust_vault
+	name = "\improper Bystroye Ustroystvo Truboprovodov (BUT)"
+
+/obj/item/device/rcd/matter/engineering/rust_vault
+	name = "\improper Bystroye Stroitel'stvo Ustroystv (BSU)"
+
+/obj/machinery/atmospherics/binary/msgs/rust_vault
+	name = "\improper Magnitno Priostanovleno Blok Khraneniya Gaza"
--- a/maps/randomvaults/rust.dmm
+++ b/maps/randomvaults/rust.dmm
@@ -0,0 +1,160 @@
+"aa" = (/turf/space,/area)
+"ab" = (/obj/structure/lattice,/turf/space,/area)
+"ac" = (/obj/structure/grille,/turf/space,/area)
+"ad" = (/obj/structure/lattice,/obj/structure/grille,/turf/space,/area)
+"ae" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area)
+"af" = (/obj/structure/lattice,/obj/item/stack/sheet/metal,/turf/space,/area)
+"ag" = (/obj/item/weapon/shard/plasma,/turf/space,/area)
+"ah" = (/turf/simulated/wall/r_wall,/area/vault/rust)
+"ai" = (/obj/machinery/door/poddoor/vault_rust,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aj" = (/obj/machinery/door/poddoor/vault_rust,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"ak" = (/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"al" = (/turf/simulated/floor/engine/airless,/area/vault/rust)
+"am" = (/obj/item/stack/sheet/metal,/turf/space,/area)
+"an" = (/obj/structure/girder/displaced,/turf/space,/area)
+"ao" = (/turf/simulated/wall,/area/vault/rust)
+"ap" = (/obj/structure/girder/reinforced,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aq" = (/obj/item/stack/sheet/metal,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"ar" = (/obj/structure/lattice,/obj/machinery/rust/gyrotron{name = "girotron"},/turf/space,/area/vault/rust)
+"as" = (/obj/structure/girder/displaced,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"at" = (/obj/item/stack/rods,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"au" = (/obj/effect/decal/cleanable/soot,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"av" = (/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"aw" = (/obj/item/stack/rods,/turf/space,/area/vault/rust)
+"ax" = (/obj/item/stack/rods,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"ay" = (/obj/item/weapon/shard/plasma,/turf/space,/area/vault/rust)
+"az" = (/obj/item/weapon/shard/plasma,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aA" = (/turf/space,/area/vault/rust)
+"aB" = (/obj/structure/lattice,/obj/item/stack/rods,/turf/space,/area/vault/rust)
+"aC" = (/obj/machinery/power/rust_fuel_injector{dir = 4; name = "toplivnyy inzhektor"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"aD" = (/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aE" = (/obj/item/stack/rods,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aF" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/machinery/power/rust_core/rust_vault,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"aG" = (/obj/structure/grille,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aH" = (/obj/item/stack/rods,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aI" = (/obj/structure/lattice,/turf/space,/area/vault/rust)
+"aJ" = (/obj/structure/lattice,/obj/item/stack/tile/plasteel,/turf/space,/area/vault/rust)
+"aK" = (/obj/item/weapon/fuel_assembly/trilithium,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aL" = (/obj/item/weapon/shard/plasma,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"aM" = (/obj/structure/grille,/obj/structure/window/reinforced/plasma{dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aN" = (/obj/structure/grille,/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"aO" = (/obj/effect/decal/cleanable/blood/gibs/robot,/turf/space,/area/vault/rust)
+"aP" = (/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aQ" = (/obj/item/stack/tile/plasteel,/turf/space,/area)
+"aR" = (/obj/item/weapon/fuel_assembly/trilithium,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"aS" = (/obj/effect/decal/cleanable/soot,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aT" = (/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"aU" = (/obj/item/stack/rods,/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aV" = (/obj/machinery/atmospherics/pipe/manifold4w/insulated/hidden,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"aW" = (/obj/item/weapon/shard/plasma,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"aX" = (/obj/structure/girder,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"aY" = (/obj/structure/lattice,/obj/item/stack/rods,/turf/space,/area)
+"aZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"ba" = (/obj/item/weapon/shard/plasma,/obj/item/weapon/fuel_assembly/trilithium,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bb" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/item/weapon/shard/plasma,/turf/simulated/floor/engine/airless,/area/vault/rust)
+"bc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine/airless,/area/vault/rust)
+"bd" = (/obj/item/stack/sheet/metal,/turf/space,/area/vault/rust)
+"be" = (/obj/item/stack/rods,/turf/space,/area)
+"bf" = (/obj/structure/catwalk,/turf/space,/area)
+"bg" = (/obj/item/stack/sheet/metal,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bh" = (/obj/item/weapon/rcd_ammo,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bi" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/structure/grille,/obj/structure/window/reinforced/plasma,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bj" = (/obj/structure/window/reinforced/plasma,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bk" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/structure/grille,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bl" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bm" = (/obj/structure/cable,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bn" = (/obj/effect/decal/cleanable/soot,/obj/item/weapon/screwdriver,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bo" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bp" = (/obj/item/device/rcd/matter/engineering/rust_vault,/obj/item/weapon/table_parts,/obj/item/device/rcd/rpd/rust_vault,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bq" = (/obj/machinery/door_control/vault_rust{dir = 1; pixel_y = 24},/obj/effect/decal/cleanable/ash,/obj/machinery/light_construct{dir = 1},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"br" = (/obj/machinery/computer/rust_core_control{name = "komp'yuternoye upravleniye tokamak yadro"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bs" = (/obj/machinery/computer/rust_core_monitor{name = "tokamak yadro komp'yuternogo monitoringa"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bt" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/machinery/computer/rust_gyrotron_controller{name = "girotron pul't distantsionnogo upravleniya"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bu" = (/obj/structure/grille,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bv" = (/obj/item/stack/sheet/metal,/obj/effect/decal/cleanable/soot,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bw" = (/obj/item/stack/sheet/metal,/turf/simulated/floor/plating/airless,/area/vault/rust)
+"bx" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"by" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bz" = (/obj/item/weapon/wrench,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bA" = (/obj/effect/decal/cleanable/soot,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bB" = (/obj/machinery/portable_atmospherics/canister/plasma,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bC" = (/obj/structure/lattice,/obj/machinery/power/battery/portable{name = "blok pitaniya portativnogo khraneniya"},/turf/space,/area/vault/rust)
+"bD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bE" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bF" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/effect/decal/cleanable/ash,/obj/item/weapon/rcd_ammo,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bG" = (/obj/item/stack/tile/plasteel,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bH" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/item/weapon/stool,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bI" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bJ" = (/obj/item/stack/sheet/metal,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bK" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bL" = (/obj/item/weapon/shard,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/space,/area)
+"bM" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/catwalk,/turf/space,/area)
+"bN" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/space,/area)
+"bO" = (/obj/item/stack/cable_coil/random,/turf/space,/area)
+"bP" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/item/stack/rods,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bQ" = (/obj/item/stack/tile/plasteel,/obj/effect/decal/cleanable/soot,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/item/weapon/rcd_ammo,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bR" = (/obj/machinery/atmospherics/binary/circulator{dir = 4; name = "rasprostranitel'"},/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/obj/effect/decal/cleanable/soot,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bS" = (/obj/structure/cable,/obj/machinery/power/generator/rust_vault{dir = 4},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bT" = (/obj/machinery/atmospherics/binary/circulator{name = "rasprostranitel'"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"bV" = (/obj/machinery/power/terminal,/obj/structure/cable,/obj/effect/decal/warning_stripes{tag = "icon-loading_area"; icon_state = "loading_area"; dir = 2},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bW" = (/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/decal/cleanable/blood/oil/streak,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bX" = (/obj/effect/decal/cleanable/soot,/obj/machinery/atmospherics/pipe/manifold/insulated/hidden,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bY" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 4},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"bZ" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden{dir = 9},/obj/item/stack/tile/plasteel,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"ca" = (/obj/effect/decal/cleanable/soot,/obj/effect/decal/cleanable/blood/oil/streak,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cb" = (/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 5},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cc" = (/obj/machinery/portable_atmospherics/canister/plasma,/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/insulated/hidden/blue{dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"ce" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{dir = 4},/turf/space,/area)
+"cf" = (/obj/structure/grille,/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/turf/space,/area)
+"cg" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/obj/machinery/power/battery_port/rust_vault,/obj/machinery/power/battery/portable{name = "blok pitaniya portativnogo khraneniya"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"ch" = (/obj/machinery/light_construct,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/obj/machinery/power/battery_port/rust_vault,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"ci" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/obj/machinery/power/battery_port/rust_vault,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cj" = (/obj/effect/decal/cleanable/soot,/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"ck" = (/obj/structure/dispenser/empty,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cl" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cm" = (/obj/machinery/power/apc/frame/rust_vault{pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"cn" = (/obj/machinery/light_construct,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"co" = (/obj/machinery/atmospherics/binary/msgs/rust_vault,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cp" = (/obj/item/stack/rods,/obj/structure/catwalk,/turf/space,/area)
+"cq" = (/obj/item/stack/tile/plasteel,/turf/space,/area/vault/rust)
+"cr" = (/obj/machinery/vending/engineering{name = "Robco instrumental'shchik"},/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (EAST)"; icon_state = "warning_corner"; dir = 4},/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"cs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/warning_stripes{dir = 2; icon_state = "radiation-w"},/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"ct" = (/obj/structure/closet/secure_closet/engineering_personal,/obj/effect/decal/warning_stripes{tag = "icon-warning_corner (NORTH)"; icon_state = "warning_corner"; dir = 1},/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cu" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/damaged/airless,/area/vault/rust)
+"cv" = (/obj/machinery/power/battery/portable{name = "blok pitaniya portativnogo khraneniya"},/turf/space,/area/vault/rust)
+"cw" = (/obj/item/stack/rods,/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"cx" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/space,/area/vault/rust)
+"cy" = (/obj/item/weapon/table_parts,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"cz" = (/obj/item/stack/tile/plasteel,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+"cA" = (/obj/item/weapon/shard,/turf/simulated/floor/plating/airless/damaged,/area/vault/rust)
+
+(1,1,1) = {"
+aaaaabacadaeaeaaaaaaabaaaaaaaaaaaaaaaaabababaeaeaeaa
+aaabababababaaaaafabababababababababababaaaaaaaaaaaa
+aaaaabaaabaaaaaaagaaahaiajajahaaaaaaaaabaaaaaaaaaaaa
+aaababaaabaaaaaaaaakahalalakahahaaamanabaaaaaaabaaaa
+aaaaabaeaoaoaoaoahapalalaqalalapahaoakarasababababab
+aeababaaaoatauavahalawalaxalayakakazaAaAaBaaaaabaaaa
+aaabaaaaawakaCavaDakaEakaFalalalaGakaHaIaIamaaabaaaa
+aaabaaaaaJaJaKaLaMalaNaEaOakawalaGaLaPaEaIaQababaaaa
+aaaeaaaaasaRaSavahapalaTaUaVaWahahaAaIaIaXaaaaaYaaaa
+aaaaaaaaaoataZbaavakahbbbcbbahahavakakbdaXaabebfaaaa
+aaaaaaaaaoavaSbgavbhahbibjbkapavavavakblakaaaaabaaaa
+aaabababaoaAbmbnbobpbqbrbsbtbuavavbvauavaoababababaa
+aaaeaaamaXaBavavbvbwbxavakbyaLauavbzbAbBaoaaaabfabad
+aaabaaanbCaIaAbDavbAbEbFbGbHbIbhauavbJbKbKbLaabMbNaa
+aaabbObeaAbPaAbQaubhakbRbAaubSbTauboavaubUaaaaabaaaa
+aaabaaaaaobVbVbVbWaqakbXbYbZcacbbKbAakcccdcecfbNabaa
+aaabamaaaocgchcicjaAakckclavcmavbAavcncoaoaaaacpaaaa
+aaabaaaaaoaoaoaIaIaBaoaoaZaoaoaoakaIaoaoaoaaabbfabaa
+aaababababaaaaabcqaIaAcrcsctcuakaAaaababaaaaabababaa
+aaaaaaaaaaabababcvaIakbAaAakavakaoabaaababaaabbfaaaa
+aaaaaaaaaaaaabaaaoakcwaIbAaAakcxaoabaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaoaAakcyaEaAczakaAaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaababaoaAcAakaAaAaAakbAabaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaoaAaAakaAaIaIaIaAaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaIaAaAaIaAaAaoaIaoaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaabaaaaabaaaaaaababaaaaaaaaaaaaaaaaaa
+"}
--- a/maps/taxistation.dmm
+++ b/maps/taxistation.dmm
--- a/vgstation13.dme
+++ b/vgstation13.dme
@@ -1591,6 +1591,7 @@
 #include "code\modules\projectiles\projectile\ricochet.dm"
 #include "code\modules\projectiles\projectile\rocket.dm"
 #include "code\modules\projectiles\projectile\special.dm"
+#include "code\modules\randomMaps\vaults.dm"
 #include "code\modules\RCD\engie.dm"
 #include "code\modules\RCD\RCD.dm"
 #include "code\modules\RCD\RPD.dm"
@@ -1930,6 +1931,7 @@
 #include "maps\tgstation.dm"
 #include "maps\defficiency\areas.dm"
 #include "maps\defficiency\pipes.dm"
+#include "maps\randomvaults\objects.dm"
 #include "maps\RandomZLevels\Academy.dm"
 #include "maps\RandomZLevels\challenge.dm"
 #include "maps\RandomZLevels\stationCollision.dm"