Resmooths Ayy Vault Walls (Mothership Lab Vault) (#32696)

* resmooths_ayy_vault_walls

* better_comment

code/game/smoothwall.dm

@@ -115,6 +115,8 @@
 
 var/list/smoothable_unsims = list(
 	"riveted",
+	"r_wall",
+	"rock_rf0",
 	)
 
 /turf/unsimulated/wall/New()

maps/randomvaults/dungeons/habitation.dmm

@@ -1,6 +1,6 @@
 "aa" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/hobo)
 "ai" = (/obj/structure/window/barricade/full/block,/obj/machinery/door/airlock/hatch{locked = 1; name = "Old Lab Maintenance"; req_access_txt = "161"; req_one_access_txt = "161"},/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
-"an" = (/obj/structure/catwalk/invulnerable,/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"an" = (/obj/structure/catwalk/invulnerable,/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "ao" = (/obj/structure/flora/pottedplant/random{icon_state = "plant-10"; tag = "icon-plant-10"},/obj/machinery/light/he{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "dark floor corner"; tag = "icon-dark floor corner (NORTH)"},/area/vault/mothership_lab/administration)
 "au" = (/obj/structure/ore_box,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "aw" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/buckshotshells,/obj/item/weapon/storage/box/buckshotshells,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
@@ -25,7 +25,7 @@
 "bD" = (/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/vault/mothership_lab/habitation)
 "bE" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/carpet,/area/vault/mothership_lab/habitation)
 "bM" = (/obj/effect/decal/cleanable/blood/gibs{basecolor = "#2299FC"; blood_color = "#2299FC"; fleshcolor = "#808D11"; icon_state = "gibdown1"},/obj/effect/landmark/corpse/vox/spaceraider,/obj/machinery/camera{dir = 1; id_tag = "labcameras"; name = "Greyling Dormitory 2"; network = list("MOTHERSHIPLAB")},/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor{dir = 1; icon_state = "dark floor stripe"; tag = "icon-dark floor stripe (NORTH)"},/area/vault/mothership_lab/habitation)
-"bO" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/cave)
+"bO" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/cave)
 "bP" = (/obj/effect/decal/remains/human/noskull,/obj/structure/boulder,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "bZ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "cc" = (/obj/machinery/light/he/broken{dir = 8},/obj/machinery/deployable/barrier{anchored = 1; req_access = null; req_access_txt = "162"; req_one_access_txt = "162"},/turf/simulated/floor,/area/vault/mothership_lab/habitation)
@@ -68,7 +68,7 @@
 "eq" = (/mob/living/simple_animal/hostile/humanoid/vox/spaceraider/medic{dir = 1},/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "ev" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "ew" = (/obj/structure/table/reinforced,/obj/item/weapon/soap,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/light/small/broken{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/habitation)
-"ey" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/raidtunnel_lower)
+"ey" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/raidtunnel_lower)
 "eF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/oil{icon_state = "floor5"},/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "eH" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/woodentable,/obj/item/stack/medical/splint/ghetto,/obj/item/bodybag,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "eS" = (/obj/effect/decal/cleanable/blood/drip{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/floor{icon_state = "white"; tag = "icon-white"},/area/vault/mothership_lab/habitation)
@@ -99,7 +99,7 @@
 "gn" = (/obj/structure/bed/chair,/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/turf/simulated/floor{dir = 9; icon_state = "darkpurple"; tag = "icon-darkpurple (WEST)"},/area/vault/mothership_lab/habitation)
 "gp" = (/obj/machinery/computer/arcade,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "gq" = (/obj/structure/table/woodentable,/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/voxstew,/obj/item/weapon/reagent_containers/food/snacks/voxstew,/obj/item/weapon/reagent_containers/food/snacks/voxstew,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
-"gx" = (/obj/machinery/door/airlock/external{locked = 1; name = "Lab External Airlock"; req_access_txt = "161"; req_one_access_txt = "161"},/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
+"gx" = (/obj/machinery/door/airlock/external{name = "Lab External Airlock"; req_access_txt = "161"; req_one_access_txt = "161"},/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "gy" = (/turf/simulated/floor{icon_state = "white"; tag = "icon-white"},/area/vault/mothership_lab/administration)
 "gz" = (/obj/item/device/flashlight/flare/ever_bright,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "gA" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/drip{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
@@ -138,9 +138,8 @@
 "iR" = (/obj/structure/window/barricade/full,/turf/simulated/floor/greengrid,/area/vault/mothership_lab/habitation)
 "iU" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor{dir = 2},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/shoes/magboots,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/suit/space/rig/grey/researcher,/obj/item/clothing/mask/breath,/turf/simulated/floor/engine,/area/vault/mothership_lab/habitation)
 "ja" = (/obj/machinery/computer/arcade,/turf/simulated/floor/carpet,/area/vault/mothership_lab/habitation)
-"je" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/hobo)
+"je" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/hobo)
 "jh" = (/obj/structure/bed,/obj/structure/curtain/open/bed,/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
-"jn" = (/obj/structure/falserwall,/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
 "jr" = (/obj/machinery/door/mineral/iron,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "asteroidplating"},/area/vault/mothership_lab/hobo)
 "jv" = (/obj/effect/spider/stickyweb,/obj/item/ammo_storage/magazine/mc9mm,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/cave)
 "jz" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/hobo)
@@ -150,7 +149,7 @@
 "jO" = (/obj/machinery/vending/zamsnax,/turf/simulated/floor{icon_state = "freezerfloor"},/area/vault/mothership_lab/habitation)
 "jP" = (/obj/machinery/light/small/broken,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/habitation)
 "jQ" = (/obj/structure/window/barricade/full,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
-"jR" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"jR" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "jW" = (/obj/item/weapon/beartrap/ied/armed,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "jZ" = (/mob/living/simple_animal/hostile/necro/zombie/raider1{dir = 4},/turf/simulated/floor/greengrid,/area/vault/mothership_lab/habitation)
 "kc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/decal/cleanable/generic,/obj/item/blueprints/construction_permit,/obj/item/weapon/circuitboard/airlock,/obj/item/weapon/circuitboard/airlock,/obj/item/weapon/circuitboard/airlock,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/hobo)
@@ -238,7 +237,7 @@
 "pl" = (/obj/structure/bed,/obj/structure/window/reinforced/plasma{dir = 1},/turf/simulated/floor{dir = 4; icon_state = "dark floor stripe"; tag = "icon-dark floor stripe (EAST)"},/area/vault/mothership_lab/administration)
 "pm" = (/obj/item/weapon/stool/bar,/obj/machinery/light/he/broken{dir = 4},/turf/simulated/floor{dir = 5; icon_state = "darkpurple"; tag = "icon-darkpurple (WEST)"},/area/vault/mothership_lab/habitation)
 "pn" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/administration)
-"pq" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/administration)
+"pq" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/administration)
 "pr" = (/obj/structure/acidsink{dir = 8; pixel_x = 10},/turf/simulated/floor{icon_state = "freezerfloor"},/area/vault/mothership_lab/habitation)
 "ps" = (/obj/effect/decal/cleanable/blood/gibs{basecolor = "#2299FC"; blood_color = "#2299FC"; dir = 4; fleshcolor = "#808D11"; icon_state = "gib4"},/obj/item/weapon/gun/projectile/mosin,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
 "px" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/hobo)
@@ -266,7 +265,7 @@
 "qQ" = (/obj/structure/forge,/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/hobo)
 "qS" = (/obj/item/weapon/table_parts,/turf/simulated/floor/plating{icon_state = "platingdmg1"; tag = ""},/area/vault/mothership_lab/habitation)
 "qV" = (/obj/machinery/space_heater/campfire/stove/fireplace,/turf/simulated/floor{icon_state = "dark floor stripe"; tag = "icon-dark floor stripe"},/area/vault/mothership_lab/administration)
-"qX" = (/obj/structure/sign/pox,/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/habitation)
+"qX" = (/obj/structure/sign/pox,/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/habitation)
 "qY" = (/obj/machinery/door/airlock/highsecurity{name = "Administrator's Bedroom"; req_access_txt = "164"; req_one_access_txt = "164"},/turf/simulated/floor{icon_state = "white"; tag = "icon-white"},/area/vault/mothership_lab/administration)
 "rg" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "rj" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/swimmingcarp_spicy,/obj/item/weapon/kitchen/utensil/spoon,/turf/simulated/floor{dir = 1; icon_state = "barber"; tag = "icon-barber (NORTH)"},/area/vault/mothership_lab/habitation)
@@ -305,10 +304,10 @@
 "tM" = (/obj/structure/bed/chair/wood/normal{dir = 4},/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/hobo)
 "tO" = (/turf/simulated/floor{icon_state = "stage_stairs"},/area/vault/mothership_lab/administration)
 "tX" = (/obj/item/stack/sheet/wood,/obj/machinery/camera{dir = 1; id_tag = "labcameras"; name = "Habitation Deck Hall 2"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor,/area/vault/mothership_lab/habitation)
-"ub" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/raidtunnel_lower)
+"ub" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/raidtunnel_lower)
 "ue" = (/obj/item/weapon/table_parts,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
-"uh" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/cave)
+"uh" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/cave)
-"ul" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/administration)
+"ul" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/administration)
 "ur" = (/turf/simulated/floor{dir = 8; icon_state = "darkpurple"; tag = "icon-darkpurple (WEST)"},/area/vault/mothership_lab/habitation)
 "uu" = (/obj/structure/catwalk/invulnerable,/obj/machinery/light/small/broken{dir = 4},/turf/simulated/floor/plating/airless,/area/vault/mothership_lab/cave)
 "uz" = (/obj/item/weapon/barricade_kit,/turf/simulated/floor{dir = 1; icon_state = "barber"; tag = "icon-barber (NORTH)"},/area/vault/mothership_lab/habitation)
@@ -342,7 +341,7 @@
 "wv" = (/mob/living/simple_animal/hostile/humanoid/vox/spaceraider/assassin/smg,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
 "wB" = (/obj/structure/acidtoilet,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/administration)
 "wD" = (/obj/machinery/door/mineral/iron,/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/floor/plating{icon_state = "asteroidplating"},/area/vault/mothership_lab/hobo)
-"wE" = (/obj/structure/catwalk/invulnerable,/obj/effect/decal/warning_stripes{icon_state = "2"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"wE" = (/obj/structure/catwalk/invulnerable,/obj/effect/decal/warning_stripes{icon_state = "2"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "wI" = (/obj/structure/flora/pottedplant/random{icon_state = "plant-16"},/turf/simulated/floor{dir = 1; icon_state = "dark floor stripe"; tag = "icon-dark floor stripe (NORTH)"},/area/vault/mothership_lab/administration)
 "wJ" = (/obj/effect/spider/stickyweb,/obj/effect/spider/cocoon,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "wL" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/machinery/door/poddoor/shutters{dir = 2; id_tag = "lab_bar"; name = "Bar Shutters"},/turf/simulated/floor/carpet,/area/vault/mothership_lab/habitation)
@@ -353,7 +352,7 @@
 "xb" = (/obj/machinery/door/airlock/freezer{name = "Freezer"; req_access_txt = "160"; req_one_access_txt = "160"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/vault/mothership_lab/administration)
 "xc" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
 "xi" = (/obj/structure/closet{anchored = 1; name = "Laborer's Locker"},/obj/item/clothing/shoes/jackboots/mothership,/obj/item/weapon/storage/belt/utility,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
-"xk" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor6"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"xk" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor6"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "xm" = (/obj/machinery/door/airlock/hatch{name = "Old Lab Maintenance"; req_access_txt = "161"; req_one_access_txt = "161"},/turf/simulated/floor/plating{icon_state = "platingdmg1"; tag = ""},/area/vault/mothership_lab/habitation)
 "xn" = (/obj/structure/window/barricade/full/block,/turf/simulated/floor{icon_state = "dark"},/area/vault/mothership_lab/habitation)
 "xr" = (/obj/structure/bed,/obj/effect/landmark/hobostart,/obj/item/weapon/card/id/mothership,/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/hobo)
@@ -394,10 +393,10 @@
 "Ac" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "Af" = (/obj/structure/vendomatpack/zamsnax,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
 "Ah" = (/turf/simulated/floor/carpet,/area/vault/mothership_lab/administration)
-"Aw" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/habitation)
+"Aw" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/habitation)
 "Az" = (/obj/structure/table/flipped{dir = 8},/turf/simulated/floor,/area/vault/mothership_lab/habitation)
 "AC" = (/obj/structure/window/barricade/full/block,/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
-"AH" = (/obj/effect/decal/warning_stripes{icon_state = "2"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"AH" = (/obj/effect/decal/warning_stripes{icon_state = "2"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "AT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating{icon_state = "asteroidplating"},/area/vault/mothership_lab/hobo)
 "AZ" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
 "Bb" = (/obj/machinery/acidshower{dir = 8},/obj/structure/curtain/open/shower/left,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/habitation)
@@ -458,11 +457,11 @@
 "EZ" = (/mob/living/simple_animal/hostile/necro/zombie/greylaborer,/turf/simulated/floor/carpet,/area/vault/mothership_lab/habitation)
 "Fb" = (/obj/item/weapon/barricade_kit,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
 "Fc" = (/obj/machinery/light/small/broken{dir = 8},/turf/simulated/floor,/area/vault/mothership_lab/habitation)
-"Fm" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"Fm" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "Fo" = (/mob/living/simple_animal/hostile/humanoid/greynurse{dir = 8},/turf/simulated/floor{icon_state = "white"; tag = "icon-white"},/area/vault/mothership_lab/habitation)
 "Fq" = (/obj/machinery/acidshower{dir = 4},/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "Fu" = (/obj/machinery/door/window/brigdoor{dir = 8},/turf/simulated/floor{icon_state = "white"; tag = "icon-white"},/area/vault/mothership_lab/habitation)
-"Fw" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor6"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"Fw" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor6"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "Fx" = (/obj/structure/rack,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "Fz" = (/obj/item/ammo_casing/shotgun/buckshot,/turf/simulated/floor,/area/vault/mothership_lab/habitation)
 "FF" = (/obj/effect/decal/cleanable/blood/oil{icon_state = "floor6"},/turf/simulated/floor/plating,/area/vault/mothership_lab/habitation)
@@ -537,7 +536,7 @@
 "Lf" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/closet/crate,/obj/item/toy/ammo/gun,/obj/item/toy/gun,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/habitation)
 "Lh" = (/obj/structure/bed,/mob/living/carbon/monkey/grey{faction = "mothership"; name = "Qorb"},/obj/item/weapon/bedsheet/red,/turf/simulated/floor/carpet,/area/vault/mothership_lab/habitation)
 "Li" = (/obj/machinery/light/he/broken,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
-"Ln" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/cave)
+"Ln" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/cave)
 "Lo" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table,/obj/item/weapon/p_folded/folded_heart,/obj/item/weapon/reagent_containers/food/snacks/zam_mooncheese/wrapped,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/habitation)
 "Lu" = (/turf/simulated/floor/plating{icon_state = "asteroidplating"},/area/vault/mothership_lab/hobo)
 "Lw" = (/obj/structure/table/reinforced,/obj/machinery/chem_dispenser/soda_dispenser,/obj/machinery/light/he/burned{dir = 1},/turf/simulated/floor/carpet,/area/vault/mothership_lab/habitation)
@@ -558,7 +557,7 @@
 "ML" = (/obj/machinery/door/airlock/silver{locked = 1; name = "Greyling Dormitory"; req_access_txt = "160"; req_one_access_txt = "160"},/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"},/obj/effect/narration/mothership_lab/nurseboss,/turf/simulated/floor{icon_state = "white"; tag = "icon-white"},/area/vault/mothership_lab/habitation)
 "MN" = (/obj/machinery/vending/discount,/turf/simulated/floor{dir = 1; icon_state = "barber"; tag = "icon-barber (NORTH)"},/area/vault/mothership_lab/habitation)
 "MO" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/closet/crate,/obj/item/toy/prize/fireripley,/obj/item/clothing/head/hardhat/red,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/habitation)
-"MQ" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/administration)
+"MQ" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/administration)
 "MS" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/cocoon,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "Nc" = (/obj/structure/table/reinforced,/turf/simulated/floor/carpet,/area/vault/mothership_lab/administration)
 "Nj" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/flora/ausbushes/ppflowers,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/grass,/area/vault/mothership_lab/habitation)
@@ -568,11 +567,11 @@
 "NF" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/iv_drip,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "NH" = (/obj/structure/window/reinforced,/obj/structure/curtain/closed,/turf/simulated/floor{dir = 1; icon_state = "dark floor stripe"; tag = "icon-dark floor stripe (NORTH)"},/area/vault/mothership_lab/habitation)
 "NJ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
-"NQ" = (/obj/effect/decal/warning_stripes{icon_state = "2"},/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/administration)
+"NQ" = (/obj/effect/decal/warning_stripes{icon_state = "2"},/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/administration)
 "NR" = (/turf/simulated/floor{icon_state = "dark"},/area/vault/mothership_lab/habitation)
 "NS" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small/broken{dir = 4},/turf/simulated/floor/plating,/area/vault/mothership_lab/cave)
 "NV" = (/obj/item/weapon/storage/fancy/flares,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
-"NX" = (/obj/structure/sign/biohazard,/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"NX" = (/obj/structure/sign/biohazard,/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "Oa" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/blethernoodlesoup,/obj/item/weapon/kitchen/utensil/spoon,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/habitation)
 "Od" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/greytvdinner2/wrapped,/obj/item/weapon/kitchen/utensil/fork/teflon,/turf/simulated/floor{dir = 1; icon_state = "barber"; tag = "icon-barber (NORTH)"},/area/vault/mothership_lab/habitation)
 "Of" = (/mob/living/simple_animal/hostile/humanoid/vox/spaceraider/assassin/smg{dir = 1},/turf/simulated/floor,/area/vault/mothership_lab/habitation)
@@ -608,7 +607,7 @@
 "Qw" = (/obj/structure/table/glass,/obj/machinery/light/he/broken{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "darkpurple"; tag = "icon-darkpurple (WEST)"},/area/vault/mothership_lab/habitation)
 "QC" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/plasteel{pixel_x = 2; pixel_y = 2},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/weapon/cell/hyper,/obj/item/weapon/cell/hyper,/obj/machinery/camera{dir = 9; id_tag = "labcameras"; name = "E.V.A. Storage"; network = list("MOTHERSHIPLAB")},/obj/machinery/recharger{pixel_x = 30},/turf/simulated/floor{icon_state = "dark"},/area/vault/mothership_lab/habitation)
 "QD" = (/obj/machinery/vending/zamsnax,/turf/simulated/floor{icon_state = "dark floor stripe"; tag = "icon-dark floor stripe"},/area/vault/mothership_lab/habitation)
-"QG" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor5"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/habitation)
+"QG" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor5"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/habitation)
 "QJ" = (/obj/structure/ladder{id = "voxtunnel"; name = "Raider Tunnel"},/obj/effect/narration/mothership_lab/raidertunnel,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
 "QL" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/carpet,/area/vault/mothership_lab/administration)
 "QO" = (/obj/structure/bed/roller,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_lower)
@@ -763,7 +762,7 @@ ibibgNpqsSqVGjulCRgyoMgyqsNcRIululJzmFpqXbXbXbuhuhuhfhuhuhuhgdgdXbXbXbXbXbXbXRcu
 ibibgNpqOjgygyqYbugygygyoMgyOrulJoUIUIpqvJVyfCuhImmTXbXbKpuhdKXbXbVyXbXbVyXbVyXbXbXbVyXbXbRLXbXbfCuhrgNSuhuhuhXbXbXbmfHyeyekbCGBbCekekekbCGBbCekubibibib
 ibibgNpqIiJiwIulYLbuulhNulgygyxbUInjjDpqPnXbVyZAXbXbVyXbXbZAXbXbXbXbXbXbXbXbXbXbXbeFVyXbXbRXXbXbXbZAVyZQfEayNJVyVyXbXbuGmzmzqIvYqIfjfdfdULsNmzekubibibib
 ibibgNpqpqpqululqltfddyFfAtfoXululpqpqpqZQZQhnuhEhaLCivCnnuhototXbXbVyXbXbVyXbZmXbVyXbXbotuhNEHyftuhXbfCuhCHXbXbXbXbMJXbeyeksCqImzjWsNqIqIqImzmzekubibib
-ibibibgNgNNQfoMQululUUXZUUululMQGiNQgNuhgxuhjRjRjRjRjRjnjRjRjRjRHQHQmMHQjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRFwjRjRxmjRjRekekekekekekekqIqIpeqIPrekubib
+ibibibgNgNNQfoMQululUUXZUUululMQGiNQgNuhgxuhjRjRjRjRjRjRjRjRjRjRHQHQmMHQjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRjRFwjRjRxmjRjRekekekekekekekqIqIpeqIPrekubib
 ibibibibgNpqgjsvfAbnyFyFyFbnddYlgjpqgNuhoJSmjRjhAZEcEcDLjhjRPREUWboxScTcpVcZjRWFQPcFQddhjRgnSOrpUKLwYmbEjRSqSqtsAHoZPArsAwAwAwAwAwAwAwAwekqIqIqImzekubib
 ibgNgNgNgNpqEmsvfAyFyFyFyFyFddYlEmpqgNuhZcLnjRjRxKBkximQjRjRRlCIvrSqFbvryvdmjRZVvvGfgahhjRQwpjqGfnuSfpmdDMEjPOcXnpFIFIBVAwqKSHpbLoSHJPAwekmzmzqImzekubib
 gNjejejejepqpqpqpqpqpqpqpqpqpqpqpqpqgNuhinVkjRjhEchOMlEcjhjROFVBLKSqSqvrVBvrpUEZnxnxWsdpjRRvsXjRtFwLwLCZaKvjtvjQAHBrzeEvAwfnfnLfoEfnfnAweksNauqIsNekubib

maps/randomvaults/dungeons/research.dmm

@@ -29,7 +29,7 @@
 "bU" = (/obj/machinery/light/he{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
 "bW" = (/obj/structure/table,/obj/machinery/light/he{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/research)
 "cb" = (/obj/machinery/light/he,/mob/living/carbon/monkey/unathi{faction = "mothership"},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
-"cd" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/research)
+"cd" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/research)
 "cl" = (/obj/structure/bookcase/manuals,/turf/simulated/floor/carpet,/area/vault/mothership_lab/research)
 "cn" = (/obj/machinery/acidshower{dir = 8},/obj/structure/curtain/open/shower/left,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
 "cv" = (/turf/simulated/floor,/area/vault/mothership_lab/research)
@@ -47,7 +47,7 @@
 "do" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/plasteel/bigstack,/obj/item/stack/sheet/plasteel/bigstack,/obj/item/stack/sheet/plasteel/bigstack,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "dp" = (/obj/machinery/vending/tool{req_access_txt = "161"; req_one_access_txt = "161"},/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "ds" = (/obj/machinery/dna_scannernew,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
-"dt" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor6"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/maintenance)
+"dt" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor6"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/maintenance)
 "du" = (/obj/machinery/optable{name = "Robotics Operating Table"},/obj/machinery/recharger/defibcharger/wallcharger{pixel_x = 34},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "dw" = (/obj/structure/closet/crate/freezer/surgery,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/organ/internal/kidneys/filter,/obj/item/organ/internal/appendix,/obj/item/organ/internal/kidneys,/turf/simulated/floor{icon_state = "white"},/area/vault/mothership_lab/research)
 "dA" = (/obj/structure/stacklifter,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "darkredfull"; tag = "icon-darkredfull"},/area/vault/mothership_lab/research)
@@ -71,7 +71,7 @@
 "ez" = (/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/vault/mothership_lab/samplestorage)
 "eC" = (/obj/machinery/acidshower{dir = 8},/obj/item/weapon/card/id/mothership_laborer,/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/obj/effect/landmark/corpse/grey/worker,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "eE" = (/obj/structure/bed/chair/comfy/couch/left/teal,/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
-"eU" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor6"},/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/research)
+"eU" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor6"},/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/research)
 "eW" = (/turf/space,/area)
 "fc" = (/obj/structure/bed,/obj/effect/decal/remains/human/noskull,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/research)
 "fg" = (/obj/machinery/computer/arcade,/turf/simulated/floor{dir = 9; icon_state = "darkred"; tag = "icon-darkred (NORTHWEST)"},/area/vault/mothership_lab/research)
@@ -97,7 +97,7 @@
 "gE" = (/obj/structure/acidtoilet{dir = 8},/obj/machinery/light/small/broken{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
 "gG" = (/obj/structure/bed/chair/comfy/red{dir = 4},/obj/machinery/light/he{dir = 8},/turf/simulated/floor/carpet,/area/vault/mothership_lab/research)
 "gN" = (/obj/effect/decal/warning_stripes/siding{dir = 9},/obj/item/clothing/gloves/boxing,/mob/living/simple_animal/hostile/retaliate/gym_rat/mothership{dir = 4},/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/research)
-"hb" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/samplestorage)
+"hb" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/samplestorage)
 "hd" = (/mob/living/simple_animal/hostile/retaliate/gym_rat/mothership,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "hh" = (/obj/structure/flora/pottedplant/random{icon_state = "plant-13"; tag = "icon-plant-13"},/turf/simulated/floor{dir = 6; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
 "hi" = (/obj/effect/decal/warning_stripes{dir = 1; icon_state = "warning"; tag = "icon-warning (NORTH)"},/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
@@ -158,7 +158,7 @@
 "kO" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/grass,/area/vault/mothership_lab/research)
 "kR" = (/obj/structure/sink/puddle,/turf/simulated/floor/grass,/area/vault/mothership_lab/research)
 "kU" = (/obj/effect/decal/cleanable/blood/drip{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/floor/plating{icon_state = "platingdmg1"; tag = ""},/area/vault/mothership_lab/research)
-"kV" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/armory)
+"kV" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/armory)
 "lc" = (/obj/effect/decal/warning_stripes{dir = 8; icon_state = "warning"; tag = "icon-warning (WEST)"},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "lg" = (/obj/effect/decal/warning_stripes/siding,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/research)
 "lh" = (/obj/effect/decal/warning_stripes{dir = 8; icon_state = "warning"; tag = "icon-warning (WEST)"},/turf/simulated/floor{dir = 8; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
@@ -206,7 +206,7 @@
 "oN" = (/obj/effect/decal/remains/human/noskull,/obj/structure/table,/obj/machinery/light/small/broken{dir = 1},/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/research)
 "oS" = (/turf/simulated/floor{dir = 1; icon_state = "stage_stairs"; tag = "icon-stage_stairs (NORTH)"},/area/vault/mothership_lab/research)
 "oT" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor{dir = 2; req_access = null; req_access_txt = "163"; req_one_access_txt = "163"},/obj/item/weapon/paper_bin/green,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
-"oV" = (/obj/structure/sign/biohazard,/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/samplestorage)
+"oV" = (/obj/structure/sign/biohazard,/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/samplestorage)
 "oX" = (/obj/machinery/r_n_d/fabricator/mechanic_fab/autolathe,/obj/effect/decal/warning_stripes{dir = 9; icon_state = "warning"; tag = "icon-warning (NORTHWEST)"},/obj/machinery/light/he/broken,/turf/simulated/floor/bluegrid,/area/vault/mothership_lab/research)
 "pa" = (/obj/structure/bed/chair/shuttle/gamer{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "pe" = (/obj/machinery/deployable/barrier{anchored = 1; req_access = null; req_access_txt = "162"; req_one_access_txt = "162"},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
@@ -248,7 +248,7 @@
 "rP" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/research)
 "rT" = (/obj/structure/rack,/obj/item/weapon/stock_parts/manipulator/nano/pico,/obj/item/weapon/stock_parts/manipulator/nano/pico,/obj/item/weapon/stock_parts/manipulator/nano/pico,/obj/item/weapon/stock_parts/capacitor/adv/super,/obj/item/weapon/stock_parts/capacitor/adv/super,/obj/item/weapon/stock_parts/capacitor/adv/super,/turf/simulated/floor{icon_state = "whitegreen"},/area/vault/mothership_lab/research)
 "rV" = (/turf/unsimulated/mineral,/area/vault/mothership_lab/asteroid)
-"rY" = (/obj/effect/decal/warning_stripes{icon_state = "3"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/research)
+"rY" = (/obj/effect/decal/warning_stripes{icon_state = "3"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/research)
 "sa" = (/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "sk" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/table/reinforced,/obj/item/tool/circular_saw/plasmasaw,/obj/item/tool/hemostat/pico,/obj/item/tool/FixOVein/clot,/obj/item/tool/bonesetter/bone_mender,/obj/item/tool/retractor/manager,/obj/item/tool/scalpel/laser,/turf/simulated/floor{icon_state = "white"},/area/vault/mothership_lab/research)
 "sr" = (/obj/structure/acidtoilet,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
@@ -311,7 +311,7 @@
 "xu" = (/obj/machinery/light/he/broken{dir = 8},/obj/structure/closet/secure_closet/guncabinet{anchored = 1; name = "raider ammunition cabinet"; req_access = null},/obj/item/weapon/storage/box/buckshotshells,/obj/item/weapon/storage/box/buckshotshells,/obj/item/weapon/storage/box/buckshotshells,/obj/item/ammo_storage/box/b762x55,/obj/item/ammo_storage/box/b762x55,/obj/item/ammo_storage/box/b762x55,/obj/item/ammo_storage/box/b380auto,/obj/item/ammo_storage/box/b380auto,/obj/item/weapon/storage/box/lethalshells,/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/vault/mothership_lab/maintenance)
 "xv" = (/obj/structure/bed/chair/shuttle/gamer{dir = 4},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "xz" = (/obj/structure/rack,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
-"xG" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/maintenance)
+"xG" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/maintenance)
 "xH" = (/obj/structure/closet/crate,/obj/item/clothing/under/grey/grey_soldier,/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/he,/obj/item/weapon/storage/belt/mothership,/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/research)
 "xI" = (/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "xT" = (/obj/structure/bed,/turf/simulated/floor{icon_state = "darkred"},/area/vault/mothership_lab/research)
@@ -348,7 +348,7 @@
 "AA" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/closet/crate/freezer/surgery,/obj/item/organ/internal/eyes/adv_1,/turf/simulated/floor{icon_state = "white"},/area/vault/mothership_lab/research)
 "AX" = (/obj/machinery/door_control{id_tag = "checkpointshutters3"; name = "Checkpoint Shutters"; pixel_x = 25; pixel_y = -25; req_access_txt = "162"; req_one_access_txt = "162"},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Ba" = (/obj/structure/flora/ausbushes/leafybush,/turf/simulated/floor/grass,/area/vault/mothership_lab/research)
-"Br" = (/obj/structure/falserwall,/turf/simulated/floor/plating{icon_state = "platingdmg1"; tag = ""},/area/vault/mothership_lab/maintenance)
+"Br" = (/obj/structure/falserwall,/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/maintenance)
 "Bu" = (/obj/structure/bed,/obj/machinery/camera{dir = 1; id_tag = "labcameras"; name = "Research Deck Barracks 4"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/research)
 "Bz" = (/turf/simulated/floor{dir = 5; icon_state = "whitegreen"; tag = "icon-whitegreen (NORTHEAST)"},/area/vault/mothership_lab/research)
 "BI" = (/obj/structure/table/reinforced,/obj/structure/closet/walllocker/defiblocker{pixel_x = 32},/obj/item/weapon/card/id/mothership,/obj/item/weapon/card/id/mothership,/turf/simulated/floor{dir = 4; icon_state = "darkred"; tag = "icon-darkred (EAST)"},/area/vault/mothership_lab/research)
@@ -358,7 +358,7 @@
 "BW" = (/obj/structure/door_assembly,/obj/machinery/camera{dir = 8; id_tag = "labcameras"; name = "Necrotic Specimens East"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor,/area/vault/mothership_lab/research)
 "BY" = (/mob/living/simple_animal/hostile/humanoid/grey/soldier/pacifier,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/armory)
 "Ca" = (/turf/simulated/floor{dir = 9; icon_state = "darkred"; tag = "icon-darkred (NORTHWEST)"},/area/vault/mothership_lab/research)
-"Ci" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/maintenance)
+"Ci" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/maintenance)
 "Cu" = (/obj/machinery/light/he{dir = 8},/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/armory)
 "Cv" = (/obj/structure/closet/crate,/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/shoes/jackboots/mothership,/obj/item/clothing/under/grey/grey_soldier,/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/research)
 "Cw" = (/obj/structure/acidtoilet,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/research)
@@ -376,7 +376,7 @@
 "Do" = (/obj/machinery/chem_master,/obj/item/weapon/reagent_containers/pill/tramadol,/obj/item/weapon/reagent_containers/pill/tramadol,/obj/item/weapon/reagent_containers/pill/tramadol,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Dw" = (/obj/structure/closet/crate,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/research)
 "DE" = (/obj/structure/rack,/obj/effect/decal/warning_stripes{icon_state = "bot"},/obj/structure/window/reinforced/plasma,/obj/item/device/flashlight/tactical,/obj/item/device/flashlight/tactical,/obj/item/device/flashlight/tactical,/turf/simulated/floor/engine,/area/vault/mothership_lab/armory)
-"DG" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/armory)
+"DG" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/armory)
 "DH" = (/turf/simulated/floor{icon_state = "whitegreencorner"},/area/vault/mothership_lab/research)
 "DJ" = (/mob/living/simple_animal/hostile/retaliate/gym_rat/mothership{dir = 4},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "DK" = (/turf/simulated/floor{dir = 6; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
@@ -410,7 +410,7 @@
 "Gq" = (/obj/structure/rack,/obj/item/tool/weldingtool/gatling,/obj/item/device/analyzer,/obj/item/device/device_analyser,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "Gu" = (/obj/structure/closet{anchored = 1; name = "Laborer's Locker"},/obj/item/device/silicate_sprayer/advanced,/obj/item/clothing/under/grey/grey_worker,/obj/item/clothing/glasses/scanner/meson,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "Gz" = (/obj/machinery/light/he{dir = 4},/obj/machinery/deployable/barrier{anchored = 1; req_access = null; req_access_txt = "162"; req_one_access_txt = "162"},/turf/simulated/floor{dir = 4; icon_state = "darkred"; tag = "icon-darkred (EAST)"},/area/vault/mothership_lab/research)
-"GA" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/samplestorage)
+"GA" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/samplestorage)
 "GR" = (/obj/structure/rack,/obj/item/device/device_analyser,/obj/item/device/device_analyser,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "GW" = (/obj/structure/closet/secure_closet{anchored = 1; name = "Researcher's Locker"; req_access_txt = "163"; req_one_access_txt = "163"},/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
 "Hd" = (/obj/machinery/door/airlock/silver{name = "Lab Lavatory"; req_access_txt = "163"; req_one_access_txt = "163"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
@@ -512,7 +512,7 @@
 "PF" = (/obj/machinery/power/treadmill,/obj/effect/decal/warning_stripes{icon_state = "bot"},/turf/simulated/floor{icon_state = "darkredfull"; tag = "icon-darkredfull"},/area/vault/mothership_lab/research)
 "PG" = (/mob/living/simple_animal/hostile/humanoid/grey/soldier/pacifier{dir = 4},/turf/simulated/floor,/area/vault/mothership_lab/research)
 "PJ" = (/obj/machinery/acidshower{dir = 4},/obj/structure/curtain/open/shower/right,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
-"PO" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor2"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/research)
+"PO" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor2"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/research)
 "PQ" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes{pixel_x = 4; pixel_y = 8},/obj/item/weapon/storage/box/beakers,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "PS" = (/obj/item/weapon/table_parts,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "PU" = (/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/machinery/light/small{dir = 1},/obj/structure/closet/crate/chest{name = "raider chest"},/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
@@ -533,7 +533,7 @@
 "Ra" = (/obj/structure/acidsink{dir = 4; pixel_x = -11},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
 "Rd" = (/obj/machinery/smartfridge/chemistry,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Re" = (/obj/machinery/light/he/broken{dir = 8},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/vault/mothership_lab/maintenance)
-"Rh" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/research)
+"Rh" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/research)
 "Rj" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor{dir = 5; icon_state = "darkred"; tag = "icon-darkred (NORTHEAST)"},/area/vault/mothership_lab/research)
 "Rm" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_y = 29},/obj/structure/bed/chair/comfy/couch/right/teal,/turf/simulated/floor{dir = 1; icon_state = "whitegreen"},/area/vault/mothership_lab/research)
 "Ro" = (/obj/structure/bed,/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/research)
@@ -564,7 +564,7 @@
 "Tb" = (/obj/structure/closet{anchored = 1; name = "MDF Uniform Locker"},/obj/item/clothing/shoes/jackboots/mothership,/obj/item/weapon/storage/belt/mothership,/obj/item/clothing/under/grey/grey_soldier,/obj/item/device/flashlight/tactical,/turf/simulated/floor{dir = 5; icon_state = "darkred"; tag = "icon-darkred (NORTHEAST)"},/area/vault/mothership_lab/armory)
 "Tc" = (/obj/structure/acidtoilet,/obj/machinery/light/small/broken{dir = 1},/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/research)
 "Tf" = (/obj/structure/flora/pottedplant/random{icon_state = "plant-22"; tag = "icon-plant-22"},/obj/machinery/light/he{dir = 1},/turf/simulated/floor{dir = 5; icon_state = "whitegreen"; tag = "icon-whitegreen (NORTHEAST)"},/area/vault/mothership_lab/research)
-"Tl" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/maintenance)
+"Tl" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/maintenance)
 "Tm" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "checkpointshutters4"; name = "Checkpoint Blast Doors"; opacity = 0},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Tn" = (/mob/living/simple_animal/hostile/humanoid/grey/soldier/heavy,/turf/simulated/floor{dir = 4; icon_state = "darkred"; tag = "icon-darkred (EAST)"},/area/vault/mothership_lab/research)
 "Tp" = (/obj/structure/bed,/obj/structure/curtain/open/bed,/turf/simulated/floor{dir = 5; icon_state = "whitegreen"; tag = "icon-whitegreen (NORTHEAST)"},/area/vault/mothership_lab/research)
@@ -577,7 +577,7 @@
 "Uk" = (/obj/structure/table/reinforced,/obj/item/weapon/soap,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/light/small{dir = 4; on = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
 "Ul" = (/obj/effect/decal/cleanable/blood{basecolor = "#2299FC"; blood_color = "#2299FC"; icon_state = "floor5"},/obj/item/weapon/gun/energy/laser/retro,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Un" = (/obj/machinery/light/he/broken{dir = 4},/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
-"Ur" = (/obj/effect/decal/warning_stripes{icon_state = "3"},/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/research)
+"Ur" = (/obj/effect/decal/warning_stripes{icon_state = "3"},/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/research)
 "Uw" = (/obj/structure/girder/reinforced,/obj/structure/window/full/reinforced/plasma,/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Ux" = (/obj/structure/closet/crate,/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/he{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/research)
 "UA" = (/obj/structure/rack,/obj/item/tool/wrench,/obj/item/tool/wrench,/obj/item/tool/wrench,/obj/item/tool/wrench/socket,/obj/item/tool/wrench/socket,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
@@ -616,7 +616,7 @@
 "WW" = (/obj/structure/table/reinforced,/obj/item/weapon/soap,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/research)
 "Xc" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/table/reinforced,/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/armory)
 "Xf" = (/obj/structure/rack,/obj/item/weapon/storage/pill_bottle/zambiscuits,/obj/item/weapon/storage/pill_bottle/zambiscuits,/obj/item/weapon/storage/pill_bottle/zambiscuits,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
-"Xk" = (/obj/structure/sign/biohazard,/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/research)
+"Xk" = (/obj/structure/sign/biohazard,/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/research)
 "Xm" = (/obj/effect/decal/cleanable/blood/drip{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"},/turf/simulated/floor/plating,/area/vault/mothership_lab/research)
 "Xs" = (/obj/machinery/r_n_d/fabricator/protolathe,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/research)
 "Xy" = (/obj/structure/closet{anchored = 1; name = "Athletic Closet"},/obj/item/clothing/under/shorts/red,/obj/item/clothing/under/shorts/red,/obj/item/clothing/under/shorts/red,/obj/item/clothing/under/shorts/red,/obj/item/weapon/storage/pill_bottle/creatine,/obj/item/weapon/storage/pill_bottle/creatine,/turf/simulated/floor{dir = 9; icon_state = "darkred"; tag = "icon-darkred (NORTHWEST)"},/area/vault/mothership_lab/research)
@@ -639,7 +639,7 @@
 "Za" = (/obj/structure/closet/secure_closet{anchored = 1; name = "MDF Locker"; req_access_txt = "162"; req_one_access_txt = "162"},/obj/item/clothing/shoes/jackboots/mothership,/obj/item/clothing/under/grey/grey_soldier,/obj/item/weapon/storage/belt/mothership,/obj/item/clothing/head/helmet/mothership,/turf/simulated/floor{dir = 1; icon_state = "darkred"; tag = "icon-darkred (NORTH)"},/area/vault/mothership_lab/research)
 "Zd" = (/obj/structure/closet{anchored = 1; name = "Athletic Closet"},/obj/item/clothing/under/shorts/red,/obj/item/clothing/under/shorts/red,/obj/item/clothing/under/shorts/red,/obj/item/clothing/under/shorts/red,/turf/simulated/floor{dir = 10; icon_state = "darkred"; tag = "icon-darkred (SOUTHWEST)"},/area/vault/mothership_lab/research)
 "Zg" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin/white,/obj/item/weapon/pen/multi,/turf/simulated/floor{icon_state = "white"},/area/vault/mothership_lab/research)
-"Zn" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/research)
+"Zn" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/research)
 "Zo" = (/obj/effect/decal/cleanable/blood/gibs{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; dir = 4; fleshcolor = "#B5B5B5"; icon_state = "gib4"},/obj/machinery/light/he/broken,/obj/item/weapon/melee/stunprobe,/turf/simulated/floor,/area/vault/mothership_lab/research)
 "Zs" = (/obj/structure/rack,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/turf/simulated/floor/plating,/area/vault/mothership_lab/maintenance)
 "Zz" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/jackboots/mothership,/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/accessory/holster/handgun,/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/research)

maps/randomvaults/mothership_lab.dm

@@ -107,6 +107,44 @@
 	jammed = 2
 	flags = NO_PACIFICATION
 
+//////////////////////////////
+// WALLS (An invulnerable wall subtype, and two icon-swapped riveted walls, applied to appropriate areas to prevent escaping the vault to the Centcomm Z-level, or tunneling into boss rooms)
+//////////////////////////////
+
+/turf/simulated/wall/invulnerable/r_wall/mothership
+	name = "super-reinforced wall"
+	desc = "Someone spent a lot of time and money on this bullet-proof, bomb-proof wall."
+	icon_state = "r_wall"
+	walltype = "rwall"
+
+/turf/simulated/wall/invulnerable/r_wall/mothership/canSmoothWith() // SMOOTH DAT WALL (For the mothership lab vault)
+	var/static/list/smoothables = list(/turf/simulated/wall/invulnerable/r_wall/mothership, /turf/unsimulated/wall/r_wall)
+	return smoothables
+
+/turf/unsimulated/wall/r_wall
+	name = "riveted reinforced wall"
+	desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "r_wall"
+	explosion_block = 9999
+	walltype = "rwall"
+
+/turf/unsimulated/wall/r_wall/canSmoothWith() // SMOOTH DAT WALL
+	var/static/list/smoothables = list(/turf/unsimulated/wall/r_wall, /turf/simulated/wall/invulnerable/r_wall)
+	return smoothables
+
+/turf/unsimulated/wall/r_rock
+	name = "riveted porous rock"
+	desc = "Asteroid rock reinforced by a wall with massive rivets embedded in the struts."
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "rock_rf0"
+	explosion_block = 9999
+	walltype = "rock_rf"
+
+/turf/unsimulated/wall/r_rock/canSmoothWith() // SMOOTH DAT WALL
+	var/static/list/smoothables = list(/turf/unsimulated/wall/r_rock)
+	return smoothables
+
 //////////////////////////////
 // NARRATION
 //////////////////////////////

maps/randomvaults/mothership_lab.dmm

@@ -17,7 +17,7 @@
 "ct" = (/obj/structure/inflatable/door,/turf/unsimulated/floor/asteroid,/area/vault/mothership_lab/raidtunnel_upper)
 "cG" = (/turf/simulated/floor{dir = 9; icon_state = "darkred"; tag = "icon-darkred (NORTHWEST)"},/area/vault/mothership_lab/control_room)
 "cH" = (/turf/simulated/floor{dir = 1; icon_state = "darkredcorners"; tag = "icon-darkredcorners (EAST)"},/area/vault/mothership_lab/control_room)
-"cK" = (/obj/structure/catwalk/invulnerable,/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/entrance)
+"cK" = (/obj/structure/catwalk/invulnerable,/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/entrance)
 "di" = (/obj/machinery/camera{dir = 4; id_tag = "labcameras"; name = "Processing Room"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor{dir = 8; icon_state = "darkred"; tag = "icon-darkred (WEST)"},/area/vault/mothership_lab/entrance)
 "dq" = (/turf/simulated/floor{dir = 5; icon_state = "darkred"; tag = "icon-darkred (NORTHEAST)"},/area/vault/mothership_lab/control_room)
 "du" = (/obj/effect/mine/stun,/turf/simulated/floor/greengrid,/area/vault/mothership_lab/entrance)
@@ -113,7 +113,7 @@
 "nU" = (/obj/effect/decal/warning_stripes{icon_state = "warning-asteroid"; tag = "icon-warning (NORTH)"},/obj/structure/hanging_lantern{dir = 1},/turf/unsimulated/floor/asteroid/air,/area/vault/mothership_lab/asteroid)
 "nW" = (/obj/item/device/flashlight/flare/ever_bright,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_upper)
 "ol" = (/obj/machinery/camera{dir = 8; id_tag = "labcameras"; name = "Entry Deck Main Hall Junction"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor,/area/vault/mothership_lab/entrance)
-"oo" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/control_room)
+"oo" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/control_room)
 "oM" = (/obj/structure/window/reinforced/plasma{dir = 1},/obj/machinery/computer/atmos_alert,/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/control_room)
 "oS" = (/obj/machinery/door/airlock/external{name = "Lab External Airlock"; req_access_txt = "160"; req_one_access_txt = "160"},/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "pe" = (/obj/structure/window/reinforced/plasma{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/paper_bin/blue,/obj/item/weapon/pen,/turf/simulated/floor{dir = 4; icon_state = "darkred"; tag = "icon-darkred (EAST)"},/area/vault/mothership_lab/control_room)
@@ -153,7 +153,7 @@
 "tb" = (/obj/machinery/door/airlock/silver{name = "Habitation Deck Access"; req_access_txt = "160"; req_one_access_txt = "160"},/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "th" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced/plasma{dir = 1},/obj/structure/window/reinforced/plasma{dir = 4},/obj/machinery/recharger,/turf/simulated/floor{dir = 5; icon_state = "darkred"; tag = "icon-darkred (NORTHEAST)"},/area/vault/mothership_lab/control_room)
 "tm" = (/obj/structure/catwalk/invulnerable,/obj/structure/closet/secure_closet/guncabinet{anchored = 1; name = "disintegrator cabinet"; req_access = null; req_access_txt = "162"; req_one_access_txt = "162"},/obj/item/weapon/gun/energy/smalldisintegrator,/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
-"tr" = (/obj/effect/decal/warning_stripes{icon_state = "1"},/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/control_room)
+"tr" = (/obj/effect/decal/warning_stripes{icon_state = "1"},/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/control_room)
 "tF" = (/obj/structure/catwalk/invulnerable,/obj/machinery/recharger{pixel_x = 30},/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "ui" = (/obj/machinery/door/window{name = "Shower"},/obj/machinery/acidshower{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/vault/mothership_lab/entrance)
 "uo" = (/obj/structure/catwalk/invulnerable,/obj/structure/rack,/obj/machinery/light/small{dir = 1},/obj/item/weapon/storage/fancy/flares,/obj/item/weapon/storage/fancy/flares,/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
@@ -191,7 +191,7 @@
 "yt" = (/obj/machinery/atmospherics/unary/tank/air{dir = 8},/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "yA" = (/obj/structure/hanging_lantern{dir = 1},/turf/unsimulated/floor/asteroid,/area/vault/mothership_lab/asteroid)
 "yD" = (/obj/structure/bed,/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/entrance)
-"yE" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/entrance)
+"yE" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/entrance)
 "yG" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/entrance)
 "yN" = (/obj/structure/cage/autoclose/cover,/obj/effect/landmark/corpse/grey/worker,/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor6"},/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_upper)
 "yQ" = (/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
@@ -221,7 +221,7 @@
 "Bv" = (/obj/machinery/light/small/broken,/turf/simulated/floor/greengrid,/area/vault/mothership_lab/entrance)
 "BJ" = (/obj/structure/window/reinforced/plasma,/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/control_room)
 "BL" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/jackboots/mothership,/obj/item/clothing/under/grey/grey_soldier,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/entrance)
-"BX" = (/obj/structure/catwalk/invulnerable,/obj/machinery/door/airlock/hatch{name = "Lab Hangar Access"; req_access_txt = "162"; req_one_access_txt = "162"},/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
+"BX" = (/obj/structure/catwalk/invulnerable,/obj/machinery/door/airlock/hatch{name = "Lab Hangar Access"; req_access_txt = "162"; req_one_access_txt = "162"},/turf/space,/area/vault/mothership_lab/entrance)
 "Ch" = (/obj/structure/table,/obj/item/tool/weldingtool/hugetank,/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "Cp" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced/plasma{dir = 1},/obj/item/weapon/storage/fancy/flares,/obj/structure/window/reinforced/plasma{dir = 8},/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/control_room)
 "Cx" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/lights/he,/obj/item/device/gps/secure/command,/turf/simulated/floor{dir = 1; icon_state = "darkredcorners"; tag = "icon-darkredcorners (EAST)"},/area/vault/mothership_lab/control_room)
@@ -261,24 +261,24 @@
 "GL" = (/turf/unsimulated/floor/asteroid,/area/vault/mothership_lab/asteroid)
 "GZ" = (/obj/structure/rack,/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor{dir = 8; req_access_txt = "162"; req_one_access_txt = "162"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/vault/mothership_lab/entrance)
 "Hb" = (/turf/simulated/floor{dir = 4; icon_state = "stage_stairs"; tag = "icon-stage_stairs"},/area/vault/mothership_lab/control_room)
-"Hn" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"},/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/entrance)
+"Hn" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"},/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/entrance)
 "HC" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "asteroidplating"},/area/vault/mothership_lab/asteroid)
-"HI" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/entrance)
+"HI" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/entrance)
 "HL" = (/obj/effect/decal/cleanable/blood/drip{basecolor = "#2299FC"; blood_color = "#2299FC"},/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_upper)
-"HM" = (/turf/unsimulated/wall/rock{desc =  "This rock is very dense, and has thick metal struts to protect it from mining."; icon_state = "rock_rf0"},/area/vault/mothership_lab/raidtunnel_upper)
+"HM" = (/turf/unsimulated/wall/r_rock,/area/vault/mothership_lab/raidtunnel_upper)
 "HQ" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/entrance)
 "Ic" = (/obj/structure/ladder{height = 1; id = "labladder_5"; name = "Administration Deck Access"},/turf/simulated/floor/plating,/area/vault/mothership_lab/control_room)
 "Io" = (/obj/structure/table/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "checkpointshutters1"; name = "Checkpoint Blast Doors"; opacity = 0},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/entrance)
 "Iq" = (/obj/structure/reagent_dispensers/sacid,/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "Iv" = (/obj/machinery/light/he{dir = 4},/obj/structure/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "darkred"; tag = "icon-darkred"},/area/vault/mothership_lab/entrance)
-"Iz" = (/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/control_room)
+"Iz" = (/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/control_room)
 "IF" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor,/area/vault/mothership_lab/entrance)
 "II" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/turf/simulated/floor{dir = 6; icon_state = "dark"},/area/vault/mothership_lab/control_room)
 "IN" = (/obj/machinery/floodlight/on/infinite{anchored = 1},/turf/simulated/floor/greengrid,/area/vault/mothership_lab/entrance)
 "IX" = (/obj/structure/catwalk/invulnerable,/turf/simulated/floor/plating,/area/vault/mothership_lab/entrance)
 "Jr" = (/obj/structure/window/reinforced/plasma{dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/smalldisintegrator,/turf/simulated/floor{dir = 8; icon_state = "darkred"; tag = "icon-darkred (WEST)"},/area/vault/mothership_lab/control_room)
 "JB" = (/obj/structure/cage/autoclose/cover,/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/corpse/grey/worker,/obj/effect/decal/cleanable/blood{basecolor = "#CFAAAA"; blood_color = "#CFAAAA"; icon_state = "floor2"},/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_upper)
-"JN" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/unsimulated/wall{desc = "A reinforced wall with massive rivets embedded in the struts. You'd need a station-sized industrial laser to cut through this."; icon_state = "r_wall"; name = "riveted reinforced wall"},/area/vault/mothership_lab/entrance)
+"JN" = (/obj/structure/sign/securearea{desc = "A warning sign. It reads 'Secure GDR facility. Trespassers will be disintegrated.'"; name = "AUTHORIZED PERSONNEL ONLY"},/turf/unsimulated/wall/r_wall,/area/vault/mothership_lab/entrance)
 "JT" = (/obj/structure/table/flipped,/turf/simulated/floor,/area/vault/mothership_lab/entrance)
 "JX" = (/obj/structure/table/flipped{dir = 1},/turf/simulated/floor/greengrid,/area/vault/mothership_lab/entrance)
 "JY" = (/obj/machinery/door/airlock/silver{name = "Lab Entry Deck"; req_access_txt = "160"; req_one_access_txt = "160"},/obj/machinery/door/poddoor{id_tag = "labcheckpoint1"; name = "Checkpoint Blast Doors"},/turf/simulated/floor/greengrid,/area/vault/mothership_lab/entrance)
@@ -325,12 +325,12 @@
 "PJ" = (/turf/simulated/floor{icon_state = "stage_stairs"; tag = "icon-stage_stairs"},/area/vault/mothership_lab/control_room)
 "PN" = (/obj/structure/bed,/turf/simulated/floor{dir = 1; icon_state = "darkred"},/area/vault/mothership_lab/entrance)
 "PO" = (/obj/machinery/door_control{id_tag = "checkpointshutters1"; name = "Checkpoint Shutters"; pixel_x = 25; pixel_y = 25; req_access_txt = "162"; req_one_access_txt = "162"},/turf/simulated/floor{icon_state = "dark vault full"},/area/vault/mothership_lab/entrance)
-"Qm" = (/obj/effect/decal/warning_stripes{icon_state = "1"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/entrance)
+"Qm" = (/obj/effect/decal/warning_stripes{icon_state = "1"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/entrance)
 "Qs" = (/mob/living/simple_animal/hostile/humanoid/vox/spaceraider/medic{dir = 8},/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_upper)
 "Qz" = (/turf/simulated/wall/r_rock/porous,/area/vault/mothership_lab/raidtunnel_upper)
 "QI" = (/turf/simulated/floor/plating,/area/vault/mothership_lab/asteroid)
 "QR" = (/turf/simulated/floor,/area/vault/mothership_lab/control_room)
-"QT" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"},/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/entrance)
+"QT" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"},/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/entrance)
 "Rg" = (/obj/machinery/camera{dir = 1; id_tag = "labcameras"; name = "Entry Deck Checkpoint 1"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor,/area/vault/mothership_lab/entrance)
 "Rl" = (/turf/unsimulated/mineral/uranium,/area/vault/mothership_lab/asteroid)
 "Rv" = (/obj/structure/closet/secure_closet/guncabinet{anchored = 1; name = "raider ammunition cabinet"; req_access = null},/obj/item/ammo_storage/box/b380auto,/obj/item/ammo_storage/box/b380auto,/turf/simulated/floor/asteroid/air,/area/vault/mothership_lab/raidtunnel_upper)
@@ -402,7 +402,7 @@
 "Zy" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "asteroidfloor"},/area/vault/mothership_lab/asteroid)
 "ZM" = (/obj/machinery/camera{id_tag = "labcameras"; name = "Entry Deck Checkpoint 2"; network = list("MOTHERSHIPLAB")},/turf/simulated/floor,/area/vault/mothership_lab/entrance)
 "ZR" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; name = "EXTERNAL AIRLOCK"},/turf/simulated/wall,/area/vault/mothership_lab/asteroid)
-"ZT" = (/turf/simulated/wall/invulnerable/r_wall,/area/vault/mothership_lab/entrance)
+"ZT" = (/turf/simulated/wall/invulnerable/r_wall/mothership,/area/vault/mothership_lab/entrance)
 "ZW" = (/obj/machinery/camera{dir = 4; id_tag = "labcameras"; name = "Asteroid Exit Gate"; network = list("MOTHERSHIPLAB")},/turf/unsimulated/floor/asteroid,/area/vault/mothership_lab/asteroid)
 
 (1,1,1) = {"
@@ -416,7 +416,7 @@ zrzrzrzrMDMDMDMDMDMDMDGEMDMDMDMDMDMDMDmvMDRlRlMDMDMDMDmvMDMDMDMDMDYFHIZTZTZTZTZT
 zrzrzrzrMDMDMDmvmvMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDMDRlRlYFHInLFfgjLKLKaTLKZTdiLKssZTvtbIbIbITjZTvtbITjZTvtbIlZZMTjHIHIJNHnMlGLyAGLGLYFMDzrzrzr
 zrzrzrMDMDMDYFYFYFYFYFYFYFYFYFYFYFMDMDMDMDMDMDMDMDMDMDMDMDMDMDRlYFHIHIFfxYZTPfLKLKLKpkLKLKLKeRuKuKuKuKuKaKuKuKuKpTuKuKuKuKuKJYuKoSOsWJeQeQeQGLGLYFMDzrzr
 zrzrzrMDMDYFgDIzIzIzIzIzIzIzIzIzjQYFAqYFYFYFYFYFYFYFYFYFYFYFYFYFYFHIykFfEUZTLgUHksTtZTjqqfIvZTqeRgbIrpwGZTBouKbIZTqebIbIbIwGHIHIJNHINqGLGLeQeQGLYFMDzrzr
-zrzrMDMDYFgDIzoolnlooMqurwsNthIzIzjQYFHIHIHIHIHIHIHIHIHIHIHIHIHIHIHIZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTvzZTZTZTbIuKolZTZTIoxTIoZTHIYFYFYFYFYFGLGLeQGLYFMDMDzr
+zrzrMDMDYFgDIzIzlnlooMqurwsNthIzIzjQYFHIHIHIHIHIHIHIHIHIHIHIHIHIHIHIZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTvzZTZTZTbIuKolZTZTIoxTIoZTHIYFYFYFYFYFGLGLeQGLYFMDMDzr
 zrMDMDYFgDIzxOCpCxPHDYIIDYPHOKSaWdIzjQHIIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXyQDEyQRzZTbIjsuKLWLKjepMPOxWHIYFAqAqMDYFAufseIfsAuMDMDzr
 zrMDYFIzIzxOcHPHPHvpPHEMPHvpPHPHXHWdIzIzIXZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTZTzKZTIXZTqeuKwGZTGGqsCLqCjLHIYFMDMDMDMDNfZWeQXdNfMDMDzr
 zrMDYFIzxOcHEMvpPHEaEauGEaEaPHvpEMXHWdIzIXZTZTZTVmgwaMaMaMaMaMaMaMaMnUaMaMaMaMaMaMaMaMgwyjZTIFDEjYgnZTIXZTQmDoQmZTZTZTZTZTZTHIYFMDMDMDMDAuGLeQGLAuMDMDzr