diff --git a/maps/submaps/surface_submaps/valley/bloodchurch.dmm b/maps/submaps/surface_submaps/valley/bloodchurch.dmm
index 96ae71acfe..455d27bcca 100644
--- a/maps/submaps/surface_submaps/valley/bloodchurch.dmm
+++ b/maps/submaps/surface_submaps/valley/bloodchurch.dmm
@@ -127,7 +127,7 @@
 /area/submap/bloodchurch)
 "xN" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/firstaid,
+/obj/random/mouseray,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "yn" = (
@@ -249,6 +249,11 @@
 /obj/effect/landmark/loot_spawn,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
+"Qz" = (
+/obj/structure/table/sifwoodentable,
+/obj/random/toolbox,
+/turf/simulated/floor/wood/sif,
+/area/submap/bloodchurch)
 "RN" = (
 /obj/structure/table/sifwoodentable,
 /obj/random/contraband/nofail,
@@ -1227,7 +1232,7 @@ fb
 MQ
 hQ
 rQ
-xN
+Qz
 MQ
 yC
 yC
diff --git a/maps/submaps/surface_submaps/valley/carriershuttle.dmm b/maps/submaps/surface_submaps/valley/carriershuttle.dmm
index 5c1129276e..8e281f1323 100644
--- a/maps/submaps/surface_submaps/valley/carriershuttle.dmm
+++ b/maps/submaps/surface_submaps/valley/carriershuttle.dmm
@@ -250,7 +250,7 @@
 "At" = (
 /obj/structure/table/standard,
 /obj/random/ammo,
-/obj/random/firstaid,
+/obj/random/handgun/sec,
 /turf/simulated/shuttle/floor/skipjack,
 /area/submap/carriershuttle)
 "Br" = (
diff --git a/maps/submaps/surface_submaps/valley/crashedexplo.dmm b/maps/submaps/surface_submaps/valley/crashedexplo.dmm
index 0efa9153bd..4e11ce6b23 100644
--- a/maps/submaps/surface_submaps/valley/crashedexplo.dmm
+++ b/maps/submaps/surface_submaps/valley/crashedexplo.dmm
@@ -16,7 +16,6 @@
 /obj/item/device/defib_kit/loaded,
 /obj/structure/closet/walllocker_double/medical/south,
 /obj/item/weapon/storage/firstaid/regular,
-/obj/item/weapon/storage/firstaid/combat,
 /obj/item/weapon/storage/firstaid/surgery,
 /obj/item/weapon/storage/firstaid/adv,
 /obj/item/selectable_item/chemistrykit/gender,
diff --git a/maps/submaps/surface_submaps/valley/eclipselava.dmm b/maps/submaps/surface_submaps/valley/eclipselava.dmm
index ad4b3d2425..fef2818e3d 100644
--- a/maps/submaps/surface_submaps/valley/eclipselava.dmm
+++ b/maps/submaps/surface_submaps/valley/eclipselava.dmm
@@ -374,8 +374,8 @@
 /area/submap/eclipselava)
 "vN" = (
 /obj/structure/table/steel,
-/obj/random/firstaid,
 /obj/random/maintenance/foodstuff,
+/obj/random/projectile,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "vO" = (
@@ -1173,26 +1173,26 @@ Bm
 Bm
 Bm
 Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -1244,9 +1244,9 @@ ZE
 ZE
 ZE
 nT
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -1298,9 +1298,9 @@ Qh
 sS
 ZE
 nT
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -1352,7 +1352,7 @@ Qh
 sS
 ZE
 nT
-Bm
+Qh
 Bm
 Bm
 Bm
@@ -1404,9 +1404,9 @@ Qh
 Qh
 Qh
 ws
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -1458,7 +1458,7 @@ Qh
 sS
 ZE
 nT
-Bm
+Qh
 Bm
 Bm
 Bm
@@ -1510,7 +1510,7 @@ Qh
 Qh
 Qh
 ws
-Bm
+Qh
 Bm
 Bm
 Bm
@@ -1562,9 +1562,9 @@ Qh
 Qh
 Qh
 ws
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
 Bm
 "}
 (10,1,1) = {"
@@ -1616,7 +1616,7 @@ Qh
 sS
 ZE
 nT
-Bm
+Qh
 Bm
 "}
 (11,1,1) = {"
@@ -1668,7 +1668,7 @@ Qh
 Qh
 Qh
 ws
-Bm
+Qh
 Bm
 "}
 (12,1,1) = {"
@@ -1720,7 +1720,7 @@ bp
 bp
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (13,1,1) = {"
@@ -1772,7 +1772,7 @@ iI
 Gg
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (14,1,1) = {"
@@ -1824,7 +1824,7 @@ MO
 PP
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (15,1,1) = {"
@@ -1876,7 +1876,7 @@ MO
 nk
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (16,1,1) = {"
@@ -1928,7 +1928,7 @@ MO
 nE
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (17,1,1) = {"
@@ -1980,7 +1980,7 @@ MO
 qy
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (18,1,1) = {"
@@ -2032,7 +2032,7 @@ bp
 bp
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (19,1,1) = {"
@@ -2084,7 +2084,7 @@ sq
 sq
 sq
 fW
-Bm
+Qh
 Bm
 "}
 (20,1,1) = {"
@@ -2136,7 +2136,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (21,1,1) = {"
@@ -2188,7 +2188,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (22,1,1) = {"
@@ -2240,7 +2240,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (23,1,1) = {"
@@ -2292,7 +2292,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (24,1,1) = {"
@@ -2344,7 +2344,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (25,1,1) = {"
@@ -2396,7 +2396,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (26,1,1) = {"
@@ -2448,7 +2448,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (27,1,1) = {"
@@ -2500,7 +2500,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (28,1,1) = {"
@@ -2552,7 +2552,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (29,1,1) = {"
@@ -2604,7 +2604,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (30,1,1) = {"
@@ -2656,7 +2656,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (31,1,1) = {"
@@ -2708,7 +2708,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (32,1,1) = {"
@@ -2760,7 +2760,7 @@ Qh
 Qh
 Qh
 Qh
-Bm
+Qh
 Bm
 "}
 (33,1,1) = {"
@@ -2812,7 +2812,7 @@ ZE
 ZE
 ZE
 nT
-Bm
+Qh
 Bm
 "}
 (34,1,1) = {"
@@ -2864,7 +2864,7 @@ bp
 bp
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (35,1,1) = {"
@@ -2916,7 +2916,7 @@ MO
 qy
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (36,1,1) = {"
@@ -2968,7 +2968,7 @@ MO
 yt
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (37,1,1) = {"
@@ -3020,7 +3020,7 @@ MO
 nk
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (38,1,1) = {"
@@ -3072,7 +3072,7 @@ dE
 yt
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (39,1,1) = {"
@@ -3124,7 +3124,7 @@ MO
 Gg
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (40,1,1) = {"
@@ -3176,7 +3176,7 @@ bp
 bp
 bp
 ws
-Bm
+Qh
 Bm
 "}
 (41,1,1) = {"
@@ -3228,7 +3228,7 @@ Qh
 Qh
 dw
 fW
-Bm
+Qh
 Bm
 "}
 (42,1,1) = {"
@@ -3279,8 +3279,8 @@ Qh
 Qh
 dw
 fW
-Bm
-Bm
+Qh
+Qh
 Bm
 "}
 (43,1,1) = {"
@@ -3330,8 +3330,8 @@ Qh
 Qh
 dw
 fW
-Bm
-Bm
+Qh
+Qh
 Bm
 Bm
 "}
@@ -3381,8 +3381,8 @@ Qh
 dw
 sq
 fW
-Bm
-Bm
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -3431,9 +3431,9 @@ Qh
 Qh
 Qh
 ws
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -3483,7 +3483,7 @@ Qh
 Qh
 dw
 fW
-Bm
+Qh
 Bm
 Bm
 Bm
@@ -3534,8 +3534,8 @@ dw
 sq
 sq
 fW
-Bm
-Bm
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -3583,10 +3583,10 @@ bp
 bp
 bp
 ws
-Bm
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
@@ -3635,7 +3635,7 @@ sq
 sq
 sq
 fW
-Bm
+Qh
 Bm
 Bm
 Bm
@@ -3669,25 +3669,25 @@ Bm
 Bm
 Bm
 Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
-Bm
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
+Qh
 Bm
 Bm
 Bm
diff --git a/maps/submaps/surface_submaps/valley/fallenlab.dmm b/maps/submaps/surface_submaps/valley/fallenlab.dmm
index 1c4563dae9..2a08bb3208 100644
--- a/maps/submaps/surface_submaps/valley/fallenlab.dmm
+++ b/maps/submaps/surface_submaps/valley/fallenlab.dmm
@@ -386,10 +386,10 @@
 /area/submap/fallenlab)
 "KI" = (
 /obj/structure/table/darkglass,
-/obj/item/weapon/storage/firstaid/clotting,
 /obj/random/maintenance/medical,
 /obj/random/maintenance/medical,
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "KR" = (
diff --git a/maps/submaps/surface_submaps/valley/leppy.dmm b/maps/submaps/surface_submaps/valley/leppy.dmm
index 77232d6313..5712146a76 100644
--- a/maps/submaps/surface_submaps/valley/leppy.dmm
+++ b/maps/submaps/surface_submaps/valley/leppy.dmm
@@ -49,7 +49,7 @@
 /area/submap/leppy)
 "J" = (
 /obj/structure/table/gold,
-/obj/random/firstaid,
+/obj/random/maintenance/misc,
 /turf/simulated/mineral/floor/cave,
 /area/submap/leppy)
 "K" = (
diff --git a/maps/submaps/surface_submaps/valley/mouseattack.dmm b/maps/submaps/surface_submaps/valley/mouseattack.dmm
index 2c49ebd997..05a5775bfb 100644
--- a/maps/submaps/surface_submaps/valley/mouseattack.dmm
+++ b/maps/submaps/surface_submaps/valley/mouseattack.dmm
@@ -18,7 +18,7 @@
 /obj/item/weapon/archaeological_find,
 /obj/random/rigsuit/chancetofail,
 /obj/item/rig_module/mounted/phase,
-/turf/template_noop,
+/turf/simulated/floor/tiled/yellow,
 /area/submap/mouseattack)
 "j" = (
 /turf/simulated/wall/gold,
@@ -38,7 +38,7 @@
 /obj/item/weapon/archaeological_find,
 /obj/random/rigsuit/chancetofail,
 /obj/item/rig_module/voice,
-/turf/template_noop,
+/turf/simulated/floor/tiled/yellow,
 /area/submap/mouseattack)
 "q" = (
 /mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned,
@@ -61,7 +61,7 @@
 /obj/item/weapon/archaeological_find,
 /obj/item/weapon/archaeological_find,
 /obj/item/rig_module/chem_dispenser/injector/advanced,
-/turf/template_noop,
+/turf/simulated/floor/tiled/yellow,
 /area/submap/mouseattack)
 "w" = (
 /obj/structure/table/rack,
@@ -89,7 +89,7 @@
 /obj/item/weapon/archaeological_find,
 /obj/random/rigsuit/chancetofail,
 /obj/item/rig_module/rad_shield,
-/turf/template_noop,
+/turf/simulated/floor/tiled/yellow,
 /area/submap/mouseattack)
 "D" = (
 /mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned,
diff --git a/maps/submaps/surface_submaps/valley/mousehq.dmm b/maps/submaps/surface_submaps/valley/mousehq.dmm
index 112cd49307..e606cdca30 100644
--- a/maps/submaps/surface_submaps/valley/mousehq.dmm
+++ b/maps/submaps/surface_submaps/valley/mousehq.dmm
@@ -91,7 +91,11 @@
 	dir = 1;
 	state = 1
 	},
-/turf/simulated/floor/bmarble,
+/obj/structure/cable/green{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
 /area/submap/mousehq)
 "u" = (
 /obj/structure/table/alien/blue,
@@ -123,6 +127,9 @@
 /obj/item/device/multitool/alien,
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
+"B" = (
+/turf/simulated/floor/plating,
+/area/submap/mousehq)
 "D" = (
 /mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire/manned,
 /turf/simulated/floor/wmarble,
@@ -169,6 +176,17 @@
 "O" = (
 /turf/simulated/wall/sandstone,
 /area/submap/mousehq)
+"P" = (
+/obj/machinery/power/port_gen/pacman,
+/turf/simulated/mineral/floor/ignore_mapgen/sif,
+/area/submap/mousehq)
+"Q" = (
+/obj/structure/cable/green{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/submap/mousehq)
 "R" = (
 /obj/structure/table/alien/blue,
 /obj/item/clothing/under/psysuit,
@@ -815,12 +833,12 @@ K
 K
 K
 K
-K
+P
 O
 y
 p
 y
-p
+Q
 O
 p
 y
@@ -886,7 +904,7 @@ O
 y
 p
 y
-p
+B
 O
 p
 y
diff --git a/maps/submaps/surface_submaps/valley/teppifarm.dmm b/maps/submaps/surface_submaps/valley/teppifarm.dmm
index 4d57f18563..9d065c7593 100644
--- a/maps/submaps/surface_submaps/valley/teppifarm.dmm
+++ b/maps/submaps/surface_submaps/valley/teppifarm.dmm
@@ -17,10 +17,6 @@
 	},
 /turf/simulated/floor/outdoors/grass/sif,
 /area/submap/teppifarm)
-"d" = (
-/obj/structure/simple_door/sifwood,
-/turf/simulated/floor/wood/sif,
-/area/submap/teppifarm)
 "g" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/outdoors/dirt,
@@ -65,7 +61,7 @@
 /area/submap/teppifarm)
 "r" = (
 /obj/structure/table/woodentable,
-/obj/random/firstaid,
+/obj/random/contraband/nofail,
 /turf/simulated/floor/wood/alt,
 /area/submap/teppifarm)
 "s" = (
@@ -311,7 +307,7 @@ k
 G
 k
 k
-d
+B
 k
 k
 b