diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/RandomRuins/SandRuins/whitesands_brazillianlab.dmm
similarity index 54%
rename from _maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
rename to _maps/RandomRuins/SandRuins/whitesands_brazillianlab.dmm
index 4954a9a5aaf4..cf8a967fb101 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_brazillianlab.dmm
@@ -1,14 +1,15 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ae" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/mineral/wood/nonmetal,
+/turf/open/floor/wood{
+	icon_state = "wood-broken";
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
 /area/ruin/unpowered)
 "aS" = (
 /obj/machinery/iv_drip,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 1
-	},
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -18,9 +19,6 @@
 /area/template_noop)
 "bq" = (
 /obj/structure/table/wood/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
-	pixel_y = 12
-	},
 /obj/item/reagent_containers/food/drinks/drinkingglass{
 	pixel_x = 8;
 	pixel_y = 2
@@ -34,112 +32,180 @@
 	},
 /area/ruin/unpowered)
 "bv" = (
-/obj/effect/decal/cleanable/blood/splatter,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/green/half,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "bB" = (
 /obj/structure/flora/rock/jungle,
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
-	},
+/obj/structure/destructible/tribal_torch/lit,
 /turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "cr" = (
 /obj/structure/barricade/sandbags,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/turf/open/floor/plating/asteroid/whitesands/grass/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "ct" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
-	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "cH" = (
-/turf/open/floor/carpet/blue{
+/obj/structure/fermenting_barrel,
+/turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"cN" = (
+/obj/structure/girder/displaced,
+/obj/structure/railing/wood{
+	dir = 4
+	},
+/obj/structure/railing/wood{
+	dir = 8
+	},
+/turf/open/floor/plating/asteroid/whitesands/dried/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"cS" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "dz" = (
 /obj/structure/table/wood/fancy/green,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+/obj/item/ammo_box/a12g{
+	pixel_y = 6
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/unpowered)
+"eC" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
+"eD" = (
+/obj/structure/flora/ash/stem_shroom,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "fd" = (
-/obj/structure/barricade/wooden/crude/snow,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/obj/structure/table/optable,
+/turf/open/floor/plasteel/white{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
 /area/ruin/unpowered)
 "fz" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 4
+/obj/structure/table/wood/fancy/green,
+/obj/item/ammo_casing/shotgun/improvised{
+	pixel_y = 4;
+	pixel_x = -4
 	},
-/turf/open/floor/plasteel/white{
-	initial_gas_mix = "ICEMOON_ATMOS"
+/obj/item/ammo_casing/shotgun/improvised{
+	pixel_y = 4;
+	pixel_x = 4
+	},
+/obj/item/ammo_casing/shotgun/improvised{
+	pixel_y = 4;
+	pixel_x = 8
+	},
+/obj/item/ammo_casing/shotgun/improvised{
+	pixel_y = 4
+	},
+/obj/item/ammo_casing/shotgun/improvised{
+	pixel_y = 4;
+	pixel_x = -8
 	},
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "fB" = (
 /obj/structure/chair/stool/bar,
 /mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
+	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."
 	},
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"fI" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
 "fK" = (
-/obj/structure/flora/grass/both,
-/turf/open/floor/plating/asteroid/snow/icemoon,
+/obj/structure/flora/rock,
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
+"fO" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/reagent_containers/food/snacks/rationpack{
+	pixel_y = 7
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
 /area/ruin/unpowered)
+"gk" = (
+/obj/structure/flora/rock,
+/turf/open/floor/plating/asteroid/whitesands/dried/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "gH" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{
-	faction = list("brazillian")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger,
 /turf/open/floor/carpet/green{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "hg" = (
-/obj/structure/barricade/wooden/snowed,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/structure/curtain/cloth/grey{
+	open = 0;
+	icon_state = "bathroom-closed";
+	opacity = 1
 	},
+/turf/open/floor/plating,
 /area/ruin/unpowered)
 "hp" = (
 /obj/item/stack/cable_coil,
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "hr" = (
-/turf/closed/wall/mineral/wood/nonmetal,
-/area/overmap_encounter/planetoid/cave/explored)
+/turf/open/floor/plating/asteroid/whitesands/dried{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
 "ht" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/corner/opaque/green{
+	dir = 9
+	},
+/turf/open/floor/plasteel/white{
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/area/ruin/unpowered)
 "hA" = (
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
+/obj/structure/destructible/tribal_torch/lit,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"hN" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood{
+	icon_state = "wood-broken3";
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/area/ruin/unpowered)
 "hO" = (
 /obj/structure/flora/tree/jungle,
 /turf/open/floor/plating/grass/jungle{
@@ -147,9 +213,10 @@
 	},
 /area/ruin/unpowered)
 "hR" = (
-/obj/structure/flora/rock/icy,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/mob/living/simple_animal/hostile/human/hermit/survivor,
+/obj/structure/chair/plastic,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "hT" = (
 /obj/structure/flora/grass/jungle/b,
 /obj/item/cultivator/rake,
@@ -159,27 +226,46 @@
 /area/ruin/unpowered)
 "ib" = (
 /obj/structure/table/wood,
+/obj/item/reagent_containers/food/snacks/onionrings{
+	pixel_y = 7
+	},
+/obj/item/spacecash/bundle/c1{
+	pixel_x = -6;
+	pixel_y = -13
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"iu" = (
-/obj/item/restraints/handcuffs/cable,
+"is" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
 /turf/open/floor/wood{
+	icon_state = "wood-broken3";
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"iu" = (
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
+	},
+/turf/open/floor/carpet/green,
+/area/ruin/unpowered)
 "jn" = (
-/obj/item/ammo_casing/spent,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
-"jy" = (
-/obj/structure/chair/wood{
-	dir = 1
+/obj/structure/table/wood/reinforced,
+/obj/item/reagent_containers/glass/rag{
+	pixel_x = 8;
+	pixel_y = 3
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
+/area/ruin/unpowered)
+"jy" = (
+/obj/structure/chair/wood,
 /mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
+	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
@@ -187,22 +273,41 @@
 /area/ruin/unpowered)
 "jU" = (
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 5
+	},
+/obj/effect/turf_decal/corner/opaque/green/half{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "kD" = (
-/obj/item/storage/toolbox/drone,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/stack/cable_coil/yellow{
+	pixel_y = -10
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"kF" = (
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/unpowered)
 "kQ" = (
-/obj/structure/bed,
-/obj/structure/curtain,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/turf_decal/corner/opaque/green/border,
+/obj/effect/turf_decal/corner/opaque/green/three_quarters{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/blood/innards,
+/obj/item/reagent_containers/glass/bucket{
+	pixel_x = 9;
+	pixel_y = 15
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -211,62 +316,113 @@
 /turf/closed/wall/mineral/wood/nonmetal,
 /area/ruin/unpowered)
 "lu" = (
-/obj/structure/barricade/wooden/snowed,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "lA" = (
-/obj/structure/table,
 /obj/item/weaponcrafting/stock{
 	pixel_x = 8;
 	pixel_y = 3
 	},
 /obj/item/stack/cable_coil/blue,
 /obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+/obj/structure/table,
+/obj/item/screwdriver/old{
+	pixel_y = 20
 	},
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
+"mi" = (
+/obj/structure/railing/wood{
+	dir = 8
+	},
+/obj/structure/railing/wood{
+	dir = 4
+	},
+/obj/structure/girder/displaced,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "mn" = (
-/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/food/drinks/soda_cans/cola{
+	pixel_x = -11;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{
+	pixel_y = -6;
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch{
+	pixel_y = 8
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "mo" = (
-/obj/structure/flora/grass/brown,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"mq" = (
+/obj/item/stack/sheet/mineral/wood/twentyfive{
+	pixel_x = 8;
+	pixel_y = -9
+	},
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
+"mv" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
+"mz" = (
+/turf/closed/wall/rust,
+/area/overmap_encounter/planetoid/sand/explored)
 "mM" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
-	},
+/obj/structure/destructible/tribal_torch/lit,
 /turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+	icon_state = "wood-broken6"
 	},
 /area/ruin/unpowered)
 "nf" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/meat/steak/bear,
-/obj/item/reagent_containers/food/snacks/meat/steak/goliath{
-	pixel_x = 4;
-	pixel_y = 3
+/obj/structure/flora/ash/stem_shroom,
+/turf/open/floor/plating/asteroid/whitesands/dried/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"nn" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "nF" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/cannabis,
-/turf/open/floor/plating/grass/jungle{
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/ammo_box/magazine/zip_ammo_9mm{
+	pixel_x = -5
+	},
+/obj/item/ammo_box/magazine/zip_ammo_9mm{
+	pixel_x = -9
+	},
+/obj/item/ammo_box/a762_stripper{
+	pixel_x = 9;
+	pixel_y = 13
+	},
+/obj/item/ammo_box/a762_stripper{
+	pixel_x = 9;
+	pixel_y = 7
+	},
+/obj/item/ammo_box/a762_stripper{
+	pixel_x = 9;
+	pixel_y = 1
+	},
+/turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
@@ -277,10 +433,8 @@
 	},
 /area/ruin/unpowered)
 "oo" = (
-/obj/structure/table,
-/obj/machinery/recharger,
 /turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+	icon_state = "wood-broken5"
 	},
 /area/ruin/unpowered)
 "oR" = (
@@ -290,19 +444,34 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"pf" = (
-/obj/item/weaponcrafting/receiver{
-	pixel_x = -16;
-	pixel_y = -8
+"pa" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
+/area/ruin/unpowered)
+"pf" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken";
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"pn" = (
+/obj/item/target,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/unpowered)
+"pu" = (
+/obj/structure/flora/rock,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "ql" = (
-/obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/green{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -320,34 +489,46 @@
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "qC" = (
 /obj/structure/bed,
 /obj/structure/curtain,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 1
-	},
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "qD" = (
-/obj/structure/flora/tree/pine,
-/obj/structure/flora/tree/pine,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/flora/ash/tall_shroom,
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
 "qS" = (
 /mob/living/simple_animal/hostile/human/hermit/survivor{
 	desc = "The greatest chef this side of the wastes.";
-	faction = list("brazillian");
 	health = 150;
 	name = "Margarine"
 	},
-/turf/open/floor/wood{
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/carpet/green,
+/area/ruin/unpowered)
+"qT" = (
+/obj/item/wrench,
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
+"rs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/green/border,
+/turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
@@ -369,16 +550,11 @@
 /area/ruin/unpowered)
 "sf" = (
 /obj/structure/table/wood,
-/obj/item/nullrod{
-	block_chance = 50;
-	desc = "This massive chart appears to be the layout of a SolGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy.";
-	icon_state = "blueprints";
-	item_state = "blueprints";
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
-	name = "facility blueprints";
-	pixel_y = 10;
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi';
-	w_class = 5
+/obj/item/toy/cards/deck{
+	pixel_y = 12
+	},
+/obj/item/spacecash/bundle/c10{
+	pixel_x = 9
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
@@ -391,36 +567,88 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"sj" = (
+/obj/structure/girder/reinforced,
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
+"sA" = (
+/obj/structure/flora/ash/stem_shroom,
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
 "sE" = (
-/obj/structure/flora/grass/green,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/turf/closed/mineral/random/whitesands,
+/area/overmap_encounter/planetoid/sand/explored)
 "te" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/ruin/unpowered)
+/obj/structure/flora/tree/cactus,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "tf" = (
-/obj/item/weaponcrafting/stock,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood{
+/obj/structure/flora/ash/fern,
+/turf/open/floor/plating/asteroid/whitesands/grass/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"tx" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/carpet/blue{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"uv" = (
-/turf/open/floor/plasteel/white{
+"tY" = (
+/mob/living/simple_animal/bot/secbot/ed209/rockplanet{
+	faction = list("hermit")
+	},
+/obj/structure/curtain/cloth/fancy,
+/turf/open/floor/carpet/red_gold,
+/area/ruin/unpowered)
+"un" = (
+/obj/structure/flora/ash/puce,
+/turf/open/floor/plating/asteroid/whitesands/dried{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
+"uq" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"uv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/unpowered)
 "uG" = (
 /obj/structure/flora/grass/jungle/b,
 /turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"vg" = (
+/obj/item/stack/sheet/metal/ten{
+	pixel_x = -9
+	},
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
 "vi" = (
 /obj/structure/flora/rock/pile,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"vr" = (
+/obj/item/toy/plush/moth/snow{
+	pixel_x = 17;
+	pixel_y = -5
+	},
+/turf/open/floor/plating/asteroid/snow/lit/whitesands,
+/area/overmap_encounter/planetoid/sand/explored)
 "vH" = (
 /obj/structure/flora/junglebush/b,
 /obj/item/reagent_containers/glass/bucket/wooden,
@@ -430,6 +658,11 @@
 /area/ruin/unpowered)
 "vR" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/corner/opaque/green/bordercorner,
+/obj/effect/turf_decal/corner/opaque/green/bordercorner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood/gibs/core,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -447,9 +680,10 @@
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
 	},
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "wh" = (
 /obj/structure/flora/tree/jungle/small,
@@ -459,49 +693,84 @@
 /area/ruin/unpowered)
 "wk" = (
 /obj/structure/table/wood/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
-	pixel_x = 8;
-	pixel_y = 2
+/obj/item/reagent_containers/food/snacks/meat/steak/meatproduct,
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"wm" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/wine{
+	pixel_x = 7;
+	pixel_y = 16
+	},
+/obj/item/food/spaghetti/pastatomato{
+	pixel_y = 3
+	},
+/obj/item/candle/infinite{
+	pixel_y = 17
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"wn" = (
+/obj/structure/flora/stump,
+/turf/open/floor/plating/asteroid/whitesands/grass/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "xg" = (
-/obj/structure/flora/tree/pine,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/flora/tree/tall/whitesands,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"xj" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"xm" = (
+/obj/structure/table,
+/obj/item/weaponcrafting/receiver{
+	pixel_x = -7;
+	pixel_y = -3
+	},
+/obj/item/weaponcrafting/stock{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/turf/open/floor/concrete/slab_1,
+/area/ruin/unpowered)
 "xu" = (
-/obj/structure/bed,
-/obj/structure/curtain,
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
-	},
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 1
+/obj/structure/bed/roller,
+/obj/effect/turf_decal/corner/opaque/green{
+	dir = 8
 	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "xI" = (
-/turf/open/floor/plating/asteroid/snow/icemoon,
+/turf/closed/wall/concrete,
 /area/ruin/unpowered)
 "xK" = (
-/obj/structure/statue/snow/snowman,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/flora/ash/cacti,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "xN" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/ruin/unpowered)
-"xQ" = (
-/obj/item/clothing/neck/stethoscope,
-/obj/structure/closet/secure_closet/medical1,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/flashlight/lantern{
+	on = 1;
+	pixel_x = -10;
+	pixel_y = 17
+	},
+/turf/open/floor/plasteel/white{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"xQ" = (
+/obj/item/clothing/neck/stethoscope,
+/obj/structure/closet/secure_closet/medical1,
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/syringe,
@@ -509,6 +778,9 @@
 /obj/item/stack/medical/suture,
 /obj/item/stack/sheet/cotton/cloth/ten,
 /obj/item/stack/sheet/cotton/cloth/ten,
+/obj/effect/turf_decal/corner/opaque/green/three_quarters{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -517,37 +789,60 @@
 /obj/structure/bed,
 /obj/structure/curtain,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/green/border,
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"yp" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
 "yr" = (
-/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/turf_decal/corner/opaque/green/border,
 /obj/machinery/space_heater,
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "zi" = (
-/obj/structure/flora/grass/both,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
-"zy" = (
-/mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
+/mob/living/simple_animal/bot/secbot{
+	desc = "A little security robot.  He looks downright furious!";
+	emagged = 2;
+	name = "\improper Officer Hermitsky";
+	faction = list("neutral","silicon","turret","hermit")
+	},
+/obj/structure/closet/crate/critter{
+	name = "DANGER: DO NOT OPEN"
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"zj" = (
+/obj/structure/chair/wood{
+	dir = 1
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken3";
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/ruin/unpowered)
+"zy" = (
+/mob/living/simple_animal/hostile/human/hermit/survivor,
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "Al" = (
 /obj/structure/chair/wood{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -559,9 +854,8 @@
 	pixel_x = 8;
 	pixel_y = 3
 	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "AN" = (
 /obj/structure/table/wood/reinforced,
@@ -580,14 +874,13 @@
 	pixel_x = 8;
 	pixel_y = 4
 	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "Br" = (
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
+/obj/structure/destructible/tribal_torch/lit,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
@@ -599,12 +892,30 @@
 	},
 /area/ruin/unpowered)
 "BL" = (
-/obj/item/weaponcrafting/receiver,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/assembly/igniter{
+	pixel_x = -9;
+	pixel_y = -14
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"BQ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"Cc" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/unpowered)
 "Cl" = (
 /obj/item/candle/infinite{
 	pixel_y = 4
@@ -633,21 +944,31 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"CI" = (
-/obj/structure/flora/junglebush/c,
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
-	},
-/turf/open/floor/plating/grass/jungle{
-	initial_gas_mix = "ICEMOON_ATMOS"
+"Cn" = (
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
+/obj/structure/chair/plastic{
+	dir = 8
 	},
-/area/ruin/unpowered)
+/turf/open/floor/plating/asteroid/snow/lit/whitesands,
+/area/overmap_encounter/planetoid/sand/explored)
+"CI" = (
+/obj/structure/girder/reinforced,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "CL" = (
 /obj/structure/bookcase/random,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"CN" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/carpet/blue{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
 "CS" = (
 /obj/machinery/hydroponics/soil,
 /turf/open/floor/plating/grass/jungle{
@@ -656,53 +977,100 @@
 /area/ruin/unpowered)
 "CT" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Da" = (
-/obj/machinery/rnd/production/protolathe/department/security,
+/obj/structure/destructible/tribal_torch/lit,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"DH" = (
-/obj/structure/railing,
-/obj/item/flashlight/lantern{
-	on = 1
-	},
-/turf/open/floor/wood{
+"DA" = (
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger,
+/turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"DH" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/asteroid/snow/lit/whitesands,
+/area/overmap_encounter/planetoid/sand/explored)
 "DX" = (
 /obj/structure/flora/rock/jungle,
 /turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"DY" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/ruin/unpowered)
 "Eg" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"Ep" = (
+/obj/machinery/pipedispenser,
+/turf/open/floor/concrete/slab_1,
+/area/ruin/unpowered)
 "Ex" = (
-/obj/structure/flora/grass/brown,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/flora/tree/tall/whitesands,
+/turf/open/floor/plating/asteroid/whitesands/grass/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"EW" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/carpet/blue{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
 "Fh" = (
-/obj/structure/statue/snow/snowlegion,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
-"Gc" = (
-/obj/machinery/pipedispenser,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/obj/structure/girder,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"FB" = (
+/obj/structure/barricade/wooden/crude,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"FI" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/carpet/blue{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"FK" = (
+/obj/item/stack/tape/industrial{
+	pixel_x = 12
+	},
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
+"FU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/clothing/ears/earmuffs,
+/obj/item/clothing/ears/earmuffs{
+	pixel_x = -8
+	},
+/obj/item/clothing/ears/earmuffs{
+	pixel_x = 8
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
 /area/ruin/unpowered)
+"Gc" = (
+/turf/open/floor/plating/asteroid/whitesands/grass/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "Ge" = (
 /obj/structure/flora/grass/jungle/b,
 /obj/effect/turf_decal/siding/wood{
@@ -713,9 +1081,14 @@
 	},
 /area/ruin/unpowered)
 "Gl" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/eggplant/eggy,
-/turf/open/floor/plating/grass/jungle{
+/obj/structure/barricade/wooden,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"Gt" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
@@ -725,80 +1098,115 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"GO" = (
+/obj/structure/destructible/tribal_torch/lit,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/carpet/green,
+/area/ruin/unpowered)
 "GU" = (
 /turf/open/floor/carpet/orange{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Hb" = (
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
-"HI" = (
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
+"Ht" = (
+/obj/structure/table/wood,
+/obj/item/food/spaghetti/pastatomato{
+	pixel_y = 8
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
-/area/overmap_encounter/planetoid/cave/explored)
+/area/ruin/unpowered)
+"HI" = (
+/turf/open/floor/plating/asteroid/whitesands/dried/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "HV" = (
 /obj/item/target/alien/anchored,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "Il" = (
-/obj/vehicle/ridden/atv,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/ruin/unpowered)
-"Iz" = (
-/obj/structure/rack,
-/obj/item/clothing/ears/earmuffs,
-/obj/item/clothing/ears/earmuffs,
-/obj/item/clothing/ears/earmuffs,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"Iz" = (
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
 "IE" = (
 /obj/machinery/iv_drip,
-/obj/effect/turf_decal/corner/opaque/green/border,
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
+/obj/item/stack/medical/gauze/improvised{
+	pixel_x = -16
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"IZ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken7"
+	},
+/area/ruin/unpowered)
 "Jt" = (
 /obj/effect/turf_decal/siding/wood,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/obj/item/storage/toolbox/drone{
+	pixel_x = 8;
+	pixel_y = 9
+	},
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "JK" = (
-/obj/item/seeds/glowshroom,
-/turf/open/floor/plating/grass/jungle{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/turf/open/floor/concrete/slab_4,
 /area/ruin/unpowered)
 "JM" = (
 /obj/structure/bed,
 /obj/structure/curtain,
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
 /obj/effect/turf_decal/corner/opaque/green/border,
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
+/obj/effect/decal/cleanable/vomit/old,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"Kb" = (
+/obj/machinery/recharge_station,
+/turf/open/floor/carpet/red_gold,
+/area/ruin/unpowered)
 "Kl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Kt" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 4
+/obj/effect/turf_decal/corner/opaque/green/three_quarters,
+/obj/effect/decal/cleanable/blood/gibs/up,
+/turf/open/floor/plasteel/white{
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
-/obj/item/flashlight/lantern{
-	on = 1
+/area/ruin/unpowered)
+"Lv" = (
+/obj/structure/destructible/tribal_torch/lit,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/turf/open/floor/plasteel/white{
+/turf/open/floor/wood{
+	icon_state = "wood-broken2";
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
@@ -819,17 +1227,18 @@
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "LA" = (
 /obj/structure/chair/stool/bar{
 	dir = 4
 	},
 /mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
+	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
@@ -837,9 +1246,6 @@
 /area/ruin/unpowered)
 "LB" = (
 /obj/effect/decal/cleanable/blood/old,
-/mob/living/simple_animal/bot/secbot/ed209/rockplanet{
-	faction = list("brazillian")
-	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -859,6 +1265,30 @@
 /area/ruin/unpowered)
 "LR" = (
 /obj/effect/decal/cleanable/blood,
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/green/border,
+/turf/open/floor/plasteel/white{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"Mg" = (
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 4
+	},
+/turf/open/floor/plating/grass/jungle{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"Mz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/green/three_quarters{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -871,9 +1301,11 @@
 /area/ruin/unpowered)
 "MM" = (
 /obj/effect/decal/cleanable/blood/tracks{
-	dir = 4
+	dir = 10
+	},
+/obj/effect/turf_decal/corner/opaque/green/half{
+	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -886,67 +1318,74 @@
 	},
 /area/ruin/unpowered)
 "NG" = (
-/obj/structure/table,
-/obj/item/ammo_box/magazine/zip_ammo_9mm,
-/obj/item/ammo_box/magazine/zip_ammo_9mm,
+/obj/structure/guncloset,
+/obj/item/gun/ballistic/rifle/polymer,
 /obj/item/gun/ballistic/automatic/zip_pistol,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"NL" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/ruin/unpowered)
 "NR" = (
-/mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
-	},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
+/obj/structure/chair/plastic,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "NY" = (
-/obj/structure/barricade/wooden/snowed,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/ruin/unpowered)
+/turf/open/floor/plating/asteroid/snow/lit/whitesands,
+/area/overmap_encounter/planetoid/sand/explored)
+"Op" = (
+/obj/structure/statue/snow/snowman,
+/turf/open/floor/plating/asteroid/snow/lit/whitesands,
+/area/overmap_encounter/planetoid/sand/explored)
 "OA" = (
 /obj/structure/table/wood/reinforced,
 /obj/item/reagent_containers/glass/maunamug,
+/obj/item/reagent_containers/food/snacks/cracker{
+	pixel_x = 12;
+	pixel_y = 7
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Pb" = (
-/obj/structure/bed/roller,
 /obj/effect/decal/cleanable/blood/gibs/down,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/green/bordercorner,
+/mob/living/simple_animal/hostile/human/hermit/survivor{
+	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Pm" = (
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
-	},
+/obj/structure/destructible/tribal_torch/lit,
 /turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Ps" = (
 /obj/structure/table/wood,
-/obj/item/screwdriver/old{
-	pixel_y = 20
+/obj/item/reagent_containers/food/snacks/meat/steak/meatproduct{
+	pixel_y = 6
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Pu" = (
-/obj/structure/flora/tree/pine/xmas,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/flora/ash/puce,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "Qk" = (
-/obj/structure/table/wood/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer,
-/turf/open/floor/wood{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/green/three_quarters{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
@@ -957,12 +1396,17 @@
 	},
 /area/ruin/unpowered)
 "Qm" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/corn,
-/turf/open/floor/plating/grass/jungle{
+/turf/open/floor/wood{
+	icon_state = "wood-broken3";
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"Rq" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "Sd" = (
 /obj/item/gun/ballistic/shotgun/doublebarrel/brazil{
 	pixel_x = 8
@@ -982,24 +1426,39 @@
 /obj/item/ammo_casing/shotgun/improvised,
 /obj/item/ammo_casing/shotgun/improvised,
 /obj/structure/closet/secure_closet,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "Sj" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/space_heater,
 /obj/effect/turf_decal/corner/opaque/green/border{
-	dir = 1
+	dir = 4
+	},
+/turf/open/floor/plasteel/white{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"SB" = (
+/obj/structure/bed,
+/obj/structure/curtain,
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/human/hermit/survivor{
+	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body."
+	},
+/obj/effect/turf_decal/corner/opaque/green/diagonal,
+/obj/item/reagent_containers/syringe{
+	pixel_x = -11
 	},
-/obj/machinery/space_heater,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "To" = (
-/obj/structure/barricade/wooden/crude/snow,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/flora/ash/cap_shroom,
+/turf/open/floor/plating/asteroid/whitesands{
+	light_range = 2
+	},
+/area/overmap_encounter/planetoid/sand/explored)
 "Tw" = (
 /obj/item/candle/infinite{
 	pixel_x = 10;
@@ -1035,22 +1494,18 @@
 	},
 /area/ruin/unpowered)
 "TA" = (
-/obj/structure/railing,
 /turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
+	icon_state = "wood-broken7"
 	},
 /area/ruin/unpowered)
 "TL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/hatchet,
-/obj/item/hatchet,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/ruin/unpowered)
+/obj/structure/barricade/sandbags,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "Ul" = (
 /obj/effect/turf_decal/siding/wood,
-/turf/open/floor/plating/asteroid/snow/icemoon,
+/obj/structure/railing,
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "Uu" = (
 /obj/structure/table/wood/reinforced,
@@ -1065,20 +1520,31 @@
 	pixel_x = 8;
 	pixel_y = 4
 	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "Ux" = (
-/mob/living/simple_animal/hostile/human/hermit/ranged/hunter{
-	faction = list("brazillian")
-	},
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
 /turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"UE" = (
+/mob/living/simple_animal/hostile/human/hermit/ranged/hunter,
+/turf/open/floor/plating/asteroid/whitesands/grass/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "Vt" = (
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/obj/structure/barricade/wooden,
+/obj/structure/barricade/wooden/crude,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/ruin/unpowered)
+"Vy" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/railing,
+/obj/item/flashlight/lantern{
+	on = 1
+	},
+/turf/open/floor/concrete/slab_1,
 /area/ruin/unpowered)
 "VB" = (
 /obj/structure/table/wood/reinforced,
@@ -1088,23 +1554,31 @@
 /area/ruin/unpowered)
 "VI" = (
 /obj/structure/flora/rock/pile,
-/turf/open/floor/plating/asteroid/snow/icemoon,
+/turf/open/floor/plating/asteroid/whitesands/lit,
 /area/ruin/unpowered)
+"VR" = (
+/mob/living/simple_animal/hostile/human/hermit/survivor,
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
 "VS" = (
-/obj/structure/flora/grass/jungle/b,
-/turf/open/floor/plasteel/white{
-	initial_gas_mix = "ICEMOON_ATMOS"
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
+/turf/open/floor/carpet/green,
 /area/ruin/unpowered)
 "VX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/ammo_casing/shotgun/improvised,
-/obj/item/ammo_casing/shotgun/improvised,
-/obj/item/ammo_casing/shotgun/improvised,
-/obj/item/ammo_casing/shotgun/improvised,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/obj/structure/table/wood/reinforced,
+/obj/item/reagent_containers/food/drinks/bottle/sarsaparilla{
+	pixel_y = 8;
+	pixel_x = -13
+	},
+/obj/item/reagent_containers/food/drinks/bottle/tequila{
+	pixel_x = 13;
+	pixel_y = 10
+	},
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
 /area/ruin/unpowered)
 "WH" = (
 /turf/open/floor/wood{
@@ -1113,24 +1587,47 @@
 /area/ruin/unpowered)
 "Xq" = (
 /obj/structure/table,
-/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular{
+	pixel_y = 12
+	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/reagent_containers/food/snacks/soup/vegetable,
+/obj/item/storage/pill_bottle/iron{
+	pixel_x = 12;
+	pixel_y = 8
+	},
+/obj/effect/turf_decal/corner/opaque/green/three_quarters{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "XD" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 1
+	dir = 9
+	},
+/turf/open/floor/carpet/green,
+/area/ruin/unpowered)
+"XH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/machinery/recharger,
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
 	},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/area/ruin/unpowered)
+"XK" = (
+/obj/structure/chair/plastic{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/sand/explored)
 "XL" = (
 /obj/structure/table/wood/reinforced,
-/obj/item/reagent_containers/food/drinks/drinkingglass{
-	pixel_x = -6;
-	pixel_y = 4
+/obj/item/reagent_containers/food/drinks/sillycup/smallcarton{
+	pixel_x = 9;
+	pixel_y = 7
 	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
@@ -1138,53 +1635,30 @@
 /area/ruin/unpowered)
 "Ya" = (
 /mob/living/simple_animal/bot/medbot/rockplanet{
-	faction = list("brazillian")
+	faction = list("hermit")
 	},
-/obj/effect/turf_decal/corner/opaque/green/border{
+/obj/effect/decal/cleanable/blood/tracks{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/opaque/green/three_quarters{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Yc" = (
 /obj/structure/table/wood/fancy/blue,
-/obj/structure/safe/floor{
-	maxspace = 99
-	},
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/lethalshot,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/techshell,
-/obj/item/ammo_casing/shotgun/meteorslug,
-/obj/item/ammo_casing/shotgun/meteorslug,
-/obj/item/ammo_casing/shotgun/meteorslug,
-/obj/item/ammo_casing/shotgun/laserscatter,
-/obj/item/ammo_casing/shotgun/laserscatter,
-/obj/item/ammo_casing/shotgun/laserscatter,
-/obj/item/ammo_casing/shotgun/pulseslug,
-/obj/item/ammo_casing/shotgun/pulseslug,
-/obj/item/ammo_casing/shotgun/pulseslug,
-/obj/item/key,
 /turf/open/floor/carpet/orange{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Yg" = (
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
+/obj/structure/destructible/tribal_torch/lit,
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 1
 	},
+/obj/effect/turf_decal/corner/opaque/green/border,
 /turf/open/floor/plasteel/white{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -1195,20 +1669,24 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
+"Yk" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/blue{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
+"Yv" = (
+/obj/structure/flora/ash/cap_shroom,
+/turf/open/floor/plating/asteroid/whitesands/dried/lit,
+/area/overmap_encounter/planetoid/sand/explored)
 "Yx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/rack_parts,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/structure/mineral_door/iron,
 /turf/open/floor/wood{
-	icon_state = "wood-broken3";
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Yy" = (
-/mob/living/simple_animal/hostile/human/hermit/survivor{
-	desc = " A wild-eyed figure, wearing tattered mining equipment and boasting a malformed body.";
-	faction = list("brazillian")
-	},
+/mob/living/simple_animal/hostile/human/hermit/survivor,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -1217,9 +1695,12 @@
 	},
 /area/ruin/unpowered)
 "YV" = (
-/obj/structure/flora/rock/pile/icy,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/overmap_encounter/planetoid/cave/explored)
+/obj/structure/destructible/tribal_torch/lit,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood{
+	initial_gas_mix = "ICEMOON_ATMOS"
+	},
+/area/ruin/unpowered)
 "YX" = (
 /turf/open/floor/plating/grass/jungle{
 	initial_gas_mix = "ICEMOON_ATMOS"
@@ -1229,28 +1710,33 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
-	},
+/obj/structure/destructible/tribal_torch/lit,
 /turf/open/floor/wood{
+	icon_state = "wood-broken";
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
 "Zd" = (
 /obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
+/turf/closed/wall/mineral/wood/nonmetal,
 /area/ruin/unpowered)
 "Zf" = (
-/obj/item/candle/tribal_torch{
-	name = "standing torch";
-	start_lit = 1
-	},
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/ruin/unpowered)
+/obj/structure/flora/ash/tall_shroom,
+/turf/open/floor/plating/asteroid/whitesands/lit,
+/area/overmap_encounter/planetoid/sand/explored)
+"Zh" = (
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/overmap_encounter/planetoid/sand/explored)
 "Zs" = (
 /obj/structure/table/wood,
-/obj/item/banhammer,
+/obj/item/reagent_containers/food/snacks/meat/steak/goliath{
+	pixel_x = 4;
+	pixel_y = 7
+	},
+/obj/item/spacecash/bundle/c5{
+	pixel_x = 15;
+	pixel_y = -2
+	},
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -1263,14 +1749,14 @@ aW
 aW
 aW
 aW
-Hb
-zi
-cr
-cr
-cr
-Hb
-Hb
-aW
+lu
+eD
+TL
+DH
+DH
+lu
+lu
+lu
 aW
 aW
 aW
@@ -1280,7 +1766,7 @@ aW
 aW
 aW
 lu
-Hb
+lu
 lu
 lu
 aW
@@ -1296,13 +1782,13 @@ aW
 aW
 aW
 aW
-Hb
-cr
-zi
-Hb
-kX
-Vt
+lu
+DH
+Cn
 NY
+lu
+kX
+NL
 kX
 kX
 kX
@@ -1311,11 +1797,11 @@ kX
 aW
 aW
 aW
-aW
-YV
-Hb
-cr
-Hb
+HI
+vi
+lu
+lu
+lu
 aW
 aW
 aW
@@ -1328,27 +1814,27 @@ aW
 aW
 aW
 aW
-aW
-cr
-Hb
-Hb
+NY
+DH
+NY
+vr
 NY
 Zd
-Vt
+pn
 Ul
 TA
 Eg
 NG
 kX
-aW
-aW
-aW
-aW
-Hb
-Hb
-Hb
-hr
-Hb
+kX
+HI
+HI
+HI
+lu
+lu
+lu
+lu
+lu
 lu
 aW
 "}
@@ -1359,26 +1845,26 @@ aW
 aW
 aW
 aW
-aW
-aW
-aW
-aW
-Hb
-fd
+lu
+HI
+NY
+NY
+Op
+NY
 Vt
 HV
-Ul
+Cc
 WH
 hp
 oo
+nF
 kX
-aW
-aW
-aW
-aW
+HI
+sj
 Hb
 Hb
-aW
+sE
+Hb
 To
 Hb
 Hb
@@ -1391,29 +1877,29 @@ aW
 aW
 aW
 aW
-aW
-aW
-aW
-aW
-Hb
-fd
-Vt
-xI
-Ul
-DH
+lu
+sE
+gk
+NY
+NY
+lu
+kX
+pn
+Vy
+WH
 LI
 CT
+XH
 kX
-aW
-Hb
-aW
-zi
+lu
+sE
+sE
+mz
+hr
+hr
 Hb
 Hb
-aW
-lu
 Hb
-xg
 aW
 "}
 (6,1,1) = {"
@@ -1422,108 +1908,108 @@ aW
 aW
 aW
 aW
-aW
-aW
-aW
-aW
-aW
-Hb
-kX
-kX
+lu
+lu
+lu
+HI
+NY
+lu
+lu
 kX
 kX
 kX
 WH
-Iz
+WH
+Da
+FU
 kX
-aW
-cr
-cr
+CI
+hr
 Hb
-zi
+sE
+hr
+sE
+sE
 Hb
-aW
-zi
 Hb
-cr
 aW
 "}
 (7,1,1) = {"
 aW
 aW
 aW
-kX
-kX
-kX
-kX
-kX
 aW
 aW
+lu
+mz
+lu
+HI
+HI
 xg
-Hb
-Hb
-Hb
+lu
+Pu
+kX
 zi
+LI
+WH
 kX
-iu
 kX
 kX
+lu
+sE
 Hb
-Hb
-cr
-Hb
-Hb
-Hb
-aW
+hr
+hr
+hr
 sE
-lu
-cr
+mz
 hr
+Hb
 "}
 (8,1,1) = {"
 aW
 aW
 aW
-kX
-te
-xN
-VX
-Gc
-xI
 aW
 aW
+lu
+lu
+sE
+lu
+HI
+HI
 kX
 kX
-NY
 kX
 kX
+WH
 kD
 oR
 kX
-Hb
-zi
-cr
+lu
+lu
 Hb
 Hb
-aW
-aW
 sE
-zi
+sE
+sE
 Hb
-To
+Hb
+sE
+hr
 "}
 (9,1,1) = {"
 aW
 aW
 aW
-kX
-Vt
-Eg
-LI
-Vt
-xI
 aW
 aW
+lu
+sE
+lu
+lu
+Yv
+HI
 kX
 Sf
 zy
@@ -1532,92 +2018,92 @@ LB
 BL
 mn
 hg
+lu
+lu
+To
+fK
+hr
 Hb
-Fh
-cr
-Hb
-aW
-aW
-aW
-Hb
-Hb
+mz
+hr
+un
 Hb
-lu
+hr
 "}
 (10,1,1) = {"
 aW
 aW
 aW
-kX
-Il
-Yx
-TL
-Zf
-fK
-xI
 aW
-kX
+lu
+lu
+lu
 Zf
-Vt
+lu
+lu
+HI
+kX
+Ep
+xm
 lA
 Da
-tf
+Eg
 pf
 hg
-YV
+lu
+cS
 Hb
+hr
+hr
+sE
+hr
+hr
+sE
 Hb
 aW
-aW
-aW
-aW
-xg
-cr
-lu
-aW
 "}
 (11,1,1) = {"
 aW
 aW
 aW
-kX
-kX
-kX
-kX
-kX
+aW
+sE
+lu
+HI
+HI
+lu
+xI
+xI
+xI
+xI
+xI
 xI
 xI
-aW
-kX
-kX
-kX
-kX
-kX
 ae
 Eg
 kX
-aW
+lu
+lu
 Hb
 Hb
-aW
-aW
-aW
 Hb
 Hb
 Hb
-To
+hr
+Hb
+Hb
 aW
 "}
 (12,1,1) = {"
 aW
 aW
 aW
-Hb
-cr
-aW
-aW
 aW
 aW
+HI
+HI
+xI
+xI
 xI
 YX
 YX
@@ -1625,30 +2111,30 @@ YX
 YX
 YX
 YX
-kX
+nn
 Ge
-kX
-aW
-Hb
-Hb
-cr
+xI
+Fh
+lu
+mv
+qD
 Hb
-hr
+sA
 Hb
-lu
+sE
+sE
 Hb
-hr
 aW
 "}
 (13,1,1) = {"
 aW
 aW
 aW
-Hb
-cr
 aW
 aW
 aW
+aW
+xI
 YX
 YX
 YX
@@ -1659,15 +2145,15 @@ YX
 uG
 uG
 YX
-kX
-aW
+xI
+HI
+lu
+hr
 Hb
-zi
-cr
+mv
 Hb
-To
+hr
 Hb
-To
 Hb
 aW
 aW
@@ -1676,11 +2162,11 @@ aW
 aW
 aW
 aW
-zi
-cr
 aW
 aW
 aW
+xI
+xI
 MI
 YX
 YX
@@ -1690,15 +2176,15 @@ Ql
 Nt
 si
 Tx
-YX
-aW
-cr
-Hb
+Ux
+xI
+xI
+lu
 hA
-cr
-Hb
+TL
+TL
 hr
-YV
+vi
 hr
 aW
 aW
@@ -1708,29 +2194,29 @@ aW
 aW
 aW
 aW
-cr
-cr
 aW
 aW
+aW
+xI
 MI
 YX
+Ux
 YX
 YX
-YX
-YX
-nF
-Gl
+CS
+CS
+CS
 hT
 MI
 YX
-CI
-cr
+GK
+xI
+lu
+lu
+lu
+hR
+TL
 lu
-Hb
-Hb
-NR
-cr
-Hb
 aW
 aW
 aW
@@ -1739,320 +2225,320 @@ aW
 (16,1,1) = {"
 aW
 aW
-Hb
-cr
-zi
 aW
 aW
+aW
+xI
+xI
 GK
-Ux
+YX
 YX
 Pm
-kX
-kX
-kX
-kX
+xI
+xI
+xI
+xI
 Pm
 YX
 MI
 YX
-aW
-YV
-aW
+xI
+xI
+HI
+lu
+lu
+TL
+lu
+lu
 lu
-Hb
-cr
-Hb
-Hb
-Hb
 aW
 aW
 "}
 (17,1,1) = {"
 aW
 aW
-Hb
-cr
-ht
 aW
-CI
+aW
+aW
+xI
+GK
 YX
 MI
-kX
-kX
-kX
-dz
+xI
+xI
+xI
 dz
-kX
-kX
-kX
+fz
+xI
+xI
+xI
 YX
 YX
 nG
-aW
-aW
+xI
+HI
+lu
+lu
+lu
+lu
+lu
+lu
 lu
-Hb
-Hb
-Hb
-Hb
-Hb
-Hb
 aW
 "}
 (18,1,1) = {"
 aW
 aW
-zi
-cr
-Hb
 aW
+aW
+aW
+xI
 YX
 MI
 MI
-kX
+xI
 CL
 Bw
 Bw
 gH
 Bw
 CL
-kX
+xI
 Pm
 MI
 MI
-aW
-aW
+xI
+xI
 kX
-aW
-aW
-Hb
-cr
-cr
+HI
+HI
+lu
+TL
+TL
 vi
 aW
 "}
 (19,1,1) = {"
 aW
 aW
-Hb
-cr
-Hb
 aW
+aW
+aW
+xI
 YX
 bB
-kX
-kX
+xI
+xI
 ct
 Bw
 GU
 GU
 Bw
-WH
-kX
-kX
+JK
+xI
+xI
 YX
 MI
 mM
 kX
 kX
 kX
-Hb
+lu
 hA
-Ex
-cr
-Hb
+lu
+TL
+lu
 aW
 "}
 (20,1,1) = {"
 aW
 aW
-qD
-cr
-Hb
 aW
+aW
+aW
+xI
 YX
 YX
-WH
-WH
-WH
+JK
+JK
+JK
 GU
 Sd
 Tw
 GU
-WH
-WH
-kX
+JK
+tY
+xI
 YX
 YX
 rP
-WH
-WH
-XD
-zi
-Hb
-jn
-cr
-Hb
+oo
+Yx
+mo
+lu
+lu
+lu
+TL
+lu
 aW
 "}
 (21,1,1) = {"
 aW
 aW
-Hb
-cr
-Hb
 aW
+aW
+aW
+xI
 YX
 YX
-WH
-WH
-WH
+JK
+JK
+JK
 GU
 Yc
 Cl
 GU
-WH
-WH
-kX
+JK
+Kb
+xI
 YX
 YX
 Yy
 WH
-WH
+Yx
 mo
-Hb
-Ex
-Hb
-Ex
-Hb
+lu
+lu
+lu
+lu
+lu
 aW
 "}
 (22,1,1) = {"
 aW
 aW
-Hb
-cr
-Hb
 aW
+aW
+aW
+xI
 YX
 Pm
-kX
-kX
+xI
+xI
 ct
 Bw
 GU
 GU
 Bw
-WH
-kX
-kX
+JK
+xI
+xI
 uG
 LC
 YZ
 kX
 kX
 kX
-Ex
-xK
-Ex
-cr
-zi
+lu
+lu
+lu
+TL
+lu
 aW
 "}
 (23,1,1) = {"
 aW
 aW
-zi
-cr
-Hb
 aW
+aW
+aW
+xI
 YX
 MI
 DX
-kX
+xI
 CL
 Bw
 Bw
 gH
 Bw
 CL
-kX
+xI
 Pm
 uG
 YX
-aW
-aW
+xI
+xI
 kX
-zi
+lu
 hA
-Hb
-Hb
-cr
-Hb
+lu
+lu
+TL
+lu
 aW
 "}
 (24,1,1) = {"
 aW
 aW
-Hb
-cr
-cr
 aW
-Ux
+aW
+aW
+xI
+YX
 MI
 MI
-kX
-kX
-kX
-dz
+xI
+xI
+xI
+fz
 dz
-kX
-kX
-kX
+xI
+xI
+xI
 YX
 YX
 GK
-aW
+xI
+Gl
+HI
+lu
 lu
-aW
-jn
-Hb
 NR
-cr
-cr
-Hb
+TL
+TL
+lu
 aW
 "}
 (25,1,1) = {"
 aW
 aW
 aW
-Hb
-cr
-Hb
 aW
+aW
+xI
+xI
 YX
 Ux
 YX
 Pm
-kX
-kX
-kX
-kX
+xI
+xI
+xI
+xI
 Pm
 YX
 YX
 nG
-aW
-aW
-lu
-aW
-aW
+xI
+xI
+Gl
+HI
+HI
 Pu
-cr
-cr
-Hb
+TL
+TL
+lu
 aW
 aW
 "}
@@ -2063,26 +2549,26 @@ aW
 aW
 aW
 aW
-aW
+xI
 Tx
 Tx
 YX
 YX
-YX
-JK
-YX
+CS
+CS
+CS
 YX
 Tx
 YX
 DX
-Ux
-aW
-cr
-aW
-aW
-Hb
-Hb
-Hb
+YX
+xI
+lu
+HI
+HI
+lu
+lu
+lu
 aW
 aW
 aW
@@ -2091,384 +2577,384 @@ aW
 (27,1,1) = {"
 aW
 aW
-aW
-aW
-aW
-aW
-aW
-aW
+kX
+kX
+xI
+xI
+xI
+xI
 Tx
 YX
 YX
 wh
-CS
+Yh
 Ql
 YX
 DX
 YX
 YX
-aW
-aW
-cr
-zi
-Hb
-cr
-Hb
-Hb
-Hb
-Hb
-Hb
+YX
+xI
+lu
+lu
+lu
+TL
+lu
+lu
+lu
+lu
+lu
 aW
 "}
 (28,1,1) = {"
 aW
-aW
-aW
-aW
-WH
-WH
-WH
-WH
+kX
+kX
+jy
+Ht
+wm
+zj
+yp
+IZ
+YX
 YX
 YX
 YX
-Yh
-Qm
 YX
 nG
 vH
 YX
-Tx
-aW
-YV
-aW
-hR
+Mg
+uv
+kX
+HI
+lu
 xK
-cr
-Hb
-Hb
-zi
-Hb
-Hb
+TL
+lu
+Gc
+Gc
+Gc
+lu
 aW
 "}
 (29,1,1) = {"
 aW
-aW
-aW
-WH
-WH
+kX
 WH
+Qm
+pa
 WH
+xj
 LA
-WH
-WH
+uq
+BQ
 YX
 GK
 YX
-YX
+DA
 YX
 GK
-VS
-rw
+uG
+kF
 uv
+kX
+kX
+HI
+lu
+HI
+Gc
+Ex
+Gc
+tf
+Gc
 lu
-aW
-aW
-Hb
-aW
-aW
-xg
-Hb
-Hb
-Hb
-Hb
 "}
 (30,1,1) = {"
-aW
 kX
-WH
-Br
 kX
-Br
+oo
+YV
+kX
+Lv
 fB
 OA
-VB
-kX
-kX
-aW
-aW
-kX
-kX
-kX
-kX
+fO
+xI
+xI
+xI
+xI
+xI
+xI
+xI
+xI
 jU
 MM
-jU
-kX
-aW
-aW
-aW
-aW
-Hb
-Hb
+Qk
+hg
+HI
+HI
+Gc
+Gc
+Gc
+Gc
 cr
-Hb
-Hb
+Gc
+lu
 "}
 (31,1,1) = {"
-aW
-cH
-cH
+kX
 cH
 WH
 WH
+Gt
 WH
+DY
 VB
-WH
-Br
+XD
+GO
 kX
-aW
-aW
+HI
+HI
 kX
 Xq
-vR
+ht
 Kl
-uv
+xN
 rw
 bv
-kX
-aW
-aW
-aW
-aW
-Hb
-Hb
+hg
+HI
+HI
+wn
+Gc
+Gc
+UE
 cr
-zi
-Hb
+Gc
+lu
 "}
 (32,1,1) = {"
-aW
-WH
+kX
+pf
 jy
 Zs
-WH
-WH
-WH
+CN
+tx
+Il
 XL
-WH
+VS
 qm
 kX
-aW
-aW
+HI
+gk
 kX
 xQ
 ql
 Pb
 Kt
 Ya
-fz
-kX
-aW
-aW
-aW
-aW
-aW
+bv
+hg
+HI
+lu
+Gc
+tf
+Gc
 cr
 cr
-Hb
-Hb
+Gc
+lu
 "}
 (33,1,1) = {"
-aW
-Br
+kX
+Da
 ib
 sf
-WH
-WH
+fI
+Yk
 fB
-Qk
-WH
+wk
+VS
 Aw
 kX
-Hb
-aW
+lu
+HI
 kX
 kX
-NY
 kX
+fd
 kQ
-vR
+Mz
 xu
 kX
-aW
-aW
-aW
-aW
-aW
-Hb
-Hb
-Hb
-Hb
+mi
+Gl
+lu
+Gc
+Gc
+Gc
+Gc
+lu
+lu
 "}
 (34,1,1) = {"
-aW
-WH
+kX
+kX
 Ps
 Al
-WH
-WH
-WH
-VB
-WH
+EW
+FI
+Il
+jn
+VS
 Uu
+Rq
+lu
+HI
+lu
+lu
 kX
-Hb
-aW
-Hb
-Hb
-zi
 kX
 yr
 vR
 Sj
 kX
-aW
-aW
-aW
-aW
-aW
-Hb
+Iz
+mq
+qT
+FK
+Gl
+Gc
 Ex
-Hb
+lu
 aW
 "}
 (35,1,1) = {"
 aW
-aW
-WH
-WH
-WH
-WH
-WH
-Qk
+kX
+cH
+Qm
+pa
+LI
+Il
+VB
 qS
 AN
+Rq
+lu
+te
+lu
+lu
+lu
 kX
-Hb
-Hb
-zi
-Hb
-Hb
-NY
 JM
-vR
+rs
 qC
 kX
-aW
-aW
-aW
-aW
-Hb
-Ex
-zi
-Hb
+lu
+Iz
+vg
+VR
+FB
+Gc
+Gc
+lu
 aW
 "}
 (36,1,1) = {"
 aW
 kX
-aW
-Br
+kX
+YV
 kX
 Br
 fB
 wk
-WH
+VS
 Ly
+Rq
+lu
+lu
+lu
+Zf
+lu
 kX
-Hb
-Hb
-Hb
-Hb
-Hb
-fd
 IE
 LR
 aS
 kX
-aW
-aW
-aW
-aW
-Hb
-xg
-Hb
-Hb
+Iz
+lu
+Iz
+lu
+Zh
+tf
+Gc
+lu
 aW
 "}
 (37,1,1) = {"
 aW
 aW
-cH
-cH
-WH
-WH
+kX
 WH
-VB
+is
 WH
+hN
+VX
+eC
 wd
 kX
-aW
-Hb
-Hb
-Hb
-zi
-fd
+HI
+lu
+lu
+lu
+lu
+kX
 xV
 Yg
-xu
+SB
 kX
-aW
-aW
-aW
-aW
-zi
-cr
-Hb
+lu
+XK
+lu
+Iz
+Zh
+Gc
+lu
 aW
 aW
 "}
 (38,1,1) = {"
 aW
 aW
-aW
+kX
+kX
+Da
 WH
-Br
-nf
 fB
 bq
-WH
-Br
-aW
+iu
+kX
+kX
 HI
-aW
-Hb
-Hb
-Hb
+HI
+lu
+pu
+lu
 kX
-fd
 kX
 kX
 kX
-aW
-aW
-Hb
-Hb
-cr
-cr
-Hb
+kX
+cN
+Zh
+Gl
+lu
+lu
+lu
+lu
 aW
 aW
 "}
@@ -2476,30 +2962,30 @@ aW
 aW
 aW
 aW
-WH
-kX
 kX
+hg
+hg
+hg
 kX
 kX
 kX
-aW
+HI
+nf
 HI
 aW
-aW
-aW
-Hb
+lu
 aW
 aW
 VI
 aW
 aW
 aW
-Hb
+lu
 vi
-Hb
-cr
-cr
-Hb
+lu
+Zf
+lu
+lu
 aW
 aW
 aW
@@ -2515,6 +3001,9 @@ aW
 aW
 aW
 aW
+HI
+HI
+HI
 aW
 aW
 aW
@@ -2524,13 +3013,10 @@ aW
 aW
 aW
 aW
-aW
-aW
-aW
-Hb
-zi
-Hb
-Hb
+lu
+lu
+lu
+lu
 aW
 aW
 aW
diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
index 60304e86f6f0..4e46bc07824c 100644
--- a/code/datums/ruins/icemoon.dm
+++ b/code/datums/ruins/icemoon.dm
@@ -16,12 +16,6 @@
 	description = "Who knows what lies within?"
 	suffix = "icemoon_underground_abandoned_village.dmm"
 
-/datum/map_template/ruin/icemoon/brazillian_lab
-	name = "Barricaded Compound"
-	id = "brazillian-lab"
-	description = "A conspicuous compound in the middle of the cold wasteland. What goodies are inside?"
-	suffix = "icemoon_underground_brazillianlab.dmm"
-
 /datum/map_template/ruin/icemoon/crashed_holemaker
 	name = "Crashed Holemaker"
 	id = "crashed_holemaker"
diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm
index b3e0cb13adcc..b9d43a4f780d 100644
--- a/code/datums/ruins/whitesands.dm
+++ b/code/datums/ruins/whitesands.dm
@@ -30,3 +30,8 @@
 	suffix = "whitesands_surface_camp_combination.dmm"
 	allow_duplicates = FALSE
 
+/datum/map_template/ruin/whitesands/brazillian_lab
+	name = "Hermit Weapons-Testing Compound"
+	id = "brazillian-lab"
+	description = "A conspicuous compound in the middle of the sandy wasteland. What goodies are inside?"
+	suffix = "whitesands_brazillianlab.dmm"
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index eb8ea3355fe9..2cd07ae6a5bf 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -488,6 +488,8 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
 	icon = 'icons/obj/guns/48x32guns.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
 	item_state = "shotgun_qb"
 	w_class = WEIGHT_CLASS_BULKY
 	force = 15 //blunt edge and really heavy