diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 43f333b2e2..d9fa812172 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -24,6 +24,7 @@
var/list/origin_tech = null //Used by R&D to determine what research bonuses it grants.
var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/force = 0
+ var/start_anomalous = FALSE //Used to generate an effect_master datum component on init
var/heat_protection = 0 //flags which determine which body parts are protected from heat. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm
var/cold_protection = 0 //flags which determine which body parts are protected from cold. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm
@@ -113,6 +114,8 @@
embed_chance = max(5, round(force/w_class))
else
embed_chance = max(5, round(force/(w_class*3)))
+ if(start_anomalous == TRUE)
+ become_anomalous()
/obj/item/equipped()
..()
diff --git a/code/game/objects/random/_random.dm b/code/game/objects/random/_random.dm
index 8683acbef5..a10b92abaa 100644
--- a/code/game/objects/random/_random.dm
+++ b/code/game/objects/random/_random.dm
@@ -5,6 +5,7 @@
icon_state = "generic"
var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything
var/drop_get_turf = TRUE
+ var/start_anomalous = FALSE
// creates a new object and deletes itself
/obj/random/Initialize()
@@ -31,6 +32,8 @@
A.pixel_x = pixel_x
A.pixel_y = pixel_y
A.set_dir(dir)
+ if(start_anomalous)
+ A.become_anomalous()
/obj/random/drop_location()
return drop_get_turf ? get_turf(src) : ..()
diff --git a/code/game/objects/random/anomalous.dm b/code/game/objects/random/anomalous.dm
new file mode 100644
index 0000000000..2e873ed269
--- /dev/null
+++ b/code/game/objects/random/anomalous.dm
@@ -0,0 +1,112 @@
+//Spawner subtypes where the result begins with anomalous properties, primarily for PoI use.
+
+/obj/random/maintenance/anom
+ name = "random anomalous clutter"
+ desc = "This is a random maintenance-style item with anomalous properties."
+ icon_state = "anomaly"
+
+/obj/random/maintenance/anom/item_to_spawn()
+ return pick(prob(300);/obj/random/tech_supply/anom,
+ prob(200);/obj/random/medical/anom,
+ prob(100);/obj/random/firstaid/anom,
+ prob(10);/obj/random/contraband/anom,
+ prob(50);/obj/random/action_figure/anom,
+ prob(50);/obj/random/plushie/anom,
+ prob(200);/obj/random/junk/anom,
+ prob(200);/obj/random/material/anom,
+ prob(50);/obj/random/toy/anom,
+ prob(100);/obj/random/tank/anom,
+ prob(50);/obj/random/soap/anom,
+ prob(60);/obj/random/drinkbottle/anom,
+ prob(500);/obj/random/maintenance/clean/anom)
+
+//Guns
+
+/obj/random/gun/random/anomalous
+ name = "random anomalous weapon"
+ desc = "This is a random energy or ballistic weapon with anomalous properties."
+ start_anomalous = TRUE
+
+/obj/random/gun/random/anomalous/item_to_spawn()
+ return pick(prob(5);/obj/random/energy/anom,
+ prob(5);/obj/random/projectile/random/anom)
+
+/obj/random/energy/anom
+ start_anomalous = TRUE
+
+/obj/random/projectile/random/anom
+ start_anomalous = TRUE
+
+//Misc objects
+
+/obj/random/tech_supply/anom
+ start_anomalous = TRUE
+
+/obj/random/medical/anom
+ start_anomalous = TRUE
+
+/obj/random/firstaid/anom
+ start_anomalous = TRUE
+
+/obj/random/contraband/anom
+ start_anomalous = TRUE
+
+/obj/random/action_figure/anom
+ start_anomalous = TRUE
+
+/obj/random/plushie/anom
+ start_anomalous = TRUE
+
+/obj/random/junk/anom
+ start_anomalous = TRUE
+
+/obj/random/material/anom
+ start_anomalous = TRUE
+
+/obj/random/material/anom
+ start_anomalous = TRUE
+
+/obj/random/toy/anom
+ start_anomalous = TRUE
+
+/obj/random/tank/anom
+ start_anomalous = TRUE
+
+/obj/random/soap/anom
+ start_anomalous = TRUE
+
+/obj/random/drinkbottle/anom
+ start_anomalous = TRUE
+
+/obj/random/maintenance/clean/anom
+ start_anomalous = TRUE
+
+/obj/random/technology_scanner/anom
+ start_anomalous = TRUE
+
+/obj/random/powercell/anom
+ start_anomalous = TRUE
+
+/obj/random/tool/anom
+ start_anomalous = TRUE
+
+/obj/random/tool/power/anom
+ start_anomalous = TRUE
+
+/obj/random/toolbox/anom
+ start_anomalous = TRUE
+
+/obj/random/tech_supply/component
+ start_anomalous = TRUE
+
+/obj/random/medical/lite/anom
+ start_anomalous = TRUE
+
+/obj/random/tank/anom
+ start_anomalous = TRUE
+
+/obj/random/coin/anom
+ start_anomalous = TRUE
+
+/obj/random/mug/anom
+ start_anomalous = TRUE
\ No newline at end of file
diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm
index be1b095464..5cdd972188 100644
--- a/code/game/objects/random/guns_and_ammo.dm
+++ b/code/game/objects/random/guns_and_ammo.dm
@@ -115,7 +115,7 @@
desc = "This is a random shotgun-type weapon."
icon_state = "gun_shotgun"
-/obj/random/projectile/item_to_spawn()
+/obj/random/projectile/shotgun/item_to_spawn()
return pick(prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
prob(3);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn,
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index de46435f2c..dd7cb763c4 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -90,7 +90,6 @@
/obj/item/device/assembly/timer,
/obj/item/device/multitool)
-
/obj/random/toolbox
name = "random toolbox"
desc = "This is a random toolbox."
@@ -315,7 +314,6 @@
prob(2);/obj/item/weapon/soap/deluxe,
prob(1);/obj/item/weapon/soap/syndie)
-
/obj/random/drinkbottle
name = "random drink"
desc = "This is a random drink."
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 91e60f1abc..04d3d67aed 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -93,6 +93,10 @@
to_chat(L, "You climb out of \the [src].")
..()
+/turf/simulated/floor/water/indoor
+ outdoors = OUTDOORS_NO
+
+
/turf/simulated/floor/water/deep
name = "deep water"
desc = "A body of water. It seems quite deep."
@@ -102,6 +106,9 @@
movement_cost = 8
depth = 2
+/turf/simulated/floor/water/deep/indoor
+ outdoors = OUTDOORS_NO
+
/turf/simulated/floor/water/pool
name = "pool"
desc = "Don't worry, it's not closed."
diff --git a/icons/misc/random_spawners.dmi b/icons/misc/random_spawners.dmi
index 27e55fc9ec..1d66009ee0 100644
Binary files a/icons/misc/random_spawners.dmi and b/icons/misc/random_spawners.dmi differ
diff --git a/maps/example/example-1.dmm b/maps/example/example-1.dmm
index 799cf42ce9..2dfdb52a9f 100644
--- a/maps/example/example-1.dmm
+++ b/maps/example/example-1.dmm
@@ -298,14 +298,7 @@
},
/turf/simulated/floor/plating,
/area/aisat)
-"P" = (
-/turf/simulated/floor/tiled/red,
-/area/aisat)
"Q" = (
-/obj/turbolift_map_holder/example{
- dir = 1;
- icon = 'icons/obj/turbolift_preview_5x5.dmi'
- },
/turf/simulated/floor/tiled/red,
/area/aisat)
@@ -776,10 +769,10 @@ F
h
h
b
-P
-P
-P
-P
+Q
+Q
+Q
+Q
Q
b
a
@@ -810,11 +803,11 @@ h
h
h
n
-P
-P
-P
-P
-P
+Q
+Q
+Q
+Q
+Q
b
a
a
@@ -844,11 +837,11 @@ n
J
n
n
-P
-P
-P
-P
-P
+Q
+Q
+Q
+Q
+Q
b
a
a
@@ -878,11 +871,11 @@ h
h
h
n
-P
-P
-P
-P
-P
+Q
+Q
+Q
+Q
+Q
b
a
a
@@ -912,11 +905,11 @@ h
h
h
b
-P
-P
-P
-P
-P
+Q
+Q
+Q
+Q
+Q
b
a
a
diff --git a/maps/submaps/surface_submaps/mountains/CaveTrench.dmm b/maps/submaps/surface_submaps/mountains/CaveTrench.dmm
index 4c9790d8f2..d3a5b6dc1b 100644
--- a/maps/submaps/surface_submaps/mountains/CaveTrench.dmm
+++ b/maps/submaps/surface_submaps/mountains/CaveTrench.dmm
@@ -12,8 +12,8 @@
"l" = (/mob/living/simple_mob/animal/passive/fish/trout,/turf/simulated/floor/water{outdoors = 0},/area/submap/CaveTrench)
"m" = (/turf/simulated/wall/wood,/area/submap/CaveTrench)
"n" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lantern,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench)
-"o" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/projectile/shotgun/pump,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench)
-"p" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench)
+"o" = (/obj/structure/table/woodentable,/obj/random/projectile/shotgun,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench)
+"p" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks,/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench)
"q" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench)
"r" = (/obj/structure/table/steel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench)
"s" = (/obj/structure/table/steel,/obj/item/weapon/paper{info = "Rellek's telling me that we're in deep shit if the townies found out I'm cooking up drones out here. Like I give a fuck, We're minning our asses off only to dig into some bug nest to get our legs chewed. Well I'm not looking a gift horse in the mouth. Those drone dudes out in the wild hooked us up with these machines so long as they get some of the metal we dig up. Win win for us, Guess we're retiring early after all."; name = "Note"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench)
@@ -34,6 +34,7 @@
"H" = (/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench)
"I" = (/obj/machinery/power/port_gen/pacman,/turf/simulated/shuttle/plating,/area/submap/CaveTrench)
"J" = (/obj/machinery/drone_fabricator{fabricator_tag = "Unknown"},/turf/simulated/shuttle/plating,/area/submap/CaveTrench)
+"O" = (/obj/random/humanoidremains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -41,7 +42,7 @@ abbccccccccccccccccccccccccccccccccccccccccca
abcccddddccdddddddddddddccccccccddddddeeeeeea
acccdddddddddddddddddddddddddddddddddeeffffea
acddddddddddddddddddddgddddddddddddddefffhfea
-aciddddddddjkkjeeeeeeeeeeeeeeeeeeeeeeefffffca
+acOddddddddjkkjeeeeeeeeeeeeeeeeeeeeeeefffffca
abddeeeeeeeekkeeffffffffffffffffffffffffffeca
abeeefffhfffkkfffhffffffffffffffffffhfffffeea
aeefffffffffkkffffffffflfffffffffffffffffffea
diff --git a/maps/submaps/surface_submaps/mountains/Cavelake.dmm b/maps/submaps/surface_submaps/mountains/Cavelake.dmm
index 3d9edb159c..f1d63302a4 100644
--- a/maps/submaps/surface_submaps/mountains/Cavelake.dmm
+++ b/maps/submaps/surface_submaps/mountains/Cavelake.dmm
@@ -3,12 +3,12 @@
"c" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Cavelake)
"d" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
"e" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
-"f" = (/turf/simulated/floor/outdoors/rocks,/area/submap/Cavelake)
+"f" = (/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Cavelake)
"g" = (/mob/living/simple_mob/animal/sif/hooligan_crab,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
-"h" = (/turf/simulated/floor/water,/area/submap/Cavelake)
-"i" = (/mob/living/simple_mob/animal/passive/fish/perch,/turf/simulated/floor/water,/area/submap/Cavelake)
+"h" = (/turf/simulated/floor/water/indoor,/area/submap/Cavelake)
+"i" = (/mob/living/simple_mob/animal/passive/fish/perch,/turf/simulated/floor/water/indoor,/area/submap/Cavelake)
"j" = (/obj/machinery/crystal,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
-"k" = (/mob/living/simple_mob/animal/passive/fish/trout,/turf/simulated/floor/water,/area/submap/Cavelake)
+"k" = (/mob/living/simple_mob/animal/passive/fish/trout,/turf/simulated/floor/water/indoor,/area/submap/Cavelake)
"l" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
"m" = (/obj/random/mob/sif,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
"n" = (/obj/item/clothing/mask/snorkel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake)
diff --git a/maps/submaps/surface_submaps/mountains/Cliff1.dmm b/maps/submaps/surface_submaps/mountains/Cliff1.dmm
index 1897f0ab17..e978bcbd9b 100644
--- a/maps/submaps/surface_submaps/mountains/Cliff1.dmm
+++ b/maps/submaps/surface_submaps/mountains/Cliff1.dmm
@@ -3,23 +3,26 @@
"c" = (/obj/item/weapon/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
"d" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
"e" = (/obj/structure/cliff/automatic/corner,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
-"f" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 5},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
-"g" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 9},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"f" = (/obj/structure/cliff/automatic{dir = 5; icon_state = "cliffbuilder"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"g" = (/obj/structure/cliff/automatic{dir = 9; icon_state = "cliffbuilder"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
"h" = (/obj/structure/cliff/automatic,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
-"i" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 9},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"i" = (/obj/structure/cliff/automatic/corner{dir = 9; icon_state = "cliffbuilder-corner"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
"j" = (/obj/random/humanoidremains{spawn_nothing_percentage = 70},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
"k" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"p" = (/obj/effect/decal/remains/ribcage,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"x" = (/obj/effect/decal/remains/deer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"D" = (/obj/structure/prop/rock/small/alt,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
+"U" = (/obj/structure/prop/rock/small,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
abbbbabbbbbbbaabbbbbbbbaaabbaa
aakckkbdbcbbbbbbdbbcdbbkkckkaa
-aakefckkkbbdbbcbbbkkkcghhhikaa
-aakcehhfkkkkkkkkkcghhhikkkckaa
-aaajkkkehfkckghhhhikkkcjbbbaaa
-aaaaabkckehhhikkkkkkcbbbbaaaaa
-aaaaaaackkkjkkcbbcbbbaaaaaaaaa
+aakefcDkkbbdbbcbbbkkkcghhhikaa
+aakcehhfkkkkUkkkkcghhhikkUckaa
+aaajkkkehfkckghhhhikkkcxbbbaaa
+aaaaabUckehhhikkkkUkcbbbbaaaaa
+aaaaaaackkkpkkcbbcbbbaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
"}
-
diff --git a/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm b/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
index 9551f28641..1ca54b0ca7 100644
--- a/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
+++ b/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
@@ -1,23 +1,23 @@
"aa" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
-"ab" = (/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"ac" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"ab" = (/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"ac" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"ad" = (/obj/effect/spider/stickyweb,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
"ae" = (/obj/structure/sign/greencross{desc = "White cross in a green field, you can get medical aid here."; name = "First-Aid"},/turf/simulated/shuttle/wall/no_join,/area/submap/CrashedMedShuttle)
"af" = (/obj/structure/grille,/obj/structure/shuttle/window,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
"ag" = (/turf/simulated/shuttle/wall,/area/submap/CrashedMedShuttle)
"ah" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
-"ai" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"ai" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"aj" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/sign/warning/airlock{pixel_x = 32},/obj/effect/spider/stickyweb,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
"ak" = (/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"al" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"am" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
-"an" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/blood/oil,/obj/structure/loot_pile/surface/bones,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"an" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/blood/oil,/obj/structure/loot_pile/surface/bones,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"ao" = (/obj/item/weapon/circuitboard/broken,/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
"ap" = (/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
"aq" = (/obj/effect/decal/cleanable/liquid_fuel,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"ar" = (/obj/structure/closet/crate/medical,/obj/random/medical,/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"as" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
-"at" = (/obj/item/weapon/material/shard,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"at" = (/obj/item/weapon/material/shard,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"au" = (/obj/structure/closet/secure_closet/personal/patient,/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"av" = (/obj/random/mob/spider/mutant,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aw" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
@@ -25,7 +25,7 @@
"ay" = (/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"az" = (/obj/effect/decal/cleanable/blood/gibs/robot,/obj/item/weapon/firstaid_arm_assembly,/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aA" = (/obj/item/stack/rods,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
-"aB" = (/obj/structure/lattice,/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"aB" = (/obj/structure/lattice,/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"aC" = (/obj/effect/decal/cleanable/blood/oil,/obj/item/weapon/firstaid_arm_assembly,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aD" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aE" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
@@ -36,49 +36,49 @@
"aJ" = (/obj/structure/table/standard,/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aK" = (/obj/structure/table/standard,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aL" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
-"aM" = (/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"aN" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"aM" = (/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"aN" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"aO" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/carrier,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aP" = (/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aQ" = (/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aR" = (/turf/simulated/shuttle/wall/no_join,/area/submap/CrashedMedShuttle)
-"aS" = (/obj/effect/decal/cleanable/blood/oil,/obj/structure/loot_pile/surface/bones,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"aS" = (/obj/effect/decal/cleanable/blood/oil,/obj/structure/loot_pile/surface/bones,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"aT" = (/obj/machinery/light,/obj/structure/table/standard,/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aU" = (/obj/structure/table/standard,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"aV" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"aW" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"aW" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"aX" = (/obj/machinery/computer,/turf/simulated/shuttle/floor/yellow,/area/submap/CrashedMedShuttle)
"aY" = (/obj/structure/prop/blackbox/crashed_med_shuttle,/turf/simulated/shuttle/floor/yellow,/area/submap/CrashedMedShuttle)
"aZ" = (/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
"ba" = (/obj/random/mob/spider/mutant,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
"bb" = (/obj/effect/spider/cocoon,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
-"bc" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bd" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"be" = (/obj/effect/spider/stickyweb,/obj/structure/girder/displaced,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bf" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/structure/extinguisher_cabinet{pixel_x = -32},/obj/structure/lattice,/obj/item/device/gps/internal/poi,/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bg" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood/drip,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bh" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"bc" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bd" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"be" = (/obj/effect/spider/stickyweb,/obj/structure/girder/displaced,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bf" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/structure/extinguisher_cabinet{pixel_x = -32},/obj/structure/lattice,/obj/item/device/gps/internal/poi,/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bg" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood/drip,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bh" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"bi" = (/obj/effect/decal/mecha_wreckage/odysseus,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
-"bj" = (/obj/item/weapon/material/shard,/obj/effect/spider/stickyweb,/obj/item/weapon/beartrap{anchored = 1; deployed = 1; icon_state = "beartrap1"},/obj/random/trash,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bk" = (/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"bj" = (/obj/item/weapon/material/shard,/obj/effect/spider/stickyweb,/obj/item/weapon/beartrap{anchored = 1; deployed = 1; icon_state = "beartrap1"},/obj/random/trash,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bk" = (/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"bl" = (/obj/effect/spider/stickyweb,/obj/item/weapon/material/shard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
-"bm" = (/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
-"bn" = (/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bo" = (/obj/effect/spider/cocoon,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"bm" = (/obj/random/medical/anom,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
+"bn" = (/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bo" = (/obj/effect/spider/cocoon,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"bp" = (/obj/structure/prop/fake_ai/dead/crashed_med_shuttle,/turf/simulated/shuttle/floor/yellow,/area/submap/CrashedMedShuttle)
-"bq" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"br" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"bq" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"br" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"bs" = (/obj/effect/decal/cleanable/blood/drip,/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
"bt" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
-"bu" = (/obj/effect/decal/remains/tajaran,/obj/item/weapon/surgical/circular_saw,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bv" = (/obj/effect/decal/cleanable/blood/oil,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
+"bu" = (/obj/effect/decal/remains/tajaran,/obj/item/weapon/surgical/circular_saw,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bv" = (/obj/effect/decal/cleanable/blood/oil,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
"bw" = (/obj/item/weapon/material/shard,/obj/structure/loot_pile/maint/technical,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
"bx" = (/obj/structure/bed/chair/office/light{dir = 8},/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle)
"by" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"bz" = (/obj/structure/girder,/turf/template_noop,/area/submap/CrashedMedShuttle)
"bA" = (/obj/structure/girder/displaced,/turf/template_noop,/area/submap/CrashedMedShuttle)
-"bB" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 8},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle)
-"bC" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
+"bB" = (/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"bC" = (/obj/structure/shuttle/engine/heater{dir = 8; icon_state = "heater"},/obj/structure/window/reinforced{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle)
"bD" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle)
"bE" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle)
"bF" = (/obj/random/medical/pillbottle,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
@@ -90,7 +90,7 @@
"bL" = (/obj/item/weapon/material/shard,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
"bM" = (/obj/machinery/light{dir = 8},/obj/structure/table/standard,/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle)
"bN" = (/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/spider/cocoon,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
-"bO" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/secure_closet/medical_wall/anesthetics{pixel_x = 32},/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
+"bO" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/closet/secure_closet/medical_wall/anesthetics{pixel_x = 32},/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"bP" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"bQ" = (/obj/effect/spider/cocoon,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"bR" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/obj/item/weapon/surgical/surgicaldrill,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
@@ -111,16 +111,18 @@
"cg" = (/obj/structure/table/standard,/obj/item/weapon/storage/belt/medical/emt,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"ch" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/syringes,/obj/effect/spider/stickyweb,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
"ci" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "crashed_med_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = null},/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle)
+"BO" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/CrashedMedShuttle)
+"Vd" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng{start_anomalous = 1},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaabaaaaabacadaeafagagagaaaaaaabaa
-aaaaaaababaaaaahabaiadajagakalamagagagaaaaaa
+aaaaaaababaaaaahabaiadajagakalVdagagagaaaaaa
aaaaaaaaaaaaaaabanagaoapagaqakakarasagagaaaa
aaaaaaaaahaaabatauagavakawaxayavakazakafabaa
aaababaaaAabaBaCaDafakaEagaFaGaHaIaJaKaLabaa
aaabaaaaaMaNacaOaPawakaQaRagagagagagagagabaa
-aaaaaaaaababaSaTaUafaVaWaXaYafabaZbabbabaaaa
+aaaaaaaaababaSaTaUafBOaWaXaYafabaZbabbabaaaa
aaaaaabcbdbeagagagagbfababbgbhaZaVbiababaaaa
aaaaaaabbjbkakblbmafbnbobpbqbrbsbtbuabaaaaaa
aaaaabbvbwbxakakakbyakakagbzbzbAagagagagaaaa
diff --git a/maps/submaps/surface_submaps/mountains/IceCave1A.dmm b/maps/submaps/surface_submaps/mountains/IceCave1A.dmm
index f5778778f9..12a555c6ca 100644
--- a/maps/submaps/surface_submaps/mountains/IceCave1A.dmm
+++ b/maps/submaps/surface_submaps/mountains/IceCave1A.dmm
@@ -7,34 +7,44 @@
"g" = (/obj/machinery/crystal/ice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
"h" = (/obj/random/firstaid,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
"i" = (/obj/random/ammo,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"j" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"r" = (/obj/random/medical/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"x" = (/obj/random/multiple/corp_crate,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"B" = (/obj/structure/bonfire/sifwood,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"C" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"E" = (/obj/random/material/precious,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"I" = (/obj/random/maintenance/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"K" = (/obj/item/clothing/shoes/boots/winter,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"P" = (/obj/item/clothing/shoes/boots/jackboots/knee,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
+"U" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/suit/storage/hooded/wintercoat/cosmic,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1A)
(1,1,1) = {"
-aaaaaaaaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaabbbbbbbbbbaaaaaaaaaa
-aacccccdccccccccddaabbbbbbbbbbaaaefggaaa
-aaccccccccccccccddaaabbbbbbbbaaagfffghaa
-aaccccccccccccccaaaaaaaaaaaaaaaafffffiaa
-aaccccccccccdcccaaaaaaaaaaaaaaaffffffeaa
-aadccccccccccccdaaaaaaccccdccggffffffaaa
-aaccccccccccccccaaaaaacccccccffffgefgaaa
+bbbaaaaaaaaaaaaaabbbbbbbbbbbbbbbaaaabbbb
+baaaaaaaaaaaaaaaaaabbbbbbbbbbbbaaaaaaabb
+aacccccdccccccccddabbbbbbbbbbbaaaCEggaab
+aaccccccccccccccddabbbbbbbbbbaaagfffghaa
+aaccccccccccccccaaabbbbaaaaaaaaaIffffiaa
+aaccccccccccdcccaaaaaaaaaaaaaaaxffBffUaa
+aadccccccccccccdaaaaaaccccdccggfffffraaa
+aaccccccccccccccaaaaaacccccccffffgeKgaaa
aaccccccccccccccffffffdccccccgggaaaaaaaa
aacccccccccdccccffggffccdcccdgggaaaaaaab
aaccdcccccccccccaaaaaaddaaaaaaaaaaabbbbb
-aaccccdccccccccdaaaaaaddageffffaaaabbbbb
-aaccccccdcccccccaaggffgdagfffffaabbbbbbb
+aaccccdccccccccdaaaaaaddajefffIaaaabbbbb
+aaccccccdcccccccaaggffgdagPffffaabbbbbbb
aaccccccccccccccaafffffgaaafafgaabbbbbbb
aaaaaadddddddddfffffgfffffffaffaabbbbbbb
-aaaaaagggfffgddddggggggffgffaffaabbbbbbb
+aaaaaajggfffgddddggggggffgffaffaabbbbbbb
aagggfffffffffccaaaaaaaafffgagfaabbbbbbb
-aagfffffffffffccaaaaaaaaggggaffaabbbbbbb
+aagfffffffjfffccaaaaaaaaggggaffaabbbbbbb
aaaggfaaaaaaaaccaaaaaaagfffffffaabbbbbbb
-aaaaffaaaaaaaaccaaaaaaaffffffaaaabbbbbbb
-aaaaffgaaaaaaaccccccddafffffgaaaabbbbbbb
-aaaaaffgaaaaaaccccccddaagfaaaaabbbbbbbbb
-aaaagfffaaaaaaaaddccffgfffaaaaabbbbbbbbb
-aaaggafffaaaaaaaddccffffffaabbbbbbbbbbbb
-faaaaafffgaaaaaaaaaaaafffgaabbbbbbbbbbbb
-ffaaaagffaaaaaaaaaaaaaggggaabbbbbbbbbbbb
-fffffffffaaaaaaaaaaaaaaaaaaabbbbbbbbbbbb
-ffffffffaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbb
+aaaaffaaaaaaaaccaaaaaaaffffffaaabbbbbbbb
+baaaffgaaaaaaaccccccddafffffgaaabbbbbbbb
+baaaaffgaaaaaaccccccddaagfaaaaabbbbbbbbb
+baaagfffaaaaaaaaddccffgfffaaaabbbbbbbbbb
+bbaggafffaaabaaaddccffffffaabbbbbbbbbbbb
+fbaaaafffgaabbaaaaaaaafffgaabbbbbbbbbbbb
+ffaaaagffaaabbbbbbbaaajjggaabbbbbbbbbbbb
+fffffffffaabbbbbbbbbbaaaaaaabbbbbbbbbbbb
+ffffffffaabbbbbbbbbbbaaaaaabbbbbbbbbbbbb
"}
diff --git a/maps/submaps/surface_submaps/mountains/IceCave1B.dmm b/maps/submaps/surface_submaps/mountains/IceCave1B.dmm
index 27346dee74..c0e9d86ffb 100644
--- a/maps/submaps/surface_submaps/mountains/IceCave1B.dmm
+++ b/maps/submaps/surface_submaps/mountains/IceCave1B.dmm
@@ -2,39 +2,46 @@
"b" = (/turf/template_noop,/area/submap/cave/IceCave1B)
"c" = (/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/IceCave1B)
"d" = (/obj/machinery/crystal/ice,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/IceCave1B)
-"e" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"e" = (/obj/effect/decal/remains/mummy2,/obj/item/clothing/suit/armor/pcarrier/blue/sol,/obj/item/clothing/head/helmet/solgov,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
"f" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
"g" = (/obj/machinery/crystal/ice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
-"h" = (/obj/random/firstaid,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
-"i" = (/obj/random/ammo,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"h" = (/mob/living/simple_mob/animal/passive/mouse/rat,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"i" = (/obj/random/gun/random/anomalous,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"A" = (/obj/effect/decal/remains/human,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"C" = (/obj/random/medical/lite/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"D" = (/obj/effect/decal/remains/mummy2,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"J" = (/obj/item/clothing/head/helmet/solgov,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"O" = (/obj/effect/decal/remains/mouse,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"Q" = (/obj/random/contraband/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
+"X" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1B)
(1,1,1) = {"
-aaaaaaaaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaabbbbbbbbbbaaaaaaaaaa
-aaccccccccccccccddaabbbbbbbbbbaaaefggaaa
-aaccdcccccccccccddaaabbbbbbbbaaagfffghaa
-aacccccccccdccccaaaaaaaaaaaaaaaafffffiaa
-aaccccccccccccccaaaaaaaaaaaaaaaffffffeaa
-aaccdcccccccccccaaaaaacccccccggffffffaaa
-aacccccccccccccdaaaaaacccccccffffgefgaaa
-aaccccccccccccccffffffdccccccgggaaaaaaaa
-aacccdccccccccccffggffcccccccgggaaaaaaab
-aacccccccccccccdaaaaaaddaaaaaaaaaaabbbbb
-aacccccdccccccccaaaaaaddageffffaaaabbbbb
+bbaaaaaaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa
+baaaaaaaaaaaaaaaaaaabbbbbbbbbbaaaaaaaaaa
+baccccccccccccccddaabbbbbbbbbbaaaefggaaa
+baccdcccccccccccddaaabbbbbbbbaaagfffgfaa
+bacccccccccdccccaaaaaaaaaaaaaaaafffffiaa
+baccccccccccccccaaaaaaaaaaaaaaafffhffAaa
+baccdcccccccccccaaaaaacccccccggQfffffaaa
+bacccccccccccccdaaaaaacccccccfXfJgDCgaaa
+baccccccccccccccffffffdccccccgggaaaaaaab
+bacccdccccccccccffggffcccccccgggaaaaaabb
+bacccccccccccccdaaaaaaddaaaaaaaaaaabbbbb
+aacccccdccccccccaaaaaaddagOffffaaaabbbbb
aacccccccccdccccaaggffgdagfffffaabbbbbbb
aacdccccccccccccaafffffgaaafafgaabbbbbbb
aaaaaadddddddddfffffgfffffffaffaabbbbbbb
aaaaaagggfffgddddggggggffgffaffaabbbbbbb
-aagggfffffffffccaaaaaaaafffgagfaabbbbbbb
-aagfffffffffffccaaaaaaaaggggaffaabbbbbbb
-aaaggfaaaaaaaaccaaaaaaagfffffffaabbbbbbb
-aaaaffaaaaaaaaccaaaaaaaffffffaaaabbbbbbb
-aaaaffgaaaaaaaccccccddafffffgaaaabbbbbbb
-aaaaaffgaaaaaaccccccddaagfaaaaabbbbbbbbb
-aaaagfffaaaaaaaaddccffgfffaaaaabbbbbbbbb
-aaaggafffaaaaaaaddccffffffaabbbbbbbbbbbb
-faaaaafffgaaaaaaaaaaaafffgaabbbbbbbbbbbb
-ffaaaagffaaaaaaaaaaaaaggggaabbbbbbbbbbbb
-fffffffffaaaaaaaaaaaaaaaaaaabbbbbbbbbbbb
-ffffffffaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbb
+bagggfffffffffccaaaaaaaafffgagfaabbbbbbb
+bagfffffffffffccaaaaaaaaggggaffaabbbbbbb
+baaggfaaaaaaaaccaaaaaaagfffffffaabbbbbbb
+baaaffaaaaaaaaccaaaaaaaffffffaaaabbbbbbb
+baaaffgaaaaaaaccccccddafffffgaaabbbbbbbb
+baaaaffgaaaaaaccccccddaagfaaaaabbbbbbbbb
+baaagfffaaaaaaaaddccffgfffaaaaabbbbbbbbb
+baaggafffaaabaaaddccffffffaabbbbbbbbbbbb
+faaaaafffgaabbaaaaaaaafffgaabbbbbbbbbbbb
+ffaaaagffaaabbbbbbbbaaggggaabbbbbbbbbbbb
+fffffffffaaabbbbbbbbaaaaaaaabbbbbbbbbbbb
+ffffffffaabbbbbbbbbbbbbababbbbbbbbbbbbbb
"}
diff --git a/maps/submaps/surface_submaps/mountains/IceCave1C.dmm b/maps/submaps/surface_submaps/mountains/IceCave1C.dmm
index e876095235..9f62b6a9e0 100644
--- a/maps/submaps/surface_submaps/mountains/IceCave1C.dmm
+++ b/maps/submaps/surface_submaps/mountains/IceCave1C.dmm
@@ -5,36 +5,44 @@
"e" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
"f" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
"g" = (/obj/machinery/crystal/ice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
-"h" = (/obj/random/firstaid,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"h" = (/obj/random/tool/power/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
"i" = (/obj/random/ammo,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"l" = (/obj/random/projectile/scrapped_ionrifle,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/IceCave1C)
+"n" = (/obj/random/powercell/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"u" = (/obj/random/trash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"E" = (/obj/structure/loot_pile/surface/bones,/obj/random/multiple/voidsuit/vintage,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"G" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"M" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"O" = (/obj/structure/loot_pile/mecha/ripley/random_sprite,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
+"Y" = (/obj/random/unidentified_medicine/viral,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/IceCave1C)
(1,1,1) = {"
-aaaaaaaaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaabbbbbbbbbbaaaaaaaaaa
-aaccccccccccccccddaabbbbbbbbbbaaaefggaaa
-aacdccccccccccccddaaabbbbbbbbaaagfffghaa
-aacccccccccccccdaaaaaaaaaaaaaaaafffffiaa
-aaccccccccccccccaaaaaaaaaaaaaaaffffffeaa
-aacccccccccccdccaaaaaadcccccdgfffffffaaa
-aaccccdcccccccccaaaaaacccccddggffgefgaaa
-aaccccccccccccccfffffgcdcccccfffaaaaaaaa
-aacccccdccccccccffggffccccdddgggaaaaaaab
+bbbbbbbaaaaaaaaaaaabbbbbbbbbbbbbbbbbaaab
+baaaaaaaaaaaaaaaaaaabbbbbbbbbbaaaaaaaaab
+baccccccccccccccddaabbbbbbbbbbaaafYGGaab
+bacdccccccccccccddaaabbbbbbbbaaaGfffghab
+bacccccccccccccdaaaaaaaaaaaaaaaaOffffiab
+baccccccccccccccaaaaaaaaaaaaaaanfffffEab
+bacccccccccccdccaaaaaadccccldgfffffffaab
+aaccccdcccccccccaaaaaacccccddggufGefgaab
+aaccccccccccccccfffffGcdcccccfffaaaaaaab
+aacccccdccccccccffggffccccdddgggaaaaaabb
aaccccccccdcccccaaaaaaddaaaaaaaaaaabbbbb
-aaccdcccccccccccaaaaaaddageffffaaaabbbbb
+aaccdcccccccccccaaaaaaddagMffffaaaabbbbb
aadcccccccccccccaaggffgdagfffffaabbbbbbb
aaccccccccccccdcaafffffgaaafafgaabbbbbbb
aaaaaadddddddddfffffgfffffffaffaabbbbbbb
-aaaaaagggfffgddddggggggffgffaffaabbbbbbb
-aagggfffffffffccaaaaaaaafffgagfaabbbbbbb
-aagfffffffffffccaaaaaaaaggggaffaabbbbbbb
-aaaggfaaaaaaaaccaaaaaaagfffffffaabbbbbbb
-aaaaffaaaaaaaaccaaaaaaaffffffaaaabbbbbbb
-aaaaffgaaaaaaaccccccddafffffgaaaabbbbbbb
-aaaaaffgaaaaaaccccccddaagfaaaaabbbbbbbbb
-aaaagfffaaaaaaaaddccffgfffaaaaabbbbbbbbb
-aaaggafffaaaaaaaddccffffffaabbbbbbbbbbbb
-faaaaafffgaaaaaaaaaaaafffgaabbbbbbbbbbbb
-ffaaaagffaaaaaaaaaaaaaggggaabbbbbbbbbbbb
-fffffffffaaaaaaaaaaaaaaaaaaabbbbbbbbbbbb
-ffffffffaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbb
+aaaaaaggGfffgddddggggggffgffaffabbbbbbbb
+aaGGgfffffffffccaaaaaaaafffgagfabbbbbbbb
+aaGfffffffffffccaaaaaaaaggggaffabbbbbbbb
+aaaggfaaaaaaaaccaaaaaaaGfffffffabbbbbbbb
+aaaaffaaaaaaaaccaaaaaaaffffffaaabbbbbbbb
+aaaaffgaaaaaaaccccccddafffffgaabbbbbbbbb
+aaaaaffgaaaaaaccccccddaagfaaaabbbbbbbbbb
+aaaagfffaaabaaaaddccffgfffaaabbbbbbbbbbb
+aaaggafffaabbaaaddccffffffaabbbbbbbbbbbb
+faaaaafffgaabbaaaaaaaafffgaabbbbbbbbbbbb
+ffaaaagffaabbbbbbbbbbaGGggaabbbbbbbbbbbb
+fffffffffaabbbbbbbbbbaaaaaaabbbbbbbbbbbb
+ffffffffaaabbbbbbbbbbbbbbbbabbbbbbbbbbbb
"}
diff --git a/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm b/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm
index be87066448..4e0a864717 100644
--- a/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm
+++ b/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm
@@ -1,73 +1,93 @@
-"a" = (/turf/template_noop,/area/template_noop)
-"b" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/cave/AMine1)
-"c" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"d" = (/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
-"e" = (/obj/machinery/light/small,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
-"f" = (/turf/simulated/wall,/area/submap/cave/AMine1)
-"g" = (/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"h" = (/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"i" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"j" = (/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"k" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light{ icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"l" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"m" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"n" = (/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"o" = (/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"p" = (/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"q" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"r" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"s" = (/obj/structure/window/reinforced/full,/turf/simulated/wall,/area/submap/cave/AMine1)
-"t" = (/obj/machinery/light{ icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"u" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor,/area/submap/cave/AMine1)
-"v" = (/obj/structure/table/standard,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/simulated/floor,/area/submap/cave/AMine1)
-"w" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor,/area/submap/cave/AMine1)
-"x" = (/turf/simulated/floor,/area/submap/cave/AMine1)
-"y" = (/obj/machinery/power/apc{operating = 0; pixel_x = 31},/turf/simulated/floor,/area/submap/cave/AMine1)
-"z" = (/obj/structure/ore_box,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"A" = (/obj/machinery/light/small{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"B" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor,/area/submap/cave/AMine1)
-"C" = (/obj/structure/closet/crate/engineering,/turf/simulated/floor,/area/submap/cave/AMine1)
-"D" = (/obj/machinery/light,/obj/machinery/space_heater,/turf/simulated/floor,/area/submap/cave/AMine1)
-"E" = (/obj/machinery/space_heater,/turf/simulated/floor,/area/submap/cave/AMine1)
-"F" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor,/area/submap/cave/AMine1)
-"G" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"H" = (/obj/machinery/vending/cola,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"I" = (/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"J" = (/obj/machinery/washing_machine,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"K" = (/obj/structure/ore_box,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
-"L" = (/obj/machinery/light{ icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"M" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"N" = (/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5; dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
-"O" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
-"P" = (/obj/structure/table/standard,/obj/item/pizzabox,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
-"Q" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/submap/cave/AMine1)
-"R" = (/obj/machinery/light{ icon_state = "tube1"; dir = 1},/turf/simulated/floor,/area/submap/cave/AMine1)
-"S" = (/obj/machinery/light/small,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"ax" = (/turf/template_noop,/area/template_noop)
+"aS" = (/obj/structure/window/reinforced/full,/turf/simulated/wall,/area/submap/cave/AMine1)
+"bd" = (/obj/structure/table/standard,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/simulated/floor,/area/submap/cave/AMine1)
+"cv" = (/turf/simulated/floor,/area/submap/cave/AMine1)
+"dg" = (/obj/machinery/power/apc{operating = 0; pixel_x = 31},/turf/simulated/floor,/area/submap/cave/AMine1)
+"dk" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"dl" = (/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/nt_3},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"fe" = (/obj/structure/bed,/obj/item/weapon/bedsheet/yellow,/obj/machinery/light,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"ga" = (/obj/machinery/light/small,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"gg" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor,/area/submap/cave/AMine1)
+"gO" = (/obj/structure/closet/crate/trashcart,/obj/random/tool/power,/turf/simulated/floor,/area/submap/cave/AMine1)
+"hi" = (/obj/effect/floor_decal/industrial/danger{dir = 4},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"iF" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one{name = "#1 miner coffee mug"},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"iQ" = (/obj/effect/floor_decal/industrial/danger{dir = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"iS" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"jp" = (/obj/random/vendordrink,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"jK" = (/obj/structure/closet/crate/engineering,/obj/random/tool,/obj/random/tool,/turf/simulated/floor,/area/submap/cave/AMine1)
+"jN" = (/obj/effect/floor_decal/industrial/danger/corner{dir = 4},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"kf" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"ki" = (/turf/simulated/wall,/area/submap/cave/AMine1)
+"kj" = (/obj/effect/floor_decal/rust/part_rusted2,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"lQ" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/submap/cave/AMine1)
+"lW" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"mk" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"mw" = (/obj/structure/loot_pile/mecha/ripley,/turf/simulated/floor,/area/submap/cave/AMine1)
+"nx" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"oo" = (/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"oR" = (/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5; dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"oT" = (/obj/structure/ore_box,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"pr" = (/obj/effect/floor_decal/industrial/danger/corner,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"ri" = (/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"rN" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/obj/random/plushie/anom,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"sT" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"vA" = (/obj/structure/noticeboard{pixel_x = 32},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"vO" = (/obj/structure/bed,/obj/item/weapon/bedsheet/yellow,/obj/machinery/light{dir = 1; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"wv" = (/obj/random/vendorfood,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"xS" = (/obj/structure/table/standard,/obj/item/toy/figure/miner,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"zq" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor,/area/submap/cave/AMine1)
+"Ak" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"AG" = (/obj/structure/table/standard,/obj/item/pizzabox/old,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"AN" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/cave/AMine1)
+"BD" = (/obj/machinery/light/small,/obj/effect/floor_decal/industrial/danger,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"BO" = (/obj/machinery/light,/obj/machinery/space_heater,/turf/simulated/floor,/area/submap/cave/AMine1)
+"Cm" = (/obj/machinery/light{dir = 1; icon_state = "tube1"},/turf/simulated/floor,/area/submap/cave/AMine1)
+"Eb" = (/obj/structure/bed,/obj/item/weapon/bedsheet/yellow,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"Fd" = (/obj/effect/floor_decal/rust/part_rusted2{dir = 8},/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"Fo" = (/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"FU" = (/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"Ih" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/effect/floor_decal/industrial/danger{dir = 4},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"Iw" = (/obj/structure/table/standard,/obj/item/clothing/under/rank/miner,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"IS" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"IT" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"KP" = (/obj/machinery/light/small{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"KW" = (/obj/effect/floor_decal/industrial/danger{dir = 6},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"MP" = (/obj/effect/floor_decal/industrial/danger,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"NC" = (/obj/machinery/space_heater,/turf/simulated/floor,/area/submap/cave/AMine1)
+"Ox" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor,/area/submap/cave/AMine1)
+"PA" = (/obj/effect/decal/remains/lizard,/turf/simulated/floor,/area/submap/cave/AMine1)
+"QL" = (/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1)
+"RQ" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"Sg" = (/obj/structure/ore_box,/obj/effect/floor_decal/industrial/danger{dir = 4},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1)
+"VF" = (/obj/item/trash/candy/proteinbar,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"Yw" = (/obj/effect/floor_decal/rust/part_rusted1,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"YR" = (/obj/machinery/washing_machine,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
+"ZR" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/submap/cave/AMine1)
(1,1,1) = {"
-aaaaaaaaaaaaaaaaaaaaaaaaa
-abbbbbbbbbbbbbcccccccccca
-abbbbbbbbbbbcddedddddedda
-abbbbbbbbbbbbdffffffffffa
-abbbcccbbbbbbdfghfijklifa
-abcccccbbbbbbdfhhmhhhhhfa
-abcccccnopbbbdfhhfiqrjifa
-abccccccccbbbdshtfffffffa
-abccccccccbbbdshhfuvvwxfa
-abccccccccbbbdshhmxxxxxfa
-abcccccccccbbdshhfxxxxyfa
-abccccccccczAdshhfBCDEFfa
-abbccccccccccdfgtfffffffa
-abbccccccccccdfGhfgHIhJfa
-abbbcccccccccKfGhfhhhhhfa
-abbbccccccccddffhfLMMMtfa
-abbbbNccccccOfffhfhjjPhfa
-abbbbcccccccdQRQhQhMMMhfa
-abbbbbbbccccdfffffffffffa
-abbbbbbbbcccddddddddddbba
-abbbbbbbbbcccccccccccbbba
-abbbbbbbbbbccccccScbbbbba
-abbbbbbbbbbbcccccbbbbbbba
-abbbbbbbbbbbcccccbbbbbbba
-aaaaaaaaaaaaaaaaaaaaaaaaa
+axaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxax
+axANANANANANANANANANANANANANiSiSiSiSiSiSiSiSiSiSax
+axANANANANANANANANANANANiSprMPBDMPMPMPMPMPBDMPMPax
+axANANANANANANANANANANANANhikikikikikikikikikikiax
+axANANANiSiSiSANANANANANANhikiFUFokikfIwvOmkrNkiax
+axANlWlWiSiSiSANANANANANANhikiFoFodkFoFoFoFoFokiax
+axANlWiSiSiSiSriQLooANANANhikiFoFokikfZRfexSEbkiax
+axANiSiSiSiSiSiSiSiSANANANhiaSFdAkkikikikikikikiax
+axANiSiSiSiSiSiSiSiSANANANhiaSFoFokiggbdbdzqmwkiax
+axANiSiSiSiSiSiSiSlWANANANhiaSFoFodkcvcvcvcvcvkiax
+axANiSiSiSlWlWiSiSiSlWANANhiaSFoFokicvPAcvcvdgkiax
+axANiSiSiSlWlWiSiSiSiSoTKPhiaSFokjkigOjKBONCOxkiax
+axANANlWiSiSiSiSiSiSiSiSiShikiFUAkkikikikikikikiax
+axANANlWiSiSiSiSiSiSiSiSiShikiRQFokiFUjpwvdlYRkiax
+axANANANiSiSiSiSiSiSiSiSiSSgkiRQFokiVFFoFoFoFokiax
+axANANANlWiSiSiSiSiSiSiSprKWkikiYwkinxISISISAkkiax
+axANANANANoRiSiSiSiSiSiSIhkikikiFokiFoiFITAGvAkiax
+axANANANANiSlWlWiSiSiSiSsTlQCmlQFolQFoISISISFokiax
+axANANANANANANANlWiSiSiShikikikikikikikikikikikiax
+axANANANANANANANANiSiSiSjNiQiQiQiQiQiQiQiQiQANANax
+axANANANANANANANANANlWiSiSiSiSiSiSiSiSiSiSANANANax
+axANANANANANANANANANANiSiSiSiSiSiSgaiSANANANANANax
+axANANANANANANANANANANANiSiSiSiSiSANANANANANANANax
+axANANANANANANANANANANANiSiSiSiSiSANANANANANANANax
+axaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxaxax
"}
diff --git a/maps/submaps/surface_submaps/mountains/Rockb1.dmm b/maps/submaps/surface_submaps/mountains/Rockb1.dmm
index 41776b8e71..9d8c44b069 100644
--- a/maps/submaps/surface_submaps/mountains/Rockb1.dmm
+++ b/maps/submaps/surface_submaps/mountains/Rockb1.dmm
@@ -21,8 +21,7 @@
/area/submap/Rockb1)
"g" = (
/obj/structure/closet/cabinet,
-/obj/item/weapon/gun/projectile/pistol,
-/obj/item/ammo_magazine/m9mm/compact,
+/obj/random/multiple/gun/projectile/handgun,
/turf/simulated/floor/lino,
/area/submap/Rockb1)
"h" = (
@@ -30,7 +29,7 @@
/turf/simulated/floor/lino,
/area/submap/Rockb1)
"i" = (
-/obj/machinery/vending/snack,
+/obj/random/vendorfood,
/turf/simulated/floor/tiled,
/area/submap/Rockb1)
"j" = (
@@ -38,11 +37,11 @@
/turf/simulated/floor/tiled,
/area/submap/Rockb1)
"k" = (
-/obj/machinery/vending/cola,
+/obj/random/vendordrink,
/turf/simulated/floor/tiled,
/area/submap/Rockb1)
"l" = (
-/obj/item/seeds/ambrosiadeusseed,
+/obj/random/maintenance/anom,
/turf/simulated/floor/tiled,
/area/submap/Rockb1)
"m" = (
@@ -60,6 +59,7 @@
/area/submap/Rockb1)
"p" = (
/obj/structure/bed,
+/obj/item/weapon/bedsheet/mime,
/turf/simulated/floor/lino,
/area/submap/Rockb1)
"q" = (
@@ -113,6 +113,7 @@
brightness_range = 5
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/floor_decal/industrial/hatch,
/turf/simulated/floor/tiled,
/area/submap/Rockb1)
"A" = (
@@ -206,12 +207,7 @@
/area/submap/Rockb1)
"M" = (
/obj/structure/table/standard,
-/obj/item/weapon/storage/toolbox/electrical,
-/turf/simulated/floor/tiled,
-/area/submap/Rockb1)
-"N" = (
-/obj/structure/table/standard,
-/obj/item/weapon/storage/toolbox/mechanical,
+/obj/random/toolbox,
/turf/simulated/floor/tiled,
/area/submap/Rockb1)
"O" = (
@@ -231,6 +227,7 @@
/area/submap/Rockb1)
"R" = (
/obj/effect/decal/cleanable/greenglow,
+/obj/item/poster/custom,
/turf/simulated/floor/plating,
/area/submap/Rockb1)
"S" = (
@@ -239,24 +236,552 @@
/area/submap/Rockb1)
(1,1,1) = {"
-aaaaaaaaaaaaaaaaaaaaaaaaa
-abbbcbbbbbbbbbbbbbbbbbbba
-abbcccccccddddddccccccbba
-abcccddddddddddddddccccba
-abccddddddddddddddddcccba
-abcddeeeeeeeeeeeeeedcccca
-abcddefgheijkelmnoedcccca
-abcddepqrestmetumvedcccba
-abcddeeewemtteweeeeecccba
-accddemtxmmtttttxyzycccba
-abdddeweeeeeeeweeeeecccba
-abdddeABCDetEmtwFGedcccba
-abdddeHIJKetLMNeeeedcccba
-abcddeeeeeeOeeeeddddcccba
-abccddddddePQRSedddccccba
-abccddddddeeeeeedccccccba
-abcccccccddddddddddccccba
-abbcccccccccccccccccccbba
-abbbbbbbbbbbbbccccbbbbbba
-aaaaaaaaaaaaaaaaaaaaaaaaa
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+b
+c
+c
+c
+c
+c
+c
+c
+d
+d
+d
+c
+c
+c
+c
+b
+b
+a
+"}
+(4,1,1) = {"
+a
+b
+c
+c
+c
+d
+d
+d
+d
+d
+d
+d
+d
+d
+c
+c
+c
+c
+b
+a
+"}
+(5,1,1) = {"
+a
+c
+c
+c
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+c
+c
+b
+a
+"}
+(6,1,1) = {"
+a
+b
+c
+d
+d
+e
+e
+e
+e
+e
+e
+e
+e
+e
+d
+d
+c
+c
+b
+a
+"}
+(7,1,1) = {"
+a
+b
+c
+d
+d
+e
+f
+p
+e
+m
+w
+A
+H
+e
+d
+d
+c
+c
+b
+a
+"}
+(8,1,1) = {"
+a
+b
+c
+d
+d
+e
+g
+q
+e
+t
+e
+B
+I
+e
+d
+d
+c
+c
+b
+a
+"}
+(9,1,1) = {"
+a
+b
+c
+d
+d
+e
+h
+r
+w
+x
+e
+C
+J
+e
+d
+d
+c
+c
+b
+a
+"}
+(10,1,1) = {"
+a
+b
+c
+d
+d
+e
+e
+e
+e
+m
+e
+D
+K
+e
+d
+d
+d
+c
+b
+a
+"}
+(11,1,1) = {"
+a
+b
+d
+d
+d
+e
+i
+s
+m
+m
+e
+e
+e
+e
+e
+e
+d
+c
+b
+a
+"}
+(12,1,1) = {"
+a
+b
+d
+d
+d
+e
+j
+t
+t
+t
+e
+t
+t
+O
+P
+e
+d
+c
+b
+a
+"}
+(13,1,1) = {"
+a
+b
+d
+d
+d
+e
+k
+m
+t
+t
+e
+E
+L
+e
+Q
+e
+d
+c
+b
+a
+"}
+(14,1,1) = {"
+a
+b
+d
+d
+d
+e
+e
+e
+e
+t
+e
+m
+M
+e
+R
+e
+d
+c
+b
+a
+"}
+(15,1,1) = {"
+a
+b
+d
+d
+d
+e
+l
+t
+w
+t
+w
+t
+M
+e
+S
+e
+d
+c
+c
+a
+"}
+(16,1,1) = {"
+a
+b
+d
+d
+d
+e
+m
+u
+e
+t
+e
+w
+e
+e
+e
+e
+d
+c
+c
+a
+"}
+(17,1,1) = {"
+a
+b
+c
+d
+d
+e
+n
+m
+e
+x
+e
+F
+e
+d
+d
+d
+d
+c
+c
+a
+"}
+(18,1,1) = {"
+a
+b
+c
+d
+d
+e
+o
+v
+e
+y
+e
+G
+e
+d
+d
+c
+d
+c
+c
+a
+"}
+(19,1,1) = {"
+a
+b
+c
+d
+d
+e
+e
+e
+e
+z
+e
+e
+e
+d
+d
+c
+d
+c
+b
+a
+"}
+(20,1,1) = {"
+a
+b
+c
+c
+d
+d
+d
+d
+e
+y
+e
+d
+d
+d
+c
+c
+c
+c
+b
+a
+"}
+(21,1,1) = {"
+a
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+a
+"}
+(22,1,1) = {"
+a
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+a
+"}
+(23,1,1) = {"
+a
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+b
+b
+a
+"}
+(24,1,1) = {"
+a
+b
+b
+b
+b
+c
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
"}
diff --git a/maps/submaps/surface_submaps/mountains/Scave1.dmm b/maps/submaps/surface_submaps/mountains/Scave1.dmm
index 11de2dd444..7cd9ca493d 100644
--- a/maps/submaps/surface_submaps/mountains/Scave1.dmm
+++ b/maps/submaps/surface_submaps/mountains/Scave1.dmm
@@ -5,7 +5,7 @@
"e" = (/obj/effect/spider/spiderling/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"f" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"g" = (/obj/random/mob/spider/mutant,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
-"h" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"h" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/effect/decal/remains,/obj/random/thermalponcho,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"i" = (/obj/random/mob/spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"j" = (/obj/item/weapon/grenade/spawnergrenade/spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"k" = (/obj/random/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
@@ -14,7 +14,18 @@
"n" = (/obj/item/device/flashlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"o" = (/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
"p" = (/obj/effect/spider/stickyweb,/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
-"q" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"q" = (/obj/effect/decal/remains/deer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"r" = (/obj/random/gun/random/anomalous,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"s" = (/obj/effect/decal/remains/ribcage,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"x" = (/obj/random/contraband/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"B" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"E" = (/obj/random/powercell,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"F" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/random/ammo,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"H" = (/obj/item/weapon/pickaxe/hand,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"M" = (/obj/random/tool,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"W" = (/obj/effect/decal/remains/tajaran,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"X" = (/obj/effect/decal/remains/mouse,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
+"Y" = (/obj/random/tool/power,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -22,24 +33,24 @@ aaaaabbaaaaaaaaaaaaaaaaaaaaaaa
aabbbbbbaabbbbbaaaaaaabbbbbaaa
abbbbbbbbbbbbbbbbbbbbbbbbbbaaa
aabbbbbbcbbbbbbbbbbbbbbbdbbbaa
-aabbbbdeddbbbcccbbbbbdddeddbaa
-aadbbfddddcbbdedbbbbbdgddddbaa
+aabbbbxeddbbbcccbbbbbBddedHbaa
+aadbbFddddcbbdedbbbbbdgdddWbaa
aadbbhfbbiddddddbccedddbdedbba
-aabbbbbbbddcdddddddddddbjgbbaa
+aabbbbbbbddcddddddddddrbjgbbaa
aabbbbbbdddbbbkcddddddbbbbbbaa
aabbbbbcdddbbbbbbcddddcbbbbaaa
aabbbbbcddcbbbbbbbdiddcbbbaaaa
aabbbbbbgdcbbbbbbbddddcbbbaaaa
-aabbbbbbdddbbbbbblddddcbbbaaaa
+aabbbbbbdddbbbbbblEdddcbbbaaaa
aabbbbbbdcdbbbbbbmddgdcbbbaaaa
-aabbbbbbdddbbbbbbcddddcbbbaaaa
-aadbbbbbdddbbbbbbbccdddbbbaaaa
+aabbbbbbdddbbbbbbcYdddcbbbaaaa
+aadbbbbbddBbbbbbbbccdddbbbaaaa
aandbbbbddbbbbbbbbbocddbbbaaaa
aaddbbbbdddbbbbbbbbbbddbbdaaaa
-aadddpddedddbbbbbbbbdedbbdaaaa
+aadddpddeddXbbbbbbbbdeBbbdaaaa
aaddppcdddgddcbcdddddcbbbdaaaa
aaqdbbbbbdddddddddddcbbbbdaaaa
-aabbbbbbbbcdddcdddddcbbbbbaaaa
+aabbbbbbbbcddBcMddsdcbbbbbaaaa
aabbbbbbbbbbbbbbbgbbbbbbbbaaaa
aabbbbbbbbbbbbbbbbbbbbbbbbaaaa
aaaaabbbbabbbbbbbaabbbbbbaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm b/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm
index 7d2dac4f13..2603b70f7c 100644
--- a/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm
+++ b/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm
@@ -5,7 +5,7 @@
"e" = (/obj/structure/droppod_door{dir = 1},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1)
"f" = (/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1)
"g" = (/obj/structure/droppod_door{dir = 8},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1)
-"h" = (/obj/structure/closet/crate,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/storage/box/flare,/obj/item/stack/marker_beacon/ten,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/trash/tastybread,/obj/item/trash/tastybread,/obj/item/trash/sosjerky,/obj/item/trash/sosjerky,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/weapon/flame/lighter/random,/obj/item/device/gps,/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1)
+"h" = (/obj/structure/closet/crate,/obj/item/weapon/storage/box/flare,/obj/item/stack/marker_beacon/ten,/obj/item/trash/tastybread,/obj/item/trash/tastybread,/obj/item/trash/sosjerky,/obj/item/trash/sosjerky,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/weapon/flame/lighter/random,/obj/item/device/gps,/obj/random/energy,/obj/random/energy,/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1)
"i" = (/obj/structure/droppod_door{dir = 4},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1)
"j" = (/obj/structure/droppod_door,/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1)
diff --git a/maps/submaps/surface_submaps/mountains/SwordCave.dmm b/maps/submaps/surface_submaps/mountains/SwordCave.dmm
index 9cd6077342..f05046f497 100644
--- a/maps/submaps/surface_submaps/mountains/SwordCave.dmm
+++ b/maps/submaps/surface_submaps/mountains/SwordCave.dmm
@@ -10,6 +10,7 @@
"j" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/swordcave)
"k" = (/mob/living/simple_mob/animal/space/bats,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/swordcave)
"l" = (/mob/living/simple_mob/animal/space/bats/cult,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/swordcave)
+"T" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/swordcave)
(1,1,1) = {"
aaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbaaaaaa
@@ -18,7 +19,7 @@ aaaabbbbbbcccccccccccccccccccccbbbbbbaaaa
aaabbbbbbcccccccccccccccccccccccdbbbbbaaa
aabbbbccccccceeeeeeeeeeeeeccccccccbbbbbaa
aabbbccccccceeeeeeeeeeeeeeeccccccccbbbbaa
-aabbbcdcccceeeffffffffffffeeeccccccbbbbaa
+aabbbcTcccceeeffffffffffffeeecccTccbbbbaa
aabbbccccceefeeeeeeefeeeeeeeeecccccbbbbaa
aabbbccccceefeeccceeeeeeeefffeeccccbbbaaa
aabbbcccceeffeecccccecccceefffeecccbbbaaa
@@ -28,23 +29,23 @@ abbbccccceefffeeeccccccceeefeeccccccbbaaa
abbbcccccceefffeeeccccceeeffeeccccccbbbaa
abbbcdccccceefffeeeeeeeeffffeeccccccbbbaa
abbcccclcccceeffffeeeeefffffeeccccccbbbaa
-abbcccccccccceeffffffffffffeeccccdccbbbaa
+abbcccccccccceeffffffffffffeeccccTccbbbaa
abbccccccccccceeffeeeeeefffeecccccccbbbaa
abbbccccdcccccceefeeeeeeeeeeckccccccbbbaa
abbbcccccccccccceeecccdceeecccccccccbbaaa
abbbcccccccccccccecccccccceccccdclccbbaaa
abbbcccccccccclcccccccccccccccccccccbbaaa
abbbbcccccclccccccccccccccclccccccccbbaaa
-abbbbbcccccccccccccccclccccccccclcccbbaaa
+abbbbbTccccccccccccccclccccccccclcccbbaaa
aabbbbbccccccccccccccccccccccccccccbbbaaa
aabbbbbccccccccccccdccccccccccccccbbbbaaa
aabbbbbcccccdccccccccccccccccccccbbbbbaaa
-aabbbbbccccccccccclccccccccdcccccbbbbaaaa
+aabbbbbccccccccccclccccccccTcccccbbbbaaaa
aabbbbbbbccccccccccccccccccccccccbbbbaaaa
aaabbbbbbbcccccccccccccccdccccccbbbbaaaaa
aaaabbbbbbcclcccccdcccccccccccccbbbbaaaaa
-aaaaabbbbbcccccccccccccccccccccbbbbbaaaaa
-aaaaabbbbbccccccccccccccccccccbbbbbaaaaaa
+aaaaabbbbbccccccccccccccccccccTbbbbbaaaaa
+aaaaabbbbbcccccccccccccTccccccbbbbbaaaaaa
aaaaaabbbbbcccdccccccccccccccbbbbbaaaaaaa
aaaaaaabbbbbcccccccclccccclcbbbbbbaaaaaaa
aaaaaaabbbbbbcccccccccccccccbbbbbaaaaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm b/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm
index 0e88b2843c..e6097b00b0 100644
--- a/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm
+++ b/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm
@@ -4,12 +4,12 @@
"ad" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"ae" = (/obj/effect/alien/egg,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"af" = (/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"ag" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ag" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"ah" = (/obj/structure/table/alien,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
"ai" = (/obj/machinery/artifact,/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"aj" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/ice,/area/template_noop)
+"aj" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/template_noop)
"ak" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"al" = (/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"al" = (/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"am" = (/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"an" = (/obj/structure/window/phoronreinforced,/obj/effect/alien/egg,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"ao" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
@@ -21,13 +21,13 @@
"au" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
"av" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
"aw" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"ax" = (/turf/simulated/floor/outdoors/ice,/area/template_noop)
-"ay" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"ax" = (/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/template_noop)
+"ay" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"az" = (/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aA" = (/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aB" = (/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aC" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
-"aD" = (/obj/structure/table/alien,/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aD" = (/obj/structure/table/alien,/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"aE" = (/obj/structure/prop/alien/pod/open,/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"aF" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aG" = (/obj/machinery/vr_sleeper/alien/random_replicant,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
@@ -42,32 +42,32 @@
"aP" = (/obj/structure/prop/alien/power,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aQ" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aR" = (/obj/effect/alien/weeds/node,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
-"aS" = (/obj/structure/table/alien,/obj/random/tool/alien,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
-"aT" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"aS" = (/obj/structure/table/alien,/obj/random/tool/alien,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
+"aT" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"aU" = (/obj/machinery/replicator,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aV" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/drug_den,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aW" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"aX" = (/obj/structure/prop/alien/computer/camera/flipped{icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"aY" = (/obj/structure/prop/alien/computer/camera{icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aX" = (/obj/structure/prop/alien/computer/camera/flipped{dir = 4; icon_state = "camera_flipped"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"aY" = (/obj/structure/prop/alien/computer/camera{dir = 8; icon_state = "camera"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"aZ" = (/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"ba" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/scientific,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
-"bb" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/nanites,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bb" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/nanites,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"bc" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/fresh_medicine,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bd" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/viral,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"be" = (/obj/machinery/door/blast/puzzle,/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bf" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"bg" = (/obj/structure/prop/lock/projectile,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
-"bh" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/old_medicine,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bg" = (/obj/structure/prop/lock/projectile,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
+"bh" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/old_medicine,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"bi" = (/obj/structure/prop/alien/dispenser,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bj" = (/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bk" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"bl" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bl" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"bm" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bn" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bo" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bp" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bq" = (/obj/machinery/implantchair,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"br" = (/obj/structure/prop/alien/computer{icon_state = "console-c"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"br" = (/obj/structure/prop/alien/computer{dir = 8; icon_state = "console-c"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bs" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bt" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bu" = (/obj/structure/loot_pile/surface/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
@@ -77,15 +77,15 @@
"by" = (/obj/structure/loot_pile/mecha/gygax/dark,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bz" = (/obj/structure/mopbucket,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bA" = (/obj/item/brokenbug,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
-"bB" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
-"bC" = (/obj/structure/prop/alien/computer/camera/flipped{icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
-"bD" = (/obj/structure/prop/alien/computer/camera{icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bB" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
+"bC" = (/obj/structure/prop/alien/computer/camera/flipped{dir = 4; icon_state = "camera_flipped"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
+"bD" = (/obj/structure/prop/alien/computer/camera{dir = 8; icon_state = "camera"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bE" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bF" = (/obj/structure/prop/blackbox/xenofrigate,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bG" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"bH" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bI" = (/obj/structure/table/alien,/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"bJ" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bJ" = (/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bK" = (/obj/structure/table/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bL" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bM" = (/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
@@ -95,8 +95,8 @@
"bQ" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bR" = (/obj/structure/table/alien,/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
"bS" = (/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"bT" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
-"bU" = (/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"bT" = (/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate)
+"bU" = (/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"bV" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bW" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"bX" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
@@ -104,12 +104,13 @@
"bZ" = (/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
"ca" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
"cb" = (/obj/structure/prop/alien/power,/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
-"cc" = (/obj/structure/loot_pile/surface/alien/end,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
-"cd" = (/obj/item/prop/alien/junk,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cc" = (/obj/structure/loot_pile/surface/alien/end,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
+"cd" = (/obj/item/prop/alien/junk,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"ce" = (/obj/random/tech_supply/component,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
-"cf" = (/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate)
+"cf" = (/obj/random/tech_supply/component,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
"cg" = (/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate)
"ch" = (/turf/simulated/shuttle/wall/alien/hard_corner,/area/submap/cave/crashed_ufo_frigate)
+"Oz" = (/obj/structure/table/alien,/turf/simulated/floor/outdoors/ice{outdoors = 0},/area/submap/cave/crashed_ufo_frigate)
(1,1,1) = {"
aaaaaaaxbGaaaaaaaaaaaaaaaaaaaaabababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -117,26 +118,26 @@ aaaaaxaxadaxaxbGaaaaaaaaababababacaeacafaeababababaaaaaaajaxadaaaaadaxajaaaaaa
adbGadadadadaxaxaaaaabababagahababacaiacababacakabababaaaaadaxadadaxaxaaaaaaaa
aaaxaxadadadadaaaaababacalalahahabamamanabacacacacaoababaaaaadbGadadaaaaaaaaaa
aaaaaaadbGadaaaaababaoacacalapapchalalalchapapaqaracasababaaaaaaadadadaxaxadaa
-aaaaadadadaaaaababaoacacapapapapatalapapauapapapavalacawababaaaaaaadadadaxajaa
+aaaaadadadaaaaababaoacacapapapapatalapapauapapapbBalacawababaaaaaaadadadaxajaa
aaadadaxaaaaababaoacayapapapalalchazacaAchaAaBapapaCacacawababaaaaaxadadadaaaa
-aaaxaxaaaaababaoacalalapapahaDabababazababababawapapaEacacaBababaaaxadaaaaaaaa
+aaaxaxaaaaababaoacalalapapOzaDabababazababababawapapaEacacaBababaaaxadaaaaaaaa
adbGaxaaaaabacacalalapapacaFababaGabababaHabababaIapapaqaAacakabaaajaxaaaaaaaa
aaadaaaaababacacaFapapacacaFabaGacaGabaHalalaJacacacapapacacabababaaaxaaaaaaaa
aaadaaaaabakacacaKapapacacacababaJababawacacchabacaAapapacababaIabaaaaaaaaaaaa
aaaaaaababababaFaFapalalacacaJacacakabaLacaLabababacapapababaIacababaaaaaaaaaa
aaaaaaabaMaNabababalalacacacababaOababaLacaLababababchatchaFalacaPabaaaaaaaaaa
aaaaaaabaFacakacchauchaoacacabaeaQaeabaLacaLabababakapaRabaSalacaPabadaxaaaaaa
-aaaaaaabaFacalalapalababaTalababaeabababawababaMaFacapapabahalacaPabadadaaaaaa
+aaaaaaabaFacalalapalababaTalababaeabababawababaMaFacapapabOzalacaPabadadaaaaaa
aaaaababaFalalapapapacababalaTabababakabababaUacaFacapapatacacababababadaxaaaa
aaaaabaVacapapapapacacakababababacacaWaAacababacacapapapabavababacacabadaxaaaa
-aaaaabacapapapapacacacacabababaXacaFaFahalaYababchaRapacabababaZacacabadadadaa
+aaaaabacapapapapacacacacabababaXacaFaFOzalaYababchaRapacabababaZacacabadadadaa
adaaabbaapapacalbbalbcacbdabacacapalalalapapapapbeapacacaIabalalacapchaZadadaa
adaaabalapabababababababababapapapapapapapapapapchaFacbfababbgacapapatacadbAaa
adaaabbhalabbiawabbiapaFabapapaRbjbkacacacaparblabbmacaFabacacapapapchaZadadaa
axaaabalbnbobpacabbiapbqchapalalalaFaFaFacacapalabbfacbmabacapapapalabadadaxaa
axaaabalbnbnbnbrabbibsapatapalagabababababakapapabbtaAbuabalapapalalabadadaxaa
aaadababaFbnapbvababaFaFchapalababbwbxbwababapapabbyacbzabalalapacababadadaaaa
-aaaaaaabaFapbBacaYababababapapabbCapapapbDabapapabbEbFbHabalalapacabadaxaaaaaa
+aaaaaaabaFapbXacaYababababapapabbCapapapbDabapapabbEbFbHabalalapacabadaxaaaaaa
aaaaaaabaFapapalalalalababapapabapapaRapapabapapabababababalapapalabadaaaaaaaa
axaaaaabbIaFapapbpalalabacalapbJapbKbLbfapbMapapacabacakbNapapalalabaaaaaaaaaa
axadaaababaFapbnbnacacabagalapbJbOaFapbPbObMapapakabacacbQapapalababaaaaaaaaaa
@@ -144,7 +145,7 @@ adbGadaaabbIbRbnapapbSabalalapbTapaRapapalbUapapacabacbVbWapacalabaaaaaaaaaaaa
aaaxaxaaababaFacapapbSababalaRapapapbXalalalaRacababacapapacakababaaaaaaaaaaaa
aaaaaxaaaaabbIaFapapapbSabalapapapapapapapapapacabacapapapacacabaaaaaaaaadadaa
aaaaaaaaaaabababchbYchabababbfbOapapapapapbObfabababchatchabababaaaaaaadbGadaa
-aaadaaaaaaaaababbZbZbnapacababaFahalagarcaaFababacapapapacababaaaaaaadadadadaa
+aaadaaaaaaaaababbZbZbnapacababaFOzalagarcaaFababacapapapacababaaaaaaadadadadaa
aaadaxajaaaaaaababcbbZapapalabababccabccabababacapapapaPababaaaaaaadadadadaaaa
aaadadaxaxbGaaaaababbZapapcdalalabababababacapapapapacababaaaaaaaxaxadadadadaa
aaaaadadadadadaaaaababaPacapapalalchapchceapapalcfaPababaaaaaabGadadadaxaxadaa
diff --git a/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm b/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
index 8b6c4b164a..46ab612d96 100644
--- a/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
+++ b/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
@@ -39,7 +39,7 @@
"aM" = (/obj/structure/frame,/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"aN" = (/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"aO" = (/obj/structure/closet/walllocker/emerglocker/north,/obj/structure/frame,/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle)
-"aP" = (/turf/simulated/floor/outdoors/rocks,/area/submap/crashedcontainmentshuttle)
+"aP" = (/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/crashedcontainmentshuttle)
"aQ" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
"aR" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/template_noop,/area/submap/crashedcontainmentshuttle)
"aS" = (/obj/structure/door_assembly/door_assembly_highsecurity{anchored = 1},/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
@@ -54,11 +54,11 @@
"bb" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"bc" = (/obj/structure/door_assembly,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle)
"bd" = (/obj/item/clothing/head/helmet/space/cult,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
-"be" = (/obj/item/weapon/material/knife/ritual,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
+"be" = (/obj/item/weapon/material/knife/ritual{start_anomalous = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
"bf" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
"bg" = (/obj/effect/spawner/gibs/generic,/turf/template_noop,/area/submap/crashedcontainmentshuttle)
"bh" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle)
-"bi" = (/obj/item/weapon/circuitboard/broken,/obj/effect/decal/remains/human,/obj/item/weapon/gun/energy/laser,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
+"bi" = (/obj/item/weapon/circuitboard/broken,/obj/effect/decal/remains/human,/obj/random/energy/highend,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"bj" = (/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle)
"bk" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"bl" = (/obj/effect/decal/remains/robot,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle)
@@ -77,7 +77,7 @@
"by" = (/obj/random/landmine,/obj/random/landmine,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"bz" = (/obj/effect/decal/remains/human,/obj/item/clothing/head/helmet/space/cult,/obj/effect/decal/cleanable/blood,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle)
"bA" = (/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle)
-"bB" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle)
+"bB" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle)
"bC" = (/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
"bD" = (/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
"bE" = (/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
@@ -91,6 +91,7 @@
"bM" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
"bN" = (/obj/structure/toilet{dir = 8},/obj/effect/spawner/gibs/generic,/obj/effect/decal/remains/human,/obj/item/weapon/card/id/syndicate{age = "\\42"; blood_type = "\\O+"; desc = "A strange ID card."; dna_hash = "\[REDACTED]"; fingerprint_hash = "\\------"; name = "Aaron Presley's ID Card(Delivery Service) "; registered_name = "Aaron Presley"; sex = "\\Male"},/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle)
"bO" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/remains/human,/obj/item/weapon/flame/lighter/random,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle)
+"ML" = (/obj/structure/table/steel_reinforced,/obj/random/maintenance/anom,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -101,7 +102,7 @@ aaaaacaaaaadaaaaaaaaajapaPaPaPadaPaaaaaaataaaaaaaa
aaaCaaaaauaDakaracacaGaQacacananacabaaaaaaaaaaaaaa
aaaVaXaaadaoaaadadajaXbHbyayadadaWacabaaaaaaaaaaaa
aaaYaaaRacaaadadaZapbIbybIazbbadaNacanbJaaaaaaaaaa
-aaaababdbeapapapadadadbIadadauadaNaAaeaTanaaaaataa
+aaaababdbeapapapadadadbIadadauadMLaAaeaTanaaaaataa
acaaaaaaapadauadadadacacaSacanadavacbhaeaeahaaaaaa
aPadaVaRacadadadbiadacbjafafacadadadbKbpaHaraaaaaa
aaaPadaaacaMadbkadbbacbvaBbwacaLadaSbKbqaHaoapaaaa
diff --git a/maps/submaps/surface_submaps/mountains/deadBeacon.dmm b/maps/submaps/surface_submaps/mountains/deadBeacon.dmm
index 253b4c53c9..b98f9dcd76 100644
--- a/maps/submaps/surface_submaps/mountains/deadBeacon.dmm
+++ b/maps/submaps/surface_submaps/mountains/deadBeacon.dmm
@@ -15,7 +15,7 @@
"o" = (/obj/item/weapon/paper/crumpled{info = "Sampatti Relay Sif-833
Decryption Key for 12-04-2488:
849B0022FBA920C244
Eyes Only.
The insider who knows all the secrets can bring down Lanka."; name = "Dusty Note"},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
"p" = (/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
"q" = (/obj/item/stack/rods,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
-"r" = (/obj/machinery/telecomms/relay{active_power_usage = 1; broadcasting = 0; panel_open = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
+"r" = (/obj/machinery/telecomms/relay{active_power_usage = 1; broadcasting = 0; panel_open = 1},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
"s" = (/obj/machinery/telecomms/broadcaster{light_power = 0; on = 0},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
"t" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/cave/deadBeacon)
"u" = (/obj/machinery/telecomms/receiver{light_power = 0; on = 0},/obj/structure/cable,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon)
@@ -37,6 +37,7 @@
"K" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon)
"L" = (/obj/structure/sign/warning/secure_area,/turf/simulated/wall/r_wall,/area/submap/cave/deadBeacon)
"M" = (/obj/structure/sign/warning/high_voltage,/turf/simulated/wall/r_wall,/area/submap/cave/deadBeacon)
+"W" = (/obj/random/maintenance/anom,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
@@ -44,7 +45,7 @@ aaaaaaaaaabbaaaaaaaa
aaaaaabbabbcbaaaaaaa
aaaaaadefgghidaaaaaa
aaaaaahjkgglhibaaaaa
-aaaaahdmnoggggbaaaaa
+aaaaahdmnoggWgbaaaaa
aaaabnpqnrsgqtbaaaaa
aaaabngnnuvwnxaaaaaa
aaaabhdgynnzkxbaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/digsite.dmm b/maps/submaps/surface_submaps/mountains/digsite.dmm
index 3c777b71f6..b2977ccb65 100644
--- a/maps/submaps/surface_submaps/mountains/digsite.dmm
+++ b/maps/submaps/surface_submaps/mountains/digsite.dmm
@@ -33,12 +33,13 @@
"G" = (/obj/structure/boulder,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
"H" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/plating/external,/area/submap/cave/digsite)
"I" = (/obj/structure/table/steel,/obj/item/weapon/tool/wrench,/obj/item/weapon/storage/box/samplebags,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
-"J" = (/obj/structure/table/steel,/obj/item/stack/flag/yellow,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
+"J" = (/obj/structure/table/steel,/obj/item/stack/flag/yellow,/obj/random/coin/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
"K" = (/obj/random/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
"L" = (/obj/structure/closet/crate,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
"M" = (/obj/machinery/floodlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
"N" = (/obj/structure/ore_box,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite)
-
+"S" = (/obj/item/prop/alien/junk{start_anomalous = 1},/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite)
+
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
aaabbbbbbbbbbbbbbbaa
@@ -46,7 +47,7 @@ aabccccccccdccccceea
abccffcfffghgcficcea
abcfffcffjggfcfffcea
abcfkflffggfffffmcea
-abcfffcffffffgfffcea
+abcfffcffffffgffScea
abccffcffffffgnfccea
abbccccclccfhccggeea
abbbbboeffffepqeeeea
@@ -61,4 +62,3 @@ aaeeeeeeeeeeeeNeeeaa
aaaaaeeeeeeeeeeeeaaa
aaaaaaaaaaaaaaaaaaaa
"}
-
diff --git a/maps/submaps/surface_submaps/mountains/lava_trench.dmm b/maps/submaps/surface_submaps/mountains/lava_trench.dmm
index 76b9f6f01f..afb648305d 100644
--- a/maps/submaps/surface_submaps/mountains/lava_trench.dmm
+++ b/maps/submaps/surface_submaps/mountains/lava_trench.dmm
@@ -1,108 +1,108 @@
"aa" = (/turf/template_noop,/area/template_noop)
-"ab" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 9},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"ab" = (/obj/structure/cliff/automatic{dir = 9; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"ac" = (/obj/structure/cliff/automatic,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"ad" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 5},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"ae" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 9},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"ad" = (/obj/structure/cliff/automatic{dir = 5; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"ae" = (/obj/structure/cliff/automatic/corner{dir = 9; icon_state = "cliffbuilder-corner"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"af" = (/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"ag" = (/obj/structure/cliff/automatic/corner,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"ah" = (/obj/structure/fence/end{icon_state = "end"; dir = 4},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"ai" = (/obj/structure/fence/post{icon_state = "post"; dir = 4},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"ah" = (/obj/structure/fence/end{dir = 4; icon_state = "end"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"ai" = (/obj/structure/fence/post{dir = 4; icon_state = "post"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"aj" = (/obj/structure/fence/door/opened,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"ak" = (/obj/structure/fence/end{icon_state = "end"; dir = 8},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"al" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 8},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"am" = (/obj/structure/fence/end{icon_state = "end"; dir = 1},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"an" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 9},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"ak" = (/obj/structure/fence/end{dir = 8; icon_state = "end"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"al" = (/obj/structure/cliff/automatic{dir = 8; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"am" = (/obj/structure/fence/end{dir = 1; icon_state = "end"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"an" = (/obj/structure/cliff/automatic{dir = 9; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
"ao" = (/obj/structure/cliff/automatic,/turf/simulated/floor/lava,/area/submap/lava_trench)
-"ap" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 5},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"ap" = (/obj/structure/cliff/automatic{dir = 5; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
"aq" = (/obj/structure/sign/warning/lava,/turf/simulated/wall,/area/submap/lava_trench)
"ar" = (/obj/structure/fence/post,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"as" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 6},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"at" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 9},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"as" = (/obj/structure/cliff/automatic{dir = 6; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"at" = (/obj/structure/cliff/automatic/corner{dir = 9; icon_state = "cliffbuilder-corner"},/turf/simulated/floor/lava,/area/submap/lava_trench)
"au" = (/turf/simulated/floor/lava,/area/submap/lava_trench)
"av" = (/obj/structure/cliff/automatic/corner,/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aw" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"aw" = (/obj/structure/railing{dir = 4; icon_state = "railing0"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"ax" = (/obj/structure/catwalk,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"ay" = (/obj/structure/railing{icon_state = "railing0"; dir = 8},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"az" = (/obj/structure/fence/door/opened{icon_state = "door_opened"; dir = 8},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"aA" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 8},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"ay" = (/obj/structure/railing{dir = 8; icon_state = "railing0"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"az" = (/obj/structure/fence/door/opened{dir = 8; icon_state = "door_opened"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"aA" = (/obj/structure/cliff/automatic{dir = 8; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
"aB" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"aC" = (/turf/simulated/floor/outdoors/rocks/caves,/area/template_noop)
-"aD" = (/obj/structure/cliff/automatic,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aE" = (/obj/structure/cliff/automatic,/obj/structure/railing{icon_state = "railing0"; dir = 8},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aF" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 10},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aG" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 10},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aH" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/obj/effect/step_trigger/teleporter/offset/east,/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aD" = (/obj/structure/cliff/automatic,/obj/structure/railing{dir = 4; icon_state = "railing0"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aE" = (/obj/structure/cliff/automatic,/obj/structure/railing{dir = 8; icon_state = "railing0"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aF" = (/obj/structure/cliff/automatic{dir = 10; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aG" = (/obj/structure/cliff/automatic/corner{dir = 10; icon_state = "cliffbuilder-corner"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aH" = (/obj/structure/railing{dir = 4; icon_state = "railing0"},/obj/effect/step_trigger/teleporter/offset/east,/turf/simulated/floor/lava,/area/submap/lava_trench)
"aI" = (/obj/structure/catwalk,/turf/simulated/floor/lava,/area/submap/lava_trench)
"aJ" = (/obj/structure/ore_box,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
-"aK" = (/obj/structure/railing{icon_state = "railing0"; dir = 8},/obj/effect/step_trigger/teleporter/offset/west,/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aL" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 4},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"aM" = (/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 4},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"aN" = (/obj/machinery/door/airlock/hatch{normalspeed = 0; safe = 0},/obj/effect/map_effect/interval/effect_emitter/sparks,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"aK" = (/obj/structure/railing{dir = 8; icon_state = "railing0"},/obj/effect/step_trigger/teleporter/offset/west,/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aL" = (/obj/structure/cliff/automatic{dir = 4; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"aM" = (/obj/machinery/light/small/flicker{dir = 4; icon_state = "bulb1"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"aN" = (/obj/random/tank/anom,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"aO" = (/turf/simulated/wall/rshull,/area/submap/lava_trench/outpost)
"aP" = (/obj/machinery/door/airlock/hatch{normalspeed = 0; safe = 0},/obj/effect/map_effect/interval/effect_emitter/sparks,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"aQ" = (/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"aR" = (/obj/effect/floor_decal/corner_oldtile/blue/full{icon_state = "corner_oldtile_full"; dir = 8},/obj/machinery/microscope,/obj/structure/table/standard,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"aS" = (/obj/effect/floor_decal/corner_oldtile/blue/full{icon_state = "corner_oldtile_full"; dir = 8},/obj/structure/table/standard,/obj/random/unidentified_medicine/scientific,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"aR" = (/obj/effect/floor_decal/corner_oldtile/blue/full{dir = 8; icon_state = "corner_oldtile_full"},/obj/machinery/microscope,/obj/structure/table/standard,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"aS" = (/obj/effect/floor_decal/corner_oldtile/blue/full{dir = 8; icon_state = "corner_oldtile_full"},/obj/structure/table/standard,/obj/random/unidentified_medicine/scientific,/obj/random/mug/anom,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"aT" = (/obj/structure/fence/end,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"aU" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 2},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aV" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 10},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"aW" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 10},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"aX" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 6},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aY" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 2},/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"aZ" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 2},/obj/structure/railing{icon_state = "railing0"; dir = 8},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aU" = (/obj/structure/cliff/automatic{dir = 2; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aV" = (/obj/structure/cliff/automatic{dir = 10; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"aW" = (/obj/structure/cliff/automatic/corner{dir = 10; icon_state = "cliffbuilder-corner"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"aX" = (/obj/structure/cliff/automatic/corner{dir = 6; icon_state = "cliffbuilder-corner"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aY" = (/obj/structure/cliff/automatic{dir = 2; icon_state = "cliffbuilder"},/obj/structure/railing{dir = 4; icon_state = "railing0"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"aZ" = (/obj/structure/cliff/automatic{dir = 2; icon_state = "cliffbuilder"},/obj/structure/railing{dir = 8; icon_state = "railing0"},/turf/simulated/floor/lava,/area/submap/lava_trench)
"ba" = (/obj/machinery/crystal/lava,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bb" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 4},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"bc" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 6},/turf/simulated/floor/lava,/area/submap/lava_trench)
-"bd" = (/obj/structure/table/steel,/obj/item/weapon/storage/excavation,/obj/item/device/measuring_tape,/obj/effect/floor_decal/corner_oldtile/purple{icon_state = "corner_oldtile"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bb" = (/obj/structure/cliff/automatic{dir = 4; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"bc" = (/obj/structure/cliff/automatic{dir = 6; icon_state = "cliffbuilder"},/turf/simulated/floor/lava,/area/submap/lava_trench)
+"bd" = (/obj/structure/table/steel,/obj/item/weapon/storage/excavation,/obj/item/device/measuring_tape,/obj/effect/floor_decal/corner_oldtile/purple{dir = 4; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"be" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop)
"bf" = (/obj/structure/railing,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bg" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 10},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
-"bh" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 10},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
+"bg" = (/obj/structure/cliff/automatic{dir = 10; icon_state = "cliffbuilder"},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
+"bh" = (/obj/structure/cliff/automatic/corner{dir = 10; icon_state = "cliffbuilder-corner"},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
"bi" = (/obj/structure/railing,/obj/effect/step_trigger/teleporter/offset/south,/turf/simulated/floor/lava,/area/submap/lava_trench)
-"bj" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 4},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
+"bj" = (/obj/structure/cliff/automatic{dir = 4; icon_state = "cliffbuilder"},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
"bk" = (/obj/structure/catwalk,/obj/structure/railing,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"bl" = (/obj/structure/catwalk,/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench)
-"bm" = (/obj/structure/fence/door/opened{icon_state = "door_opened"; dir = 4},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bn" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 2},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bo" = (/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 1},/obj/machinery/space_heater,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bm" = (/obj/structure/fence/door/opened{dir = 4; icon_state = "door_opened"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"bn" = (/obj/structure/cliff/automatic{dir = 2; icon_state = "cliffbuilder"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"bo" = (/obj/effect/floor_decal/corner_oldtile/purple/full{dir = 1; icon_state = "corner_oldtile_full"},/obj/machinery/space_heater,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bp" = (/obj/machinery/floodlight,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bq" = (/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"br" = (/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 1},/obj/structure/bed/chair/office/light{icon_state = "officechair_white"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bq" = (/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/light/small/flicker{dir = 1; icon_state = "bulb1"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"br" = (/obj/effect/floor_decal/corner_oldtile/blue{dir = 1; icon_state = "corner_oldtile"},/obj/structure/bed/chair/office/light{dir = 4; icon_state = "officechair_white"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bs" = (/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
-"bt" = (/obj/effect/floor_decal/corner_oldtile/purple{icon_state = "corner_oldtile"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bu" = (/obj/structure/cliff/automatic/corner{icon_state = "cliffbuilder-corner"; dir = 6},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bv" = (/obj/item/slime_crystal,/obj/item/slime_crystal,/obj/item/slime_crystal,/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 9},/obj/structure/table/standard,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bt" = (/obj/effect/floor_decal/corner_oldtile/purple{dir = 4; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bu" = (/obj/structure/cliff/automatic/corner{dir = 6; icon_state = "cliffbuilder-corner"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"bv" = (/obj/item/slime_crystal,/obj/item/slime_crystal,/obj/item/slime_crystal,/obj/effect/floor_decal/corner_oldtile/blue{dir = 9; icon_state = "corner_oldtile"},/obj/structure/table/standard,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bw" = (/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
"bx" = (/obj/machinery/crystal/ice,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
-"by" = (/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bz" = (/obj/effect/floor_decal/corner_oldtile{icon_state = "corner_oldtile"; dir = 1},/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
-"bA" = (/obj/effect/floor_decal/corner_oldtile{icon_state = "corner_oldtile"; dir = 4},/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
-"bB" = (/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 8},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bC" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 1},/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"by" = (/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/light/small/flicker{dir = 1; icon_state = "bulb1"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bz" = (/obj/effect/floor_decal/corner_oldtile{dir = 1; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
+"bA" = (/obj/effect/floor_decal/corner_oldtile{dir = 4; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
+"bB" = (/obj/effect/floor_decal/corner_oldtile/blue{dir = 8; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bC" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/obj/effect/floor_decal/corner_oldtile/purple/full{dir = 1; icon_state = "corner_oldtile_full"},/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bD" = (/obj/effect/step_trigger/teleporter/offset/north,/turf/simulated/floor/lava,/area/submap/lava_trench)
"bE" = (/obj/machinery/crystal/lava,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
-"bF" = (/obj/structure/table/rack,/obj/random/tool/powermaint,/obj/random/tool/powermaint,/obj/effect/floor_decal/corner_oldtile/purple{icon_state = "corner_oldtile"; dir = 6},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bF" = (/obj/structure/table/rack,/obj/random/tool/powermaint,/obj/random/tool/powermaint,/obj/effect/floor_decal/corner_oldtile/purple{dir = 6; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bG" = (/obj/effect/floor_decal/corner_oldtile/purple,/obj/structure/table/steel,/obj/item/device/xenoarch_multi_tool,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bH" = (/obj/effect/floor_decal/corner_oldtile/purple,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bI" = (/obj/item/device/gps/science{gps_tag = "CRYSTALS"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bK" = (/obj/effect/floor_decal/corner_oldtile/blue/full,/obj/random/drinkbottle,/obj/random/maintenance/research,/obj/structure/table/standard,/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 8},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bL" = (/obj/structure/flora/pottedplant/crystal,/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 8},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bM" = (/obj/structure/cult/pylon,/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
+"bK" = (/obj/effect/floor_decal/corner_oldtile/blue/full,/obj/random/drinkbottle,/obj/random/maintenance/research,/obj/structure/table/standard,/obj/machinery/light/small/flicker{dir = 8; icon_state = "bulb1"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bL" = (/obj/structure/flora/pottedplant/crystal,/obj/effect/floor_decal/corner_oldtile/blue{dir = 8; icon_state = "corner_oldtile"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bM" = (/obj/structure/cult/pylon{datum_components = /datum/component/artifact_master},/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost)
"bN" = (/obj/structure/anomaly_container,/obj/machinery/artifact,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bO" = (/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bP" = (/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 4},/obj/structure/table/steel,/obj/machinery/recharger,/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"bQ" = (/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 8},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bR" = (/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bS" = (/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 1},/obj/structure/loot_pile/surface/medicine_cabinet{pixel_y = 28},/obj/structure/table/standard,/obj/item/device/healthanalyzer/improved,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bO" = (/obj/machinery/light/small/flicker{dir = 4; icon_state = "bulb1"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bP" = (/obj/effect/floor_decal/corner_oldtile/purple/full{dir = 4; icon_state = "corner_oldtile_full"},/obj/structure/table/steel,/obj/machinery/recharger,/obj/machinery/light/small/flicker{dir = 4; icon_state = "bulb1"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bQ" = (/obj/machinery/light/small/flicker{dir = 8; icon_state = "bulb1"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"bR" = (/obj/machinery/light/small/flicker{dir = 1; icon_state = "bulb1"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
+"bS" = (/obj/effect/floor_decal/corner_oldtile/blue{dir = 1; icon_state = "corner_oldtile"},/obj/structure/loot_pile/surface/medicine_cabinet{pixel_y = 28},/obj/structure/table/standard,/obj/item/device/healthanalyzer/improved,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bT" = (/obj/machinery/suspension_gen{anchored = 1},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bU" = (/obj/machinery/light/small/flicker,/obj/structure/ore_box,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
"bW" = (/obj/structure/anomaly_container,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
-"bX" = (/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 4},/obj/item/weapon/storage/box/samplebags,/obj/structure/table/steel,/obj/item/stack/flag/red,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"bX" = (/obj/effect/floor_decal/corner_oldtile/purple/full{dir = 4; icon_state = "corner_oldtile_full"},/obj/item/weapon/storage/box/samplebags,/obj/structure/table/steel,/obj/item/stack/flag/red,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"bY" = (/obj/machinery/crystal,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
-"bZ" = (/obj/structure/table/steel,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
+"bZ" = (/obj/structure/table/steel,/obj/item/weapon/stock_parts/subspace/crystal{start_anomalous = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
"ca" = (/obj/structure/table/steel,/obj/item/stack/material/diamond,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench)
"cb" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
-"ce" = (/obj/effect/floor_decal/corner_oldtile/blue/full,/obj/structure/table/standard,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
+"ce" = (/obj/effect/floor_decal/corner_oldtile/blue/full,/obj/structure/table/standard,/obj/random/firstaid/anom,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"ch" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench)
"cj" = (/obj/item/clothing/head/bio_hood/anomaly,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
"ck" = (/obj/item/clothing/suit/bio_suit/anomaly,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost)
@@ -127,11 +127,11 @@ aBaBaVaWafafafafafafafafaFaUaUaUaUaUbcawaxayaFaUaUaGauauauauauaubbafafafafafafaf
aBaBaBalafafafafafafafafafafafafafafafafbwafafafbfbgbhbibibibibibjbfbfafafbaafafafafarafaBaBaBaB
beaBaBalafafafafbwbwbwbwbwafafafafafafafbwbwbwbwbkbkblblblblblblblbkbkafafafafafafafbmafaBaBaBaB
beaBaBalafafafafbwbxbEbYbwbwbwbwbwbwbwbwbwbwbwafafafaAbDbDbDbDbDavapafafafafafafafafarafaBaBaBaB
-beaBaBalafafafafbwbZcacrbwbwbwcqbUaJaOaNaOcocpcsafaqaAauauauauauaubbafafafafafafafafaTafaBaBaBaB
+beaBaBalafafafafbwbZcacrbwbwbwcqbUaJaOaPaOcocpcsafaqaAauauauauauaubbafafafafafafafafaTafaBaBaBaB
beaBaBalafafafafbwbwbwbwbwbwaJaOaOaOaObOaOaOaOaOafafaFaGauauafauaubbafafaqbpafafafafaLafaBaBaBaB
beaBaBaVbnbnaWafafbwbwbwbwbwaOaOaSbSaOaPaObdboaOaOafafaAauauauauauavapafafafafafafafaLaBaBaBaBaB
beaBaBaBaBaBalafafafafafafafaOaRbraQbqaQbycjbtbCaOafafaAauauauauauauavapafafafbaafafaLaBaBbeaBaB
-beaBaBaBaBaBalafafafafafafaMaObvaQaQaQaQaQcbbIbFaObQafaFaGauauauauauaubbafafafafafafaLaBaBbebebe
+beaBaBaBaBaBalafafafafafafaMaObvaQaQaQaQaQcbbIbFaObQafaFaGauauauauauaubbafafaNafafafaLaBaBbebebe
bebebebeaBaBaVbnbnbnbnaWafafaOcebBaQaQbTckaQbHbXaOafafafaAauauafauauaubbafafafafafafaLaBaBbebeaa
bebebebeaBaBaBaBaBaBaBalafafaOaObKbLbzbsbAbGbPaOaOafafafaAauauafbaauaubbafafbaafafafaLaBaBbebeaa
aaaabebebeaBaBaBaBaBaBalafafafaOaOaObsbMbsaOaOaObNafafafafafauafafauaubbafafafafafbuasaBaBbebeaa
diff --git a/maps/submaps/surface_submaps/mountains/prepper1.dmm b/maps/submaps/surface_submaps/mountains/prepper1.dmm
index 2e9f7a24d4..3bacbcbf05 100644
--- a/maps/submaps/surface_submaps/mountains/prepper1.dmm
+++ b/maps/submaps/surface_submaps/mountains/prepper1.dmm
@@ -10,14 +10,14 @@
"j" = (/obj/structure/table/steel,/obj/item/weapon/tape_roll,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"k" = (/obj/structure/table/steel,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/item/stack/tile/floor/steel,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"l" = (/obj/structure/inflatable/door,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
-"m" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
+"m" = (/obj/structure/closet/wardrobe/grey,/obj/random/ammo,/obj/random/ammo,/obj/random/contraband,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"n" = (/obj/structure/closet/crate/freezer/rations,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"o" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"p" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"q" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/material/makeshift,/obj/item/clothing/head/helmet/bucket,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"r" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
"s" = (/obj/structure/table/steel,/obj/item/device/flashlight/lantern,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
-"t" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,/obj/item/ammo_magazine/clip/c762,/obj/item/ammo_magazine/clip/c762,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
+"t" = (/obj/structure/table/rack,/obj/random/multiple/gun/projectile/rifle,/turf/simulated/floor/plating,/area/submap/cave/prepper1)
(1,1,1) = {"
aaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
index 2c0b30631e..a3a1f44399 100644
--- a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
+++ b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
@@ -60,7 +60,7 @@
"bh" = (/obj/item/clothing/suit/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
"bi" = (/obj/item/trash/candy,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"bj" = (/obj/structure/table/rack,/obj/structure/loot_pile/maint/boxfort,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bk" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
+"bk" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/obj/random/contraband,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
"bl" = (/obj/structure/closet/crate/secure/science{icon_state = "scisecurecrateopen"; locked = 0; name = "Virus Samples - FRAGILE"; opened = 1},/obj/item/weapon/virusdish/random,/obj/item/weapon/virusdish/random,/obj/item/weapon/virusdish/random,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
"bm" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/obj/effect/decal/remains/human,/obj/item/clothing/under/corp/mbill_flight{desc = "A flight suit belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date."; name = "\improper old Major Bill's flight suit"},/obj/item/clothing/head/soft/mbill{desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; name = "old shipping cap"},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"bn" = (/obj/structure/table/standard,/obj/item/device/taperecorder,/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
@@ -102,7 +102,7 @@
"bX" = (/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"bY" = (/obj/structure/sign/warning/secure_area,/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
"bZ" = (/obj/structure/sign/kiddieplaque{desc = "By order of the S.D.D.C, this site or craft is to be buried and not disturbed until such time that sterility can be confirmed. Dated: 20/12/2491 "; name = "\improper Sif Department of Disease Control notice"},/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
-"ca" = (/obj/structure/sign/warning,/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
+"ca" = (/obj/structure/table/steel,/obj/random/tool/power,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"cb" = (/obj/item/bodybag,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"cc" = (/obj/structure/table/steel,/obj/item/weapon/storage/box/bodybags,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"cd" = (/obj/structure/table/steel,/obj/item/clothing/suit/bio_suit,/obj/random/medical/lite,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
@@ -116,6 +116,7 @@
"cl" = (/obj/structure/table/rack,/obj/item/clothing/head/bio_hood,/obj/item/clothing/suit/bio_suit,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"cm" = (/obj/item/weapon/weldingtool/largetank,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"cn" = (/obj/structure/closet/crate/medical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
+"co" = (/obj/structure/sign/biohazard,/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -136,9 +137,9 @@ aaababadadbHbIbJbKadbLaQbMadbNbOadbPbQbRadagahabaa
ababacabadaiajakakbSaiadaiadadadadadadadadadadaaaa
ababababbTabaeaeafaeababababbUabababababadagahaaaa
aaabababbVbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWadadadaaaa
-aaaaababababababababbXbYbZcacbcbcbabcccdceabcfaaaa
+aaaaababababababababbXbYbZcocbcbcbabcccdceabcfaaaa
aaaaacababcgchcicjckclababcmabcbcbababababababaaaa
-aaaaaaababcnchababababababababaaaaaaaaaaababacaaaa
+aaaaaaababcncaababababababababaaaaaaaaaaababacaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm b/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm
index 0adb4b8937..bd1005733e 100644
--- a/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm
+++ b/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm
@@ -5,8 +5,8 @@
"e" = (/obj/structure/barricade,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"f" = (/turf/template_noop,/area/template_noop)
"g" = (/obj/effect/map_effect/portal/master/side_b{portal_id = "spatial_anomaly_4"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
-"h" = (/obj/effect/map_effect/portal/line/side_a{icon_state = "portal_line_side_a"; dir = 4},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
-"i" = (/obj/effect/map_effect/portal/line/side_b{icon_state = "portal_line_side_b"; dir = 8},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
+"h" = (/obj/effect/map_effect/portal/line/side_a{dir = 4; icon_state = "portal_line_side_a"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
+"i" = (/obj/effect/map_effect/portal/line/side_b{dir = 8; icon_state = "portal_line_side_b"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"j" = (/turf/simulated/floor/lava,/area/submap/spatial_anomaly)
"k" = (/obj/item/weapon/disposable_teleporter/slime,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"l" = (/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
@@ -23,17 +23,17 @@
"w" = (/obj/structure/table/steel_reinforced,/obj/item/device/xenoarch_multi_tool,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
"x" = (/turf/simulated/wall/solidrock,/area/template_noop)
"y" = (/obj/random/technology_scanner,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
-"z" = (/obj/structure/table/steel_reinforced,/obj/random/unidentified_medicine/scientific,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
+"z" = (/obj/structure/table/steel_reinforced,/obj/random/unidentified_medicine/scientific,/obj/random/medical/lite/anom,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
"A" = (/obj/structure/table/steel_reinforced,/obj/random/tool/power,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
"B" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/ore/diamond,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
"C" = (/obj/structure/sign/warning/lava,/turf/simulated/wall,/area/submap/spatial_anomaly)
"D" = (/obj/effect/map_effect/portal/line/side_a,/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"E" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/jackhammer,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"F" = (/obj/effect/map_effect/portal/master/side_a{dir = 1; icon_state = "portal_side_a"; portal_id = "spatial_anomaly_2"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
-"G" = (/obj/effect/map_effect/portal/line/side_a{icon_state = "portal_line_side_a"; dir = 1},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
+"G" = (/obj/effect/map_effect/portal/line/side_a{dir = 1; icon_state = "portal_line_side_a"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"H" = (/turf/unsimulated/wall,/area/template_noop)
"I" = (/obj/effect/map_effect/portal/master/side_b{dir = 1; icon_state = "portal_side_b"; portal_id = "spatial_anomaly_1"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
-"J" = (/obj/effect/map_effect/portal/line/side_b{icon_state = "portal_line_side_b"; dir = 1},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
+"J" = (/obj/effect/map_effect/portal/line/side_b{dir = 1; icon_state = "portal_line_side_b"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"K" = (/obj/item/weapon/mining_scanner,/obj/structure/table/rack,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"L" = (/obj/item/weapon/storage/belt/archaeology,/obj/effect/decal/remains/human,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"M" = (/obj/structure/bookcase/manuals/xenoarchaeology,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
@@ -45,6 +45,8 @@
"S" = (/obj/item/weapon/pickaxe/six_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"T" = (/obj/item/weapon/pickaxe/two_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"U" = (/obj/item/device/measuring_tape,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
+"V" = (/obj/random/maintenance/anom,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
+"W" = (/obj/random/coin/anom,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
"X" = (/obj/item/weapon/pickaxe/three_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly)
"Y" = (/obj/item/weapon/pickaxe/excavationdrill,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly)
@@ -59,7 +61,7 @@ fffaaabaaaaaabCbbsaaaaaaaaffff
fffaaaObaaaabbNbbaaaaaaaaaxfff
ffxaaabbblbbbybbaabPbbblaaafff
ffaaaaaaaaabbbtmaabbaaabaaafff
-ffaaaaaaaaatttttaabaaaabaaafff
+ffaaaaaaaaaWttVtaabaaaabaaafff
ffaalbbbbbaatvtQaalaaaabaaafff
ffaabaaaabaaBwzAaabaaaabaaffff
ffaabaaaabaaaaaaaabatnbbaaHHHf
@@ -71,7 +73,7 @@ fffaaaaaaaaabbbaablaabbbaeeaaf
fffaaaalbbbabbbaabbaabbbblbaaf
ffffaabbaabababbbbbaaUbbbEKaff
ffffaaTbbabXbabbLbYaabbbaaaaff
-ffffaabbbabbbabbmttaaFGGaaafff
+ffffaabbbabbbabbmtVaaFGGaaafff
ffffaaIJJablbabtttMaatttaaffff
fffffatttaaaaaaaaaaaaaaaafffff
fffffaaaaaaaaaaaaaaaaaaaffffff
diff --git a/maps/submaps/surface_submaps/mountains/temple.dmm b/maps/submaps/surface_submaps/mountains/temple.dmm
index 45419d055f..c209b3a098 100644
--- a/maps/submaps/surface_submaps/mountains/temple.dmm
+++ b/maps/submaps/surface_submaps/mountains/temple.dmm
@@ -2,12 +2,12 @@
"b" = (/turf/simulated/mineral/floor,/area/submap/AbandonedTemple)
"c" = (/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"d" = (/turf/simulated/wall/sandstone,/area/submap/AbandonedTemple)
-"e" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/carpet/turcarpet,/area/submap/AbandonedTemple)
+"e" = (/obj/effect/decal/cleanable/cobweb,/obj/random/maintenance/anom,/turf/simulated/floor/carpet/turcarpet,/area/submap/AbandonedTemple)
"f" = (/obj/effect/decal/remains/mummy1,/turf/simulated/floor/carpet/turcarpet,/area/submap/AbandonedTemple)
"g" = (/turf/simulated/wall/sandstonediamond,/area/submap/AbandonedTemple)
"h" = (/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"i" = (/obj/item/weapon/ectoplasm,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
-"j" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/platinum,/obj/item/weapon/coin/uranium,/obj/item/weapon/coin/diamond,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/uranium,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/phoron,/obj/item/weapon/coin/platinum,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
+"j" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/platinum,/obj/item/weapon/coin/uranium,/obj/item/weapon/coin/diamond,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/uranium,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/phoron,/obj/item/weapon/coin/platinum,/obj/effect/decal/cleanable/cobweb,/obj/random/coin/anom,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"k" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"l" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"m" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
@@ -39,6 +39,7 @@
"M" = (/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/flame/candle/candelabra/everburn,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"N" = (/obj/effect/decal/cleanable/cobweb2,/obj/item/weapon/flame/candle/candelabra/everburn,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/AbandonedTemple)
"O" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor,/area/submap/AbandonedTemple)
+"U" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/candle/candelabra/everburn{start_anomalous = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/AbandonedTemple)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaa
@@ -53,7 +54,7 @@ abcdppgccccccccccgccdcbaa
abcdppggggzggzggggcAdcbaa
abcdwcgBCccccccCDgcndcbaa
abcdcEgccwpFppcccgcldcbaa
-abcdcczcccpGyHlcczwndcbaa
+abcdcczcccpGUHlcczwndcbaa
abcddsgccIIccIIccgnddcbaa
abcmddgccccccccccgddJcbaa
abbcmddccKIccIIcsddccbbaa
diff --git a/maps/submaps/surface_submaps/mountains/vault2.dmm b/maps/submaps/surface_submaps/mountains/vault2.dmm
index 0c8e85ce2c..389252b59f 100644
--- a/maps/submaps/surface_submaps/mountains/vault2.dmm
+++ b/maps/submaps/surface_submaps/mountains/vault2.dmm
@@ -1,7 +1,7 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/simulated/wall,/area/submap/cave/vault2)
"c" = (/turf/simulated/floor/plating,/area/submap/cave/vault2)
-"d" = (/obj/random/multiple/minevault,/turf/simulated/floor/plating,/area/submap/cave/vault2)
+"d" = (/obj/random/multiple/minevault,/obj/random/maintenance/anom,/turf/simulated/floor/plating,/area/submap/cave/vault2)
(1,1,1) = {"
aaaaaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/vault3.dmm b/maps/submaps/surface_submaps/mountains/vault3.dmm
index bd93aba096..5f8476a946 100644
--- a/maps/submaps/surface_submaps/mountains/vault3.dmm
+++ b/maps/submaps/surface_submaps/mountains/vault3.dmm
@@ -5,7 +5,7 @@
"e" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/floor/plating,/area/submap/cave/vault3)
"f" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/turf/simulated/floor/plating,/area/submap/cave/vault3)
"g" = (/obj/effect/alien/weeds,/turf/simulated/floor/plating,/area/submap/cave/vault3)
-"h" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/obj/effect/alien/weeds/node,/turf/simulated/floor/plating,/area/submap/cave/vault3)
+"h" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/queen/empress/mother,/turf/simulated/floor/plating,/area/submap/cave/vault3)
"i" = (/obj/structure/bed/nest,/turf/simulated/floor/plating,/area/submap/cave/vault3)
(1,1,1) = {"
@@ -14,7 +14,7 @@ aabbbbbaa
abbcdcbba
abefffgba
abgfhfgba
-abgfffeba
+abgfffgba
abbigibba
aabbbbbaa
aaaaaaaaa
diff --git a/maps/submaps/surface_submaps/mountains/vault4.dmm b/maps/submaps/surface_submaps/mountains/vault4.dmm
index 78ac6842d5..33b07428b2 100644
--- a/maps/submaps/surface_submaps/mountains/vault4.dmm
+++ b/maps/submaps/surface_submaps/mountains/vault4.dmm
@@ -5,7 +5,7 @@
"e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
"f" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien/drone,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
"g" = (/obj/effect/alien/weeds/node,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
-"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
+"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/obj/random/maintenance/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
"i" = (/obj/effect/alien/weeds,/mob/living/simple_mob/animal/space/alien,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
"j" = (/obj/effect/alien/weeds,/obj/effect/alien/egg,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault4)
diff --git a/maps/submaps/surface_submaps/mountains/vault5.dmm b/maps/submaps/surface_submaps/mountains/vault5.dmm
index eed4f490a7..ca888297f1 100644
--- a/maps/submaps/surface_submaps/mountains/vault5.dmm
+++ b/maps/submaps/surface_submaps/mountains/vault5.dmm
@@ -1,20 +1,21 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
-"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/obj/item/weapon/gun/projectile/p92x/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/obj/random/handgun,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"f" = (/obj/effect/alien/weeds,/obj/item/clothing/suit/storage/vest/tactical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"g" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/mob/living/simple_mob/animal/space/alien,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"i" = (/obj/effect/alien/weeds,/obj/effect/alien/egg,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
"j" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/queen/empress,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
-"k" = (/obj/effect/alien/weeds,/obj/item/clothing/head/helmet/tac,/obj/item/weapon/gun/projectile/SVD,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"k" = (/obj/effect/alien/weeds,/obj/item/clothing/head/helmet/tac,/obj/random/multiple/gun/projectile/rifle,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
+"V" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/mob/living/simple_mob/animal/space/alien,/obj/random/gun/random/anomalous,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5)
(1,1,1) = {"
aaaaaaaaa
aabbcbbaa
abbdefbba
-abgeeehba
+abgeeeVba
abiejeiba
abheeegba
abbkegbba
diff --git a/maps/submaps/surface_submaps/plains/Boathouse.dmm b/maps/submaps/surface_submaps/plains/Boathouse.dmm
index 0f20993d39..f8ce4226eb 100644
--- a/maps/submaps/surface_submaps/plains/Boathouse.dmm
+++ b/maps/submaps/surface_submaps/plains/Boathouse.dmm
@@ -7,9 +7,9 @@
"ag" = (/obj/structure/table/bench/wooden,/turf/template_noop,/area/submap/Boathouse)
"ah" = (/obj/structure/table/woodentable,/turf/template_noop,/area/submap/Boathouse)
"ai" = (/turf/simulated/wall/wood,/area/submap/Boathouse)
-"aj" = (/obj/structure/closet/cabinet,/obj/item/clothing/accessory/jacket,/obj/item/clothing/accessory/jacket,/obj/item/clothing/head/beanie,/turf/simulated/floor/wood,/area/submap/Boathouse)
+"aj" = (/obj/structure/closet/cabinet,/obj/item/clothing/accessory/jacket,/obj/item/clothing/accessory/jacket,/obj/item/clothing/head/beanie,/obj/random/medical/lite,/turf/simulated/floor/wood,/area/submap/Boathouse)
"ak" = (/turf/simulated/floor/wood,/area/submap/Boathouse)
-"al" = (/obj/structure/closet/cabinet,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/item/weapon/storage/box/beanbags,/turf/simulated/floor/wood,/area/submap/Boathouse)
+"al" = (/obj/structure/closet/cabinet,/obj/item/weapon/storage/box/beanbags,/obj/random/projectile/shotgun,/turf/simulated/floor/wood,/area/submap/Boathouse)
"am" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
"an" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/Boathouse)
"ao" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/turf/simulated/floor/water,/area/submap/Boathouse)
@@ -19,22 +19,22 @@
"as" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
"at" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/Boathouse)
"au" = (/obj/item/weapon/stool,/turf/simulated/floor/wood,/area/submap/Boathouse)
-"av" = (/turf/simulated/floor/wood{ icon_state = "wood_broken6"},/area/submap/Boathouse)
+"av" = (/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Boathouse)
"aw" = (/obj/structure/railing{dir = 8},/turf/simulated/floor/water,/area/submap/Boathouse)
-"ax" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
+"ax" = (/obj/structure/table/woodentable,/obj/random/drinkbottle,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
"ay" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
"az" = (/obj/structure/table/woodentable,/obj/item/weapon/tape_roll,/obj/random/firstaid,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aA" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse)
-"aB" = (/turf/simulated/floor/wood{ icon_state = "wood_broken2"},/area/submap/Boathouse)
-"aC" = (/obj/structure/railing{dir = 8},/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse)
-"aD" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse)
+"aB" = (/turf/simulated/floor/wood{icon_state = "wood_broken2"},/area/submap/Boathouse)
+"aC" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1; icon_state = "railing0"},/turf/simulated/floor/water,/area/submap/Boathouse)
+"aD" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/turf/simulated/floor/water,/area/submap/Boathouse)
"aE" = (/obj/vehicle/boat/sifwood,/turf/simulated/floor/water,/area/submap/Boathouse)
"aF" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aG" = (/obj/structure/table/woodentable,/obj/item/weapon/oar,/obj/item/weapon/oar,/turf/simulated/floor/wood,/area/submap/Boathouse)
-"aH" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/turf/simulated/floor/water,/area/submap/Boathouse)
+"aH" = (/obj/structure/railing{dir = 8; icon_state = "railing0"},/turf/simulated/floor/water,/area/submap/Boathouse)
"aI" = (/obj/structure/table/woodentable,/obj/random/powercell,/turf/simulated/floor/wood,/area/submap/Boathouse)
-"aJ" = (/turf/simulated/floor/wood{ icon_state = "wood_broken4"},/area/submap/Boathouse)
-"aK" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse)
+"aJ" = (/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Boathouse)
+"aK" = (/obj/structure/railing{dir = 8; icon_state = "railing0"},/obj/structure/railing{dir = 1; icon_state = "railing0"},/turf/simulated/floor/water,/area/submap/Boathouse)
"aL" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aM" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/fruitsalad,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aN" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Boathouse)
@@ -44,13 +44,16 @@
"aR" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/bag/trash,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aS" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/lighter,/obj/item/weapon/storage/fancy/candle_box,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aT" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse)
-"aU" = (/obj/structure/table/rack,/obj/item/clothing/accessory/poncho/blue,/obj/item/clothing/accessory/poncho/blue,/turf/simulated/floor/wood,/area/submap/Boathouse)
+"aU" = (/obj/structure/table/rack,/obj/item/clothing/accessory/poncho/blue,/obj/item/clothing/accessory/poncho/blue,/obj/random/thermalponcho,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aV" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aW" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aX" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage,/obj/item/clothing/accessory/storage,/turf/simulated/floor/wood,/area/submap/Boathouse)
"aY" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse)
-"aZ" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse)
+"aZ" = (/obj/structure/table/woodentable,/obj/random/snack,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse)
"ba" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Boathouse)
+"lN" = (/obj/random/multiple/corp_crate/no_weapons,/turf/simulated/floor/wood,/area/submap/Boathouse)
+"DG" = (/obj/structure/table/woodentable,/obj/random/mug,/turf/template_noop,/area/submap/Boathouse)
+"NW" = (/obj/structure/table/woodentable,/obj/random/mug/anom,/turf/template_noop,/area/submap/Boathouse)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -71,7 +74,7 @@ aaacadadadadadadadaeaeaeaeaeaeaeaeaeaeadadadadadadadadadacacacababababababababaa
aaacacadadadadadadaeaeaeaeaeaeaeaeaeaeadadadadacacacacacacababababababababababaa
aaabacadadadadadadaeaeaeaeaeaeaeaeaeaeadadadacacababababababababafababababababaa
aaabacacadadadadadaeaeaeaeaeaeaeaeaeadadadadacababagagagagababababababababababaa
-aaababacacadadadadadaeaeaeaeaeaeaeaeadadadacabababahahahahababababababababababaa
+aaababacacadadadadadaeaeaeaeaeaeaeaeadadadacabababDGahNWahababababababababababaa
aaabababacadadadadadaeaeadaeaeaeaeaeadadadacabababagagagagababababababababababaa
aaabababacacacadadadadaeadadaeaeaeaeaeadadacacabababababababababababafababababaa
aaabababababacacacadadadadadaeaeaeaeaeadadadacacacababababababababababababababaa
@@ -90,7 +93,7 @@ aaababababababababacacadadadadadadadadadaeaeaeaeaeaeaeaeaeaeadadadadadadadacabaa
aaabababababababababacadadadadadadadadadadaeaeaeaeaeaeaeaeaeadadadadadadadacabaa
aaabababaiaiaiaiaiaiacacadadadadadadadadadaeaeaeaeaeaeaeaeaeadadadadadadadacabaa
aaabaiaiaiaiaiaiaiaiaiaiaiaiaiaiadadadadadadaeaeaeaeaeaeaeaeadadadadadadadacabaa
-aaaiaiajakakalaiakakakakaiaiaiaiadadadadadadaeaeaeaeaeaeaeaeadadadadadadacacabaa
+aaaiaiajakakalailNakakakaiaiaiaiadadadadadadaeaeaeaeaeaeaeaeadadadadadadacacabaa
aaaiaiakamamakaianakakakaoapapapadadadadadadaeaeaeaeaeaeaeadadadadadadacacababaa
aaaiaiaqarasaqaiatauakakakavakakawadadadadadaeaeaeaeaeaeaeadadadadadadacabababaa
aaaiaiaqaxayaqaiazakakakakakakakawadadadadadadaeaeaeaeaeaeadadadadadadacabababaa
diff --git a/maps/submaps/surface_submaps/plains/BuriedTreasure2.dmm b/maps/submaps/surface_submaps/plains/BuriedTreasure2.dmm
index f10b287e69..a49f7a66bc 100644
--- a/maps/submaps/surface_submaps/plains/BuriedTreasure2.dmm
+++ b/maps/submaps/surface_submaps/plains/BuriedTreasure2.dmm
@@ -1,5 +1,5 @@
"a" = (/turf/template_noop,/area/submap/BuriedTreasure)
-"b" = (/obj/structure/closet/grave,/obj/random/contraband,/obj/random/contraband,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/drinkbottle,/obj/random/mre,/obj/random/projectile/sec,/obj/item/clothing/under/explorer/armored,/turf/template_noop,/area/submap/BuriedTreasure)
+"b" = (/obj/structure/closet/grave,/obj/random/contraband,/obj/random/contraband,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/cash,/obj/random/drinkbottle,/obj/random/mre,/obj/item/clothing/under/explorer/armored,/obj/random/projectile,/turf/template_noop,/area/submap/BuriedTreasure)
(1,1,1) = {"
aaaaa
diff --git a/maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm b/maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm
index fdc989871d..c205e5c040 100644
--- a/maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm
+++ b/maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm
@@ -1,5 +1,5 @@
"a" = (/turf/template_noop,/area/submap/BuriedTreasure)
-"b" = (/obj/structure/closet/grave,/obj/random/energy,/obj/random/drinkbottle,/obj/random/contraband,/obj/random/ammo,/obj/random/ammo,/obj/random/mre,/obj/random/tool/power,/obj/random/unidentified_medicine/fresh_medicine,/obj/random/unidentified_medicine/combat_medicine,/obj/random/medical/pillbottle,/obj/random/soap,/turf/template_noop,/area/submap/BuriedTreasure)
+"b" = (/obj/structure/closet/grave,/obj/random/energy,/obj/random/drinkbottle,/obj/random/contraband,/obj/random/ammo,/obj/random/ammo,/obj/random/mre,/obj/random/unidentified_medicine/fresh_medicine,/obj/random/unidentified_medicine/combat_medicine,/obj/random/medical/pillbottle,/obj/random/soap,/obj/random/tool/power,/obj/random/maintenance/clean/anom,/turf/template_noop,/area/submap/BuriedTreasure)
(1,1,1) = {"
aaaaa
diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm
index d600520954..520dd76d7b 100644
--- a/maps/submaps/surface_submaps/plains/Diner.dmm
+++ b/maps/submaps/surface_submaps/plains/Diner.dmm
@@ -1,464 +1,87 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/turf/template_noop,
-/area/template_noop)
-"ab" = (
-/turf/template_noop,
-/area/submap/Diner)
-"ac" = (
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Diner)
-"ad" = (
-/turf/simulated/wall,
-/area/submap/Diner)
-"ae" = (
-/obj/structure/window/reinforced/full,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"af" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ag" = (
-/obj/structure/table/standard,
-/obj/machinery/microwave,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ah" = (
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ai" = (
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/food/condiment/enzyme,
-/obj/item/weapon/reagent_containers/glass/beaker,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aj" = (
-/obj/structure/table/standard,
-/obj/machinery/light{
- dir = 1
- },
-/obj/item/weapon/material/knife/butch,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ak" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"al" = (
-/obj/machinery/vending/dinnerware,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"am" = (
-/obj/structure/sink/kitchen,
-/turf/simulated/wall,
-/area/submap/Diner)
-"an" = (
-/obj/structure/flora/tree/sif,
-/turf/template_noop,
-/area/submap/Diner)
-"ao" = (
-/obj/structure/bed/chair/wood{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ap" = (
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aq" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ar" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
-/obj/item/weapon/material/kitchen/utensil/fork,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"as" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,
-/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"at" = (
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1";
- pixel_y = 0
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"au" = (
-/obj/structure/table/standard,
-/obj/item/weapon/book/manual/chef_recipes,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"av" = (
-/obj/structure/table/standard,
-/obj/item/weapon/material/kitchen/rollingpin,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aw" = (
-/obj/machinery/appliance/mixer/cereal,
-/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ax" = (
-/obj/structure/bed/chair/wood,
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ay" = (
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/weapon/storage/fancy/egg_box,
-/obj/item/weapon/storage/fancy/egg_box,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"az" = (
-/obj/structure/simple_door/wood,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aA" = (
-/obj/structure/simple_door/wood,
-/turf/simulated/floor/tiled,
-/area/submap/Diner)
-"aB" = (
-/obj/structure/simple_door/wood,
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aC" = (
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/weapon/material/kitchen/utensil/fork,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aD" = (
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aE" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/weapon/stool/padded,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aF" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aG" = (
-/turf/simulated/floor/tiled,
-/area/submap/Diner)
-"aH" = (
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aI" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aJ" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aK" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aL" = (
-/obj/machinery/light/small{
- brightness_color = "#DA0205";
- brightness_power = 1;
- brightness_range = 5;
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/submap/Diner)
-"aM" = (
-/obj/machinery/light/small{
- brightness_color = "#DA0205";
- brightness_power = 1;
- brightness_range = 5;
- dir = 8
- },
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aN" = (
-/obj/structure/closet/crate/freezer,
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aO" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aP" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/table/standard,
-/obj/machinery/microwave,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aQ" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aR" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/coatrack,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aS" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aT" = (
-/obj/structure/closet/crate/freezer,
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aU" = (
-/obj/machinery/gibber,
-/turf/simulated/floor/tiled/freezer,
-/area/submap/Diner)
-"aV" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aW" = (
-/obj/machinery/appliance/cooker/fryer,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aX" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/outdoors/dirt,
-/area/submap/Diner)
-"aY" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1";
- pixel_y = 0
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"aZ" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/appliance/cooker/grill,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"ba" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled,
-/area/submap/Diner)
-"bb" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/submap/Diner)
-"bc" = (
-/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"bd" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/closet/secure_closet/freezer/fridge,
-/obj/item/weapon/storage/fancy/egg_box,
-/obj/item/weapon/storage/fancy/egg_box,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"be" = (
-/obj/structure/table/standard,
-/obj/machinery/chemical_dispenser/bar_coffee,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"bf" = (
-/obj/item/frame/apc,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bg" = (
-/obj/structure/table/woodentable,
-/obj/item/device/flashlight/lamp,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bh" = (
-/obj/structure/bed/chair/office/light,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bi" = (
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bk" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bl" = (
-/obj/structure/table/woodentable,
-/obj/item/weapon/cell/high,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bm" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bn" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bo" = (
-/obj/structure/simple_door/wood,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"bp" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/structure/windoor_assembly{
- icon_state = "l_windoor_assembly01";
- dir = 2
- },
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"bq" = (
-/obj/structure/bookcase,
-/turf/simulated/floor/lino,
-/area/submap/Diner)
-"br" = (
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/space_heater,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"bs" = (
-/obj/structure/sink{
- icon_state = "sink";
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
-"bt" = (
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
-"bu" = (
-/obj/structure/toilet,
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
-"bv" = (
-/obj/structure/bed/chair/wood{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"bw" = (
-/obj/structure/bed/chair/wood{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/submap/Diner)
-"bx" = (
-/obj/structure/simple_door/wood,
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
-"by" = (
-/obj/structure/mirror{
- dir = 4;
- pixel_x = -32;
- pixel_y = 0
- },
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
-"bz" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
-"bA" = (
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/hydro,
-/area/submap/Diner)
+"aa" = (/turf/template_noop,/area/template_noop)
+"ab" = (/turf/template_noop,/area/submap/Diner)
+"ac" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Diner)
+"ad" = (/turf/simulated/wall,/area/submap/Diner)
+"ae" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"af" = (/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ag" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ah" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ai" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/glass/beaker,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aj" = (/obj/structure/table/standard,/obj/machinery/light{dir = 1},/obj/item/weapon/material/knife/butch,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ak" = (/obj/machinery/vending/hotfood,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"al" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"am" = (/obj/structure/sink/kitchen,/turf/simulated/wall,/area/submap/Diner)
+"an" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Diner)
+"ao" = (/obj/structure/bed/chair/wood{dir = 1},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ap" = (/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aq" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ar" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/obj/item/weapon/material/kitchen/utensil/fork,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"as" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"at" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"au" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"av" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/rollingpin,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aw" = (/obj/machinery/appliance/mixer/cereal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ax" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ay" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/condiment/sugar,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"az" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aA" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled,/area/submap/Diner)
+"aB" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aC" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/obj/effect/floor_decal/corner/red/diagonal,/obj/item/weapon/material/kitchen/utensil/fork,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aD" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aE" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aF" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aG" = (/turf/simulated/floor/tiled,/area/submap/Diner)
+"aH" = (/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aI" = (/obj/structure/closet/crate/freezer,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aJ" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/diagonal,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aK" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aL" = (/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5; dir = 8},/turf/simulated/floor/tiled,/area/submap/Diner)
+"aM" = (/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5; dir = 8},/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aN" = (/obj/structure/closet/crate/freezer,/obj/machinery/light/small{dir = 4},/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aO" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/diagonal,/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aP" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aQ" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/obj/item/weapon/reagent_containers/food/condiment/flour,/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aR" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/coatrack,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aS" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/table/standard,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aT" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aU" = (/obj/machinery/gibber,/turf/simulated/floor/tiled/freezer,/area/submap/Diner)
+"aV" = (/obj/machinery/light/small,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aW" = (/obj/machinery/appliance/cooker/fryer,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aX" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/outdoors/dirt,/area/submap/Diner)
+"aY" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"aZ" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/appliance/cooker/grill,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"ba" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Diner)
+"bb" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled,/area/submap/Diner)
+"bc" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bd" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"be" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_coffee,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bf" = (/obj/item/frame/apc,/turf/simulated/floor/lino,/area/submap/Diner)
+"bg" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/lino,/area/submap/Diner)
+"bh" = (/obj/structure/bed/chair/office/light,/turf/simulated/floor/lino,/area/submap/Diner)
+"bi" = (/turf/simulated/floor/lino,/area/submap/Diner)
+"bj" = (/obj/structure/table/standard,/obj/random/mug,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bk" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/lino,/area/submap/Diner)
+"bl" = (/obj/structure/table/woodentable,/obj/item/weapon/cell/high,/turf/simulated/floor/lino,/area/submap/Diner)
+"bm" = (/obj/structure/table/woodentable,/obj/random/mug,/turf/simulated/floor/lino,/area/submap/Diner)
+"bn" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/lino,/area/submap/Diner)
+"bo" = (/obj/structure/simple_door/wood,/turf/simulated/floor/lino,/area/submap/Diner)
+"bp" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/structure/windoor_assembly{icon_state = "l_windoor_assembly01"; dir = 2},/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bq" = (/obj/structure/bookcase,/turf/simulated/floor/lino,/area/submap/Diner)
+"br" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/space_heater,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bs" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
+"bt" = (/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
+"bu" = (/obj/structure/toilet,/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
+"bv" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bw" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled/white,/area/submap/Diner)
+"bx" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
+"by" = (/obj/structure/mirror{dir = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
+"bz" = (/obj/machinery/light/small,/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
+"bA" = (/obj/structure/table/standard,/obj/random/soap/anom,/turf/simulated/floor/tiled/hydro,/area/submap/Diner)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaabababacabababababadaeaeadadadadadadadadabababaa
-aaabababacacabababadadafafadagahaiajakalamadababaa
+aaabababacacabababadadafafadagbjaiajakalamadababaa
aaabanacacacababadadafaxaxadapapapapapapapadadabaa
aaababacacacabadadaqafarasadatapauahavapapawadadaa
aaababacacacabadafafafaoaoadapapapapapapapapayadaa
diff --git a/maps/submaps/surface_submaps/plains/Epod.dmm b/maps/submaps/surface_submaps/plains/Epod.dmm
index 23ad06ceb5..c317cfeb78 100644
--- a/maps/submaps/surface_submaps/plains/Epod.dmm
+++ b/maps/submaps/surface_submaps/plains/Epod.dmm
@@ -9,7 +9,7 @@
"i" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/obj/item/weapon/weldingtool,/turf/simulated/shuttle/floor,/area/submap/Epod1)
"j" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Epod1)
"k" = (/obj/structure/bed/chair,/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor,/area/submap/Epod1)
-"l" = (/obj/structure/bed/chair,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/item/weapon/storage/backpack/satchel,/obj/item/weapon/spacecash/c100,/turf/simulated/shuttle/floor,/area/submap/Epod1)
+"l" = (/obj/structure/bed/chair,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/item/weapon/storage/backpack/satchel,/obj/random/cash/big,/obj/random/contraband,/turf/simulated/shuttle/floor,/area/submap/Epod1)
"m" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/Epod1)
"n" = (/obj/structure/flora/tree/dead,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod1)
diff --git a/maps/submaps/surface_submaps/plains/Epod2.dmm b/maps/submaps/surface_submaps/plains/Epod2.dmm
index db809d4c7b..f88d12a4e4 100644
--- a/maps/submaps/surface_submaps/plains/Epod2.dmm
+++ b/maps/submaps/surface_submaps/plains/Epod2.dmm
@@ -6,12 +6,12 @@
"f" = (/obj/structure/boulder{icon_state = "boulder2"},/turf/simulated/floor/outdoors/dirt,/area/submap/Epod2)
"g" = (/obj/structure/boulder{icon_state = "boulder3"},/turf/simulated/floor/outdoors/rocks,/area/submap/Epod2)
"h" = (/turf/simulated/shuttle/wall,/area/submap/Epod2)
-"i" = (/obj/structure/shuttle/engine/propulsion/burst{icon_state = "propulsion"; dir = 4},/turf/simulated/shuttle/wall,/area/submap/Epod2)
+"i" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 4; icon_state = "propulsion"},/turf/simulated/shuttle/wall,/area/submap/Epod2)
"j" = (/obj/structure/boulder,/turf/simulated/floor/outdoors/rocks,/area/submap/Epod2)
"k" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced,/obj/item/stack/rods,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/plating,/area/submap/Epod2)
-"l" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{pixel_y = -32},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/shuttle/floor,/area/submap/Epod2)
-"m" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/obj/structure/loot_pile/surface/medicine_cabinet{pixel_y = 28},/obj/machinery/light,/obj/effect/decal/cleanable/vomit,/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/drip,/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty,/turf/simulated/shuttle/floor,/area/submap/Epod2)
-"n" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/obj/structure/closet/walllocker/emerglocker{pixel_y = 28},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor,/area/submap/Epod2)
+"l" = (/obj/structure/bed/chair{dir = 8; icon_state = "chair_preview"},/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/dirt,/obj/machinery/status_display{pixel_y = -32},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/shuttle/floor,/area/submap/Epod2)
+"m" = (/obj/structure/bed/chair{dir = 8; icon_state = "chair_preview"},/obj/structure/loot_pile/surface/medicine_cabinet{pixel_y = 28},/obj/machinery/light,/obj/effect/decal/cleanable/vomit,/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/drip,/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty,/turf/simulated/shuttle/floor,/area/submap/Epod2)
+"n" = (/obj/structure/bed/chair{dir = 8; icon_state = "chair_preview"},/obj/structure/closet/walllocker/emerglocker{pixel_y = 28},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/drip,/obj/random/projectile/sec,/turf/simulated/shuttle/floor,/area/submap/Epod2)
"o" = (/obj/effect/decal/cleanable/blood/drip,/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1; name = "Escape Pod Hatch"},/turf/simulated/shuttle/floor,/area/submap/Epod2)
"p" = (/obj/structure/boulder{icon_state = "boulder4"},/turf/simulated/floor/outdoors/dirt,/area/submap/Epod2)
"q" = (/obj/structure/boulder{icon_state = "boulder2"},/turf/simulated/floor/outdoors/rocks,/area/submap/Epod2)
diff --git a/maps/submaps/surface_submaps/plains/Field1.dmm b/maps/submaps/surface_submaps/plains/Field1.dmm
index 9dcafe0400..98f5e34aef 100644
--- a/maps/submaps/surface_submaps/plains/Field1.dmm
+++ b/maps/submaps/surface_submaps/plains/Field1.dmm
@@ -7,6 +7,7 @@
"g" = (/obj/vehicle/train/trolley,/turf/simulated/floor/outdoors/dirt,/area/submap/Field1)
"h" = (/obj/vehicle/train/engine,/turf/simulated/floor/outdoors/dirt,/area/submap/Field1)
"i" = (/obj/item/device/flashlight,/turf/simulated/floor/outdoors/dirt,/area/submap/Field1)
+"B" = (/obj/random/tech_supply/anom,/turf/simulated/floor/outdoors/dirt,/area/submap/Field1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -26,7 +27,7 @@ aaaabbbbbbbddddddddddddbbbbbba
aaaabbbbbbbddddddddddddbbbbcba
aaaabbbbbbbdddedfddddbbbbbbbba
aaabbbbbbbbbdegghdddbbbbbbbbba
-aaabbbbbbbbbbbdibdbbbbbbbbbbba
+aaabbbbbbbbbbbBibdbbbbbbbbbbba
aabbbbbbbbbbbbbbbbbbbbbbbcbbba
abbbcbbbbbbbbbbbbbbbbbbbbbbbba
abbbbbbbbbbbbbbbbbbbbbbbbbbbba
diff --git a/maps/submaps/surface_submaps/plains/Mechpt.dmm b/maps/submaps/surface_submaps/plains/Mechpt.dmm
index ad39aa84df..cb689aa255 100644
--- a/maps/submaps/surface_submaps/plains/Mechpt.dmm
+++ b/maps/submaps/surface_submaps/plains/Mechpt.dmm
@@ -6,37 +6,44 @@
"f" = (/obj/structure/railing,/obj/structure/table/woodentable,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/template_noop,/area/submap/Mechpt)
"g" = (/obj/structure/railing,/obj/structure/table/woodentable,/turf/template_noop,/area/submap/Mechpt)
"h" = (/obj/structure/railing,/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/turf/template_noop,/area/submap/Mechpt)
-"i" = (/obj/structure/railing{ icon_state = "railing0"; dir = 4},/turf/template_noop,/area/submap/Mechpt)
+"i" = (/obj/structure/railing{dir = 4; icon_state = "railing0"},/turf/template_noop,/area/submap/Mechpt)
"j" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
-"k" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/turf/template_noop,/area/submap/Mechpt)
+"k" = (/obj/structure/railing{dir = 8; icon_state = "railing0"},/turf/template_noop,/area/submap/Mechpt)
"l" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
"m" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
"n" = (/obj/effect/decal/cleanable/blood/oil/streak,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
"o" = (/obj/effect/decal/mecha_wreckage/ripley/deathripley,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
"p" = (/obj/effect/decal/mecha_wreckage/ripley/firefighter,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
"q" = (/obj/item/stack/cable_coil,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
-"r" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/template_noop,/area/submap/Mechpt)
-"s" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/obj/structure/table/woodentable,/obj/structure/reagent_dispensers/beerkeg,/turf/template_noop,/area/submap/Mechpt)
-"t" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c50,/turf/template_noop,/area/submap/Mechpt)
-"u" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/obj/structure/table/woodentable,/obj/item/weapon/cell/high,/obj/item/weapon/cell/device/weapon,/turf/template_noop,/area/submap/Mechpt)
-"v" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/template_noop,/area/submap/Mechpt)
+"r" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/turf/template_noop,/area/submap/Mechpt)
+"s" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/obj/structure/table/woodentable,/obj/structure/reagent_dispensers/beerkeg,/turf/template_noop,/area/submap/Mechpt)
+"t" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c50,/turf/template_noop,/area/submap/Mechpt)
+"u" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/obj/structure/table/woodentable,/obj/item/weapon/cell/high,/obj/item/weapon/cell/device/weapon,/turf/template_noop,/area/submap/Mechpt)
+"v" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/template_noop,/area/submap/Mechpt)
+"x" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/newdirt,/area/submap/Mechpt)
+"D" = (/obj/random/tank/anom,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
+"H" = (/obj/structure/railing,/obj/structure/table/woodentable,/obj/random/tool,/turf/template_noop,/area/submap/Mechpt)
+"Q" = (/turf/simulated/floor/outdoors/newdirt,/area/submap/Mechpt)
+"R" = (/obj/random/tool/anom,/turf/simulated/floor/outdoors/newdirt,/area/submap/Mechpt)
+"T" = (/obj/effect/decal/cleanable/blood/oil/streak,/turf/simulated/floor/outdoors/newdirt,/area/submap/Mechpt)
+"Z" = (/obj/random/tool,/turf/simulated/floor/outdoors/dirt,/area/submap/Mechpt)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
abbbbbbbbbbbbbbbbbbbbbbbbbbbba
abbbbbbbbbcbbbbbbbbbbbbbbbbbba
-abbdddddddddefghgdddddddddddba
-abijjjjjjjjjjjjjjjjjjjjjjjjjka
-abijjjjjjjjjjjjjjjjjjjjjjjjjka
-abijjjljjjjjjjjjjjjmjjjnjjjjka
-abijjjjjmjjjjjjjjjjjjjjjjjjjka
-ajjjjjjjjjjojjjjjjjjjjjjjjjjja
-abjjjjjjjjjjjjjjjjjjjjjjjjjjja
-abijjjjjjjjjjjpjjjmjjjjjjjjjka
+abbdddddddddefHhgdddddddddddba
+abijjjjQQQQjjjjjjjjjjjjjjjjjka
+abijjjjjjjQjjjjjjjjjjjjjjjjjka
+abiQjjljjjjjjQQjjjjxQjjTQjjjka
+abiQQjjjmjjjjjQQjjQQQQQjQjjjka
+aQQQQjjjjjjoDjjjjjjQjjjjQQjjja
+abQQjjjjjjRjjjjjjjjjjjjQQQQjja
+abijjjjjQQQQjjpjjjmjjjjjjjjjka
abijjjjjjjjjjjjjjjjjjjjjjjjjka
abijjjjjjjmjjqjjjjjjjjjjjjjjka
-abijnjjjjjjjjjjjjjjjjjjjjjjjka
-abijjjjjjjjjjjjjjjjjjjjjjjjjka
+abijnjjjQQQQQjjjjjjjjQQjZjjjka
+abijjjQQQQQQQjjjjjjjQQQjjjjjka
abbrrrrrrrrrstutvrrrrrrrrrrrba
abbbbbbbbbbbbbbbbbbbbbbbbbbbba
abbbbbbbbbbbbbbbbbbbbbbbbbbbba
diff --git a/maps/submaps/surface_submaps/plains/Oldhouse.dmm b/maps/submaps/surface_submaps/plains/Oldhouse.dmm
index 20d8b41be3..388a225f50 100644
--- a/maps/submaps/surface_submaps/plains/Oldhouse.dmm
+++ b/maps/submaps/surface_submaps/plains/Oldhouse.dmm
@@ -3,14 +3,14 @@
"c" = (/turf/simulated/wall/wood,/area/submap/Oldhouse)
"d" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Oldhouse)
"e" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"f" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"f" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/cobweb2,/obj/random/maintenance/clean/anom,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"g" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"h" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"i" = (/turf/simulated/floor/wood,/area/submap/Oldhouse)
"j" = (/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
"k" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"l" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"m" = (/obj/structure/closet/cabinet,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"m" = (/obj/structure/closet/cabinet,/obj/random/projectile/sec,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"n" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"o" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse)
"p" = (/turf/simulated/floor/wood{icon_state = "wood_broken2"},/area/submap/Oldhouse)
@@ -19,7 +19,7 @@
"s" = (/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse)
"t" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"u" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"v" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"v" = (/obj/structure/bed/chair/wood{dir = 1; icon_state = "wooden_chair"},/turf/simulated/floor/wood,/area/submap/Oldhouse)
"w" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"x" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
"y" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/wood,/area/submap/Oldhouse)
@@ -31,8 +31,8 @@
"E" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"F" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/blue,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"G" = (/obj/item/weapon/reagent_containers/food/snacks/chips,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
-"H" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/candle,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"I" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
+"H" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/candle,/obj/random/medical/lite/anom,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"I" = (/obj/structure/bed/chair/wood{dir = 8; icon_state = "wooden_chair"},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"J" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"K" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"L" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse)
diff --git a/maps/submaps/surface_submaps/plains/Peninsula.dmm b/maps/submaps/surface_submaps/plains/Peninsula.dmm
index 4823fb8dab..81832bd03e 100644
--- a/maps/submaps/surface_submaps/plains/Peninsula.dmm
+++ b/maps/submaps/surface_submaps/plains/Peninsula.dmm
@@ -5,7 +5,7 @@
"e" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Peninsula)
"f" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Peninsula)
"g" = (/obj/structure/table/woodentable,/obj/item/device/flashlight,/turf/template_noop,/area/submap/Peninsula)
-"h" = (/obj/structure/table/woodentable,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/template_noop,/area/submap/Peninsula)
+"h" = (/obj/structure/table/woodentable,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/random/tech_supply/anom,/turf/template_noop,/area/submap/Peninsula)
"i" = (/obj/structure/bonfire,/turf/template_noop,/area/submap/Peninsula)
"j" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/template_noop)
diff --git a/maps/submaps/surface_submaps/plains/PlainsKururak.dmm b/maps/submaps/surface_submaps/plains/PlainsKururak.dmm
index f3a43e4c91..5bd625aaab 100644
--- a/maps/submaps/surface_submaps/plains/PlainsKururak.dmm
+++ b/maps/submaps/surface_submaps/plains/PlainsKururak.dmm
@@ -3,7 +3,7 @@
"c" = (/obj/random/trash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
"d" = (/obj/random/firstaid,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
"e" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
-"f" = (/obj/random/projectile/sec,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
+"f" = (/obj/random/projectile/shotgun,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
"g" = (/obj/random/tech_supply,/obj/random/tech_supply,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
"h" = (/mob/living/simple_mob/animal/sif/kururak,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
"i" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/PlainsKururak)
diff --git a/maps/submaps/surface_submaps/plains/RationCache.dmm b/maps/submaps/surface_submaps/plains/RationCache.dmm
index 0ddb58dd6f..2b18ce34ad 100644
--- a/maps/submaps/surface_submaps/plains/RationCache.dmm
+++ b/maps/submaps/surface_submaps/plains/RationCache.dmm
@@ -3,8 +3,11 @@
"c" = (/mob/living/simple_mob/animal/sif/diyaab,/turf/simulated/floor/outdoors/snow,/area/submap/RationCache)
"d" = (/mob/living/simple_mob/animal/sif/diyaab,/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache)
"e" = (/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache)
-"f" = (/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/RationCache)
+"f" = (/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/random/mre/dessert/vegan,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/RationCache)
"g" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache)
+"j" = (/obj/random/mre/drink,/turf/simulated/floor/outdoors/dirt,/area/submap/RationCache)
+"I" = (/obj/item/trash/liquidfood,/turf/simulated/floor/outdoors/snow,/area/submap/RationCache)
+"S" = (/obj/random/mre/spread/vegan,/turf/simulated/floor/outdoors/snow,/area/submap/RationCache)
(1,1,1) = {"
aaaabbbaaa
@@ -12,9 +15,9 @@ aabbbbbbaa
abbbbcbbbb
abbbdbbcbb
bbcefebbbb
-bbbegebbbb
+bbbjgeIbbb
bbbbebcbbb
-bbbbbbbbaa
+bbSbbbbbaa
aabbcbbaaa
aabbbaaaaa
"}
diff --git a/maps/submaps/surface_submaps/plains/Rocky2.dmm b/maps/submaps/surface_submaps/plains/Rocky2.dmm
index eaa06c481a..4e20117d75 100644
--- a/maps/submaps/surface_submaps/plains/Rocky2.dmm
+++ b/maps/submaps/surface_submaps/plains/Rocky2.dmm
@@ -10,6 +10,8 @@
"j" = (/obj/structure/flora/ausbushes/sunnybush,/turf/template_noop,/area/submap/Rocky2)
"k" = (/obj/structure/flora/ausbushes/stalkybush,/turf/template_noop,/area/submap/Rocky2)
"l" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/Rocky2)
+"o" = (/obj/random/mre/spread/vegan,/turf/template_noop,/area/submap/Rocky2)
+"Z" = (/obj/random/contraband/anom,/turf/template_noop,/area/submap/Rocky2)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaa
@@ -26,10 +28,10 @@ abbbbbbcccbdbbhbbcccceeea
abdbbbccccbbbbbbbbccceeea
abbbbccccbbhbbbbbbcceeeea
abbbccccccfbbbdbbbcccceea
-abbeccccccbbbbbbficccceea
+aboeccccccbbbbbbficccceea
abbeccccccbgbhbbbbccccbba
abbeecccccbbbbbbbbcccccba
-abbeecccccjbdbbbhbcccccba
+abbeecccccjbdbbbhZcccccba
abbbecccccbbbbbbbccccccba
abbbeccceebbkbbbbccccccba
abbbbccceeccbbfbcccccbbba
diff --git a/maps/submaps/surface_submaps/plains/Shakden.dmm b/maps/submaps/surface_submaps/plains/Shakden.dmm
index 86f2057db1..1bc4f62e0b 100644
--- a/maps/submaps/surface_submaps/plains/Shakden.dmm
+++ b/maps/submaps/surface_submaps/plains/Shakden.dmm
@@ -9,13 +9,16 @@
"i" = (/mob/living/simple_mob/animal/sif/shantak/retaliate,/turf/simulated/floor/outdoors/dirt,/area/submap/Shakden)
"j" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden)
"k" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/material/knife/hook,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden)
+"l" = (/obj/random/grenade/lethal,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden)
+"G" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden)
+"N" = (/obj/random/ammo,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
abbbccccccccccccbbba
abccccccccccccccccba
-abccccdddedfccccccba
-abccceddgddddddcccca
+abccccGddedfccccccba
+abccceNdgddddddcccca
abcchdddddddgddcccca
acccdddddccdddddccca
accddddcccccdddddcca
@@ -25,8 +28,8 @@ abccdddddddddccddcca
abcedddddddddccdddba
accddgddgdddcccdddba
acccdddddddcccdddbba
-acccddgdddfcccdddbba
-accccdddijkcccddcbba
+acccGdgdddfcccdddbba
+acccclddijkcccddcbba
abccccddddecccddccba
abccccccccccccccccba
abbccccccbbbbccccbba
diff --git a/maps/submaps/surface_submaps/plains/Smol3.dmm b/maps/submaps/surface_submaps/plains/Smol3.dmm
index 2a9d8eb55e..8a936d4a42 100644
--- a/maps/submaps/surface_submaps/plains/Smol3.dmm
+++ b/maps/submaps/surface_submaps/plains/Smol3.dmm
@@ -3,17 +3,18 @@
"c" = (/turf/simulated/wall/wood,/area/submap/Smol3)
"d" = (/obj/structure/simple_door/wood,/turf/template_noop,/area/submap/Smol3)
"e" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
-"f" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
+"f" = (/obj/structure/closet/crate/freezer,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
"g" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/chips,/obj/item/weapon/reagent_containers/food/snacks/chips,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
"h" = (/obj/structure/table/woodentable,/obj/item/weapon/paper{desc = "Lamen's Hunter Shack! Selling freshly hunted meat for six thalers a slab. Support Locale hunters! Also selling Getmore Products for 3 thalers a bag, or 2 thalers for a bottle of water. Please place all payments into the nearbye bag."},/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
"i" = (/obj/structure/table/woodentable,/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
"j" = (/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c200,/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
+"T" = (/obj/random/ammo,/turf/simulated/floor/outdoors/dirt,/area/submap/Smol3)
(1,1,1) = {"
aaaaaaaaaaaaaaa
abbbbbbbbbbbbba
abbbccdccbbbbba
-abbbceeecbbbbba
+abbbcTeecbbbbba
abbbcfegcbbbbba
abbbchijcbbbbba
abbeeeeeeebbbba
diff --git a/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm
index 7afbe010ab..e7e9eefdfe 100644
--- a/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm
+++ b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm
@@ -4,13 +4,13 @@
"d" = (/obj/structure/girder/displaced,/turf/template_noop,/area/submap/SupplyDrop2)
"e" = (/turf/simulated/wall/titanium,/area/submap/SupplyDrop2)
"f" = (/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
-"g" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
+"g" = (/obj/structure/loot_pile/maint/junk,/obj/random/maintenance/anom,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
"h" = (/obj/item/device/flashlight,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
-"i" = (/obj/structure/loot_pile/maint/technical,/obj/item/device/gps/internal/poi,/obj/item/weapon/cell/device/weapon/empty,/obj/item/weapon/cell/device/weapon/empty,/turf/simulated/floor/plating,/area/submap/SupplyDrop2)
+"i" = (/obj/structure/loot_pile/maint/technical,/obj/item/device/gps/internal/poi,/obj/item/weapon/cell/device/weapon/empty,/obj/item/weapon/cell/device/weapon/empty,/obj/random/ammo,/turf/simulated/floor/plating,/area/submap/SupplyDrop2)
"j" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
"k" = (/obj/structure/girder,/turf/template_noop,/area/submap/SupplyDrop2)
-"l" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
-"m" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/plating,/area/submap/SupplyDrop2)
+"l" = (/obj/structure/loot_pile/maint/trash,/obj/random/energy/sec,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2)
+"m" = (/obj/structure/loot_pile/maint/trash,/obj/random/grenade/less_lethal,/turf/simulated/floor/plating,/area/submap/SupplyDrop2)
(1,1,1) = {"
aabbcdaaa
diff --git a/maps/submaps/surface_submaps/plains/Thiefc.dmm b/maps/submaps/surface_submaps/plains/Thiefc.dmm
index f8b8327363..787450936a 100644
--- a/maps/submaps/surface_submaps/plains/Thiefc.dmm
+++ b/maps/submaps/surface_submaps/plains/Thiefc.dmm
@@ -12,15 +12,17 @@
"l" = (/obj/structure/closet/crate,/obj/item/weapon/folder/blue,/obj/item/weapon/folder/red,/obj/item/weapon/folder/white,/obj/item/weapon/folder/yellow,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
"m" = (/obj/structure/table/steel,/obj/item/weapon/paper{desc = "This is some bullshit. First chance we got to knick something that looks half decent turns out to be mostly junk. And now we're getting calls that the other stash we've got has got a spider problem. Fuck this, Between the shitty weather, The pissed of bugs, And now apparently some NT goon running around in the area there's hardly enough reason to stick around. I'm telling Carl I'm out tommorow."; name = "Note"},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
"n" = (/obj/vehicle/train/trolley,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
-"o" = (/obj/structure/closet/crate,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
+"o" = (/obj/structure/closet/crate,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/random/ammo,/obj/random/ammo,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
"p" = (/obj/structure/closet/crate,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/practiceshells,/obj/random/projectile/scrapped_gun,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
+"D" = (/obj/random/multiple/corp_crate,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
+"U" = (/obj/random/contraband,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaa
abcbbbbbcccccccbbbbbbbbba
abccccccccdecccccbbbbbbba
-accccccccfghcchcccbbbbbba
-accccccchhhhihhccccbbbbba
+accccccccfghccUcccbbbbbba
+acccccccDhhhihhccccbbbbba
abcccccjhhkhhhlccccbbbbba
abbccccmhhnhhhocccccbbbba
abbbbbcchhhhhhpccccccbbba
diff --git a/maps/submaps/surface_submaps/plains/VRDen.dmm b/maps/submaps/surface_submaps/plains/VRDen.dmm
index a5340c7461..7fe883e6b8 100644
--- a/maps/submaps/surface_submaps/plains/VRDen.dmm
+++ b/maps/submaps/surface_submaps/plains/VRDen.dmm
@@ -3,7 +3,7 @@
"c" = (/turf/simulated/wall,/area/submap/VRDen)
"d" = (/obj/structure/extinguisher_cabinet{pixel_y = 28},/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
"e" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; operating = 0; pixel_x = 0; pixel_y = 24},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/submap/VRDen)
-"f" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
+"f" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light{dir = 1; icon_state = "tube1"},/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
"g" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/submap/VRDen)
"h" = (/obj/effect/decal/cleanable/dirt,/obj/fiftyspawner/phoron,/turf/simulated/floor,/area/submap/VRDen)
"i" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/integrated_circuit/memory,/obj/item/weapon/paper{info = "To: Whoever reads it\[br]From: Simulant\[br]Went away to grab some spare parts, won't return for couple weeks. Can't support larger scale sims without machines I lost yesterday. Please don't touch my stuff, while I'm gone."; name = "note"},/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
@@ -20,7 +20,7 @@
"t" = (/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
"u" = (/turf/simulated/floor/tiled/steel_dirty,/area/submap/VRDen)
"v" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
-"w" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/greengrid,/area/submap/VRDen)
+"w" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/greengrid,/area/submap/VRDen)
"x" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel_dirty,/area/submap/VRDen)
"y" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/broken_device/random,/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
"z" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
@@ -43,10 +43,13 @@
"Q" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_dirty,/area/submap/VRDen)
"R" = (/obj/structure/loot_pile/maint/junk,/turf/template_noop,/area/submap/VRDen)
"S" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/submap/VRDen)
-"T" = (/obj/structure/toilet{dir = 8},/obj/item/device/integrated_electronics/debugger,/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/simulated/floor,/area/submap/VRDen)
+"T" = (/obj/structure/toilet{dir = 8},/obj/item/device/integrated_electronics/debugger,/obj/machinery/light{dir = 1; icon_state = "tube1"},/turf/simulated/floor,/area/submap/VRDen)
"U" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/steel_dirty,/area/submap/VRDen)
"V" = (/obj/effect/decal/remains/robot,/turf/template_noop,/area/submap/VRDen)
-"W" = (/obj/machinery/light{icon_state = "tube1"; dir = 1},/turf/template_noop,/area/submap/VRDen)
+"W" = (/obj/machinery/light{dir = 1; icon_state = "tube1"},/turf/template_noop,/area/submap/VRDen)
+"X" = (/obj/effect/decal/cleanable/dirt,/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/vore_16},/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
+"Y" = (/obj/random/tech_supply/anom,/turf/simulated/floor/tiled/steel,/area/submap/VRDen)
+"Z" = (/obj/effect/decal/cleanable/dirt,/obj/structure/sign/poster{pixel_x = -32; poster_decl = /decl/poster/vore_19},/turf/simulated/floor,/area/submap/VRDen)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
@@ -56,9 +59,9 @@ abbbbbccccccccbbbbba
abbbcccdefgcccccbbba
abbbchijklmcnopcbbba
abbbcqrstuvcwopcbbba
-abbbcxyzutuzAopcbbba
-abbbczxtuxttBopcbbba
-abbbcCuDuuEcAopcbbba
+abbbcxyzutuXAopcbbba
+abbbczxtuxtYBopcbbba
+abbbcZuDuuEcAopcbbba
abbbcjFtGuHcAopcbbba
abbbcIcccJccwopcbbba
abbbcKcLttMNBopcbbba
diff --git a/maps/submaps/surface_submaps/plains/camp1.dmm b/maps/submaps/surface_submaps/plains/camp1.dmm
index 08263431ad..7a324d8011 100644
--- a/maps/submaps/surface_submaps/plains/camp1.dmm
+++ b/maps/submaps/surface_submaps/plains/camp1.dmm
@@ -6,7 +6,7 @@
"f" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
"g" = (/obj/machinery/space_heater,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
"h" = (/obj/structure/simple_door/sifwood,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
-"i" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/crossbow,/obj/item/stack/rods{amount = 17},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
+"i" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/crossbow,/obj/item/stack/rods{amount = 17},/obj/random/tool/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
"j" = (/obj/item/stack/material/log/sif{amount = 25},/turf/template_noop,/area/template_noop)
"k" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/outdoors/dirt,/area/submap/camp1)
"l" = (/turf/simulated/floor/outdoors/dirt,/area/submap/camp1)
diff --git a/maps/submaps/surface_submaps/plains/construction1.dmm b/maps/submaps/surface_submaps/plains/construction1.dmm
index 23577514ee..046f0f1aa7 100644
--- a/maps/submaps/surface_submaps/plains/construction1.dmm
+++ b/maps/submaps/surface_submaps/plains/construction1.dmm
@@ -8,7 +8,7 @@
"h" = (/obj/structure/firedoor_assembly,/obj/structure/grille,/turf/simulated/floor/plating/external,/area/submap/construction1)
"i" = (/obj/item/clothing/gloves/black,/turf/simulated/floor/outdoors/rocks,/area/template_noop)
"j" = (/turf/simulated/floor/tiled/external,/area/submap/construction1)
-"k" = (/obj/item/weapon/tool/wrench,/turf/simulated/floor/plating/external,/area/submap/construction1)
+"k" = (/obj/random/tool,/turf/simulated/floor/plating/external,/area/submap/construction1)
"l" = (/turf/simulated/wall,/area/submap/construction1)
"m" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/plating/external,/area/submap/construction1)
"n" = (/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/outdoors/rocks,/area/template_noop)
@@ -18,18 +18,19 @@
"r" = (/obj/item/clothing/head/orangebandana,/turf/template_noop,/area/template_noop)
"s" = (/obj/item/clothing/head/welding/engie,/turf/simulated/floor/plating/external,/area/submap/construction1)
"t" = (/obj/structure/door_assembly/door_assembly_mai,/turf/simulated/floor/plating/external,/area/submap/construction1)
-"u" = (/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating/external,/area/submap/construction1)
"v" = (/obj/item/weapon/airlock_electronics,/turf/simulated/floor/tiled/external,/area/submap/construction1)
"w" = (/obj/item/clothing/suit/storage/hazardvest,/turf/template_noop,/area/template_noop)
"x" = (/obj/structure/windoor_assembly,/turf/simulated/floor/tiled/external,/area/submap/construction1)
-"y" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating/external,/area/submap/construction1)
+"y" = (/obj/random/toolbox,/turf/simulated/floor/plating/external,/area/submap/construction1)
"z" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled/external,/area/submap/construction1)
"A" = (/obj/item/weapon/shovel,/turf/simulated/floor/plating/external,/area/submap/construction1)
"B" = (/obj/item/weapon/airlock_electronics,/turf/simulated/floor/plating/external,/area/submap/construction1)
-"C" = (/obj/item/weapon/weldingtool/largetank,/turf/simulated/floor/tiled/external,/area/submap/construction1)
+"C" = (/obj/random/tool,/turf/simulated/floor/tiled/external,/area/submap/construction1)
"D" = (/obj/item/weapon/tool/crowbar,/turf/simulated/floor/plating/external,/area/submap/construction1)
"E" = (/obj/item/clothing/glasses/welding,/turf/simulated/floor/plating/external,/area/submap/construction1)
"F" = (/obj/item/clothing/suit/storage/hazardvest,/turf/simulated/floor/plating/external,/area/submap/construction1)
+"V" = (/obj/random/tool/anom,/turf/simulated/floor/plating/external,/area/submap/construction1)
+"Z" = (/obj/random/maintenance/clean,/turf/simulated/floor/plating/external,/area/submap/construction1)
(1,1,1) = {"
aaaaaaaaaaaaaaaa
@@ -39,9 +40,9 @@ aaaachgggficffaa
aaacchgjkfccccaa
aaccclmjgfcnccaa
aalloojjgpfccaaa
-aalggljqgefccraa
-aalsgtjjuffcaaaa
-aalgglvjgffcwaaa
+aalZVljqgefccraa
+aalsgtjjyffcaaaa
+aalkglvjgffcwaaa
aalllllxlgfcaaaa
acyjjzjjjAfcaaaa
acgBjjjCggfcaaaa
diff --git a/maps/submaps/surface_submaps/plains/farm1.dmm b/maps/submaps/surface_submaps/plains/farm1.dmm
index 58c510ff1c..d96f9ea789 100644
--- a/maps/submaps/surface_submaps/plains/farm1.dmm
+++ b/maps/submaps/surface_submaps/plains/farm1.dmm
@@ -1,9 +1,9 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
"c" = (/obj/structure/railing,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
-"d" = (/obj/structure/railing{ icon_state = "railing0"; dir = 4},/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
+"d" = (/obj/structure/railing{dir = 4; icon_state = "railing0"},/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
"e" = (/turf/simulated/floor/outdoors/grass/sif,/area/submap/farm1)
-"f" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
+"f" = (/obj/structure/railing{dir = 8; icon_state = "railing0"},/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
"g" = (/turf/simulated/wall/wood,/area/submap/farm1)
"h" = (/obj/structure/grille/rustic,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/submap/farm1)
"i" = (/obj/structure/window/reinforced/full,/obj/structure/grille/rustic,/turf/simulated/floor/plating,/area/submap/farm1)
@@ -25,7 +25,7 @@
"y" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/matches,/obj/item/weapon/flame/match,/turf/simulated/floor/wood,/area/submap/farm1)
"z" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/farm1)
"A" = (/obj/item/clothing/shoes/boots/winter/hydro,/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,/turf/simulated/floor/wood,/area/submap/farm1)
-"B" = (/obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/wood,/area/submap/farm1)
+"B" = (/obj/structure/bed/chair/wood{dir = 8; icon_state = "wooden_chair"},/turf/simulated/floor/wood,/area/submap/farm1)
"C" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/fancy/candle_box,/turf/simulated/floor/wood,/area/submap/farm1)
"D" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/wheatseed,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1)
"E" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/wood,/area/submap/farm1)
@@ -40,8 +40,11 @@
"N" = (/obj/machinery/power/port_gen/pacman,/turf/simulated/floor/plating,/area/submap/farm1)
"O" = (/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor/plating,/area/submap/farm1)
"P" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/turf/simulated/floor/plating,/area/submap/farm1)
-"Q" = (/obj/structure/table/steel,/turf/simulated/floor/plating,/area/submap/farm1)
-"R" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
+"Q" = (/obj/structure/table/steel,/obj/random/tool,/turf/simulated/floor/plating,/area/submap/farm1)
+"R" = (/obj/structure/railing{dir = 1; icon_state = "railing0"},/turf/simulated/floor/outdoors/dirt,/area/submap/farm1)
+"S" = (/obj/structure/table/marble,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/submap/farm1)
+"V" = (/obj/structure/closet/cabinet,/obj/random/multiple/gun/projectile/rifle,/turf/simulated/floor/wood,/area/submap/farm1)
+"X" = (/obj/item/clothing/shoes/galoshes,/turf/simulated/floor/plating,/area/submap/farm1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -50,7 +53,7 @@ abccccccccccccccccccccccccbaaaaa
adeeeeeeeeeeeeeeeeeeeeeeeefaaaaa
adeeeeeeeeeeeeeeeeeeeeeeeefaaaaa
adeegghhggeeeeiiiiiiiiiiiefaaaaa
-adeegjklmgeeeeinnnnnnnnniefaaaaa
+adeegjkSmgeeeeinnnnnnnnniefaaaaa
adeegkkklheeeeioooooooooiefaaaaa
adeegkkkpgebbeiqqqrrrsssiefaaaaa
adegggtgggebbbuvoorwxoooiefaaaaa
@@ -60,7 +63,7 @@ adehCkkktktbbeiDDDDDDDDDiefaaaaa
adegEkkFgggebeiiiiiiiiiiiefaaaaa
adeggtgggeeebeeeeeeeeeeeeefaaaaa
adegGkkHgeebbbeeeeebbbbbbbbbbbba
-adegFkkIgeebbbbbbbbbbbbbbbbbbbba
+adegVkFIgeebbbbbbbbbbbbbbbbbbbba
adeggggggeebeeeeeeebbbbbbbbbbbba
adeebbbbbbbbeeeeeeebbbeeeefaaaaa
adebbJJJJJJbbeeegggKKKgggefaaaaa
@@ -68,7 +71,7 @@ adebJJLLLLJJbbeegMKKKKKMgefaaaaa
adebJLLLLLLJJbbehNKKKKKKhefaaaaa
adebJJLLLLLLJJbehMKKKKKMhefaaaaa
adebbJJLLLLLLJbehOKKKKKKhefaaaaa
-adeebbJJLLLLJJbegMKPQQKMgefaaaaa
+adeebbJJLLLLJJbegMXPQQKMgefaaaaa
adeeebbJJJJJJbbegggggggggefaaaaa
adeeeebbbbbbbbeeeeeeeeeeeefaaaaa
adeeeeeeeeeeeeeeeeeeeeeeeefaaaaa
diff --git a/maps/submaps/surface_submaps/plains/hotspring.dmm b/maps/submaps/surface_submaps/plains/hotspring.dmm
index b1bb8c5109..dafd2d75cf 100644
--- a/maps/submaps/surface_submaps/plains/hotspring.dmm
+++ b/maps/submaps/surface_submaps/plains/hotspring.dmm
@@ -10,7 +10,7 @@
"k" = (/obj/effect/vfx/steam,/obj/effect/map_effect/interval/effect_emitter/steam,/turf/simulated/floor/water,/area/submap/hotspring)
"m" = (/obj/effect/vfx/steam,/turf/simulated/floor/water/shoreline/corner,/area/submap/hotspring)
"n" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/hotspring)
-"o" = (/obj/structure/table/woodentable,/obj/item/weapon/material/harpoon,/obj/item/pizzabox/vegetable,/turf/simulated/floor/wood/sif,/area/submap/hotspring)
+"o" = (/obj/structure/table/woodentable,/obj/item/weapon/material/harpoon,/obj/item/pizzabox/vegetable,/obj/random/maintenance/anom,/turf/simulated/floor/wood/sif,/area/submap/hotspring)
"p" = (/obj/effect/vfx/steam,/turf/simulated/floor/water/shoreline{dir = 1},/area/submap/hotspring)
"r" = (/obj/item/weapon/material/shard,/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/wood/sif,/area/submap/hotspring)
"s" = (/obj/random/junk,/turf/simulated/floor/outdoors/dirt,/area/submap/hotspring)
diff --git a/maps/submaps/surface_submaps/plains/house1.dmm b/maps/submaps/surface_submaps/plains/house1.dmm
index d886d8d157..b4a6bbc984 100644
--- a/maps/submaps/surface_submaps/plains/house1.dmm
+++ b/maps/submaps/surface_submaps/plains/house1.dmm
@@ -21,11 +21,11 @@
"au" = (/obj/structure/toilet,/turf/simulated/floor/tiled/freezer,/area/submap/house1)
"av" = (/obj/structure/table/marble,/obj/random/drinkbottle,/turf/simulated/floor/tiled,/area/submap/house1)
"aw" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/tiled,/area/submap/house1)
-"ax" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/weapon/coin/phoron,/turf/simulated/floor/wood,/area/submap/house1)
+"ax" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/weapon/coin/phoron{start_anomalous = 1},/turf/simulated/floor/wood,/area/submap/house1)
"ay" = (/obj/item/clothing/head/bearpelt{pixel_y = 6},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1)
-"az" = (/obj/item/weapon/material/harpoon,/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1)
+"az" = (/obj/item/weapon/material/harpoon{start_anomalous = 1},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1)
"aA" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/clothing/accessory/medal/conduct{pixel_y = 6},/turf/simulated/floor/wood,/area/submap/house1)
-"aB" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/submap/house1)
+"aB" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/submap/house1)
"aC" = (/obj/item/weapon/towel,/turf/simulated/floor/tiled/freezer,/area/submap/house1)
"aD" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/tiled,/area/submap/house1)
"aE" = (/turf/simulated/floor/tiled,/area/submap/house1)
@@ -40,15 +40,15 @@
"aN" = (/obj/structure/table/wooden_reinforced,/obj/item/device/binoculars/spyglass,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1)
"aO" = (/obj/structure/table/wooden_reinforced,/obj/item/device/flashlight/lantern,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1)
"aP" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/house1)
-"aQ" = (/obj/structure/table/rack,/obj/item/device/gps/explorer,/turf/simulated/floor/wood,/area/submap/house1)
+"aQ" = (/obj/structure/table/rack,/obj/item/device/gps/explorer,/obj/item/clothing/accessory/armor/legguards/tan,/turf/simulated/floor/wood,/area/submap/house1)
"aR" = (/obj/structure/simple_door/wood,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1)
"aS" = (/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1)
"aT" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1)
-"aU" = (/obj/structure/table/rack,/obj/item/clothing/under/explorer,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/simulated/floor/wood,/area/submap/house1)
+"aU" = (/obj/structure/table/rack,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/clothing/under/explorer/armored,/obj/item/clothing/accessory/armor/armorplate/tactical,/turf/simulated/floor/wood,/area/submap/house1)
"aV" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/wood,/area/submap/house1)
"aW" = (/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/submap/house1)
"aX" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/house1)
-"aY" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/explorer,/obj/item/clothing/mask/gas/explorer,/obj/item/weapon/material/knife/tacknife/survival,/turf/simulated/floor/wood,/area/submap/house1)
+"aY" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/explorer,/obj/item/clothing/mask/gas/explorer,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/armor/armguards/bulletproof,/turf/simulated/floor/wood,/area/submap/house1)
"aZ" = (/obj/item/clothing/shoes/boots/winter/explorer,/turf/simulated/floor/wood,/area/submap/house1)
"ba" = (/obj/structure/table/woodentable,/obj/random/action_figure,/obj/item/device/flashlight/lantern,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1)
"bb" = (/obj/item/weapon/bedsheet/hopdouble,/obj/structure/bed/double/padded,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1)
diff --git a/maps/submaps/surface_submaps/plains/lonehome.dmm b/maps/submaps/surface_submaps/plains/lonehome.dmm
index 6ac42745d8..ec9f97b3a3 100644
--- a/maps/submaps/surface_submaps/plains/lonehome.dmm
+++ b/maps/submaps/surface_submaps/plains/lonehome.dmm
@@ -44,7 +44,7 @@
"nD" = (/obj/structure/bed/chair/sofa/black,/turf/simulated/floor/wood,/area/submap/lonehome)
"nL" = (/obj/machinery/appliance/cooker/oven,/turf/simulated/floor/tiled/white,/area/submap/lonehome)
"nT" = (/obj/item/stack/cable_coil,/turf/simulated/floor/wood/broken,/area/submap/lonehome)
-"ox" = (/obj/structure/closet/cabinet,/obj/item/weapon/storage/wallet/random,/obj/item/weapon/towel/random,/obj/item/weapon/melee/umbrella/random,/obj/random/ammo,/obj/random/cigarettes,/obj/random/contraband,/obj/random/junk,/obj/random/maintenance/security,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/wood,/area/submap/lonehome)
+"ox" = (/obj/structure/closet/cabinet,/obj/item/weapon/storage/wallet/random,/obj/item/weapon/towel/random,/obj/item/weapon/melee/umbrella/random,/obj/random/ammo,/obj/random/cigarettes,/obj/random/contraband,/obj/random/junk,/obj/random/maintenance/security,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/anom,/turf/simulated/floor/wood,/area/submap/lonehome)
"oS" = (/obj/structure/closet/cabinet,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/toolbox,/obj/random/toolbox,/turf/simulated/floor/wood,/area/submap/lonehome)
"oZ" = (/obj/structure/bed/chair/sofa/black/left,/turf/simulated/floor/wood,/area/submap/lonehome)
"pb" = (/obj/structure/fence/cut/large{dir = 8},/turf/template_noop,/area/submap/lonehome)
@@ -76,7 +76,7 @@
"wj" = (/obj/item/weapon/bedsheet/rddouble,/turf/simulated/floor/wood,/area/submap/lonehome)
"xr" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/bcarpet,/area/submap/lonehome)
"xM" = (/obj/structure/fence/cut/large{dir = 8},/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome)
-"xO" = (/obj/item/clothing/suit/straight_jacket,/turf/simulated/floor,/area/submap/lonehome)
+"xO" = (/obj/item/clothing/suit/straight_jacket{start_anomalous = 1},/turf/simulated/floor,/area/submap/lonehome)
"yh" = (/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome)
"yn" = (/obj/structure/window/reinforced/polarized{dir = 8; id = "h_living"},/obj/structure/bed/chair/sofa/black/corner{dir = 1},/turf/simulated/floor/wood,/area/submap/lonehome)
"yr" = (/obj/item/weapon/reagent_containers/blood,/obj/item/weapon/pack/cardemon,/obj/item/weapon/pack/cardemon,/obj/item/weapon/deck/tarot,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
@@ -103,7 +103,7 @@
"Gm" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/turf/simulated/wall/wood,/area/submap/lonehome)
"Gr" = (/obj/structure/table/bench/marble,/obj/structure/window/reinforced/polarized{id = "h_master"},/obj/structure/flora/pottedplant/bamboo{pixel_y = 7},/turf/simulated/floor/wood,/area/submap/lonehome)
"GA" = (/obj/item/weapon/reagent_containers/food/snacks/ghostmuffin/poison,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome)
-"GS" = (/obj/structure/table/steel,/obj/item/stack/material/phoron{amount = 5},/obj/item/stack/material/phoron{amount = 5},/obj/fiftyspawner/wood,/obj/fiftyspawner/steel,/turf/simulated/floor,/area/submap/lonehome)
+"GS" = (/obj/structure/table/steel,/obj/item/stack/material/phoron{amount = 5},/obj/item/stack/material/phoron{amount = 5},/obj/fiftyspawner/wood,/obj/fiftyspawner/steel,/obj/random/gun/random/anomalous,/turf/simulated/floor,/area/submap/lonehome)
"Hc" = (/obj/effect/decal/cleanable/blood/gibs,/obj/structure/kitchenspike,/obj/effect/rune,/turf/simulated/floor,/area/submap/lonehome)
"Hu" = (/obj/item/frame/apc,/obj/machinery/light_switch{pixel_x = 11; pixel_y = 22},/obj/random/junk,/turf/simulated/floor,/area/submap/lonehome)
"Im" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/turf/simulated/floor/wood,/area/submap/lonehome)
diff --git a/maps/submaps/surface_submaps/plains/methlab.dmm b/maps/submaps/surface_submaps/plains/methlab.dmm
index b419e7655d..1d9a8ba41b 100644
--- a/maps/submaps/surface_submaps/plains/methlab.dmm
+++ b/maps/submaps/surface_submaps/plains/methlab.dmm
@@ -3,7 +3,7 @@
"aY" = (/obj/item/weapon/material/shard{pixel_x = 5; pixel_y = 3},/obj/item/weapon/material/shard{pixel_x = 9},/turf/template_noop,/area/submap/methlab)
"bn" = (/obj/structure/fence/cut/medium,/turf/template_noop,/area/submap/methlab)
"bA" = (/obj/item/weapon/cell/hyper,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
-"bJ" = (/obj/effect/floor_decal/rust,/obj/random/maintenance,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
+"bJ" = (/obj/effect/floor_decal/rust,/obj/random/maintenance,/obj/random/medical/pillbottle,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
"bQ" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/weapon/material/shard{pixel_x = 9},/obj/item/weapon/material/shard{pixel_x = 5},/turf/template_noop,/area/submap/methlab)
"cg" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio{anchored = 1; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; name = "Reception Emergency Phone"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
"ck" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/ambrosiadeusseed,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/old_tile/white,/area/submap/methlab)
@@ -22,7 +22,7 @@
"jo" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/tiled/old_tile/white,/area/submap/methlab)
"kp" = (/obj/effect/floor_decal/rust/mono_rusted3,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/old_tile/green,/area/submap/methlab)
"lb" = (/obj/machinery/biogenerator,/turf/simulated/floor/tiled/old_tile/white,/area/submap/methlab)
-"lt" = (/obj/item/frame/apc,/obj/structure/table/steel,/obj/machinery/light_switch{pixel_x = 11; pixel_y = 22},/turf/simulated/floor,/area/submap/methlab)
+"lt" = (/obj/item/frame/apc,/obj/structure/table/steel,/obj/machinery/light_switch{pixel_x = 11; pixel_y = 22},/obj/random/tool,/turf/simulated/floor,/area/submap/methlab)
"lx" = (/turf/simulated/floor/outdoors/dirt,/area/submap/methlab)
"lJ" = (/obj/structure/fence/corner,/turf/template_noop,/area/submap/methlab)
"lN" = (/obj/structure/barricade,/obj/effect/floor_decal/steeldecal/steel_decals_central5,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
@@ -91,9 +91,9 @@
"Oq" = (/obj/structure/fence{dir = 4},/turf/template_noop,/area/submap/methlab)
"Py" = (/obj/random/trash,/turf/simulated/floor/outdoors/dirt,/area/submap/methlab)
"PH" = (/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/old_tile/white,/area/submap/methlab)
-"PO" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/module/power_control,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
+"PO" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/module/power_control,/obj/random/contraband/anom,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
"PZ" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/old_tile/green,/area/submap/methlab)
-"QP" = (/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
+"QP" = (/obj/structure/table/steel_reinforced,/obj/random/contraband,/obj/random/medical/pillbottle,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
"QW" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/old_tile/green,/area/submap/methlab)
"Sn" = (/obj/structure/barricade,/obj/effect/floor_decal/steeldecal/steel_decals_central5,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
"St" = (/obj/structure/salvageable/implant_container,/turf/simulated/floor/tiled/steel_dirty,/area/submap/methlab)
diff --git a/maps/submaps/surface_submaps/plains/oldhotel.dmm b/maps/submaps/surface_submaps/plains/oldhotel.dmm
index e1de9c38a8..f5129ea697 100644
--- a/maps/submaps/surface_submaps/plains/oldhotel.dmm
+++ b/maps/submaps/surface_submaps/plains/oldhotel.dmm
@@ -113,7 +113,7 @@
"SZ" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/oldhotel)
"TU" = (/turf/simulated/floor/wood/broken,/area/submap/oldhotel)
"Ut" = (/obj/structure/kitchenspike,/turf/simulated/floor/outdoors/dirt,/area/submap/oldhotel)
-"Uw" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
+"Uw" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/book/manual/chef_recipes{start_anomalous = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
"UU" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/lighter/zippo/royal,/obj/item/weapon/lipstick/random,/turf/simulated/floor/wood,/area/submap/oldhotel)
"Vf" = (/obj/structure/window/reinforced/tinted{dir = 4},/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower/medical,/obj/random/soap,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
"Vj" = (/turf/simulated/floor/carpet/oracarpet,/area/submap/oldhotel)
@@ -122,6 +122,7 @@
"WH" = (/obj/item/device/flashlight{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/wood,/area/submap/oldhotel)
"YI" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/oldhotel)
"YQ" = (/obj/item/weapon/material/shard,/obj/structure/grille/broken/rustic,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
+"Zz" = (/obj/structure/bed/chair/wood{dir = 1},/obj/random/maintenance/anom,/turf/simulated/floor/wood,/area/submap/oldhotel)
"ZG" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/oldhotel)
(1,1,1) = {"
@@ -145,7 +146,7 @@ gAMUMUnDZGOQqgWySZtnRQbbhQWDSywmCxeKCxCxMUCxMUMUgA
gAMUMUhQZGhQhQZGhQhQSZDNhQwVJqCxCxJVMUMUMUMUMUMUgA
gAMUMUhQhQMkPOvNJTtnSZkWhQDxmRmREsMUMUMUMUMUMUMUgA
gAMUMUCxdLDNPdkIjehQSZdnhQDiSyzsCxCxMUMUMUMUMUMUgA
-gAMUMUCxdLvAhpPdlynDCSGkhQgMCxGCyjMUMUMUMUMUMUMUgA
+gAMUMUCxdLvAhpPdlynDCSZzhQgMCxGCyjMUMUMUMUMUMUMUgA
gAMUMUhQhQGkqgqgAZhQdLdLZGIlJqCxCxMUMUMUMUMUMUMUgA
gAMUMUhQhQhQZGhQhQhQMUMUnDIQCxAOAOMUMoMUGNMUMUMUgA
gAMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUMUgA
diff --git a/maps/submaps/surface_submaps/plains/priderock.dmm b/maps/submaps/surface_submaps/plains/priderock.dmm
index 1b2246d2af..645e025a43 100644
--- a/maps/submaps/surface_submaps/plains/priderock.dmm
+++ b/maps/submaps/surface_submaps/plains/priderock.dmm
@@ -20,7 +20,7 @@
"yi" = (/obj/structure/cliff/automatic/ramp{dir = 9},/obj/structure/railing{dir = 8},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"yI" = (/obj/structure/cliff/automatic{dir = 4},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"An" = (/obj/structure/railing,/obj/random/humanoidremains,/obj/random/humanoidremains,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
-"As" = (/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
+"As" = (/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/medical,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"Bf" = (/obj/random/trash,/obj/random/trash,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"Bv" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"BB" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/priderock)
@@ -62,7 +62,7 @@
"Zm" = (/turf/template_noop,/area/submap/priderock)
"ZA" = (/obj/random/trash,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/grass/sif,/area/submap/priderock)
"ZJ" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/grass/sif,/area/submap/priderock)
-"ZO" = (/obj/structure/table/woodentable,/obj/random/plushie,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/grass/sif,/area/submap/priderock)
+"ZO" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/dirt,/obj/random/plushie/anom,/turf/simulated/floor/outdoors/grass/sif,/area/submap/priderock)
(1,1,1) = {"
ZmZmZmZmqPZmZmZmZmZmZmZmZmZmZm
diff --git a/maps/submaps/surface_submaps/plains/smol2.dmm b/maps/submaps/surface_submaps/plains/smol2.dmm
index 739a000ce1..2ba4e087e9 100644
--- a/maps/submaps/surface_submaps/plains/smol2.dmm
+++ b/maps/submaps/surface_submaps/plains/smol2.dmm
@@ -4,7 +4,7 @@
"d" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/smol2)
"e" = (/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/turf/template_noop,/area/submap/smol2)
"f" = (/obj/structure/table/woodentable,/turf/template_noop,/area/submap/smol2)
-"g" = (/obj/item/weapon/storage/firstaid,/obj/item/stack/medical/splint,/obj/item/weapon/reagent_containers/pill/tramadol,/turf/template_noop,/area/submap/smol2)
+"g" = (/obj/item/stack/medical/splint,/obj/item/weapon/reagent_containers/pill/tramadol,/obj/random/firstaid,/turf/template_noop,/area/submap/smol2)
"h" = (/obj/effect/decal/cleanable/blood,/turf/template_noop,/area/submap/smol2)
(1,1,1) = {"
diff --git a/maps/submaps/surface_submaps/plains/snow3.dmm b/maps/submaps/surface_submaps/plains/snow3.dmm
index 56e9a78878..9e67ffc50e 100644
--- a/maps/submaps/surface_submaps/plains/snow3.dmm
+++ b/maps/submaps/surface_submaps/plains/snow3.dmm
@@ -1,16 +1,20 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/template_noop,/area/submap/snow3)
"c" = (/turf/simulated/floor/outdoors/snow,/area/submap/snow3)
+"h" = (/obj/structure/prop/rock/small/alt,/turf/simulated/floor/outdoors/snow,/area/submap/snow3)
+"O" = (/obj/structure/prop/rock/flat,/turf/simulated/floor/outdoors/snow,/area/submap/snow3)
+"U" = (/obj/structure/prop/rock/sharp,/turf/simulated/floor/outdoors/snow,/area/submap/snow3)
+"W" = (/obj/structure/prop/rock/small,/turf/simulated/floor/outdoors/snow,/area/submap/snow3)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
abbbbccccccbbbbbbbba
abbcccccccccccccbbba
abccccccccccccccccca
-abccccccccccccccccca
+abccccccccccOcccccca
abccccccccccccccccba
-abccccccccccccccbbba
-abbbcccccccccccbbbba
+abccUWccccccccccbbba
+abbbhccccccccccbbbba
abbbbbbbcccbbbbbbbba
aaaaaaaaaaaaaaaaaaaa
"}
diff --git a/maps/submaps/surface_submaps/plains/snow4.dmm b/maps/submaps/surface_submaps/plains/snow4.dmm
index 4d766fcf82..34e9841e90 100644
--- a/maps/submaps/surface_submaps/plains/snow4.dmm
+++ b/maps/submaps/surface_submaps/plains/snow4.dmm
@@ -1,16 +1,19 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/template_noop,/area/submap/snow4)
"c" = (/turf/simulated/floor/outdoors/snow,/area/submap/snow4)
+"e" = (/obj/structure/prop/rock/small,/turf/simulated/floor/outdoors/snow,/area/submap/snow4)
+"f" = (/obj/structure/prop/rock/small/alt,/turf/template_noop,/area/submap/snow4)
+"C" = (/obj/structure/prop/rock,/turf/simulated/floor/outdoors/snow,/area/submap/snow4)
(1,1,1) = {"
aaaaaaaaaa
abbcbbbbba
abcccbcbba
-abccccccba
+abcCccccba
abbccccbba
abcccccbba
acccccccba
-acccbcccba
-abcbbbccba
+acccbeccba
+abcbbfecba
aaaaaaaaaa
"}
diff --git a/maps/submaps/surface_submaps/plains/snow5.dmm b/maps/submaps/surface_submaps/plains/snow5.dmm
index d14b78e01e..4fb888d88c 100644
--- a/maps/submaps/surface_submaps/plains/snow5.dmm
+++ b/maps/submaps/surface_submaps/plains/snow5.dmm
@@ -1,22 +1,24 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/template_noop,/area/submap/snow5)
"c" = (/turf/simulated/floor/outdoors/snow,/area/submap/snow5)
+"j" = (/obj/structure/prop/rock/small,/turf/simulated/floor/outdoors/snow,/area/submap/snow5)
+"k" = (/obj/structure/prop/rock/small/alt,/turf/simulated/floor/outdoors/snow,/area/submap/snow5)
(1,1,1) = {"
aaaaaaaaaaaa
abbcccccbbba
-abcccccccbba
+abckcccccbba
abcccccccbba
abbcccccccba
abbcccccccba
abbbcccccbba
-abbbccccccba
+abbbcccjccba
abbbbcccccba
abbbbcccccba
abbbbccccbba
abbbcccccbba
abbbccccbbba
-abbbcccbbbba
+abbbckcbbbba
abbcccbbbbba
aaaaaaaaaaaa
"}
diff --git a/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm b/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
index 2f60fca5d9..eec0582e67 100644
--- a/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
@@ -9,69 +9,69 @@
"ai" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark6"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aj" = (/turf/simulated/shuttle/wall/dark{icon_state = "dark0"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"ak" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark10"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
-"al" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/shuttle/wall/dark{icon_state = "dark0"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
+"al" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/turf/simulated/shuttle/wall/dark{icon_state = "dark0"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"am" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/template_noop,/area/submap/Blackshuttledown)
"an" = (/obj/machinery/light{dir = 1},/obj/structure/table/rack,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ao" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ap" = (/obj/machinery/door/airlock/external{density = 1; frequency = 1331; id_tag = "merc_shuttle_outer"; name = "Ship External Access"; req_access = list(150)},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aq" = (/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"ar" = (/obj/machinery/gibber,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"as" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"at" = (/obj/machinery/bodyscanner{dir = 8},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"au" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aq" = (/obj/effect/floor_decal/corner/green/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"ar" = (/obj/machinery/gibber,/obj/effect/floor_decal/corner/green/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"as" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/green/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"at" = (/obj/machinery/bodyscanner{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"au" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner/green/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"av" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aw" = (/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
-"ax" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/p90,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"ax" = (/obj/structure/table/rack/gun_rack/steel,/obj/random/multiple/gun/projectile/smg,/obj/random/multiple/gun/projectile/smg,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"ay" = (/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"az" = (/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aA" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aB" = (/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aB" = (/obj/effect/floor_decal/corner/green/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aC" = (/obj/machinery/optable,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aD" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aE" = (/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aF" = (/obj/machinery/organ_printer/flesh,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aF" = (/obj/machinery/organ_printer/flesh,/obj/effect/floor_decal/corner/green/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aG" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aH" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark6"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aI" = (/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
-"aJ" = (/obj/structure/table/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"aJ" = (/obj/structure/table/rack/gun_rack/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"aK" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aL" = (/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aM" = (/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aN" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aO" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aQ" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aR" = (/obj/structure/table/steel,/obj/item/weapon/grenade/smokebomb,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"aP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/corner/green/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aQ" = (/obj/structure/prop/machine/tgmc_console3/starts_on,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"aR" = (/obj/structure/table/rack/gun_rack/steel,/obj/random/grenade/box,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"aS" = (/obj/effect/floor_decal/borderfloor/corner,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aT" = (/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aW" = (/obj/structure/table/standard,/obj/item/weapon/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aW" = (/obj/structure/table/standard,/obj/item/weapon/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/obj/random/medical,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aX" = (/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aY" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/gloves/sterile,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"ba" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"bb" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"ba" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/green/border{dir = 6; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"bb" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bc" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bd" = (/obj/machinery/door/airlock/security{locked = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"be" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"bf" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark10"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
-"bg" = (/obj/machinery/computer/communications,/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bg" = (/obj/structure/prop/machine/tgmc_console1/starts_on,/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bh" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bi" = (/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bj" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bk" = (/obj/structure/table/steel,/obj/item/weapon/material/knife,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bj" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bk" = (/obj/structure/table/steel,/obj/item/weapon/material/knife,/obj/random/drinkbottle,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bl" = (/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bm" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bn" = (/obj/random/mob/merc/all,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bo" = (/obj/structure/table/steel,/obj/random/toolbox,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
+"bo" = (/obj/structure/table/rack/shelf/steel,/obj/random/toolbox,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bp" = (/obj/structure/table/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/random/projectile/scrapped_gun,/obj/random/projectile/scrapped_gun,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/Blackshuttledown)
"br" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bs" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bt" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bu" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bv" = (/obj/structure/table/steel,/obj/random/projectile,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
+"bv" = (/obj/structure/table/rack,/obj/random/multiple/gun/projectile/smg,/obj/random/multiple/gun/projectile,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bw" = (/obj/machinery/fusion_fuel_compressor,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/submap/Blackshuttledown)
"by" = (/obj/machinery/door/airlock/glass,/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
@@ -85,8 +85,8 @@
"bG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/Blackshuttledown)
"bH" = (/obj/machinery/power/apc{dir = 8; name = "BSD APC"; pixel_x = -24},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bI" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
-"bJ" = (/obj/machinery/computer/area_atmos,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bK" = (/obj/machinery/fusion_fuel_injector/mapped{icon_state = "injector0"; dir = 4},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
+"bJ" = (/obj/machinery/computer/area_atmos{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bK" = (/obj/machinery/fusion_fuel_injector/mapped{dir = 4; icon_state = "injector0"},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bL" = (/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bM" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bN" = (/obj/structure/table/steel,/obj/item/weapon/paper{info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53"},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
@@ -95,32 +95,39 @@
"bQ" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bR" = (/obj/machinery/portable_atmospherics/canister/empty/oxygen,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bS" = (/obj/machinery/atmospherics/pipe/tank/oxygen,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
-"bT" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bT" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bU" = (/obj/structure/bed/chair/office/dark,/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bV" = (/obj/structure/table/steel,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"bV" = (/obj/structure/table/rack/gun_rack/steel,/obj/item/clothing/accessory/armor/armorplate/merc,/obj/item/clothing/accessory/armor/armorplate/merc,/obj/item/clothing/suit/armor/pcarrier/merc,/obj/item/clothing/suit/armor/pcarrier/merc,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"bW" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bX" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bY" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bY" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bZ" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
"ca" = (/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
"cb" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
-"cc" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/pistol,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"cc" = (/obj/structure/table/rack/gun_rack/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/random/multiple/gun/projectile/handgun,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"cd" = (/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"ce" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"ce" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cf" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
"cg" = (/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
-"ch" = (/obj/structure/table/steel,/obj/random/energy,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"ch" = (/obj/structure/table/rack/gun_rack/steel,/obj/random/energy/highend,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"ci" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
"cj" = (/obj/machinery/light,/obj/structure/table/rack,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ck" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cl" = (/obj/structure/table/woodentable,/obj/random/projectile,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"cm" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"cm" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cn" = (/obj/structure/table/woodentable,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"co" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/toy/plushie/spider,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"co" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/obj/item/toy/plushie/spider,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cp" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"cq" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"cr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cs" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/ranged/laser/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"kV" = (/obj/item/weapon/stool{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"uW" = (/obj/random/mob/merc/armored,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"Bi" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"CZ" = (/obj/structure/table/steel,/obj/random/cigarettes,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"Fm" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/obj/item/clothing/suit/storage/toggle/track/blue,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"Qz" = (/obj/machinery/computer/communications{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"ZE" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -138,14 +145,14 @@ aaabababababababaHajajaIaJajayaKaLaLaMajaBaNaNaEaOaDaPajaGabababababaa
aaabafababababaHajaQajawaRajayaSaTaTaUajaVaWaEaXaYaZbaajababababafabaa
aaabababababaHajbbbcajbdajajayazajajajajajajbeajajajajajbfabababababaa
aaabababababajbgbhazajbiaLaLbhazajbjbkblbmbnblblajbobobpajbfababababaa
-aaabababababbqbrblazajbsblblblbtajblblbububublblajbvblblbwalamabababaa
-aaabababababbxbrblaKbybhblbzblblbAblblbBbCbCblblbDblblblbKalamabababaa
-aaabababababbxbrblaSbEbFblblblblbAblblbCbCbCblblbDblblblbKalamabababaa
-aaabababababbGbrblazajbsblblblbtajblblbububublblajbHblblbIalamabababaa
+aaabababababbqQzblazajbsuWblblbtajblblbububublblajbvblblbwalamabababaa
+aaabababababbxbrblaKbybhblbzblblbAblblbBbCZEblblbDblblblbKalamabababaa
+aaabababababbxbrblaSbEbFblblblblbAblblZEBiCZblblbDblblblbKalamabababaa
+aaabababababbGbrblazajbsblblblbtajblblkVkVkVblblajbHblblbIalamabababaa
aaabababababajbJbFcsajbLaTaTbFbMajbNbOblbPbnblblajbQbRbSajaGababababaa
aaabababababavajbTbUajbdajajayazajajajajajajbAajajajajajaGabababababaa
aaababababababavajaQajawbVajaybWaLaLbXajbYblblblblbZcaajababababababaa
-aaabafabababababavajajcbccajayaSaTaTcdajceblbYblbYajcfajbfabafabababaa
+aaabafabababababavajajcbccajayaSaTaTcdajceblbYblFmajcfajbfabafabababaa
aaabababababababaHajajcgchajaycrajaAaAajbYblbYblbYajciajajbfababababaa
aaabababababababajajajajajajcjckajapapajbYclcmcncoajajajajalamabababaa
aaabababababababajajajajajajajajajababajajajajajajajajajajalamabababaa
diff --git a/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm b/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm
index fb5eef1bee..c954e42bba 100644
--- a/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm
@@ -9,69 +9,69 @@
"ai" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark6"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aj" = (/turf/simulated/shuttle/wall/dark{icon_state = "dark0"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"ak" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark10"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
-"al" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/shuttle/wall/dark{icon_state = "dark0"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
+"al" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/turf/simulated/shuttle/wall/dark{icon_state = "dark0"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"am" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/template_noop,/area/submap/Blackshuttledown)
"an" = (/obj/machinery/light{dir = 1},/obj/structure/table/rack,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ao" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ap" = (/obj/machinery/door/airlock/external{density = 1; frequency = 1331; id_tag = "merc_shuttle_outer"; name = "Ship External Access"; req_access = list(150)},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aq" = (/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"ar" = (/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 1},/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"as" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"at" = (/obj/machinery/bodyscanner{dir = 8},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"au" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aq" = (/obj/effect/floor_decal/corner/green/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"ar" = (/obj/effect/floor_decal/corner/green/border{dir = 1; icon_state = "bordercolor"},/obj/structure/morgue{dir = 8; icon_state = "morgue1"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"as" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/green/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"at" = (/obj/machinery/bodyscanner{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"au" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner/green/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"av" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aw" = (/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
-"ax" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/p90,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"ax" = (/obj/structure/table/steel,/obj/random/energy/highend,/obj/random/energy/highend,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"ay" = (/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"az" = (/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aA" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aB" = (/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aB" = (/obj/effect/floor_decal/corner/green/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aC" = (/obj/machinery/optable,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aD" = (/obj/structure/janitorialcart,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"aE" = (/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aF" = (/obj/machinery/organ_printer/flesh,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aF" = (/obj/machinery/organ_printer/flesh,/obj/effect/floor_decal/corner/green/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aG" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aH" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark6"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"aI" = (/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
-"aJ" = (/obj/structure/table/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"aJ" = (/obj/structure/table/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/random/energy/highend,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"aK" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aL" = (/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aM" = (/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aN" = (/obj/structure/ore_box,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"aO" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aQ" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aR" = (/obj/structure/table/steel,/obj/item/weapon/grenade/smokebomb,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"aP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/corner/green/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aQ" = (/obj/structure/prop/machine/tgmc_console4/starts_on,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"aR" = (/obj/structure/table/steel,/obj/random/grenade/less_lethal,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"aS" = (/obj/effect/floor_decal/borderfloor/corner,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aT" = (/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"aU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"aV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"aV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aW" = (/obj/structure/table/standard,/obj/item/weapon/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aX" = (/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"aY" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/gloves/sterile,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"ba" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
-"bb" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/obj/random/firstaid,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"ba" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/green/border{dir = 6; icon_state = "bordercolor"},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
+"bb" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bc" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bd" = (/obj/machinery/door/airlock/security{locked = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"be" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown)
"bf" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark10"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
-"bg" = (/obj/machinery/computer/communications,/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bg" = (/obj/machinery/computer/communications{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 9},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bh" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bi" = (/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bj" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bk" = (/obj/structure/table/steel,/obj/item/weapon/material/knife,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bl" = (/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bm" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bn" = (/obj/structure/curtain/open/shower/security,/obj/structure/window/reinforced/tinted/frosted{icon_state = "fwindow"; dir = 1},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
-"bo" = (/obj/structure/table/steel,/obj/random/toolbox,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
-"bp" = (/obj/structure/table/steel,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
+"bn" = (/obj/structure/curtain/open/shower/security,/obj/structure/window/reinforced/tinted/frosted{dir = 1; icon_state = "fwindow"},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
+"bo" = (/obj/structure/table/rack/shelf/steel,/obj/random/toolbox,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
+"bp" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/table/rack/shelf/steel,/obj/random/tool/power,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/Blackshuttledown)
"br" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bs" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bt" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bu" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bv" = (/obj/structure/table/steel,/obj/random/projectile,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
+"bv" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"bw" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -16},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
"bx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/submap/Blackshuttledown)
"by" = (/obj/machinery/door/airlock/glass,/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
@@ -85,7 +85,7 @@
"bG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/Blackshuttledown)
"bH" = (/obj/machinery/power/apc{dir = 8; name = "BSD APC"; pixel_x = -24},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bI" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
-"bJ" = (/obj/machinery/computer/area_atmos,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bJ" = (/obj/machinery/computer/area_atmos{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bK" = (/mob/living/simple_mob/humanoid/merc/ranged/laser/poi,/turf/template_noop,/area/submap/Blackshuttledown)
"bL" = (/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bM" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
@@ -95,31 +95,41 @@
"bQ" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bR" = (/obj/machinery/portable_atmospherics/canister/empty/oxygen,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"bS" = (/obj/machinery/atmospherics/pipe/tank/oxygen,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
-"bT" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bT" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bU" = (/obj/structure/bed/chair/office/dark,/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bV" = (/obj/structure/table/steel,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"bW" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bX" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"bY" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"bY" = (/obj/structure/bed,/obj/item/weapon/bedsheet/blue,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"bZ" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
"ca" = (/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
-"cb" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/curtain/open/shower/security,/obj/structure/window/reinforced/tinted/frosted{icon_state = "fwindow"; dir = 1},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
-"cc" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/pistol,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"cb" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/curtain/open/shower/security,/obj/structure/window/reinforced/tinted/frosted{dir = 1; icon_state = "fwindow"},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
+"cc" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/table/rack/shelf/steel,/obj/item/clothing/accessory/armor/armguards/blue,/obj/item/clothing/accessory/armor/legguards/blue,/obj/item/clothing/suit/armor/pcarrier/blue/sol,/obj/item/clothing/head/helmet/solgov,/obj/item/clothing/under/solgov/utility/fleet/combat,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"cd" = (/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"ce" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"ce" = (/obj/structure/bed,/obj/item/weapon/bedsheet/blue,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cf" = (/obj/structure/urinal{dir = 4; icon_state = "urinal"; pixel_x = -32},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
-"cg" = (/obj/structure/toilet{icon_state = "toilet00"; dir = 4},/obj/structure/curtain,/obj/structure/window/reinforced/tinted/frosted{icon_state = "fwindow"; dir = 1},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
-"ch" = (/obj/structure/table/steel,/obj/random/energy,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
+"cg" = (/obj/structure/toilet{dir = 4; icon_state = "toilet00"},/obj/structure/curtain,/obj/structure/window/reinforced/tinted/frosted{dir = 1; icon_state = "fwindow"},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
+"ch" = (/obj/structure/table/rack/shelf/steel,/obj/item/clothing/accessory/armor/armguards/blue,/obj/item/clothing/accessory/armor/legguards/blue,/obj/item/clothing/suit/armor/pcarrier/blue/sol,/obj/item/clothing/head/helmet/solgov,/obj/item/clothing/under/solgov/utility/fleet/combat,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown)
"ci" = (/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown)
"cj" = (/obj/machinery/light,/obj/structure/table/rack,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ck" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"cl" = (/obj/structure/table/woodentable,/obj/random/projectile,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
-"cm" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"cl" = (/obj/structure/table/woodentable,/obj/random/multiple/gun/projectile/handgun,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"cm" = (/obj/structure/bed,/obj/item/weapon/bedsheet/blue,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cp" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"cq" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown)
"cr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"cs" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/ranged/laser/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
"ct" = (/mob/living/simple_mob/humanoid/merc/ranged/smg/sol,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"dr" = (/obj/structure/prop/machine/tgmc_console2/starts_on,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"dX" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/structure/prop/machine/tgmc_console1,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"fh" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"jx" = (/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown)
+"kN" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"ls" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/structure/prop/machine/tgmc_console2/starts_on,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"pK" = (/obj/structure/prop/machine/tgmc_console5/starts_on,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"xx" = (/obj/effect/floor_decal/borderfloor,/obj/structure/table/rack,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"Ca" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"Rc" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
+"Ug" = (/obj/effect/floor_decal/borderfloor,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/weapon/rig/combat,/obj/item/weapon/tank/jetpack/rig,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -132,20 +142,20 @@ aaababababababadadabafababababagahabababagabababababababababababababaa
aaabababababababaiajajajakababagabababbKagabababafaiajajajajakabababaa
aaabababababababajajajajajajajajajababajajajajajajajajajajajalamababaa
aaababababafababajajajajajajanaoajapapajaqarasatauajajajajajalamababaa
-aaabababababababavajajawaxajayazajaAaAajaBaCaEaEaEaEaFajajaGababababaa
+aaabababababababavajajbvaxajayazajaAaAajaBaCaEaEaEaEaFajajaGababababaa
aaabababababababaHajajaIaJajayaKaLaLaMajaBaEaEaEaOaEaPajaGabababababaa
aaabafababababaHajaQajawaRajayaSaTaTaUajaVaWaEaXaYaZbaajababababafabaa
aaabababababaHajbbbcajbdajajayazajajajajajajbeajajajajajbfabababababaa
-aaabababababajbgbhazajbiaLaLbhazajbjbkblbmblctblajbobobpajbfababababaa
-aaabababababbqbrblazajbsblblblbtajblblbububublblajbvblblaDalamabababaa
-aaabababababbxbrblaKbybhblbzblblbAblblbBbCbCblblbDblblctaNalamabababaa
-aaabababababbxbrblaSbEbFblblblblbAblblbCbCbCblblbDblblblcialamabababaa
-aaabababababbGbrblazajbsblblblbtajblblbububublblajbHblblbIalamabababaa
-aaabababababajbJbFcsajbLaTaTbFbMajbNbOblbPctblblajbQbRbSajaGababababaa
+aaabababababajbgbhCaajbidXlsbhazajbjbkblbmblctdrajbobobpajbfababababaa
+aaabababababbqbrblazajbsblfhblbtajblblbububublblajciblblaDalamabababaa
+aaabababababbxbrblaKbybhblbzblblbAblblbBRcbCblblbDblblctaNalamabababaa
+aaabababababbxbrblaSbEbFblblblblbAblblbCkNRcblblbDblblblcialamabababaa
+aaabababababbGbrblazajbsblfhblbtajblblbububublblajbHblblbIalamabababaa
+aaabababababajbJbFcsajbLxxUgbFbMajbNbOblbPctblblajbQbRbSajaGababababaa
aaabababababavajbTbUajbdajajayazajajajajajajbAajajajajajaGabababababaa
-aaababababababavajaQajawbVajaybWaLaLbXajbYblblbZcacabnajababababababaa
+aaababababababavajpKajawchajaybWaLaLbXajbYblblbZcacabnajababababababaa
aaabafabababababavajajaIccajayaSaTaTcdajceblbYajbwcacbajbfabafabababaa
-aaabababababababaHajajawchajaycrajaAaAajbYblbYajcfcabnajajbfababababaa
+aaabababababababaHajajawchajaycrajaAaAajbYblbYajcfjxbnajajbfababababaa
aaabababababababajajajajajajcjckajapapajbYclcmajcgcabnajajalamabababaa
aaabababababababajajajajajajajajajababajajajajajajajajajajalamabababaa
aaababafababababcpajajajcqababagbKabababagabababcpajajajajcqababababaa
diff --git a/maps/submaps/surface_submaps/wilderness/Boombase.dmm b/maps/submaps/surface_submaps/wilderness/Boombase.dmm
index 438cd0a713..f71e514128 100644
--- a/maps/submaps/surface_submaps/wilderness/Boombase.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Boombase.dmm
@@ -8,45 +8,45 @@
"ah" = (/obj/item/stack/rods,/turf/simulated/wall/r_wall,/area/submap/BoomBase)
"ai" = (/obj/structure/closet/crate/secure/phoron,/obj/fiftyspawner/phoron,/turf/simulated/floor/plating,/area/submap/BoomBase)
"aj" = (/obj/structure/closet/crate/secure/phoron,/obj/fiftyspawner/phoron,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"ak" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{ icon_state = "burned1"},/area/submap/BoomBase)
+"ak" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{icon_state = "burned1"},/area/submap/BoomBase)
"al" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"am" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"an" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"ao" = (/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"ap" = (/mob/living/simple_mob/animal/giant_spider/phorogenic,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"aq" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase)
-"ar" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase)
+"aq" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/turf/simulated/floor/tiled/steel{icon_state = "steel_dirty"},/area/submap/BoomBase)
+"ar" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel{icon_state = "steel_dirty"},/area/submap/BoomBase)
"as" = (/obj/item/weapon/material/shard,/turf/simulated/floor/plating,/area/submap/BoomBase)
"at" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/plating,/area/submap/BoomBase)
"au" = (/turf/simulated/floor/outdoors/dirt,/area/submap/BoomBase)
"av" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BoomBase)
"aw" = (/obj/effect/decal/cleanable/dirt,/obj/random/mob/spider/mutant,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"ax" = (/turf/simulated/floor/tiled/steel{ icon_state = "burned1"},/area/submap/BoomBase)
+"ax" = (/turf/simulated/floor/tiled/steel{icon_state = "burned1"},/area/submap/BoomBase)
"ay" = (/obj/effect/decal/remains/human,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"az" = (/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase)
-"aA" = (/turf/simulated/floor/tiled/steel{ icon_state = "broken0"},/area/submap/BoomBase)
+"az" = (/turf/simulated/floor/tiled/steel{icon_state = "steel_dirty"},/area/submap/BoomBase)
+"aA" = (/turf/simulated/floor/tiled/steel{icon_state = "broken0"},/area/submap/BoomBase)
"aB" = (/turf/simulated/floor/plating,/area/submap/BoomBase)
"aC" = (/obj/structure/flora/tree/dead,/turf/simulated/floor/outdoors/dirt,/area/submap/BoomBase)
"aD" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/BoomBase)
"aE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"aF" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{ icon_state = "broken1"},/area/submap/BoomBase)
-"aG" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{ icon_state = "burned2"},/area/submap/BoomBase)
+"aF" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{icon_state = "broken1"},/area/submap/BoomBase)
+"aG" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{icon_state = "burned2"},/area/submap/BoomBase)
"aH" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/outdoors/dirt,/area/submap/BoomBase)
"aI" = (/obj/random/mob/spider/mutant,/turf/simulated/floor/outdoors/dirt,/area/submap/BoomBase)
"aJ" = (/obj/structure/table,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"aK" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/giant_spider/phorogenic,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"aL" = (/turf/simulated/floor/tiled/steel{ icon_state = "burned2"},/area/submap/BoomBase)
+"aL" = (/turf/simulated/floor/tiled/steel{icon_state = "burned2"},/area/submap/BoomBase)
"aM" = (/turf/simulated/floor/outdoors/rocks,/area/submap/BoomBase)
-"aN" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/standard,/obj/item/weapon/tank/phoron,/obj/item/weapon/fuel_assembly/phoron,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"aO" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase)
-"aP" = (/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase)
+"aN" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/standard,/obj/item/weapon/tank/phoron{start_anomalous = 1},/obj/item/weapon/fuel_assembly/phoron,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
+"aO" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel{icon_state = "steel_dirty"},/area/submap/BoomBase)
+"aP" = (/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel{icon_state = "steel_dirty"},/area/submap/BoomBase)
"aQ" = (/obj/item/device/transfer_valve,/turf/simulated/floor/outdoors/rocks,/area/submap/BoomBase)
"aR" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/submap/BoomBase)
"aS" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/BoomBase)
"aT" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"aU" = (/obj/effect/spider/stickyweb,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
"aV" = (/obj/effect/spider/stickyweb,/obj/random/mob/spider/mutant,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase)
-"aW" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel{ icon_state = "burned1"},/area/submap/BoomBase)
+"aW" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel{icon_state = "burned1"},/area/submap/BoomBase)
"aX" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/ash,/turf/template_noop,/area/submap/BoomBase)
"aY" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/BoomBase)
diff --git a/maps/submaps/surface_submaps/wilderness/CaveS.dmm b/maps/submaps/surface_submaps/wilderness/CaveS.dmm
index 62d6587224..9ace606cb3 100644
--- a/maps/submaps/surface_submaps/wilderness/CaveS.dmm
+++ b/maps/submaps/surface_submaps/wilderness/CaveS.dmm
@@ -25,19 +25,24 @@
"y" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/CaveS)
"z" = (/obj/random/landmine,/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/CaveS)
"A" = (/turf/simulated/floor,/area/submap/CaveS)
-"B" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/storage/toolbox,/obj/random/toolbox,/turf/simulated/floor,/area/submap/CaveS)
+"B" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/random/toolbox,/obj/random/toolbox/anom,/turf/simulated/floor,/area/submap/CaveS)
"C" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor,/area/submap/CaveS)
"D" = (/obj/structure/table/woodentable,/turf/simulated/floor,/area/submap/CaveS)
-"E" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/submap/CaveS)
+"E" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/submap/CaveS)
"F" = (/turf/simulated/wall,/area/submap/CaveS)
"G" = (/obj/structure/closet/crate,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/paracetamol,/obj/random/firstaid,/turf/simulated/floor,/area/submap/CaveS)
"H" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/submap/CaveS)
-"I" = (/obj/structure/closet/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/energy,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/turf/simulated/floor,/area/submap/CaveS)
+"I" = (/obj/structure/closet/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/energy,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/random/energy/highend,/turf/simulated/floor,/area/submap/CaveS)
"J" = (/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/lurker,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS)
"K" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/submap/CaveS)
"L" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/CaveS)
"M" = (/obj/machinery/computer/communications,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/submap/CaveS)
"N" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor,/area/submap/CaveS)
+"O" = (/obj/random/rigsuit,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS)
+"V" = (/obj/random/medical/pillbottle,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS)
+"W" = (/obj/random/multiple/corp_crate,/turf/simulated/floor,/area/submap/CaveS)
+"Y" = (/obj/random/powercell/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS)
+"Z" = (/obj/random/multiple/gun/projectile/smg,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -54,9 +59,9 @@ abbbbddddddddbbbbbjbbfbkkddddddddddddbba
abbbddddddddddbbbbcblbdmkiidddddddddbbba
abbbdddddddddddbbbbbbdddmkkkdddddddbbbba
abbbddddddddddddbbbbddddddhkmddddddbbbba
-abbdddddndkkidddbbddddddddkkkkkkddddbbba
+abbdddddndYOidddbbddddddddkkkkkkddddbbba
abbdddokkkkkkdddbbdddddddpkkkkkkqdddbbba
-abbdddikkkkkrddbbddddddddkkkkkkkdddddbba
+abbdddikkkkZrddbbddddddddkkkkkkkdddddbba
abbddddkqkkkdddbdddddddddkkddddksddddbba
abdddddddkkkkddddddddddddhkddddkkdddddba
abdddddddkkkksdddddpkqkkkkddddpkddddddba
@@ -72,8 +77,8 @@ abddvvvvvvvkkkkidddikkkhkkkkAAACkdddbbba
abddvvvvvvkkddddddddkhkkkkkADDAAkkddbbba
abdddvvvvvkkxddddddkkkidkkAEFFGwkkdddbba
abdddddyvkkddddddikkkkddkkAHFFIkkddddbba
-abdddddddviddddddJkkkkddkkAKLMAAddddbbba
-abbddddddddddddddkkkkkdddkkkAAAdddddbbba
+abdddddddviddddddJkkkkddkkAKLMWAddddbbba
+abbddddddddddddddVkkkkdddkkkAAAdddddbbba
abbdddddddddddddddkidddddwkkANdddddbbbba
abbdddddddddddddddddddddddrkkddddbbbbbba
abbbdddddddddddddddddddddddddddbbbbbbbba
diff --git a/maps/submaps/surface_submaps/wilderness/Chapel.dmm b/maps/submaps/surface_submaps/wilderness/Chapel.dmm
index a681497ed8..9313391c60 100644
--- a/maps/submaps/surface_submaps/wilderness/Chapel.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Chapel.dmm
@@ -11,14 +11,14 @@
"ak" = (/obj/structure/closet/grave,/obj/random/mob/spider{mob_faction = "neutral"},/turf/simulated/floor/outdoors/rocks,/area/template_noop)
"al" = (/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"am" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
-"an" = (/obj/item/weapon/material/knife/ritual,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"an" = (/obj/item/weapon/material/knife/ritual{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"ao" = (/obj/structure/closet/grave,/turf/simulated/floor/outdoors/dirt,/area/template_noop)
-"ap" = (/obj/structure/loot_pile/surface/bones,/obj/item/weapon/coin/diamond,/obj/item/clothing/under/technomancer/master,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"ap" = (/obj/structure/loot_pile/surface/bones,/obj/item/weapon/coin/diamond,/obj/item/clothing/under/technomancer/master{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"aq" = (/obj/structure/closet/grave,/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop)
"ar" = (/obj/random/mob/spider/nurse{mob_faction = "neutral"},/obj/structure/closet/grave,/turf/simulated/floor/outdoors/dirt,/area/template_noop)
"as" = (/obj/item/weapon/scepter,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"at" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
-"au" = (/obj/structure/table/sifwoodentable,/obj/item/godfig,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1)
+"au" = (/obj/structure/table/sifwoodentable,/obj/item/godfig{start_anomalous = 1},/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1)
"av" = (/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"aw" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/flame/candle/candelabra/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"ax" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
@@ -47,12 +47,12 @@
"aU" = (/obj/structure/closet/coffin,/obj/random/junk,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1)
"aV" = (/obj/item/weapon/flame/candle/candelabra,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1)
"aW" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/flame/candle/candelabra,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
-"aX" = (/obj/structure/table/sifwoodentable,/obj/item/glass_jar,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"aX" = (/obj/structure/table/sifwoodentable,/obj/item/glass_jar{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"aY" = (/obj/structure/closet/coffin,/obj/random/maintenance/cargo,/obj/effect/decal/remains/human,/obj/random/projectile/scrapped_gun,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"aZ" = (/obj/structure/simple_door/sifwood,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"ba" = (/obj/structure/bed/padded,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bb" = (/obj/structure/closet/coffin,/obj/random/cash,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
-"bc" = (/obj/item/weapon/flame/candle/candelabra,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"bc" = (/obj/item/weapon/flame/candle/candelabra{start_anomalous = 1},/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bd" = (/obj/structure/table/sifwoodentable,/obj/structure/bedsheetbin,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"be" = (/obj/structure/closet/coffin,/obj/random/maintenance/clean,/obj/effect/decal/remains/ribcage,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bf" = (/obj/structure/closet/coffin,/obj/random/contraband,/obj/effect/decal/remains/mouse,/obj/effect/decal/remains/unathi,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
@@ -60,7 +60,7 @@
"bh" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/material/harpoon,/obj/item/weapon/material/harpoon,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bi" = (/obj/structure/closet/coffin,/obj/random/cash,/obj/effect/decal/remains/ribcage,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bj" = (/obj/structure/table/sifwoodentable,/obj/random/toolbox,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
-"bk" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/material/fishing_net,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"bk" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/material/fishing_net{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bl" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop)
"bm" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop)
"bn" = (/obj/structure/sink/puddle,/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop)
@@ -68,7 +68,7 @@
"bp" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/rocks,/area/template_noop)
"bq" = (/obj/machinery/vending/hydroseeds,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"br" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
-"bs" = (/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/pickaxe/hand,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"bs" = (/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/pickaxe/hand{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bt" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1)
"bu" = (/obj/machinery/space_heater,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bv" = (/obj/random/obstruction,/turf/simulated/floor/outdoors/rocks,/area/template_noop)
@@ -76,7 +76,7 @@
"bx" = (/obj/structure/closet/coffin,/obj/random/junk,/obj/effect/decal/remains/tajaran,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"by" = (/obj/structure/closet/coffin,/obj/random/junk,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
"bz" = (/obj/structure/closet/coffin,/obj/random/maintenance/clean,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1)
-"bA" = (/obj/structure/closet/coffin,/obj/random/cash,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
+"bA" = (/obj/structure/closet/coffin,/obj/random/cash,/obj/effect/decal/remains/human,/obj/random/maintenance/anom,/turf/simulated/floor/wood/sif,/area/submap/Chapel1)
(1,1,1) = {"
aaaaaaabaaaaaaaaaaaaaaabakabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/wilderness/Cragzone1.dmm b/maps/submaps/surface_submaps/wilderness/Cragzone1.dmm
index b876135d09..ba1234bc28 100644
--- a/maps/submaps/surface_submaps/wilderness/Cragzone1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Cragzone1.dmm
@@ -3,6 +3,8 @@
"c" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Cragzone1)
"d" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Cragzone1)
"e" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Cragzone1)
+"n" = (/obj/random/multiple/large_corp_crate,/obj/random/maintenance/clean/anom,/turf/simulated/floor/outdoors/dirt,/area/submap/Cragzone1)
+"t" = (/obj/random/mob/sif/hostile,/turf/simulated/floor/outdoors/dirt,/area/submap/Cragzone1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -22,9 +24,9 @@ abbbbbbbbcbbbbeeeebbbbbbddddba
abbbddbbbbbbbbbbbbbbbbbbbdddba
abbbdddebbbbbbbbdbbbbcbbbbbbba
abbddddeeeebbbbdddbbbbddbbbbba
-abbddddddeeebbbbddbbbddddbbbba
+abbddddddetebbbbddbbbddddbbbba
abbbbbddddeebbbbdbbbbddddbbbba
-abbbbbbdddeebbbbbbbbbbdddbbbba
+abbbbbbdddnebbbbbbbbbbdddbbbba
abcbbbbbdddebbbbbbbbbbbddbbcba
abbbbbbbbbdbbbbbbbbbbbbbbbbbba
abbbcbbbbbbbbbbcbbbbbbbcbbbbba
diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
index 6b85ef347a..115c54f0de 100644
--- a/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
@@ -1,6 +1,6 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/simulated/wall/wood,/area/submap/DJOutpost1)
-"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1)
+"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1)
"d" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/submap/DJOutpost1)
"e" = (/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"f" = (/obj/machinery/telecomms/relay/preset/ruskie,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
@@ -9,29 +9,29 @@
"i" = (/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"j" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"k" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"l" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{ icon_state = "intercom"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"l" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{dir = 8; icon_state = "intercom"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"m" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"n" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1)
"o" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"p" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"q" = (/obj/effect/decal/remains,/obj/item/clothing/under/dress/blacktango,/obj/effect/decal/cleanable/blood,/obj/item/device/universal_translator/ear,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"r" = (/obj/random/mob/spider/mutant,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"s" = (/obj/structure/bed/chair/office/dark{ icon_state = "officechair_dark"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"s" = (/obj/structure/bed/chair/office/dark{dir = 8; icon_state = "officechair_dark"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"t" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/bed/chair/office/dark{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"u" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/crate,/obj/item/stack/material/phoron{amount = 25},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"v" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"w" = (/obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"x" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/storage/bible,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"w" = (/obj/structure/bed/chair/wood{dir = 8; icon_state = "wooden_chair"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"x" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/storage/bible{start_anomalous = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"y" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"z" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"A" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/device/multitool,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"A" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/device/multitool{start_anomalous = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"B" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"C" = (/obj/effect/overlay/snow/floor,/obj/machinery/power/port_gen/pacman,/obj/structure/cable/yellow,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"D" = (/obj/machinery/door/airlock/glass,/obj/item/device/gps/internal/poi,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"E" = (/obj/machinery/biogenerator,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"F" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"F" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/random_multi/single_item/sfr_headset,/obj/random/toy/anom,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"G" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"H" = (/obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"H" = (/obj/structure/bed/chair/wood{dir = 1; icon_state = "wooden_chair"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"I" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"J" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"K" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
@@ -39,7 +39,7 @@
"M" = (/obj/machinery/light/flamp,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"N" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"O" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
-"P" = (/obj/structure/table/rack,/obj/item/ammo_magazine/clip/c762/hunter,/obj/item/weapon/gun/projectile/shotgun/pump/rifle,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
+"P" = (/obj/structure/table/rack,/obj/random/multiple/gun/projectile/rifle,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"Q" = (/obj/structure/table/rack,/obj/item/device/flashlight/lantern,/obj/item/device/gps{gps_tag = "Sif Free Radio"},/turf/simulated/floor/wood,/area/submap/DJOutpost1)
"R" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/wood,/area/submap/DJOutpost1)
diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm
index bb91419270..f8ce276a62 100644
--- a/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm
+++ b/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm
@@ -1,6 +1,6 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/simulated/wall/wood,/area/submap/DJOutpost1)
-"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1)
+"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1)
"d" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/turf/simulated/floor,/area/submap/DJOutpost1)
"e" = (/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
"f" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
@@ -13,18 +13,18 @@
"n" = (/obj/item/stack/rods,/turf/template_noop,/area/template_noop)
"o" = (/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
"p" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
-"q" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/structure/cable/yellow,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
+"q" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio{start_anomalous = 1},/obj/structure/cable/yellow,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
"r" = (/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1)
"s" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"u" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
-"w" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/turf/simulated/floor,/area/submap/DJOutpost1)
+"w" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "shardmedium"},/turf/simulated/floor,/area/submap/DJOutpost1)
"x" = (/obj/structure/girder,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1)
"y" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
"A" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
"B" = (/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1)
"C" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/submap/DJOutpost1)
-"D" = (/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/turf/template_noop,/area/template_noop)
-"F" = (/obj/item/device/transfer_valve,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1)
+"D" = (/obj/item/weapon/material/shard{icon_state = "shardmedium"},/turf/template_noop,/area/template_noop)
+"F" = (/obj/item/device/transfer_valve{start_anomalous = 1},/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1)
"G" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor,/area/submap/DJOutpost1)
"H" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/template_noop,/area/template_noop)
"I" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
@@ -36,11 +36,12 @@
"O" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
"P" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
"S" = (/obj/structure/girder,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1)
+"W" = (/obj/random/tech_supply/anom,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaa
aaabcbbbbbdbaaaaaa
-aabbeekffefbbaaaaa
+aabbeWkffefbbaaaaa
abbePOSoOeegbbaaaa
nweeOooroOiPhCsoaa
DbeporxrrooOlSruoa
@@ -48,7 +49,7 @@ abeOrrrrrLmyqxrroa
abbkxrrFrrxbbkrAoa
abPorrrrrroOfbouaa
abeOorrrropeeboaaa
-ndeOokxBxkOPfMHaaa
+ndWOokxBxkOPfMHaaa
abbeOkOoOkeKbbaaaa
aabbObePebfbbaaaaa
aaabNbbIbbGbaaaaaa
diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm
index b06a6f586b..f0a1ae3e35 100644
--- a/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm
+++ b/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm
@@ -9,15 +9,15 @@
"ai" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aj" = (/obj/structure/bookcase,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"ak" = (/turf/simulated/wall/rpshull,/area/submap/DJOutpost1)
-"al" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"al" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/obj/random/technology_scanner/anom,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"am" = (/obj/structure/sign/warning/lethal_turrets,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1)
"an" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1)
"ao" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"ap" = (/obj/random/mob/robotic,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aq" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/random_multi/single_item/sfr_headset,/obj/item/weapon/archaeological_find,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"ar" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"ar" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{dir = 8; icon_state = "intercom"},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"as" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"at" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/item/weapon/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"at" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{dir = 8; icon_state = "intercom"},/obj/item/weapon/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"au" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow,/obj/machinery/power/solar_control/autostart,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"av" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/landmine,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"aw" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/robutt,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
@@ -31,7 +31,7 @@
"aE" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow,/obj/machinery/power/solar,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
"aF" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/weapon/gun/energy/ionrifle/pistol,/obj/item/weapon/bone/skull/unknown,/obj/item/weapon/bone,/obj/item/weapon/bone/ribs,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aG" = (/obj/machinery/biogenerator,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"aH" = (/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"aH" = (/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aI" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aJ" = (/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1)
"aK" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
@@ -39,7 +39,7 @@
"aM" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aN" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aO" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"aP" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"aP" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown{start_anomalous = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aQ" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/lasershotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aR" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/obj/effect/overlay/snow/floor,/turf/simulated/floor,/area/submap/DJOutpost1)
"aS" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm
index f8c6aeca46..b2dae1a6e5 100644
--- a/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm
+++ b/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm
@@ -16,15 +16,15 @@
"ap" = (/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aq" = (/obj/structure/sign/warning/server_room,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1)
"ar" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"as" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/weapon/bone/skull/unknown,/obj/item/weapon/bone,/obj/item/weapon/bone/ribs,/obj/item/weapon/gun/energy/gun/burst,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"as" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/weapon/bone/skull/unknown,/obj/item/weapon/bone,/obj/item/weapon/bone/ribs{start_anomalous = 1},/obj/random/energy/highend,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"at" = (/mob/living/carbon/human/ai_controlled/replicant,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"au" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/random_multi/single_item/sfr_headset,/obj/item/weapon/archaeological_find,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"av" = (/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1)
-"aw" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"aw" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{dir = 8; icon_state = "intercom"},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"ax" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"ay" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1)
"az" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
-"aA" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/item/weapon/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"aA" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{dir = 8; icon_state = "intercom"},/obj/item/weapon/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aB" = (/obj/item/clothing/under/corp/pcrc,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aC" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow,/obj/machinery/power/solar_control/autostart,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aD" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/landmine,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1)
@@ -39,7 +39,7 @@
"aM" = (/obj/item/device/gps/internal/poi,/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1)
"aN" = (/obj/structure/table/bench/padded,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aO" = (/obj/machinery/biogenerator,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"aP" = (/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"aP" = (/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aQ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aR" = (/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1)
"aS" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
@@ -49,8 +49,9 @@
"aW" = (/obj/structure/sign/warning/emergence,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1)
"aX" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"aY" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
-"aZ" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/lasershotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"aZ" = (/obj/structure/table/rack,/obj/random/energy/highend,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
"ba" = (/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
+"SR" = (/obj/structure/table/bench/padded,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/obj/random/contraband/anom,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1)
(1,1,1) = {"
aaabababababacababababababababac
@@ -63,7 +64,7 @@ abafaEaoaoaFafapaGaHaIaJaKafaLab
abafafafafafafaMaqafafafafafabab
abafaNapapapaGapaGapapapaOafabab
abafaPatapapapapapapatapaQafacab
-acahaNapapafafaRafaSapapaTahabab
+acahSRapapafafaRafaSapapaTahabab
abafafaUapafaVapaWaSapaXafafabab
abaiajafaYafaZbaafaSapafajaiabab
abadaiafahafafaRafafahafaiadabab
diff --git a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
index 74e4b5c824..4c6829f300 100644
--- a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
+++ b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
@@ -22,29 +22,29 @@
"aw" = (/obj/structure/girder,/obj/item/stack/material/steel,/turf/simulated/floor,/area/submap/DecoupledEngine)
"ax" = (/obj/structure/lattice,/obj/structure/grille/broken,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
"ay" = (/obj/effect/floor_decal/rust,/obj/item/stack/material/steel,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"az" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 6},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
+"az" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 6; icon_state = "intact"},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aA" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aB" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aB" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine)
"aD" = (/obj/structure/lattice,/obj/structure/grille,/turf/template_noop,/area/submap/DecoupledEngine)
"aE" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/template_noop,/area/submap/DecoupledEngine)
"aF" = (/obj/structure/sign/warning/radioactive{dir = 8},/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine)
"aG" = (/obj/machinery/fusion_fuel_compressor,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aH" = (/obj/machinery/fusion_fuel_injector/mapped,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aI" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aJ" = (/obj/machinery/power/rad_collector,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aL" = (/obj/structure/grille/broken,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/item/weapon/material/shard/phoron,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aJ" = (/obj/machinery/power/rad_collector,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 9; icon_state = "warning"},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 5; icon_state = "warning"},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aL" = (/obj/structure/grille/broken,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"},/obj/item/weapon/material/shard/phoron,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aM" = (/obj/machinery/atmospherics/pipe/manifold4w/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aN" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/effect/floor_decal/rust,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aO" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/floor/water,/area/submap/DecoupledEngine)
+"aN" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/obj/effect/floor_decal/rust,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aO" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_r"},/turf/simulated/floor/water,/area/submap/DecoupledEngine)
"aP" = (/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aQ" = (/obj/machinery/door/airlock/maintenance_hatch{icon_state = "door_closed"; locked = 0; name = "Engine Access"; req_one_access = list(11)},/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aR" = (/obj/structure/closet/crate/oldreactor{anchored = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aR" = (/obj/structure/closet/crate/oldreactor{anchored = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 8; icon_state = "warning"},/turf/simulated/floor,/area/submap/DecoupledEngine)
"aS" = (/obj/structure/closet/crate/oldreactor{anchored = 1},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aT" = (/obj/item/poi/brokenoldreactor{anchored = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aT" = (/obj/item/poi/brokenoldreactor{anchored = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 4; icon_state = "warning"},/turf/simulated/floor,/area/submap/DecoupledEngine)
"aU" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aV" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/turf/simulated/floor,/area/submap/DecoupledEngine)
-"aW" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aV" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"aW" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5; icon_state = "intact"},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aX" = (/obj/structure/shuttle/engine/router,/turf/simulated/floor,/area/submap/DecoupledEngine)
"aY" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/floor/water,/area/submap/DecoupledEngine)
"aZ" = (/obj/item/stack/material/steel,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
@@ -52,26 +52,28 @@
"bb" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/turf/template_noop,/area/submap/DecoupledEngine)
"bc" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/template_noop,/area/submap/DecoupledEngine)
"bd" = (/obj/machinery/atmospherics/pipe/tank/carbon_dioxide,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"be" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"be" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor,/area/submap/DecoupledEngine)
"bf" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"bg" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"bg" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/submap/DecoupledEngine)
"bh" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
"bi" = (/obj/machinery/atmospherics/tvalve/digital{dir = 8},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"bj" = (/obj/machinery/atmospherics/binary/pump{dir = 8},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"bk" = (/obj/machinery/atmospherics/pipe/manifold/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"bl" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/turf/simulated/floor,/area/submap/DecoupledEngine)
-"bm" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
+"bl" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"},/turf/simulated/floor,/area/submap/DecoupledEngine)
+"bm" = (/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
"bn" = (/obj/effect/floor_decal/rust,/obj/structure/closet/crate/radiation,/turf/simulated/floor,/area/submap/DecoupledEngine)
"bo" = (/obj/effect/decal/cleanable/blood/oil,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine)
"bp" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/rcd,/turf/simulated/floor,/area/submap/DecoupledEngine)
"bq" = (/obj/structure/sign/warning/radioactive,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine)
-"br" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"bs" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine)
-"bt" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine)
+"br" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine)
+"bs" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine)
+"bt" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine)
"bu" = (/obj/structure/sign/scenery/engineleft,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine)
"bv" = (/obj/structure/sign/scenery/engineright,/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine)
"bw" = (/obj/structure/girder,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
"bx" = (/obj/structure/girder/displaced,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine)
+"NS" = (/obj/random/tool/anom,/turf/template_noop,/area/submap/DecoupledEngine)
+"QU" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/effect/floor_decal/rust,/obj/random/tool/anom,/turf/simulated/floor,/area/submap/DecoupledEngine)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -89,7 +91,7 @@ aaababababababababababababababababababababababababajabajabaa
aaabababaiababababababababababafababababamabajabajababababaa
aaabababababacabababababababajajabababababajanajajajabadabaa
aaabadabafababaoaoaoaoacabaoapaqaqarasatatanananajababababaa
-aaamababababauavavavawaxaoapayaqazaAaBaOanananajabababababaa
+aaamababababauavavavawaxaoapayaqazQUaBaOanananajabababababaa
aaababauauaDaEaFaGaHaIaJaoaKaIaLaMaAaNaOananajajabababababaa
aaababababaPaPaQaPaPaPaRaSaTaUaVaWaNaXaYanajajababababababaa
aaababaZbabbbcavbdbdaPbebfbgaUaVazaNaXbhajajabadabajabababaa
@@ -100,7 +102,7 @@ aaabababbwajabababababababababababababababababababababababaa
aaabababababababababababababababamababababababababababababaa
aaabababababababababababababababababajabauababababadabababaa
aaababababababababababaiadabababbxajabababababababababababaa
-aaabababababababababababababamababababababababababababababaa
+aaabababNSabababababababababamababababababababababababababaa
aaababadabababababababababababababababababababababababababaa
aaabababafababababababababababababababababababababababababaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm
index 8c36970f98..9d342df390 100644
--- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm
+++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm
@@ -31,25 +31,25 @@
"aE" = (/obj/machinery/power/smes/buildable/point_of_interest,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/submap/DoomP)
"aF" = (/obj/machinery/power/smes/buildable/point_of_interest,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/submap/DoomP)
"aG" = (/obj/machinery/power/apc{dir = 1; name = "PAPC"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
-"aH" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/port_gen/pacman,/turf/simulated/floor/plating,/area/submap/DoomP)
+"aH" = (/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/power/port_gen/pacman,/turf/simulated/floor/plating,/area/submap/DoomP)
"aI" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
-"aJ" = (/obj/structure/table/standard,/obj/item/stack/material/phoron{amount = 25},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
+"aJ" = (/obj/structure/table/standard,/obj/item/stack/material/phoron{amount = 25},/obj/random/tool/power,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aK" = (/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aL" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/DoomP)
"aM" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled,/area/submap/DoomP)
"aN" = (/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/DoomP)
"aO" = (/obj/structure/table/standard,/obj/random/pizzabox,/turf/simulated/floor/tiled,/area/submap/DoomP)
"aP" = (/turf/simulated/floor/tiled,/area/submap/DoomP)
-"aQ" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled,/area/submap/DoomP)
-"aR" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
-"aS" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
+"aQ" = (/obj/random/vendorfood,/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled,/area/submap/DoomP)
+"aR" = (/obj/machinery/power/terminal{dir = 1; icon_state = "term"},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
+"aS" = (/obj/machinery/power/terminal{dir = 1; icon_state = "term"},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aU" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aV" = (/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aW" = (/obj/machinery/light/small,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"aX" = (/obj/structure/lattice,/turf/simulated/floor/water,/area/submap/DoomP)
"aY" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled,/area/submap/DoomP)
-"aZ" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled,/area/submap/DoomP)
+"aZ" = (/obj/random/vendordrink,/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled,/area/submap/DoomP)
"ba" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled,/area/submap/DoomP)
"bb" = (/obj/machinery/door/airlock/engineering,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DoomP)
"bc" = (/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall,/area/submap/DoomP)
@@ -62,11 +62,11 @@
"bj" = (/obj/machinery/door/airlock/highsecurity,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"bk" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/white,/area/submap/DoomP)
"bl" = (/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
-"bm" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
+"bm" = (/obj/structure/table/standard,/obj/random/grenade/box,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"bn" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/syndie_kit/spy,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"bo" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/smokes,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"bp" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/handcuffs,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
-"bq" = (/obj/structure/table/rack,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
+"bq" = (/obj/structure/table/rack,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/random/multiple/gun/projectile/handgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"br" = (/obj/structure/table/rack,/obj/random/energy,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"bs" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/contender,/obj/item/ammo_magazine/s357,/obj/item/ammo_magazine/s357,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP)
"bt" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/toy/plushie/spider,/obj/effect/floor_decal/corner/lime/full{dir = 8},/turf/simulated/floor/tiled/white,/area/submap/DoomP)
@@ -93,6 +93,7 @@
"bO" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/effect/floor_decal/corner/lime{dir = 1},/obj/random/soap,/turf/simulated/floor/tiled/white,/area/submap/DoomP)
"bP" = (/obj/random/junk,/turf/simulated/floor/outdoors/rocks,/area/submap/DoomP)
"bQ" = (/obj/random/junk,/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/DoomP)
+"DB" = (/obj/structure/table/standard,/obj/random/tech_supply,/turf/simulated/floor/tiled,/area/submap/DoomP)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -126,7 +127,7 @@ aaabababacafafafafafafafakakakakakafafafacadadasadadasadatauavavavauatadasadadas
aaabababacafafafafafafafakakakakakakafafacatatatatatatatatatatawatatatatatatatatatatatafafafafafakakakakafafafafacacabaa
aaabababacacafafafafafafakakakakakakafafacataxayaAayaBayazaCataDataEaFaFaFaGaHaIaJaKatafafafafafakakakakafafafafacacabaa
aaabababacacacafafafafakakakakakakakafasaLataMaNaOaNaNaNaPaQataPataRaSaSaSaTaUaVaWaVataXasafafafakakakafafafafafafacabaa
-aaabababababacacafafafakakakakakakakafafafataYaNaNaNbgaNaPaZatbaatatatatatatbbbcatatatafafafafafakakakafafafafafafacabaa
+aaabababababacacafafafakakakakakakakafafafataYDBaNaNbgaNaPaZatbaatatatatatatbbbcatatatafafafafafakakakafafafafafafacabaa
aaababababababacafafafakakakakakakakakafafatbdbebebfbebxbMaPbhaPbNbiaPaPaPaPaPbiaPaPatafafafafafakakakafafafafafafafacaa
aaabababagabababacafafakakakakakakakakasaXatbjatatatatatatatatatatatatatatbkatatatatataXasafafafakakakafafafafafafafacaa
aaababababababacacafafafakakakakakakakakafatblbmbnbobpbqbrbsatbtbubvbwbvbObybkbzbkbAatafafafafafakakakafafafafafafafacaa
diff --git a/maps/submaps/surface_submaps/wilderness/Drugden.dmm b/maps/submaps/surface_submaps/wilderness/Drugden.dmm
index 90bd27b450..05e66f0c6b 100644
--- a/maps/submaps/surface_submaps/wilderness/Drugden.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Drugden.dmm
@@ -8,15 +8,15 @@
"h" = (/obj/random/trash,/turf/simulated/floor,/area/submap/Drugd)
"i" = (/obj/structure/closet/cabinet,/obj/item/weapon/lipstick/random,/turf/simulated/floor/carpet,/area/submap/Drugd)
"j" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/structure/curtain/open/bed,/turf/simulated/floor/carpet,/area/submap/Drugd)
-"k" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/happy{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
+"k" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/happy{name = "pill"},/obj/random/medical/pillbottle,/turf/simulated/floor/carpet,/area/submap/Drugd)
"l" = (/turf/simulated/floor,/area/submap/Drugd)
"m" = (/obj/structure/curtain/black,/turf/simulated/floor,/area/submap/Drugd)
"n" = (/obj/random/trash,/turf/simulated/floor/carpet,/area/submap/Drugd)
"o" = (/turf/simulated/floor/carpet,/area/submap/Drugd)
"p" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor,/area/submap/Drugd)
-"q" = (/obj/structure/closet/cabinet,/turf/simulated/floor/carpet,/area/submap/Drugd)
+"q" = (/obj/structure/closet/cabinet,/obj/random/maintenance/anom,/turf/simulated/floor/carpet,/area/submap/Drugd)
"r" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/methylphenidate{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
-"s" = (/obj/structure/bed/chair/comfy/beige{icon_state = "armchair_preview"; dir = 1},/turf/simulated/floor/carpet,/area/submap/Drugd)
+"s" = (/obj/structure/bed/chair/comfy/beige{dir = 1; icon_state = "armchair_preview"},/turf/simulated/floor/carpet,/area/submap/Drugd)
"t" = (/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
"u" = (/obj/random/junk,/turf/simulated/floor,/area/submap/Drugd)
"v" = (/obj/structure/closet/cabinet,/obj/item/poster,/turf/simulated/floor/carpet,/area/submap/Drugd)
@@ -25,10 +25,10 @@
"y" = (/obj/structure/bed/chair/comfy/beige,/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
"z" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor,/area/submap/Drugd)
"A" = (/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
-"B" = (/obj/structure/table/standard,/obj/item/weapon/storage/pill_bottle/happy,/turf/simulated/floor/tiled,/area/submap/Drugd)
+"B" = (/obj/structure/table/standard,/obj/item/weapon/storage/pill_bottle/happy,/obj/random/medical/pillbottle,/turf/simulated/floor/tiled,/area/submap/Drugd)
"C" = (/obj/structure/table/standard,/obj/item/stack/medical/splint,/turf/simulated/floor/tiled,/area/submap/Drugd)
"D" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/pill/citalopram,/obj/item/weapon/reagent_containers/pill/citalopram,/turf/simulated/floor/tiled,/area/submap/Drugd)
-"E" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/pill/tramadol,/obj/item/weapon/reagent_containers/pill/tramadol,/turf/simulated/floor/tiled,/area/submap/Drugd)
+"E" = (/obj/structure/table/standard,/obj/random/medical/anom,/turf/simulated/floor/tiled,/area/submap/Drugd)
"F" = (/obj/structure/closet/cabinet,/obj/item/clothing/accessory/jacket,/obj/item/weapon/material/butterfly/switchblade,/turf/simulated/floor/carpet,/area/submap/Drugd)
"G" = (/obj/item/weapon/reagent_containers/pill/zoom{name = "pill"},/obj/random/trash,/turf/simulated/floor/carpet,/area/submap/Drugd)
"H" = (/obj/item/weapon/reagent_containers/pill/zoom{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
@@ -37,7 +37,7 @@
"K" = (/obj/item/wheelchair,/turf/simulated/floor/tiled,/area/submap/Drugd)
"L" = (/obj/structure/table/standard,/obj/random/firstaid,/turf/simulated/floor,/area/submap/Drugd)
"M" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/tiled,/area/submap/Drugd)
-"N" = (/obj/effect/floor_decal/rust,/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/Drugd)
+"N" = (/obj/effect/floor_decal/rust,/obj/structure/table/standard,/obj/random/contraband/anom,/turf/simulated/floor/tiled,/area/submap/Drugd)
"O" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/pill/zoom,/obj/item/weapon/reagent_containers/pill/zoom,/turf/simulated/floor,/area/submap/Drugd)
"P" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/tramadol{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd)
"Q" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard,/turf/simulated/floor,/area/submap/Drugd)
diff --git a/maps/submaps/surface_submaps/wilderness/Epod3.dmm b/maps/submaps/surface_submaps/wilderness/Epod3.dmm
index 42fbe7f6f8..99ad8bc001 100644
--- a/maps/submaps/surface_submaps/wilderness/Epod3.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Epod3.dmm
@@ -6,9 +6,9 @@
"f" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod3)
"g" = (/obj/effect/spider/stickyweb,/turf/template_noop,/area/submap/Epod3)
"h" = (/obj/structure/bed/chair{dir = 4},/obj/structure/closet/walllocker/emerglocker{pixel_y = 28},/obj/item/device/radio/intercom{pixel_y = -26},/turf/simulated/shuttle/floor,/area/submap/Epod3)
-"i" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_y = 28},/obj/machinery/light,/obj/item/weapon/weldingtool/largetank,/turf/simulated/shuttle/floor,/area/submap/Epod3)
-"j" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood/splatter,/obj/item/ammo_casing/spent,/obj/item/clothing/under/suit_jacket/really_black,/obj/item/clothing/shoes/dress,/obj/item/clothing/glasses/sunglasses,/obj/random/multiple/gun/projectile/handgun,/turf/simulated/shuttle/floor,/area/submap/Epod3)
-"k" = (/obj/structure/shuttle/engine/propulsion/burst{icon_state = "propulsion"; dir = 8},/turf/simulated/shuttle/wall,/area/submap/Epod3)
+"i" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_y = 28},/obj/machinery/light,/obj/item/weapon/weldingtool/largetank{start_anomalous = 1},/turf/simulated/shuttle/floor,/area/submap/Epod3)
+"j" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/structure/bed/chair{dir = 8; icon_state = "chair_preview"},/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood/splatter,/obj/item/ammo_casing/spent,/obj/item/clothing/under/suit_jacket/really_black,/obj/item/clothing/shoes/dress,/obj/item/clothing/glasses/sunglasses,/obj/random/multiple/gun/projectile/handgun,/turf/simulated/shuttle/floor,/area/submap/Epod3)
+"k" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 8; icon_state = "propulsion"},/turf/simulated/shuttle/wall,/area/submap/Epod3)
"l" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod3)
"m" = (/obj/machinery/door/airlock/external{name = "Escape Pod Hatch"; welded = 1},/turf/simulated/shuttle/floor,/area/submap/Epod3)
"n" = (/obj/effect/spider/eggcluster/small/frost,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod3)
diff --git a/maps/submaps/surface_submaps/wilderness/Epod4.dmm b/maps/submaps/surface_submaps/wilderness/Epod4.dmm
index 00557bf42c..c6ddfdac57 100644
--- a/maps/submaps/surface_submaps/wilderness/Epod4.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Epod4.dmm
@@ -8,10 +8,10 @@
"h" = (/turf/simulated/shuttle/wall,/area/submap/Epod4)
"i" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/Epod4)
"j" = (/obj/structure/flora/grass/both,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod4)
-"k" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/water,/area/submap/Epod4)
+"k" = (/obj/structure/bed/chair{dir = 1; icon_state = "chair_preview"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/water,/area/submap/Epod4)
"l" = (/turf/simulated/floor/water/deep,/area/submap/Epod4)
-"m" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/effect/decal/remains/posi,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0},/obj/item/clothing/shoes/brown,/obj/item/clothing/under/corp/mbill,/obj/item/clothing/head/soft/mbill,/turf/simulated/floor/water,/area/submap/Epod4)
-"n" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/structure/closet/walllocker/emerglocker/east,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/crate/hydroponics{desc = "All you need to destroy that pesky planet."; name = "exotic seeds crate"; starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium)},/turf/simulated/floor/water,/area/submap/Epod4)
+"m" = (/obj/structure/bed/chair{dir = 1; icon_state = "chair_preview"},/obj/effect/decal/remains/posi,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0},/obj/item/clothing/shoes/brown,/obj/item/clothing/under/corp/mbill,/obj/item/clothing/head/soft/mbill{start_anomalous = 1},/turf/simulated/floor/water,/area/submap/Epod4)
+"n" = (/obj/structure/bed/chair{dir = 1; icon_state = "chair_preview"},/obj/structure/closet/walllocker/emerglocker/east,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/crate/hydroponics{desc = "All you need to destroy that pesky planet."; name = "exotic seeds crate"; starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium)},/turf/simulated/floor/water,/area/submap/Epod4)
"o" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall,/area/submap/Epod4)
"p" = (/obj/structure/door_assembly/door_assembly_ext{anchored = 1},/turf/simulated/floor/water,/area/submap/Epod4)
"q" = (/obj/structure/flora/grass/brown,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod4)
diff --git a/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm b/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
index ccb107a33f..5499e63ca2 100644
--- a/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
+++ b/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
@@ -1,7 +1,7 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/simulated/mineral/ignore_mapgen/sif,/area/submap/FrostflyNest)
"c" = (/obj/structure/boulder,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
-"d" = (/turf/simulated/wall/solidrock,/area/submap/FrostflyNest)
+"d" = (/obj/random/medical/lite/anom,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
"e" = (/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
"f" = (/obj/structure/outcrop/diamond,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
"g" = (/obj/random/humanoidremains,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
@@ -10,16 +10,17 @@
"j" = (/obj/random/humanoidremains,/obj/random/gun/random,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
"k" = (/obj/random/medical/pillbottle,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
"l" = (/obj/random/gun/random,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
+"x" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/submap/FrostflyNest)
(1,1,1) = {"
aabbbcbbaa
-abbddedbba
-bbddfgddbb
-bddhieiddb
-bdfjefefdb
-bdkeegeddb
-ceefefldbb
-bdddgdddba
-bbbdddbbba
+abbbbebbba
+bbbbfgbbbb
+bbbhiedbbb
+bbfjefexbb
+bbkeegebbb
+ceexeflbbb
+bbbbgbbbba
+bbbbbbbbba
abbbbbbaaa
"}
diff --git a/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm b/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm
index 41b0910984..82c4c5089e 100644
--- a/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm
+++ b/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm
@@ -4,13 +4,16 @@
"d" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/GovPatrol)
"e" = (/obj/item/device/radio/off,/turf/template_noop,/area/submap/GovPatrol)
"f" = (/obj/item/weapon/storage/backpack/parachute,/turf/template_noop,/area/submap/GovPatrol)
-"g" = (/obj/item/weapon/storage/box/flare,/turf/template_noop,/area/submap/GovPatrol)
+"g" = (/obj/item/weapon/storage/box/flare,/obj/random/medical/lite/anom,/turf/template_noop,/area/submap/GovPatrol)
"h" = (/obj/item/ammo_casing,/turf/template_noop,/area/submap/GovPatrol)
"i" = (/obj/item/clothing/under/solgov/utility/sifguard,/obj/item/clothing/shoes/boots/jackboots,/obj/effect/decal/remains,/turf/template_noop,/area/submap/GovPatrol)
"j" = (/obj/item/stack/material/wood/sif,/turf/template_noop,/area/submap/GovPatrol)
"k" = (/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,/turf/template_noop,/area/submap/GovPatrol)
"l" = (/obj/structure/bonfire/sifwood,/turf/template_noop,/area/submap/GovPatrol)
"m" = (/obj/effect/decal/remains,/turf/template_noop,/area/submap/GovPatrol)
+"u" = (/obj/random/projectile/scrapped_shotgun,/turf/template_noop,/area/submap/GovPatrol)
+"I" = (/obj/item/clothing/head/beret/solgov/sifguard/patrol,/turf/template_noop,/area/submap/GovPatrol)
+"X" = (/obj/item/clothing/suit/storage/solgov/service/sifguard,/turf/template_noop,/area/submap/GovPatrol)
(1,1,1) = {"
aaaaaaaaaaaaa
@@ -20,9 +23,9 @@ abbdbbbbbbbba
abbbbbbbbbbba
abbbbbbbbbbba
abbbbedfbbbba
-abbbbbbghbbba
+abbIbbbghbbba
adbhbibbbbbba
-abbjbbbbbbbba
+abbjbbbXbubba
abbbkbblbbhba
abbhbbbbbmhba
aaaaaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/wilderness/Lab1.dmm b/maps/submaps/surface_submaps/wilderness/Lab1.dmm
index d679f68887..36c4c06eb9 100644
--- a/maps/submaps/surface_submaps/wilderness/Lab1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Lab1.dmm
@@ -10,15 +10,15 @@
"j" = (/obj/machinery/light/small,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"k" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox,/obj/random/tool,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"l" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"m" = (/obj/structure/table/standard,/obj/random/tool,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"m" = (/obj/structure/table/standard,/obj/random/tool,/obj/machinery/recharger,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"n" = (/obj/machinery/vending/tool,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"o" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/shoes/boots/winter,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"o" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/shoes/boots/winter,/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"p" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"q" = (/obj/structure/table/standard,/obj/random/toolbox,/obj/item/weapon/cell/super,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"r" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"s" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"t" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"u" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"t" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"u" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; pixel_x = -24},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"v" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"w" = (/obj/machinery/power/smes/buildable/point_of_interest,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"x" = (/obj/structure/table/standard,/obj/item/weapon/paper{desc = "Gladstone for the last fucking time, We have crowbars for a REASON. Stop breaking in through the goddamn windows! We big red shiny doors for god's sakes!"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
@@ -27,34 +27,36 @@
"A" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"B" = (/obj/machinery/vending/hydroseeds,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"C" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"D" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"D" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/obj/random/tool/anom,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"E" = (/obj/structure/table/standard,/obj/fiftyspawner/steel,/obj/fiftyspawner/glass,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"F" = (/obj/structure/table/standard,/obj/item/device/multitool,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"F" = (/obj/structure/table/standard,/obj/item/device/multitool,/obj/item/clothing/glasses/welding{start_anomalous = 1},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"G" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"H" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"I" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"I" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"J" = (/obj/item/weapon/cell/super,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"K" = (/obj/machinery/pros_fabricator,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"L" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"L" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"M" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"N" = (/obj/item/weapon/storage/bag/circuits,/obj/structure/table/standard,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"O" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"P" = (/obj/item/robot_parts/chest,/obj/item/robot_parts/l_arm,/obj/item/robot_parts/r_arm,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"P" = (/obj/item/robot_parts/chest,/obj/item/robot_parts/l_arm,/obj/item/robot_parts/r_arm{start_anomalous = 1},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"Q" = (/obj/structure/closet/crate/hydroponics,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"R" = (/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
-"S" = (/obj/structure/table/standard,/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"S" = (/obj/structure/table/standard,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/weapon/material/knife/machete/hatchet,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"T" = (/obj/machinery/vending/robotics,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"U" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
"V" = (/obj/machinery/optable,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"W" = (/obj/structure/table/standard,/obj/random/technology_scanner/anom,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
+"X" = (/obj/structure/bed,/obj/item/weapon/bedsheet/green,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
abbbbbbbbbbbbbbbbbba
acdefcdeeeeeefcdefca
-acghhihhjhhjhhihhhca
+acghhihhjhhjhhihhWca
ackhgcdfcllcdfchhhca
acmhncbbchhcbbcohpca
-acqhrcbbcshcbbcthtca
+acqhrcbbcshcbbcthXca
acuvwcbbchhcbbcxhyca
acdefcbbcllcbbcdefca
abbbbbbbbzzbbbbbbbba
diff --git a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm
index 35db3777dc..d66d00cdbe 100644
--- a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm
@@ -32,9 +32,11 @@
"F" = (/obj/machinery/door/airlock,/obj/effect/mine,/turf/simulated/floor,/area/submap/MilitaryCamp1)
"G" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/MilitaryCamp1)
"H" = (/obj/random/landmine,/turf/template_noop,/area/template_noop)
-"I" = (/obj/structure/table/standard,/obj/random/cigarettes,/obj/item/weapon/flame/lighter/random,/turf/simulated/floor,/area/submap/MilitaryCamp1)
+"I" = (/obj/structure/table/standard,/obj/random/cigarettes,/obj/item/weapon/flame/lighter/random,/obj/random/maintenance/anom,/turf/simulated/floor,/area/submap/MilitaryCamp1)
"J" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor,/area/submap/MilitaryCamp1)
"K" = (/obj/effect/decal/cleanable/blood,/obj/random/landmine,/turf/template_noop,/area/submap/MilitaryCamp1)
+"P" = (/obj/item/weapon/cell/device/weapon/empty,/turf/simulated/floor,/area/submap/MilitaryCamp1)
+"Z" = (/mob/living/simple_mob/mechanical/viscerator,/obj/item/weapon/cell/device/weapon/empty,/turf/simulated/floor,/area/submap/MilitaryCamp1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
@@ -43,11 +45,11 @@ aghcdbbbbbbfibcjbbba
abccbbdbbklbbbccgkba
adkbblmmnommnmpcbbba
abbbbmmmonmmmmmbdbda
-abbdmmqoormstqmmbeba
+abbdmmqoormstZmmbeba
abbbmmqruvmwxxmmbbda
abbymmzmmAmmmzmrBdba
abbbomqoovoqAvmmbbba
-afdbomqooCDqEvmmbida
+afdbomqPoCDqEvmmbida
abbbrmzFmmmmzzmrbGba
HbbBmmqorvEvqqmmbbba
aGbbmmIJmooqqqmmpbKa
diff --git a/maps/submaps/surface_submaps/wilderness/MHR.dmm b/maps/submaps/surface_submaps/wilderness/MHR.dmm
index 8c03a44867..d318a5e13f 100644
--- a/maps/submaps/surface_submaps/wilderness/MHR.dmm
+++ b/maps/submaps/surface_submaps/wilderness/MHR.dmm
@@ -11,12 +11,14 @@
"k" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
"l" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
"m" = (/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
-"n" = (/obj/effect/decal/cleanable/cobweb2,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
+"n" = (/obj/effect/decal/cleanable/cobweb2,/mob/living/simple_mob/mechanical/viscerator,/obj/random/multiple/gun/projectile/smg,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
"o" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
"p" = (/obj/effect/decal/cleanable/spiderling_remains,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
"q" = (/obj/effect/decal/remains/robot,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
-"r" = (/obj/effect/decal/remains,/obj/item/clothing/mask/gas/explorer,/obj/item/weapon/material/twohanded/fireaxe,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
-"s" = (/obj/effect/decal/cleanable/spiderling_remains,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
+"r" = (/obj/effect/decal/remains,/obj/item/clothing/mask/gas/explorer{start_anomalous = 1},/obj/item/weapon/material/twohanded/fireaxe,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
+"s" = (/obj/effect/decal/cleanable/spiderling_remains,/mob/living/simple_mob/mechanical/viscerator,/obj/random/bomb_supply,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
+"t" = (/mob/living/simple_mob/mechanical/viscerator,/obj/random/contraband/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
+"C" = (/obj/random/maintenance/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
@@ -32,7 +34,7 @@ abeeeeelmneeoddddeea
abeeepllldqfdddddeea
abeeeldldlddddddreea
abeeedldfdddddddeeea
-abbeellllddmddqeeeea
+abbeetllldCmddqeeeea
abbeeeseedldddeeeeba
abbeeeeeeeeeeeeeebba
abbbeeeeeeeeeeeeebba
diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm
index e7282d9b1f..a7b5dab12b 100644
--- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm
@@ -1,9 +1,9 @@
"aa" = (/turf/template_noop,/area/submap/Manor1)
"ab" = (/turf/simulated/wall/wood,/area/submap/Manor1)
"ac" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"ad" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 4},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"ad" = (/obj/structure/bed/chair/wood{dir = 4; icon_state = "wooden_chair"},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"ae" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"af" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"af" = (/obj/structure/bed/chair/wood{dir = 8; icon_state = "wooden_chair"},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"ag" = (/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"ah" = (/obj/structure/flora/pottedplant/dead,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"ai" = (/obj/structure/flora/pottedplant/drooping,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
@@ -49,7 +49,7 @@
"aW" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"aX" = (/obj/structure/table/standard,/obj/item/weapon/material/knife,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"aY" = (/obj/machinery/appliance/cooker/oven,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{start_anomalous = 1},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"ba" = (/obj/machinery/appliance/cooker/grill,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bb" = (/obj/structure/table/standard,/obj/item/weapon/tray,/obj/item/weapon/tray,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bc" = (/obj/structure/table/standard,/obj/item/weapon/material/knife/butch,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
@@ -57,29 +57,29 @@
"be" = (/obj/random/trash,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bf" = (/obj/structure/closet/cabinet,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random/contraband,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bg" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"bh" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"bh" = (/obj/structure/bed/chair/wood{dir = 1; icon_state = "wooden_chair"},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bi" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken0"},/area/submap/Manor1)
"bj" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bk" = (/obj/random/plushielarge,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bl" = (/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
"bm" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/accessory/sweater/blue,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
"bn" = (/obj/structure/window/reinforced/full,/turf/template_noop,/area/submap/Manor1)
-"bo" = (/obj/item/weapon/material/twohanded/baseballbat/metal,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
+"bo" = (/obj/item/weapon/material/twohanded/baseballbat/metal{start_anomalous = 1},/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
"bp" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
"bq" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"br" = (/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken5"},/area/submap/Manor1)
+"br" = (/obj/structure/bed/chair/comfy/purp{dir = 4; icon_state = "comfychair_preview"},/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken5"},/area/submap/Manor1)
"bs" = (/obj/structure/table,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"bt" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"bu" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"bt" = (/obj/structure/bed/chair/wood{dir = 4; icon_state = "wooden_chair"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"bu" = (/obj/structure/bed/chair/wood{dir = 8; icon_state = "wooden_chair"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bv" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bw" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
-"bx" = (/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"by" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"bx" = (/obj/structure/bed/chair/comfy/purp{dir = 4; icon_state = "comfychair_preview"},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"by" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/obj/random/grenade/less_lethal,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bz" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bA" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bB" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/stew,/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bC" = (/obj/item/weapon/shovel,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"bD" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"bD" = (/obj/structure/bed/chair/wood{dir = 1; icon_state = "wooden_chair"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bE" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bF" = (/obj/structure/table/standard,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/sausage,/obj/item/weapon/reagent_containers/food/snacks/sausage,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
@@ -93,7 +93,7 @@
"bO" = (/obj/machinery/icecream_vat,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bP" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
"bQ" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"bR" = (/obj/effect/decal/cleanable/cobweb,/obj/structure/table/woodentable,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"bR" = (/obj/effect/decal/cleanable/cobweb,/obj/structure/table/woodentable,/obj/machinery/recharger,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bS" = (/obj/structure/flora/pottedplant/subterranean,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"bT" = (/obj/item/weapon/material/minihoe,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1)
"bU" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/purcarpet,/area/submap/Manor1)
@@ -114,7 +114,7 @@
"cj" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"ck" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cl" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Manor1)
-"cm" = (/obj/effect/decal/cleanable/blood,/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"cm" = (/obj/effect/decal/cleanable/blood,/obj/structure/bed/chair/comfy/purp{dir = 4; icon_state = "comfychair_preview"},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cn" = (/obj/structure/closet/crate,/obj/item/weapon/storage/wallet/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"co" = (/obj/structure/coatrack,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cp" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/suit/storage/hooded/wintercoat,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
@@ -132,17 +132,21 @@
"cB" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken3"},/area/submap/Manor1)
"cC" = (/obj/effect/decal/cleanable/spiderling_remains,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cD" = (/obj/structure/closet/crate,/obj/item/clothing/suit/armor/vest,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"cE" = (/obj/structure/closet/crate,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"cE" = (/obj/structure/closet/crate,/obj/random/medical/lite/anom,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cF" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
-"cG" = (/obj/structure/toilet{icon_state = "toilet00"; dir = 8},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
-"cH" = (/obj/machinery/shower{icon_state = "shower"; dir = 8},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
+"cG" = (/obj/structure/toilet{dir = 8; icon_state = "toilet00"},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
+"cH" = (/obj/machinery/shower{dir = 8; icon_state = "shower"},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
"cI" = (/obj/item/stack/material/wood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
-"cJ" = (/obj/machinery/shower{icon_state = "shower"; dir = 8},/obj/structure/curtain/open/shower,/obj/random/soap,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
-"cK" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
-"cL" = (/obj/structure/toilet{icon_state = "toilet00"; dir = 1},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
+"cJ" = (/obj/machinery/shower{dir = 8; icon_state = "shower"},/obj/structure/curtain/open/shower,/obj/random/soap,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
+"cK" = (/obj/structure/table/standard,/obj/random/medical/pillbottle,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
+"cL" = (/obj/structure/toilet{dir = 1; icon_state = "toilet00"},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
"cM" = (/obj/structure/table/woodentable,/obj/item/modular_computer/laptop/preset/custom_loadout/cheap,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cN" = (/turf/template_noop,/area/template_noop)
"cO" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Manor1)
+"Bh" = (/obj/structure/table/woodentable,/obj/random/action_figure/anom,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"CS" = (/obj/structure/table/woodentable,/obj/random/powercell/anom,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"VB" = (/obj/structure/table/woodentable,/obj/item/weapon/material/kitchen/utensil/fork{start_anomalous = 1},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"WJ" = (/obj/structure/table/woodentable,/obj/random/drinkbottle/anom,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
(1,1,1) = {"
cNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcN
@@ -156,7 +160,7 @@ cNaaaaaaaaaaabaxagayabagaqagagazalalaganananaAaBaAagananagagagagagagagagagalalaC
cNaaaaaaaaaaababasababagaqagabababababababababababababababababababababababababababagaqagabaDagagaEabaaaaaacN
cNaaaaaacOaaabagagagasagaqagabaFaGagalaHabaIaJaKagagaLaLagagagagahabagaMagagagaNabagaqagabaOagagalabaaaaaacN
cNaaaaaaaaaaabasabababagaqagabagagagagagabaKaKaPaPagaQaQagaPaPagagabaRagaRaRagaSabagaqagabababasababaaaaaacN
-cNaaaaaaaaaaabagagaTabagaqagabagaUagaUagabagadalaVafaQaQadaValafagabaRagaWaXagaYabalaqagasagagagagabaaaaaacN
+cNaaaaaaaaaaabagagaTabagaqagabagaUagaUagabagadalVBafaQaQadaValafagabaRagaWaXagaYabalaqagasagagagagabaaaaaacN
cNaaaaaaaaaaabagagaMabagaqagabagaUagaUagabagadalalafaQaQadalalafagabaRagaZaRagbaabagaqagabababasababaaaaaacN
cNaaaaaaaaaaabaDalaOabagaqagabagaUagaUagabagadalalafaQaQadalalafagabbbagaRbcagbdabagaqagabaOagagalabaaaaaacN
cNaaaaaaaaaaabababababagaqagabagagagaganabagadalalafaQaQadalalafagabagagagagagagabagaqagabaDbeagbfabaaaaaacN
@@ -164,7 +168,7 @@ cNaaaaaaaaaaabaDalbgabalaqagabagaUagaUanabagadalalafaQaQadalalafagabagagagagagag
cNaaaaaaaaababagbhagabazaqagasagaUagaUanabagadaGalafaQaQadalalafagabagagagagagagabagaqagabbiagagagababaaaacN
cNaaaaaaababbjagagbkabalaqagabagaUanaUanabagadalalafaQaQadalalafagabagagagagagagabagaqagabagblbmagagababaacN
cNaaaaaabnagagagagaOabagaqanabanananananabanadalalafaQaQadalalafagasagagagagagagasagaqagasagbobpbqbrbsacaacN
-cNaaaaaabnagagagagalabagaranabagaUanaUagabanbtalalafaQaQadalalbuanabagagaRbvagagabagaqagabagblbwagbxbsacaacN
+cNaaaaaabnagagagagalabagaranabagaUanaUagabanbtalalafaQaQadWJalbuanabagagaRbvagagabagaqagabagblbwagbxbsacaacN
cNaaaaaaababagagagbyabanaranabagaUanaUagabanbtalalafaQaQadalbzbuanabagagbAaRagbBabagaqagabagblblagbCababaacN
cNaaaaaaaaababagagagabanaragabagaUanaUagabananbhbhagaQaQagbhbDananabagagbEbFagbGabagaqagabalblblagababaaaacN
cNaaaaaaaaaaabagagagabagaragabagaganagagabbHananagagaQaQaganananbIabagagbFbJagbKabagaqagabaDblblalabaaaaaacN
@@ -175,13 +179,13 @@ cNaaaaaaaaababbRazbSabbqaqagagagagananananananasagagaQaQagagasagagagagagagagagag
cNaaaaaaababagagagagabagaqagababababasabababababalagbUaQagalabababababababababababagaqagabagblblbVagababaacN
cNaaaaaaacagagagagbqasbqaqagabbWbXabagabbYagbZabalagbUbUagcaabcbccagcdcecfagagcgabagaqagasagbpchagbxbsacaacN
cNaacOaaacagagagbqagabagaqagabagagasagabagagciabcjckbUbUagcjabagclclclclclclclaDabagaqagabbqbwblagcmagacaacN
-cNaaaaaaababagbQbQagabahaqagabbWazabagasagagcnababcobUbUcoababagclclclclclclclalabahaqahabagbwblagcpababaacN
+cNaaaaaaababagbQbQagabahaqagabbWazabagasagagcnababcobUbUcoababagclclclclclclclBhabahaqahabagbwblagcpababaacN
cNaaaaaaaaababcqagagababasabababababagabagagagaKababcrcrababagagclclclclclclclalababasababcsblbwagababaaaacN
cNaaaaaaaaaaabctagcuabcvcwcxabcycwasagabbYagaKaKczabbUbUabazafagclclclclclclclagagagagahabagcAcBagabaaaaaacN
cNaaaaaaaaaaababalagabcwabababcwcwabagabbYcCaJcDcEabbUbUabalagagagagagclclclclclclclclagabcAbqagababaaaaaacN
cNaaaaaaaaaaaaababalabcwcFcGabcwcHabasabababababababbNbNabababababahagclclclclclclclclagabagcIababaaaaaaaacN
cNaaaaaaaaaaaaaaabababcwabababcwcHabcwcvababaaaaaaaaaaaaaaaaaaaaababalclclclclclclclclagabcIababaaaaaaaaaacN
-cNaaaaaaaaaaaaaaaaababcwcFcGabcwcJabcKcLabaaaaaaaaaaaaaaaaaaaaaaaaabcMalalagagagagagagahabababaaaaaacOaaaacN
+cNaaaaaaaaaaaaaaaaababcwcFcGabcwcJabcKcLabaaaaaaaaaaaaaaaaaaaaaaaaabcMCSalagagagagagaMahabababaaaaaacOaaaacN
cNaaaaaacOaaaaaaaaaaabababababababababababaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababaaaaaaaaaaaaaacN
cNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacN
cNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcNcN
diff --git a/maps/submaps/surface_submaps/wilderness/Rocky1.dmm b/maps/submaps/surface_submaps/wilderness/Rocky1.dmm
index bbe9827a67..1d7db052e1 100644
--- a/maps/submaps/surface_submaps/wilderness/Rocky1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Rocky1.dmm
@@ -5,6 +5,7 @@
"e" = (/turf/simulated/mineral,/area/submap/Rocky1)
"f" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Rocky1)
"g" = (/obj/random/handgun/sec,/obj/effect/decal/remains/human,/obj/item/weapon/spacecash/c200,/turf/simulated/floor/outdoors/dirt,/area/submap/Rocky1)
+"V" = (/obj/random/material/anom,/turf/simulated/floor/outdoors/dirt,/area/submap/Rocky1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaa
@@ -22,7 +23,7 @@ aabbbcbbcccccccccceeeeeaa
aabbbccccceeeeeecdeeeebaa
aabbbceeeeeeeeeeeeebbbbaa
aabbcceeeeeeeeeeebbfbbbaa
-aabcceeeccbbeeebbbbbbbbaa
+aabcceeeVcbbeeebbbbbbbbaa
aabceeeccbbbbbbbbbbbbbbaa
aabceeecbbbbbbbfbbbbbbbaa
aabbccecbbbbbbbbbbbbbbbaa
diff --git a/maps/submaps/surface_submaps/wilderness/Rocky2.dmm b/maps/submaps/surface_submaps/wilderness/Rocky2.dmm
index 10116c3ec6..5b75066eaa 100644
--- a/maps/submaps/surface_submaps/wilderness/Rocky2.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Rocky2.dmm
@@ -7,7 +7,7 @@
"g" = (/obj/structure/flora/ausbushes/grassybush,/turf/template_noop,/area/submap/Rocky2)
"h" = (/obj/structure/flora/ausbushes/fullgrass,/turf/template_noop,/area/submap/Rocky2)
"i" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/template_noop,/area/submap/Rocky2)
-"j" = (/obj/item/weapon/shovel,/turf/template_noop,/area/submap/Rocky2)
+"j" = (/obj/item/weapon/shovel{start_anomalous = 1},/turf/template_noop,/area/submap/Rocky2)
"k" = (/obj/structure/flora/ausbushes/sunnybush,/turf/template_noop,/area/submap/Rocky2)
"l" = (/obj/structure/flora/ausbushes/stalkybush,/turf/template_noop,/area/submap/Rocky2)
"m" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/Rocky2)
diff --git a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
index 5844b83f8e..0661323a59 100644
--- a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
@@ -38,48 +38,48 @@
"aL" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aM" = (/obj/item/weapon/storage/belt/janitor,/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aN" = (/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aO" = (/obj/structure/table/standard,/obj/item/modular_computer/laptop/preset/custom_loadout/cheap,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aQ" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/pistol,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun/taser,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aS" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aT" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aO" = (/obj/structure/table/standard,/obj/item/modular_computer/laptop/preset/custom_loadout/cheap,/obj/effect/floor_decal/corner/red/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aQ" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/obj/random/multiple/gun/projectile/handgun,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aR" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/obj/random/energy/anom,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aS" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aT" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/red/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aU" = (/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"aV" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"aW" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 9},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"aX" = (/obj/structure/closet/crate/hydroponics,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aV" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/random/multiple/gun/projectile/shotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
+"aW" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/lime/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"aX" = (/obj/structure/closet/crate/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"aY" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"aZ" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"ba" = (/obj/structure/janitorialcart,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bb" = (/obj/structure/table/standard,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bb" = (/obj/structure/table/standard,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bc" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bd" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note"},/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bd" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note"},/obj/effect/floor_decal/corner/red/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"be" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bf" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bg" = (/obj/machinery/vending/security,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bg" = (/obj/machinery/vending/security,/obj/effect/floor_decal/corner/red/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bh" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"bi" = (/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bj" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bi" = (/obj/effect/floor_decal/corner/lime/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bj" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bk" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"bl" = (/obj/item/mecha_parts/part/gygax_left_leg,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase)
"bm" = (/obj/machinery/light,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase)
"bn" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/weapon/gun/projectile/pistol,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase)
-"bo" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bo" = (/obj/structure/closet/crate/trashcart,/obj/random/soap/anom,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bp" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bq" = (/obj/structure/table/standard,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/bag/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"br" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/effect/floor_decal/corner/red/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"br" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/effect/floor_decal/corner/red/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bs" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bt" = (/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bu" = (/obj/effect/floor_decal/corner/red/border,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bv" = (/obj/machinery/door/airlock/security{icon_state = "door_locked"; locked = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
"bw" = (/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
"bx" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle/pistol,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase)
-"by" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"by" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bz" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bA" = (/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 8},/mob/living/bot/farmbot{faction = "malf_drone"; name = "Mr. Weddleton"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"bB" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bA" = (/obj/effect/floor_decal/corner/lime/border{dir = 8; icon_state = "bordercolor"},/mob/living/bot/farmbot{faction = "malf_drone"; name = "Mr. Weddleton"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bB" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bC" = (/obj/effect/decal/remains/posi,/turf/template_noop,/area/template_noop)
-"bD" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bD" = (/obj/random/vendordrink,/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bE" = (/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bF" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bG" = (/obj/structure/door_assembly,/obj/effect/floor_decal/borderfloor{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
@@ -91,7 +91,7 @@
"bM" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bN" = (/obj/effect/decal/remains,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bO" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
-"bP" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"bP" = (/obj/random/vendorfood,/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bQ" = (/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bR" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"bS" = (/obj/item/stack/rods,/obj/structure/girder,/turf/simulated/floor/tiled,/area/submap/Rockybase)
@@ -109,13 +109,13 @@
"ce" = (/obj/structure/table/standard,/obj/random/toolbox,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cf" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cg" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "We've finally been able to get the Vicerator delivery grenades working, Took awhile to make sure the latching mechanism didn't fail but we're sure we've got it this time. Vel'Shem's worried about the miners having there own drone fab now but I say it's a small price to pay to keep the metal flowing, Especially since there telling us NT's starting to monopolize the metal rich parts."; name = "V-Grenade Notice 1"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"ch" = (/obj/structure/table/standard,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"ch" = (/obj/structure/table/standard,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond{start_anomalous = 1},/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"ci" = (/obj/structure/table/standard,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cj" = (/obj/structure/table/standard,/obj/item/stack/material/steel,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"ck" = (/obj/structure/table/standard,/obj/machinery/light{dir = 1},/obj/item/weapon/circuitboard/mecha/gygax/main,/obj/item/weapon/circuitboard/mecha/gygax/peripherals,/obj/item/weapon/circuitboard/mecha/gygax/targeting,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cl" = (/obj/structure/door_assembly,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cm" = (/obj/item/weapon/material/shard,/turf/simulated/floor,/area/submap/Rockybase)
-"cn" = (/obj/structure/table/standard,/obj/fiftyspawner/rods,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"cn" = (/obj/structure/table/standard,/obj/fiftyspawner/rods,/obj/random/tech_supply/component,/obj/random/tech_supply/anom,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"co" = (/obj/machinery/vending/engivend,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cp" = (/obj/machinery/vending/tool,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"cq" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox,/turf/simulated/floor/tiled,/area/submap/Rockybase)
@@ -156,20 +156,20 @@
"cZ" = (/obj/item/mecha_parts/part/gygax_armour,/turf/simulated/floor,/area/submap/Rockybase)
"da" = (/obj/item/mecha_parts/chassis/gygax,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dc" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dd" = (/obj/machinery/vending/robotics,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dd" = (/obj/machinery/vending/robotics,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"de" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"df" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dg" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dh" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"di" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/submap/Rockybase)
-"dj" = (/obj/item/mecha_parts/part/gygax_right_leg,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/item/mecha_parts/part/gygax_left_arm,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
+"dj" = (/obj/item/mecha_parts/part/gygax_right_leg,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dk" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/item/mecha_parts/part/gygax_left_arm{start_anomalous = 1},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase)
"dl" = (/obj/machinery/vending,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dm" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dn" = (/obj/machinery/power/smes/buildable/point_of_interest,/obj/structure/cable/green,/turf/simulated/floor,/area/submap/Rockybase)
"do" = (/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dp" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/mechanical/combat_drone/lesser,/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dq" = (/obj/structure/closet/secure_closet/hydroponics,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dq" = (/obj/structure/closet/secure_closet/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dr" = (/obj/effect/decal/cleanable/blood/oil,/turf/template_noop,/area/template_noop)
"ds" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dt" = (/obj/machinery/mech_recharger,/turf/simulated/floor/tiled,/area/submap/Rockybase)
@@ -181,11 +181,15 @@
"dz" = (/obj/item/weapon/surgical/surgicaldrill,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dA" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dB" = (/obj/effect/decal/cleanable/dirt,/mob/living/bot/medbot{faction = "malf_drone"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dC" = (/obj/machinery/vending/hydroseeds,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled,/area/submap/Rockybase)
-"dD" = (/obj/structure/closet/crate/secure/hydrosec,/obj/effect/floor_decal/corner/lime/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dC" = (/obj/machinery/vending/hydroseeds,/obj/effect/floor_decal/corner/lime/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"dD" = (/obj/structure/closet/crate/secure/hydrosec,/obj/effect/floor_decal/corner/lime/border{dir = 6; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase)
"dE" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/structure/gravemarker{dir = 1},/turf/template_noop,/area/template_noop)
"dF" = (/obj/effect/spawner/gibs/robot,/turf/template_noop,/area/template_noop)
"dG" = (/obj/effect/spawner/gibs/human,/turf/template_noop,/area/template_noop)
+"fp" = (/obj/random/tech_supply/component,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"kv" = (/obj/random/maintenance/anom,/turf/simulated/floor/tiled,/area/submap/Rockybase)
+"yB" = (/turf/simulated/floor/outdoors/newdirt,/area/submap/Rockybase)
+"QX" = (/obj/structure/table/woodentable,/obj/random/maintenance/anom,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -196,30 +200,30 @@ aaaaaaaaaeafafafagafafafafagafafafafafaeafafafafafafafafafafafafafagafafafafafaf
aaaaaaaaafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahafafafafafafafafafafafafafaaaaaaaa
aaaaaaaaafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaaaaaaaa
aaaaaaaaafafafafafafafafafafafafafafafagafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafagafaaaaaaaa
-abaaaaaaafafaiaiaiaiaiafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafagafafafafafafafafafafaaaaajaa
-aaaaaaaaafafaiaiaiaiaiaiakafafafaiaiaiaiaiafafafafafafafafalalamalalalafafafafafafafafafaiaiaiakafafafafaaaaaaaa
-aaaaaaaaafaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiafafafafafanalalaoalalalalalanafafafafafaiaiaiaiaiaiaiaiaiafaaaaaaaa
-aaaaaaapafaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaqaqaraqaqaqaqaqasaraqaqaiaiaiaiaiaiaiaiaiaiaiaiaiafaaaaaaaa
-aaaaaaaaafaiaiatatatatatatatatatatatatatatatatatatatatatatatauavavauatatatatatatatatatatatatataiaiaiaiafaaawaaaa
-aaaaaaaaafaiatataxayazataAaBaCaDaEaEaBaFaGaHaBaIatataJaKaLaMataNaNataOaPaQaRaSaTataUaVataWaXatataiaiaiafaaaaaaaa
+abaaaaaaafafafafafaiaiafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafagafafafafafafafafafafaaaaajaa
+aaaaaaaaafafafafaiaiaiaiakafafafafafafafafafafafafafafafafalalamalalalafafafafafafafafafaiaiaiakafafafafaaaaaaaa
+aaaaaaaaafaiaiafaiaiaiaiaiaiafaiaiafafafaiaiafafafafafanalalaoalalalalalanafafafafafaiaiaiaiaiaiafafafafaaaaaaaa
+aaaaaaapafaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaqaqaraqaqaqaqaqasaraqaqaiaiaiaiaiaiaiaiaiaiaiafafafaaaaaaaa
+aaaaaaaaafaiaiatatatatatatatatatatatatatatatatatatatatatatatauavavauatatatatatatatatatatatatataiaiaiyBafaaawaaaa
+aaaaaaaaafaiatataxayazataAQXaCaDaEaEaBaFaGaHaBaIatataJaKaLaMataNaNataOaPaQaRaSaTataUaVataWaXatataiaiyBafaaaaaaaa
aaaaaaaaaiaiatataYayaZataEaEaEaEaEaEaEaEaEaEaEaEatatbaaNaNbbatbcaNatbdbebfaNaNbgataUbhatbibjatataiaiaiafaaaaaaaa
-aaaaaaaaaiaiatataYaybkataEblaEaEbmaEaBbnaBaHaBaFatatboaNbpbqataNaNatbrbsbtbtbubtbvbwbxatbibyatataiaiaiafaaaaaaaa
-aaaaaaabaiaiatatayayayatatatbzatatatatatatatatatatatatbzatatatavavatatatatatbzatatatatatbAbBatataiaiaiafaaaaaabC
-aaaaaaaaaiaiatatatbzatatbDbEbEbEbEbFbEbEbEbEbGbEbFbEbEbEbEbEbEbEbEbEbEbFbEbEbEbEbHbHbIatbibyatataiaiaiafaaaabJaa
-aaaaaaaaaiaiatatbcaNaNaNaNaNaNbKbLbLaNbMbNaNaNaNaNaNaNaNaNaNaNbLaNaNaNaNaNaNaNaNbKbLbLbzbibyatataiaiaiafaaaaaaaa
-aaaaaaaaafaiatatatbOatatbPbQbQbRbRbRbQbQbQbSaNalbTbUbQbVbQbRbRbRbQbQbQbQbQbUbQbQbQbQbWatbibBatataiaiaiafaaaaaaaa
-aaaaaaaaafaiatatbXaybYatatatatatatatatatatatalalatatatatbZatatatatcaatatatatatatatatatatbibyatataiaiaiafaaaaaaaa
-aaaaaaaaafaiatatcbcbayatcccdcecfcgchcicjckclalcmcnatcocpaNcqcratcscaaNctcucvbLaNaNaNcwatbibyatataiaiaiafaaaaaaaa
-aaaaaaaaafaiatatcxbOcyataNaNaNaNaNaNaNaNaNcacaalczataNaNcAcBcCatcDaNbLbLcEcFcGcHcIaNcJatbibBatataiaiaiagaaaaaaaa
-aaaaaaaaafaiatatcbcbcKataNcMaNaNcMaNaNcNaNcOcaalcPatcQbLcRcScTatcUaNbLcVcWcXcYcWcZalaNatbibyatataiaiafafaaaaaaaa
-aaaaaaaaafaiatatcxbOayatcQaNaNdaaNcLaNdcbLdccacaddatdedfdgdfdhataNaNbLdicYcYcWcHalcmaNatbidjatataiaiafafaaaaaaaa
+aaaaaaaaaiaiatataYaybkataEblaEaEbmaEaBbnaBaHaBaFatatboaNbpbqataNaNatbrbsbtbtbubtbvbwbxatbibyatataiaiafafaaaaaaaa
+aaaaaaabaiaiatatayayayatatatbzatatatatatatatatatatatatbzatatatavavatatatatatbzatatatatatbAbBatataiafafafaaaaaabC
+aaaaaaaayBaiatatatbzatatbDbEbEbEbEbFbEbEbEbEbGbEbFbEbEbEbEbEbEbEbEbEbEbFbEbEbEbEbHbHbIatbibyatataiafafafaaaabJaa
+aaaaaayByBaiatatbcaNaNaNaNaNaNbKbLbLaNbMbNaNaNaNaNaNaNaNaNaNaNbLaNaNaNaNaNaNaNaNbKbLbLbzbibyatataiafafafaaaaaaaa
+aaaaaayBaiaiatatatbOatatbPbQbQbRbRbRbQbQbQbSaNalbTbUbQbVbQbRbRbRbQbQbQbQbQbUbQbQbQbQbWatbibBatataiafafafaaaaaaaa
+aaaaaaaiaiaiatatbXaybYatatatatatatatatatatatalalatatatatbZatatatatcaatatatatatatatatatatbibyatataiaiaiafaaaaaaaa
+aaaaaaaiaiaiatatcbcbayatcccdcecfcgchcicjckclalcmcnatcocpaNcqcratcscaaNctcucvbLaNaNaNcwatbibyatataiaiaiafaaaaaaaa
+aaaaaaaiaiaiatatcxbOcyataNaNaNaNaNaNaNaNaNcacaalczataNaNcAcBcCatcDaNbLbLcEcFcGcHcIaNcJatbibBatataiaiaiagaaaaaaaa
+aaaaaaaiaiaiatatcbcbcKataNcMaNaNcMaNaNcNaNcOcaalcPatcQbLcRcScTatcUaNbLcVcWcXcYcWcZalaNatbibyatataiaiafafaaaaaaaa
+aaaaaaaaaiaiatatcxbOayatcQaNaNdaaNcLaNdcbLdccacaddatdedfdgdfdhataNaNbLdicYcYcWcHalcmaNatbidjatataiaiafafaaaaaaaa
aaaaabaaafaiatatcbcbdkataNcMaNaNalalbLbLbLbLaNaNdlataNaNdmcSdnatdoaNaNdpcWcGcGcGcGalbLatbidqatataiakafafaaaadraa
-aaaaaaaaafaiatatcxbOayataNaNaNaNaNaNdsdtaNdtaNaNcpatdudvdwaNdxatdyaNdzaNaNdAcIdAbLbLdBatdCdDatataiaiafafaaaabCaa
+aaaaaaaaafaiatatcxbOayatfpaNaNaNaNaNdsdtaNdtaNaNcpatdudvdwaNdxatdyaNdzaNkvdAcIdAbLbLdBatdCdDatataiaiafafaaaabCaa
aaaaaaaaafaiaiatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatatataiaiafafafaaaaaaaa
aaaaaaaaafaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiafafafaaaaaaaa
-aaaaaaaaafaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiafaiaiaiafafafaiaiaiaiaiaiaiafafafafaaaaaaaa
-aaaaaaaaafafaiaiaiaiaiaiaiaiaiaiaiaiakafafafaiaiaiaiaiaiafafafafafafafafafafafafafafafafafafafafafafafafaaaadraa
-aaaaaaaaafagafafafafafafaiaiaiaiaiafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaaaaaaaa
+aaaaaaaaafaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiafaiaiafafafafaiaiaiaiaiaiaiafafafafaaaaaaaa
+aaaaaaaaafafaiaiafafaiaiaiafafaiaiaiakafafafaiaiaiafaiaiafafafafafafafafafafafafafafafafafafafafafafafafaaaadraa
+aaaaaaaaafagafafafafafafaiafafafaiafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaaaaaaaa
aaaaaaadaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaapaaaaaaaaaaaaabaaapaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaadEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaadFaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaadFaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/wilderness/Shack1.dmm b/maps/submaps/surface_submaps/wilderness/Shack1.dmm
index 604b970b92..101857502b 100644
--- a/maps/submaps/surface_submaps/wilderness/Shack1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Shack1.dmm
@@ -3,7 +3,7 @@
"c" = (/turf/template_noop,/area/submap/Shack1)
"d" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Shack1)
"e" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken1"},/area/submap/Shack1)
-"f" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/fancy/candle_box,/obj/item/weapon/storage/box/matches,/turf/simulated/floor/wood,/area/submap/Shack1)
+"f" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/fancy/candle_box,/obj/item/weapon/storage/box/matches{start_anomalous = 1},/turf/simulated/floor/wood,/area/submap/Shack1)
"g" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/storage/apron/overalls,/obj/item/clothing/under/overalls,/obj/random/mre,/turf/simulated/floor/wood,/area/submap/Shack1)
"h" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Shack1)
"i" = (/turf/simulated/floor/wood,/area/submap/Shack1)
@@ -13,17 +13,18 @@
"m" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Shack1)
"n" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken3"},/area/submap/Shack1)
"o" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/wood,/area/submap/Shack1)
-"p" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/toolbox,/turf/simulated/floor/wood,/area/submap/Shack1)
+"p" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/random/toolbox/anom,/turf/simulated/floor/wood,/area/submap/Shack1)
"q" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/weapon/material/twohanded/fireaxe/scythe,/turf/simulated/floor/wood,/area/submap/Shack1)
"r" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/wood,/area/submap/Shack1)
"s" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken6"},/area/submap/Shack1)
-"t" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/device/flashlight/lamp,/turf/simulated/floor/wood,/area/submap/Shack1)
+"t" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/device/flashlight/lamp{start_anomalous = 1},/turf/simulated/floor/wood,/area/submap/Shack1)
"u" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/Shack1)
+"O" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/anom,/turf/simulated/floor/wood,/area/submap/Shack1)
(1,1,1) = {"
aaaaaaaaaaaaaaa
abbbbbbbccccdca
-abefghhbcccddca
+abefghObcccddca
abhijhkbclcddca
abiiiiimdddddla
abniiiimdddddca
diff --git a/maps/submaps/surface_submaps/wilderness/Shelter.dmm b/maps/submaps/surface_submaps/wilderness/Shelter.dmm
index 3b985d359b..06b6fc6ff8 100644
--- a/maps/submaps/surface_submaps/wilderness/Shelter.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Shelter.dmm
@@ -10,12 +10,12 @@
"j" = (/obj/structure/bonfire/sifwood,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1)
"k" = (/obj/random/mob/robotic,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1)
"l" = (/obj/structure/bed/roller/adv,/obj/random/humanoidremains,/obj/random/cash,/obj/random/cigarettes,/obj/item/clothing/under/explorer,/obj/item/clothing/shoes/boots/winter/explorer,/obj/item/clothing/mask/gas/explorer,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/suit/armor/pcarrier/light/nt,/obj/random/projectile/scrapped_smg,/obj/random/projectile/scrapped_pistol,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1)
-"m" = (/obj/random/medical/lite,/obj/random/technology_scanner,/obj/random/toolbox,/obj/random/trash,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1)
-"n" = (/obj/structure/fence/corner{icon_state = "corner"; dir = 1},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
-"o" = (/obj/structure/fence/door/locked{icon_state = "door_closed"; dir = 1},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
-"p" = (/obj/structure/fence/post{icon_state = "post"; dir = 8},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
-"q" = (/obj/structure/fence{icon_state = "straight"; dir = 8},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
-"r" = (/obj/structure/fence/cut/large{icon_state = "straight_cut3"; dir = 8},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
+"m" = (/obj/random/medical/lite,/obj/random/toolbox,/obj/random/trash,/obj/random/technology_scanner/anom,/obj/random/tool/anom,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Shelter1)
+"n" = (/obj/structure/fence/corner{dir = 1; icon_state = "corner"},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
+"o" = (/obj/structure/fence/door/locked{dir = 1; icon_state = "door_closed"},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
+"p" = (/obj/structure/fence/post{dir = 8; icon_state = "post"},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
+"q" = (/obj/structure/fence{dir = 8; icon_state = "straight"},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
+"r" = (/obj/structure/fence/cut/large{dir = 8; icon_state = "straight_cut3"},/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
"s" = (/obj/structure/fence/corner,/turf/simulated/floor/outdoors/snow,/area/submap/Shelter1)
(1,1,1) = {"
diff --git a/maps/submaps/surface_submaps/wilderness/Snowrock1.dmm b/maps/submaps/surface_submaps/wilderness/Snowrock1.dmm
index 5bf7acdbc6..7a6cfaba74 100644
--- a/maps/submaps/surface_submaps/wilderness/Snowrock1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Snowrock1.dmm
@@ -6,6 +6,7 @@
"f" = (/obj/structure/closet/crate/trashcart,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/SnowR1)
"g" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/SnowR1)
"h" = (/obj/random/trash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/SnowR1)
+"W" = (/obj/random/maintenance/anom,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/SnowR1)
(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaa
@@ -13,7 +14,7 @@ abbbbbbbbbbbbbbbbbba
abbbbbbccccccbbbdbba
abdbbbccccccccbbbbba
abbbbbcccccccccbbbba
-abbbbcccefghhcccbbba
+abbbbcccefWhhcccbbba
abbccccchggggcccbbba
abbcccccggggbbbbbbba
abbccbbbbbbbbbbdbbba
diff --git a/maps/submaps/surface_submaps/wilderness/borglab.dmm b/maps/submaps/surface_submaps/wilderness/borglab.dmm
index 4005f31387..0e7313642b 100644
--- a/maps/submaps/surface_submaps/wilderness/borglab.dmm
+++ b/maps/submaps/surface_submaps/wilderness/borglab.dmm
@@ -8,7 +8,7 @@
"ah" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small/emergency/flicker,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/contraband,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"ai" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/tiled,/area/submap/BorgLab)
"aj" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/random/energy/highend,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
-"ak" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
+"ak" = (/obj/effect/floor_decal/techfloor/orange,/obj/random/grenade/lethal,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
"al" = (/obj/effect/floor_decal/techfloor/orange,/obj/random/contraband,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
"bj" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"bz" = (/obj/random/trash,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
@@ -100,7 +100,7 @@
"AI" = (/mob/living/simple_mob/mechanical/combat_drone/lesser{faction = "corrupt"},/turf/simulated/floor/reinforced,/area/submap/BorgLab)
"Bl" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab)
"Bq" = (/obj/random/trash,/mob/living/simple_mob/mechanical/mining_drone,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
-"Cf" = (/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/rust,/obj/item/weapon/module/power_control,/turf/simulated/floor/tiled,/area/submap/BorgLab)
+"Cf" = (/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/rust,/obj/item/weapon/module/power_control{start_anomalous = 1},/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Cz" = (/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/plating,/area/submap/BorgLab)
"CA" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"CS" = (/obj/effect/floor_decal/rust,/obj/effect/spawner/gibs/robot,/turf/simulated/floor/plating,/area/submap/BorgLab)
@@ -131,13 +131,13 @@
"KH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/weapon/material/shard{pixel_y = 10},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab)
"Lr" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/weapon/material/shard{pixel_y = 10},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab)
"Lz" = (/obj/structure/table/standard,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/trash,/obj/random/maintenance/research,/turf/simulated/floor/tiled,/area/submap/BorgLab)
-"LB" = (/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/obj/structure/table/rack,/turf/simulated/floor/plating,/area/submap/BorgLab)
+"LB" = (/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/obj/structure/table/rack,/obj/random/toolbox/anom,/turf/simulated/floor/plating,/area/submap/BorgLab)
"LC" = (/obj/effect/spawner/gibs/human,/mob/living/simple_mob/mechanical/mecha/odysseus/murdysseus{faction = "corrupt"},/turf/simulated/floor/reinforced,/area/submap/BorgLab)
"MT" = (/obj/machinery/space_heater,/obj/effect/floor_decal/rust,/obj/machinery/light/small/emergency/flicker{dir = 4},/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Nb" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Nj" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab)
"Nq" = (/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab)
-"Ns" = (/obj/effect/floor_decal/rust,/obj/effect/spawner/gibs/robot,/turf/simulated/floor/tiled,/area/submap/BorgLab)
+"Ns" = (/obj/effect/floor_decal/rust,/obj/effect/spawner/gibs/robot,/obj/random/maintenance/anom,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Nt" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Nv" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/mono_rusted3,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"NB" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/reinforced,/area/submap/BorgLab)
@@ -148,7 +148,7 @@
"OH" = (/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab)
"OW" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/weapon/broken_gun/laserrifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
"Pf" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab)
-"Qe" = (/obj/effect/map_effect/interval/sound_emitter/energy_gunfight,/turf/simulated/floor/plating,/area/submap/BorgLab)
+"Qe" = (/obj/effect/floor_decal/industrial/warning,/obj/random/tool/power/anom,/turf/simulated/floor/reinforced,/area/submap/BorgLab)
"Qg" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop)
"Qn" = (/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Qs" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small/emergency/flicker,/turf/simulated/floor/plating,/area/submap/BorgLab)
@@ -192,12 +192,12 @@
"YZ" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab)
"Za" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"Zc" = (/obj/structure/railing,/turf/simulated/floor/plating,/area/submap/BorgLab)
-"Zn" = (/obj/item/device/measuring_tape,/turf/simulated/floor/plating,/area/submap/BorgLab)
+"Zn" = (/obj/item/device/measuring_tape{start_anomalous = 1},/turf/simulated/floor/plating,/area/submap/BorgLab)
"Zq" = (/obj/machinery/door/window/brigdoor/westright{dir = 1; name = "Containment Pen"; req_one_access = list(43,1)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab)
"Zt" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/submap/BorgLab)
"Zy" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab)
"ZO" = (/obj/effect/floor_decal/rust,/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab)
-
+
(1,1,1) = {"
DFDFDFDFsrQgQgDFsrDFQgDFDFDFDFDFDFDFDFDFDFDFsrDFDFDFDFDFDFDFDFDF
DFDFQgsrQgQgQgQgQgQgQgDFDFDFDFDFDFDFDFDFDFDFDFsrDFDFQgQgQgQgDFDF
@@ -208,10 +208,10 @@ DFsrQgQgWQVHTUOqCzWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQRGRGDqRPDFDFDF
DFDFQgWQWQWQWQGAWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQWQRGRGDqDFDFDF
DFDFQgWQmiUjQWQnDvWQaaxzOWWQuXTDNjWQmwTDbYWQpeWKJrWQWQRGRGDFDFDF
DFQgQgWQrPZayISycCWQjfLCnkWQTWGzuQWQTUyBtxWQWhxOWqWQWQWQRGQgDFDF
-srQgQgWQtagfbjicUzWQVcJpabWQUVVcUMWQVcODVcWQyzububWQsKWQWQQgDFDF
+srQgQgWQtagfbjicUzWQVcJpabWQUVVcUMWQVcODQeWQyzububWQsKWQWQQgDFDF
DFQgQgWQNsZOCAgNWQWQbIugOHWQYDwtyqWQYDmBYDWQJomBYDlzWQWQWQWQWQDF
srQgWQWQZtmfNCWQWQeVRLejPfghyRrarOiiAsAsifacGCVriSNtWQnylJWQZcsr
-QgQgWQTjlUCANqOzhWzkNjXGnWLzFvaeJhaftyCSCXththBlYkNvkIYZWRmsQesr
+QgQgWQTjlUCANqOzhWzkNjXGnWLzFvaeJhaftyCSCXththBlYkNvkIYZWRmsqWsr
QgQgWQDjkjktdTUyZtJZagnbYZahFtJmYkaiddoaNbQsFjqWVhSGWQTNDsWQgcDF
QgWQxkCfYkfhGyMTWQWQYDneYDcALrneheadUWdKOHmaKHZqtXTvWQWQWQWQWQDF
QgWQjzRtFuZyDWxUqaWQJdajVUWQJdRLopWQgaTpopWQNBopJdWQqWWQWQQgDFDF
@@ -225,4 +225,3 @@ DFDFDFRPQgQgbLRPDFDFDFDFDFDFDFDFDFDFQgQgDFDFDFDFRPRPRPQgQgQgDFDF
DFDFsrDFQgQgQgDFDFsrDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFQgQgQgDFDF
DFDFDFDFDFDFDFsrDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFsrDFDFDFDFDFDFDF
"}
-
diff --git a/maps/submaps/surface_submaps/wilderness/butchershack.dmm b/maps/submaps/surface_submaps/wilderness/butchershack.dmm
index d32c35b6da..645cc78d6c 100644
--- a/maps/submaps/surface_submaps/wilderness/butchershack.dmm
+++ b/maps/submaps/surface_submaps/wilderness/butchershack.dmm
@@ -1,7 +1,7 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/simulated/wall/log_sif,/area/submap/ButcherShack)
"c" = (/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
-"d" = (/obj/structure/closet,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/packageWrap,/obj/item/weapon/material/knife/hook,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
+"d" = (/obj/structure/closet,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/beartrap{start_anomalous = 1},/obj/item/weapon/beartrap,/obj/item/weapon/packageWrap,/obj/item/weapon/material/knife/hook,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
"e" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
"f" = (/obj/structure/closet/crate/freezer,/obj/effect/decal/cleanable/blood/gibs,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack)
"g" = (/obj/machinery/gibber/autogibber,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
@@ -13,8 +13,8 @@
"m" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
"n" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
"o" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
-"p" = (/obj/structure/table/standard,/obj/item/clothing/suit/chef/classic,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
-"q" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/blood,/obj/item/weapon/material/knife/butch,/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack)
+"p" = (/obj/structure/table/standard,/obj/item/clothing/suit/chef/classic{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
+"q" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/blood,/obj/item/weapon/material/knife/butch{start_anomalous = 1},/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack)
"r" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/cutlet,/obj/item/weapon/reagent_containers/food/snacks/cutlet,/obj/item/weapon/reagent_containers/food/snacks/cutlet,/obj/item/weapon/reagent_containers/food/snacks/sausage,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
"s" = (/obj/structure/coatrack,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
"t" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack)
diff --git a/maps/submaps/surface_submaps/wilderness/chasm.dmm b/maps/submaps/surface_submaps/wilderness/chasm.dmm
index 1595474087..a591877119 100644
--- a/maps/submaps/surface_submaps/wilderness/chasm.dmm
+++ b/maps/submaps/surface_submaps/wilderness/chasm.dmm
@@ -45,7 +45,7 @@
"wF" = (/obj/random/junk,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"wP" = (/obj/random/humanoidremains,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"xt" = (/obj/effect/spider/stickyweb/dark,/turf/simulated/mineral/ignore_mapgen,/area/submap/Chasm)
-"yq" = (/obj/item/weapon/bone/leg,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rusted,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
+"yq" = (/obj/item/weapon/bone/leg{start_anomalous = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rusted,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
"yD" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
"yL" = (/obj/structure/outcrop/platinum,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"zq" = (/obj/structure/outcrop/diamond,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
@@ -63,6 +63,7 @@
"DQ" = (/obj/structure/cliff/automatic{dir = 4},/obj/structure/ledge/ledge_stairs{dir = 1},/obj/structure/barricade,/turf/simulated/floor/plating,/area/submap/Chasm)
"DS" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"DW" = (/obj/structure/cliff/automatic{dir = 4},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
+"DY" = (/obj/random/maintenance/anom,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm)
"Ea" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/pickaxe/excavationdrill,/turf/simulated/floor/plating,/area/submap/Chasm)
"Ec" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm)
"Ee" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm)
@@ -74,11 +75,12 @@
"HE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"HF" = (/obj/structure/cliff/automatic{dir = 5},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"Ie" = (/obj/random/tool/power,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
-"Ji" = (/obj/item/device/instrument/violin,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
+"Ji" = (/obj/item/device/instrument/violin{start_anomalous = 1},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"JJ" = (/obj/structure/loot_pile/surface/bones,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
"Kv" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm)
"Kz" = (/obj/random/trash,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm)
"KX" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
+"Lb" = (/obj/random/maintenance/anom,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm)
"Ll" = (/obj/random/humanoidremains,/obj/effect/spider/stickyweb,/obj/random/multiple/gun/projectile/shotgun,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"Lt" = (/obj/random/maintenance/medical,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm)
"LJ" = (/obj/effect/decal/cleanable/dirt,/obj/structure/ledge/ledge_stairs{dir = 1},/obj/structure/barricade,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
@@ -86,7 +88,7 @@
"Oj" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/Chasm)
"Ov" = (/obj/structure/loot_pile/surface/bones,/obj/effect/spider/stickyweb,/obj/random/outcrop,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"Pk" = (/obj/random/multiple/gun/projectile/rifle,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
-"Pr" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/map_effect/interval/sound_emitter/geiger/high,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
+"Pr" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/device/geiger{icon_state = "geiger_on_1"; scanning = 1},/obj/effect/map_effect/radiation_emitter,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
"Qi" = (/obj/item/weapon/bone/skull/tajaran,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm)
"Qr" = (/obj/structure/cliff/automatic/corner{dir = 6},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm)
"Rx" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm)
@@ -126,11 +128,11 @@ hRhRhRScScScEcTtEcTtHEHETtEcScScScEcEehR
hRhRScScScTtEcTpufufufufHFKvpkScScScEehR
hRScScScleEcTpNURzRzRzRzRYHFKvScScSchRhR
hRScScuhKvTpNURzzqVDYUZnRzDWKvTtScSchRhR
-hRScScKvTpNURzPkTRucOjKXyLRYHFKvpkScSchR
+hRScScKvTpNURzPkTRucOjKXyLRYHFKvLbScSchR
hRScScKvAqRzSHkRgKQiiFJiBQRzRYHFKvScSchR
hRScScKvAqaEOvEuEahGPrmuFebFDSDWKvScSchR
hRScScKvZaBUwPsgDiJJSjTlZSwFTRDWLtScSchR
-hRScScDaEcZaujyLwFstCoSSIeBQEhaFKvScSchR
+hRScScDYEcZaujyLwFstCoSSIeBQEhaFKvScSchR
hRScScScTtEcZaYRDSyqUZXZLlQraFKvEcScSchR
hREeScScScEcKvZaXUyDyDzsqxaFKvEcxtSchRhR
hREeEcScScScKvEcrYYpLJDQEcKvDaScScScFrEe
diff --git a/maps/submaps/surface_submaps/wilderness/chemspill2.dmm b/maps/submaps/surface_submaps/wilderness/chemspill2.dmm
index d41f441794..2942214a4a 100644
--- a/maps/submaps/surface_submaps/wilderness/chemspill2.dmm
+++ b/maps/submaps/surface_submaps/wilderness/chemspill2.dmm
@@ -14,7 +14,7 @@
"n" = (/obj/effect/decal/remains/ribcage,/turf/simulated/floor/water/contaminated,/area/submap/ChemSpill2)
"o" = (/obj/item/stack/rods,/turf/simulated/floor/water/contaminated,/area/submap/ChemSpill2)
"p" = (/obj/random/firstaid,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2)
-"q" = (/obj/random/tech_supply,/obj/random/energy,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2)
+"q" = (/obj/random/tech_supply,/obj/random/energy/highend,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2)
"r" = (/obj/random/humanoidremains,/obj/random/rigsuit,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2)
"s" = (/obj/effect/decal/remains/lizard,/turf/simulated/floor/outdoors/mud,/area/submap/ChemSpill2)
"t" = (/obj/item/weapon/storage/mre/random,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2)
@@ -22,6 +22,7 @@
"v" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/rocks,/area/submap/ChemSpill2)
"w" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/outdoors/mud,/area/submap/ChemSpill2)
"x" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/ice,/area/submap/ChemSpill2)
+"Z" = (/obj/random/powercell/anom,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2)
(1,1,1) = {"
aaaaaaaaaaabbaaaaaaaaaaaaaaaaa
@@ -41,7 +42,7 @@ abbbcdefffbbbbbbbbbbffddbbbbaa
aabbcddfffecbbbbbbbfffdcbbbbaa
aaaacddfffeecpbbbbbffddcbbaaaa
aaaacdefffccbqrbbbbffsdcbaaaaa
-aaacbdffffbbbbbtbbeffddbaaaaaa
+aaacbdffffbbbbZtbbeffddbaaaaaa
aaacjjjfffbbbbbbbbfffddbbbaaaa
aaabujjfffibbebbbffffddbbbaaaa
aaabbdjfffffffbffffffdsbbbaaaa
diff --git a/maps/submaps/surface_submaps/wilderness/deathden.dmm b/maps/submaps/surface_submaps/wilderness/deathden.dmm
index 99de781901..aaa033b317 100644
--- a/maps/submaps/surface_submaps/wilderness/deathden.dmm
+++ b/maps/submaps/surface_submaps/wilderness/deathden.dmm
@@ -14,7 +14,7 @@
"fg" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
"fr" = (/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
"fG" = (/obj/structure/closet/cabinet,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
-"fS" = (/obj/structure/table/wooden_reinforced,/obj/item/pizzabox/meat,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
+"fS" = (/obj/structure/table/wooden_reinforced,/obj/item/pizzabox/meat{start_anomalous = 1},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"fV" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
"gB" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/template_noop)
"hq" = (/obj/structure/grille/rustic,/obj/structure/barricade,/obj/item/weapon/material/shard{pixel_x = 6},/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen)
@@ -31,7 +31,7 @@
"kY" = (/obj/structure/table/bench/wooden,/obj/effect/floor_decal/carpet{dir = 1},/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
"la" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"lw" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
-"lP" = (/obj/item/weapon/gun/projectile/colt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
+"lP" = (/obj/random/multiple/gun/projectile/handgun,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"mc" = (/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"md" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/savik{health = 75; name = "young savik"},/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"mu" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
@@ -62,7 +62,7 @@
"vD" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/shreddedp,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"wa" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/savik{health = 75; name = "young savik"},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen)
"wm" = (/turf/template_noop,/area/submap/DeathDen)
-"wv" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = -8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
+"wv" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/random/tool/anom,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"wG" = (/obj/item/weapon/deadringer,/obj/item/weapon/reagent_containers/food/snacks/bearstew,/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 6},/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
"wK" = (/obj/structure/window/reinforced/tinted/frosted{dir = 1},/obj/structure/table/wooden_reinforced,/obj/random/soap,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
"xN" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen)
@@ -76,11 +76,11 @@
"An" = (/obj/structure/simple_door/iron,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen)
"Ap" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen)
"Aw" = (/obj/structure/simple_door/sifwood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen)
-"Bf" = (/obj/item/clothing/head/psy_crown/gluttony,/obj/random/junk,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
+"Bf" = (/obj/item/clothing/head/psy_crown/gluttony{start_anomalous = 1},/obj/random/junk,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"BW" = (/obj/structure/table/wooden_reinforced,/obj/item/clothing/suit/cultrobes/alt,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
-"De" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
+"De" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/random/projectile/shotgun,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
"DH" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/random/trash,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
-"EF" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/weapon/gun/projectile/deagle,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
+"EF" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/random/multiple/gun/projectile/handgun,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
"EL" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/turf/template_noop,/area/submap/DeathDen)
"EN" = (/obj/effect/floor_decal/carpet,/obj/random/maintenance/engineering,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
"ER" = (/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
@@ -95,13 +95,14 @@
"Kj" = (/obj/structure/windoor_assembly,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
"Kn" = (/obj/effect/floor_decal/carpet{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)
"Ky" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
-"KG" = (/mob/living/simple_mob/humanoid/clown,/obj/effect/spawner/gibs/human,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
+"KG" = (/obj/effect/spawner/gibs/human,/mob/living/simple_mob/humanoid/clown/clown,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
+"KZ" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"MO" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/DeathDen)
"Nu" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"Oh" = (/obj/structure/gravemarker,/obj/structure/closet/grave{opened = 0},/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial,/turf/template_noop,/area/submap/DeathDen)
"OZ" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen)
"Ph" = (/obj/structure/barricade,/turf/template_noop,/area/submap/DeathDen)
-"Qb" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/shreddedp,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
+"Qb" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/shreddedp{start_anomalous = 1},/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
"Qe" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop)
"QK" = (/obj/structure/closet/cabinet,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/trash/plate,/obj/item/trash/plate,/obj/item/weapon/storage/box/cups,/obj/item/weapon/storage/box/donut,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"Ri" = (/obj/structure/simple_door/sifwood,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen)
@@ -112,7 +113,7 @@
"TL" = (/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/turf/template_noop,/area/template_noop)
"Uj" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen)
"Up" = (/obj/structure/windoor_assembly,/obj/random/trash,/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen)
-"UR" = (/obj/item/weapon/stool/padded,/obj/item/clothing/suit/cultrobes/magusred,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
+"UR" = (/obj/item/weapon/stool/padded,/obj/item/clothing/suit/cultrobes/magusred{start_anomalous = 1},/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"WH" = (/obj/effect/spawner/gibs/human,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
"Ym" = (/obj/structure/simple_door/sifwood,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen)
"Zb" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen)
@@ -131,7 +132,7 @@ PhThHZlPDHZgbkphigfgGPBWThMOQeQeQecf
rQAnTAUjmcshdrIcSgdLphklThMOMOMOMOcf
PhThThlaixGTphHZThThThThThThThThMOcf
cfTLoXsXzVjiojThvdKykcZvoIvuEFThMOQe
-cfezeSdVuPwvZbRinOnKfrkYKnknlaThMOQe
+cfezeSdVuPwvZbRinOnKfrkYKnknKZThMOQe
cfcfHZThThThThTheOyStNHTxSoGURThMOQe
cfcfnrMOMOMOMOThvdqCyZRsENwGBfThMOQe
cfnrvrxNMOMOMOThFRZvlaaLxZvuqcThMOQe
diff --git a/maps/submaps/surface_submaps/wilderness/demonpool.dmm b/maps/submaps/surface_submaps/wilderness/demonpool.dmm
index 16977a543a..ba3c5daea9 100644
--- a/maps/submaps/surface_submaps/wilderness/demonpool.dmm
+++ b/maps/submaps/surface_submaps/wilderness/demonpool.dmm
@@ -18,7 +18,9 @@
/area/submap/DemonPool)
"ay" = (
/obj/structure/girder/cult,
-/obj/item/weapon/material/twohanded/fireaxe/scythe,
+/obj/item/weapon/material/twohanded/fireaxe/scythe{
+ start_anomalous = 1
+ },
/turf/simulated/floor/cult,
/area/submap/DemonPool)
"bb" = (
@@ -539,7 +541,8 @@
"Qq" = (
/obj/item/weapon/beartrap/hunting{
anchored = 1;
- deployed = 1
+ deployed = 1;
+ start_anomalous = 1
},
/obj/effect/decal/cleanable/blood/gibs/limb,
/obj/effect/decal/cleanable/blood/gibs/limb,
diff --git a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
index 870f4a1587..bbe744076d 100644
--- a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
+++ b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
@@ -26,7 +26,7 @@
"dy" = (/obj/structure/shuttle/engine/propulsion/burst,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/floor/outdoors/rocks,/area/submap/DerelictEngine)
"dC" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
"dG" = (/obj/machinery/door/blast/puzzle{checkrange_mult = 3; dir = 4; layer = 3.3; name = "Blast Door"; open_layer = 3.3},/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine)
-"dL" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/weapon/implanter/compressed,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
+"dL" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk{start_anomalous = 1},/obj/item/weapon/implanter/compressed,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"dO" = (/obj/item/prop/alien/junk,/obj/item/weapon/paper/alien,/obj/item/clothing/head/helmet/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine)
"dX" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor,/obj/item/weapon/storage/belt/medical/alien,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"el" = (/obj/effect/floor_decal/techfloor{dir = 9},/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
@@ -57,7 +57,7 @@
"hY" = (/obj/item/weapon/material/shard/phoron{pixel_x = 7},/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/plating,/area/submap/DerelictEngine)
"hZ" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
"ib" = (/obj/random/trash,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
-"ig" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
+"ig" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"; start_anomalous = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"il" = (/obj/item/weapon/surgical/FixOVein/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/weapon/cell/device/weapon/recharge/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine)
"iz" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"iB" = (/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
@@ -128,7 +128,7 @@
"sl" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
"sq" = (/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/power/port_gen/pacman,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"st" = (/obj/random/trash,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
-"sv" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/floor_decal/techfloor/hole/right{dir = 8},/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
+"sv" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/floor_decal/techfloor/hole/right{dir = 8},/obj/item/weapon/reagent_containers/glass/bucket{start_anomalous = 1},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
"sy" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
"sz" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/the_singularitygen/tesla,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"sG" = (/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/plating,/area/submap/DerelictEngine)
@@ -141,7 +141,7 @@
"tW" = (/obj/machinery/field_generator{anchored = 1; state = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"ut" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/loot_pile/surface/alien/security,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"uB" = (/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/emitter/gyrotron/anchored{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
-"uH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/clothing/under/psysuit,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
+"uH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/clothing/under/psysuit{start_anomalous = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"uJ" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/weapon/implanter/adrenalin,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"uP" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/power/grounding_rod/pre_mapped{item_state = 2},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"uX" = (/obj/effect/floor_decal/techfloor/orange{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/paper/alien,/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
@@ -259,7 +259,7 @@
"Jm" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/DerelictEngine)
"JG" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/structure/particle_accelerator/particle_emitter/right{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"JT" = (/obj/structure/particle_accelerator/power_box{anchored = 1; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
-"JX" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/item/prop/alien/junk,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
+"JX" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/item/prop/alien/junk{start_anomalous = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"Ku" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/random/trash,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine)
"KB" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"KL" = (/obj/effect/floor_decal/techfloor/orange/corner{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/DerelictEngine)
@@ -327,7 +327,7 @@
"UQ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/spawner/gibs/human,/turf/simulated/floor/plating,/area/submap/DerelictEngine)
"UV" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/item/weapon/gun/energy/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"UW" = (/obj/effect/floor_decal/techfloor/orange/corner{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/submap/DerelictEngine)
-"UZ" = (/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/weapon/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/obj/structure/table/alien,/turf/simulated/floor/greengrid,/area/submap/DerelictEngine)
+"UZ" = (/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/weapon/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank{start_anomalous = 1},/obj/structure/table/alien,/turf/simulated/floor/greengrid,/area/submap/DerelictEngine)
"Vb" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine)
"Vg" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"Vk" = (/obj/item/weapon/oar{desc = "Used to provide propulsion to a space ship."; force = 50; name = "Alien oar"; throw_range = 10; throw_speed = 5; throwforce = 30},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
@@ -359,7 +359,7 @@
"Yr" = (/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine)
"Yu" = (/obj/structure/particle_accelerator/end_cap{anchored = 1; dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"YG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/power/grounding_rod/pre_mapped{item_state = 2},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
-"YH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
+"YH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7; start_anomalous = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"YI" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine)
"YJ" = (/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine)
"Zh" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 8},/obj/structure/window/phoronreinforced{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine)
diff --git a/maps/submaps/surface_submaps/wilderness/frostoasis.dmm b/maps/submaps/surface_submaps/wilderness/frostoasis.dmm
index 826e4d600a..804efce491 100644
--- a/maps/submaps/surface_submaps/wilderness/frostoasis.dmm
+++ b/maps/submaps/surface_submaps/wilderness/frostoasis.dmm
@@ -12,13 +12,13 @@
"kr" = (/obj/item/weapon/a_gift,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/FrostOasis)
"ll" = (/obj/random/obstruction,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis)
"lo" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
-"ls" = (/obj/structure/table/standard,/obj/item/weapon/a_gift,/obj/item/weapon/a_gift,/turf/simulated/floor/wood,/area/submap/FrostOasis)
+"ls" = (/obj/structure/table/standard,/obj/item/weapon/a_gift,/obj/item/weapon/a_gift,/obj/random/material/anom,/obj/random/mug/anom,/turf/simulated/floor/wood,/area/submap/FrostOasis)
"me" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
"mh" = (/turf/simulated/floor/outdoors/dirt,/area/submap/FrostOasis)
"mw" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis)
"mD" = (/obj/structure/flora/grass/both,/mob/living/simple_mob/animal/sif/shantak{faction = "diyaab"},/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
"mH" = (/obj/random/obstruction,/obj/random/obstruction,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis)
-"nB" = (/obj/structure/closet/grave,/obj/structure/gravemarker,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
+"nB" = (/obj/structure/closet/grave,/obj/structure/gravemarker,/obj/random/multiple/voidsuit,/obj/random/gun/random/anomalous,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
"ou" = (/mob/living/simple_mob/animal/giant_spider/webslinger{faction = "diyaab"},/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
"oA" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis)
"oB" = (/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
@@ -38,7 +38,7 @@
"Bt" = (/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
"BF" = (/mob/living/simple_mob/animal/sif/diyaab,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis)
"EW" = (/obj/structure/table/standard,/obj/item/weapon/gift,/obj/item/weapon/gun/energy/temperature,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis)
-"Fl" = (/obj/structure/curtain/open/bed,/obj/item/weapon/storage/fancy/blackcandle_box,/obj/random/soap,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/structure/table/rack,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis)
+"Fl" = (/obj/structure/curtain/open/bed,/obj/item/weapon/storage/fancy/blackcandle_box{start_anomalous = 1},/obj/random/soap,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/structure/table/rack,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis)
"It" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/template_noop)
"IF" = (/turf/simulated/floor/beach/water/ocean,/area/submap/FrostOasis)
"Ji" = (/obj/item/weapon/a_gift,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/FrostOasis)
diff --git a/maps/submaps/surface_submaps/wilderness/kururakden.dmm b/maps/submaps/surface_submaps/wilderness/kururakden.dmm
index 630c58204d..fda8cad3f1 100644
--- a/maps/submaps/surface_submaps/wilderness/kururakden.dmm
+++ b/maps/submaps/surface_submaps/wilderness/kururakden.dmm
@@ -8,6 +8,7 @@
"h" = (/obj/random/junk,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen)
"i" = (/obj/random/powercell,/obj/random/unidentified_medicine/old_medicine,/obj/random/trash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen)
"j" = (/obj/random/humanoidremains,/obj/random/coin,/obj/random/contraband,/obj/random/projectile/random,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen)
+"P" = (/obj/random/mob/sif/kururak,/obj/item/weapon/cell/device/weapon/recharge,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen)
(1,1,1) = {"
aaaaaaaaaa
@@ -17,7 +18,7 @@ aabbbfbbaa
aacbgdccaa
abhdccibaa
abfcefbbaa
-abbdjbbaaa
+abbPjbbaaa
abbbbbbaaa
aaaaaaaaaa
"}
diff --git a/maps/submaps/surface_submaps/wilderness/wilderness.dm b/maps/submaps/surface_submaps/wilderness/wilderness.dm
index 707dc9feaf..85fd9d5f98 100644
--- a/maps/submaps/surface_submaps/wilderness/wilderness.dm
+++ b/maps/submaps/surface_submaps/wilderness/wilderness.dm
@@ -188,7 +188,7 @@
/datum/map_template/surface/wilderness/deep/BluSD
name = "Blue Shuttle Down"
- desc = "You REALLY shouldn't be near this. Mostly because they're Police."
+ desc = "You REALLY shouldn't be near this. Mostly because they're SolGov."
mappath = 'maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm'
cost = 50
template_group = "Shuttle Down"
diff --git a/maps/submaps/surface_submaps/wilderness/wolfden.dmm b/maps/submaps/surface_submaps/wilderness/wolfden.dmm
index 1cd95c22bb..62b30b83cc 100644
--- a/maps/submaps/surface_submaps/wilderness/wolfden.dmm
+++ b/maps/submaps/surface_submaps/wilderness/wolfden.dmm
@@ -17,16 +17,17 @@
"A" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"C" = (/mob/living/simple_mob/animal/sif/shantak,/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen)
"D" = (/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen)
-"G" = (/obj/item/weapon/bone/arm,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
+"G" = (/obj/item/weapon/bone/arm{start_anomalous = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"I" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"J" = (/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"K" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"M" = (/obj/random/maintenance/cargo,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen)
"O" = (/obj/random/gun/random,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
+"Q" = (/obj/random/maintenance/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"R" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen)
"S" = (/obj/item/weapon/bone,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen)
"T" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/engineering,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen)
-"U" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/engineering,/obj/item/clothing/head/fedora,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen)
+"U" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/engineering,/obj/item/clothing/head/fedora{start_anomalous = 1},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen)
"V" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen)
"W" = (/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/cargo,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
"X" = (/mob/living/simple_mob/animal/sif/shantak,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen)
@@ -39,7 +40,7 @@ VoooooozRo
ooovuKuvzo
ooiAoooIoo
oXSwrooooo
-oOWeTpoooC
+oOWeTQoooC
oXDJGMmooo
ooyIqcjXoo
ooorYUpooV
diff --git a/maps/submaps/surface_submaps/wilderness/xenohive.dmm b/maps/submaps/surface_submaps/wilderness/xenohive.dmm
index 2cd090c354..60828f9109 100644
--- a/maps/submaps/surface_submaps/wilderness/xenohive.dmm
+++ b/maps/submaps/surface_submaps/wilderness/xenohive.dmm
@@ -9,13 +9,15 @@
"eM" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/dirt,/area/template_noop)
"fw" = (/turf/template_noop,/area/submap/XenoHive)
"fG" = (/obj/effect/alien/weeds,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
-"fW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/map_effect/interval/sound_emitter/ballistic_gunfight,/turf/simulated/floor/outdoors/dirt,/area/submap/XenoHive)
-"gO" = (/obj/effect/alien/weeds,/obj/item/organ/internal/heart,/obj/item/organ/internal/kidneys/vox,/obj/structure/safe,/obj/random/multiple/gun/projectile/shotgun,/obj/random/contraband,/turf/simulated/floor,/area/submap/XenoHive)
+"fW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/XenoHive)
+"gl" = (/obj/effect/alien/weeds,/obj/random/toolbox/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
+"gO" = (/obj/effect/alien/weeds,/obj/item/organ/internal/heart,/obj/item/organ/internal/kidneys/vox,/obj/structure/safe,/obj/random/multiple/gun/projectile/shotgun,/obj/random/contraband/anom,/turf/simulated/floor,/area/submap/XenoHive)
"gS" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/ignore_mapgen,/area/template_noop)
"hx" = (/obj/effect/alien/weeds,/obj/machinery/telecomms/broadcaster,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/XenoHive)
-"im" = (/obj/item/stack/animalhide/xeno,/obj/effect/alien/weeds,/obj/structure/table/rack,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive)
+"il" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/corpse/hedberg/merc,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
+"im" = (/obj/effect/alien/weeds,/obj/structure/table/rack,/obj/item/clothing/suit/armor/pcarrier/tan/tactical,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive)
"iF" = (/obj/structure/bed/chair{dir = 8},/obj/effect/alien/weeds,/obj/effect/spawner/gibs/human,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
-"iJ" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/obj/machinery/light/small/emergency/flicker{dir = 1},/turf/simulated/floor,/area/submap/XenoHive)
+"iJ" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/obj/machinery/light/small/emergency/flicker{dir = 1},/obj/item/weapon/ore/magmellite,/turf/simulated/floor,/area/submap/XenoHive)
"jY" = (/mob/living/simple_mob/animal/space/alien/queen/empress,/obj/effect/alien/weeds,/turf/simulated/floor,/area/submap/XenoHive)
"kl" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"lb" = (/turf/template_noop,/area/template_noop)
@@ -30,17 +32,19 @@
"sy" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop)
"sX" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor,/area/submap/XenoHive)
"tz" = (/obj/effect/alien/weeds,/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
-"tA" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
+"tA" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/corpse/hedberg,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
"uJ" = (/obj/structure/sign/biohazard,/turf/simulated/wall/skipjack,/area/submap/XenoHive)
"va" = (/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive)
"vu" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"wH" = (/obj/effect/alien/weeds,/obj/structure/loot_pile/mecha/durand,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"xB" = (/turf/simulated/wall/skipjack,/area/submap/XenoHive)
"xQ" = (/obj/effect/decal/cleanable/dirt,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
-"yb" = (/obj/effect/alien/weeds,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor,/area/submap/XenoHive)
+"yb" = (/obj/effect/alien/weeds,/obj/effect/landmark/corpse/hedberg/merc,/turf/simulated/floor,/area/submap/XenoHive)
"yx" = (/mob/living/simple_mob/animal/space/alien,/obj/effect/alien/weeds,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt,/area/submap/XenoHive)
"yS" = (/obj/structure/table/steel_reinforced,/obj/effect/alien/weeds,/obj/item/toy/plushie/face_hugger,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/XenoHive)
"zU" = (/obj/structure/salvageable/autolathe,/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
+"zV" = (/obj/effect/alien/weeds,/obj/item/weapon/ore/magmellite,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
+"Ak" = (/obj/effect/alien/weeds,/obj/item/weapon/ore/magmellite,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive)
"AA" = (/obj/effect/alien/resin/wall,/obj/effect/alien/weeds,/turf/simulated/mineral/ignore_mapgen,/area/submap/XenoHive)
"AB" = (/obj/effect/alien/resin/wall,/turf/simulated/mineral/ignore_mapgen,/area/submap/XenoHive)
"BD" = (/obj/effect/alien/resin/membrane,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
@@ -48,14 +52,15 @@
"Ce" = (/obj/effect/alien/weeds,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/item/organ/internal/eyes/replicant,/obj/structure/safe,/obj/random/multiple/gun/projectile/rifle,/obj/random/contraband,/turf/simulated/floor,/area/submap/XenoHive)
"CR" = (/obj/effect/alien/resin/wall,/turf/simulated/floor/outdoors/dirt,/area/template_noop)
"De" = (/obj/effect/alien/weeds,/obj/effect/spawner/gibs/human,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
-"Dh" = (/mob/living/simple_mob/animal/space/alien,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
+"Dh" = (/obj/effect/alien/weeds,/obj/random/medical/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
+"DN" = (/obj/effect/alien/weeds,/obj/random/maintenance/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"Et" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/XenoHive)
"FE" = (/mob/living/simple_mob/animal/space/alien/drone,/obj/effect/alien/weeds,/turf/simulated/floor,/area/submap/XenoHive)
"Gw" = (/obj/structure/table,/obj/effect/alien/weeds,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor,/area/submap/XenoHive)
"Gy" = (/mob/living/simple_mob/animal/space/alien,/obj/effect/alien/weeds,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
"GN" = (/obj/effect/alien/weeds,/obj/effect/alien/resin/membrane,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"Hr" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop)
-"Hu" = (/obj/effect/alien/weeds,/turf/simulated/floor,/area/submap/XenoHive)
+"Hu" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/blood/skathari,/turf/simulated/floor,/area/submap/XenoHive)
"Hx" = (/obj/item/weapon/portable_destructive_analyzer,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"Hz" = (/obj/effect/alien/weeds,/obj/structure/simple_door/resin,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"HI" = (/obj/effect/alien/weeds,/obj/structure/prop/blackbox/quarantined_shuttle,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/XenoHive)
@@ -79,6 +84,7 @@
"QG" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/turf/simulated/floor,/area/submap/XenoHive)
"Rr" = (/obj/structure/noticeboard/anomaly,/turf/simulated/wall/skipjack,/area/submap/XenoHive)
"Sl" = (/obj/structure/salvageable/bliss,/obj/effect/alien/weeds,/turf/simulated/floor,/area/submap/XenoHive)
+"SO" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/ore/magmellite,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
"Tb" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
"Tq" = (/mob/living/simple_mob/animal/space/alien,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"Tv" = (/mob/living/simple_mob/animal/space/alien,/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive)
@@ -88,25 +94,26 @@
"VA" = (/obj/effect/alien/weeds/node,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"WD" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
"WE" = (/obj/effect/alien/weeds,/obj/structure/mopbucket,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
+"Xa" = (/obj/effect/alien/weeds,/obj/structure/prop/nest{creature_types = list(/mob/living/simple_mob/animal/space/alien/drone); desc = "An underground nest of Skathari."; icon = 'icons/mob/alien.dmi'; icon_state = "nest"; interaction_message = "You feel like you shouldn't be sticking your nose into this thing."; name = "skathari nest"; total_creature_max = 10},/turf/simulated/floor,/area/submap/XenoHive)
"Xy" = (/obj/structure/table/steel_reinforced,/obj/effect/alien/weeds,/obj/machinery/light/small/emergency/flicker{dir = 8},/obj/item/weapon/reagent_containers/food/snacks/truffle/random,/turf/simulated/floor,/area/submap/XenoHive)
-"YG" = (/obj/effect/alien/weeds,/mob/living/simple_mob/humanoid/merc/melee/sword/poi{health = 15; maxHealth = 15},/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
-"YL" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/outdoors/dirt,/area/submap/XenoHive)
+"YG" = (/obj/effect/alien/weeds,/obj/effect/landmark/corpse/hedberg/merc,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive)
+"YL" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/corpse/sifguard,/turf/simulated/floor/outdoors/dirt,/area/submap/XenoHive)
"Zc" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
-"Zx" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/melee/sword/poi{health = 15; maxHealth = 15},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
+"Zx" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/corpse/hedberg,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive)
(1,1,1) = {"
lblblbsysysysysysylblblbHrsyeMlblblblbHrlblbsysylb
lbsysyABABABABABABsysysyrLABrLHrsysysyrLrLABsysylb
lbsyxBxBIsvuvaimRrxBxBEtdndndnEtEtEtEtEtyxrLMJfwlb
syABxBHIndqzGwaviJgOxBABEtdkEtEtABEtABEtEtEtVjfwlb
-syABTvfGooqItAiFjYIrbqABEtEtEtEtPvdndnMZABEtEtEtlb
-syABHxSltAhxVgPeYGIYQCABEtEtABwHdnDeVuklHzPvABEtsy
-syABdmJjsXfGTbmEFECexBABABABWEklZcZxkldnBDxQxQEtsy
-syABpsHOTbCbLBHuABABxBtzcoJVdnklPvdnABEtEtxQspdnsy
-syABxBySTbybzUuJxBxBxBWDOrBDdnABABEtEtEtEtABPqPqCR
-lbsyxBXyfGaSLBMxGyGNHJVAvaAAABEtEtEtEtEtEtEtTqfWeM
-lbsyxBABABHufGMxQGbOklABABABEtEttzdnDhdnEtEtABYLlb
-lbsyEtEtxBxBxBxBxBABABABEtEtEtdnDhdnABrLrLEtEtPXlb
+syABTvfGooqItAiFjYIrbqABEtEtEtEtPvdnDhMZABEtEtEtlb
+syABHxSlilhxVgPeYGIYQCABEtEtABwHdnDeVuklHzPvABEtsy
+syABdmJjsXfGTbmEFECexBABABABWEklZcZxklzVBDxQxQEtsy
+syABpsHOTbCbLBHuABABxBtzcoJVdnklPvdnABEtEtxQspzVsy
+syABxBySSOybzUuJxBxBxBWDOrBDDNABABEtEtEtEtABPqPqCR
+lbsyxBXyfGaSLBMxGyGNHJVAAkAAABEtEtEtEtEtEtEtTqfWeM
+lbsyxBABABXafGMxQGbOklABABABEtEttzdnPvglEtEtABYLlb
+lbsyEtEtxBxBxBxBxBABABABEtEtEtdnPvdnABrLrLEtEtPXlb
lblblbsysysysysysysysysylblbMJrLsygSsysyMJVjEtEtlb
lblblblblblbsysysysylblblblblbsysysysysysylblbsylb
lblblblblblblblblblblblblblblblblblblblblblblblblb
diff --git a/polaris.dme b/polaris.dme
index d217d81ad0..2e8b4f02e8 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1161,6 +1161,7 @@
#include "code\game\objects\items\weapons\tools\wirecutters.dm"
#include "code\game\objects\items\weapons\tools\wrench.dm"
#include "code\game\objects\random\_random.dm"
+#include "code\game\objects\random\anomalous.dm"
#include "code\game\objects\random\guns_and_ammo.dm"
#include "code\game\objects\random\maintenance.dm"
#include "code\game\objects\random\mapping.dm"