diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
index e3e0266c1820..760d719c9476 100644
--- a/_maps/map_files220/cyberiad/cyberiad.dmm
+++ b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -3319,13 +3319,8 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/processing)
 "apc" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/pen,
 /obj/machinery/newscaster/security_unit/east,
+/obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel,
 /area/station/security/processing)
 "apd" = (
@@ -3987,9 +3982,6 @@
 	},
 /area/station/security/brig)
 "arE" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/light_switch/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -5794,6 +5786,12 @@
 	pixel_y = -22;
 	dir = 1
 	},
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/pen,
 /turf/simulated/floor/plasteel{
 	icon_state = "redcorner"
 	},
@@ -13041,6 +13039,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/public/dorms)
+"aWX" = (
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "aXc" = (
 /obj/machinery/crema_switch{
 	pixel_y = -25
@@ -25043,6 +25048,7 @@
 	},
 /area/station/medical/sleeper)
 "bXI" = (
+/obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "whiteblue"
@@ -31050,9 +31056,6 @@
 /turf/simulated/wall,
 /area/station/engineering/tech_storage)
 "cvy" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/storage)
 "cvz" = (
@@ -33533,6 +33536,7 @@
 	layer = 2
 	},
 /obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/portable/scrubber,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -33546,6 +33550,7 @@
 	layer = 2
 	},
 /obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/portable/pump,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -33787,12 +33792,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "cGr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 9
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "cGs" = (
@@ -33905,6 +33910,7 @@
 	layer = 2
 	},
 /obj/machinery/ai_status_display/north,
+/obj/machinery/atmospherics/portable/pump,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -34328,12 +34334,10 @@
 	},
 /area/station/engineering/hallway)
 "cHU" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/visible,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "cHW" = (
@@ -34880,7 +34884,8 @@
 /obj/item/t_scanner,
 /obj/item/wrench,
 /obj/structure/disposalpipe/segment{
-	dir = 4
+	dir = 4;
+	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -36338,6 +36343,13 @@
 "cPu" = (
 /turf/simulated/wall/r_wall,
 /area/station/maintenance/portsolar)
+"cPv" = (
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "cPx" = (
 /obj/item/radio/intercom/directional/north,
 /obj/structure/chair/comfy/shuttle{
@@ -36709,10 +36721,8 @@
 	},
 /area/station/engineering/hallway)
 "cQI" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/storage)
@@ -37391,6 +37401,9 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
 "cSA" = (
+/obj/machinery/atmospherics/pipe/simple/visible/purple{
+	dir = 9
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
 	},
@@ -37784,7 +37797,6 @@
 	},
 /area/station/engineering/atmos/control)
 "cTG" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -37794,6 +37806,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "yellowcorner"
@@ -38391,9 +38406,13 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/break_room)
 "cVN" = (
-/obj/structure/closet/firecloset,
 /obj/machinery/light/directional/north,
 /obj/item/radio/intercom/directional/north,
+/obj/machinery/atmospherics/unary/portables_connector{
+	layer = 2
+	},
+/obj/machinery/atmospherics/portable/scrubber,
+/obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "neutral"
@@ -38424,12 +38443,15 @@
 /area/station/maintenance/apmaint)
 "cVS" = (
 /obj/machinery/alarm/directional/north,
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal,
 /obj/machinery/camera{
 	c_tag = "Engineering Atmos Storage";
 	network = list("SS13","Engineering")
 	},
+/obj/machinery/atmospherics/unary/portables_connector{
+	layer = 2
+	},
+/obj/machinery/atmospherics/portable/scrubber,
+/obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "neutral"
@@ -38447,11 +38469,7 @@
 	},
 /obj/item/clothing/glasses/welding,
 /obj/item/clothing/glasses/welding,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -40313,10 +40331,11 @@
 	},
 /area/station/engineering/hallway)
 "dcH" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "neutral"
@@ -42373,9 +42392,9 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/ne)
 "dkz" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "dkA" = (
@@ -42394,6 +42413,7 @@
 	network = list("SS13","Engineering")
 	},
 /obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -42464,9 +42484,11 @@
 /turf/simulated/floor/engine/n2,
 /area/station/engineering/atmos)
 "dkP" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
 	},
@@ -43979,15 +44001,16 @@
 	},
 /area/station/aisat/hall)
 "dqO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/storage)
 "dqQ" = (
@@ -45944,6 +45967,12 @@
 	dir = 8
 	},
 /area/station/engineering/aitransit)
+"dTI" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos/storage)
 "dTL" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -46728,10 +46757,9 @@
 /turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "egO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/visible/purple{
+	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
 	},
@@ -47067,7 +47095,6 @@
 	},
 /area/station/engineering/control)
 "enG" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 4;
@@ -47085,6 +47112,7 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "enJ" = (
@@ -50139,13 +50167,6 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/space/nearstation)
-"fwZ" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/atmos)
 "fxr" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
@@ -51456,7 +51477,7 @@
 	},
 /area/station/engineering/hallway)
 "fWP" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -56064,12 +56085,11 @@
 	},
 /area/station/science/toxins/mixing)
 "hAX" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/power/apc/engineering/north,
-/obj/structure/cable{
-	d2 = 2;
-	icon_state = "0-2"
+/obj/machinery/atmospherics/unary/portables_connector{
+	layer = 2
 	},
+/obj/machinery/atmospherics/portable/pump,
+/obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "neutral"
@@ -57656,8 +57676,12 @@
 	},
 /area/station/medical/surgery/secondary)
 "ieI" = (
-/obj/structure/reagent_dispensers/watertank/high,
 /obj/machinery/status_display/directional/north,
+/obj/machinery/atmospherics/unary/portables_connector{
+	layer = 2
+	},
+/obj/machinery/atmospherics/portable/pump,
+/obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "neutral"
@@ -58088,6 +58112,12 @@
 	},
 /area/station/engineering/hallway)
 "ioM" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/storage)
 "ioU" = (
@@ -58254,6 +58284,7 @@
 	layer = 2
 	},
 /obj/machinery/status_display/directional/north,
+/obj/machinery/atmospherics/portable/scrubber,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -58720,6 +58751,12 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/public/toilet/lockerroom)
+"iDh" = (
+/obj/machinery/atmospherics/unary/thermomachine/heater{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "iDk" = (
 /obj/machinery/airlock_controller/air_cycler{
 	ext_button_link_id = "secmaint_btn_ext";
@@ -59937,20 +59974,10 @@
 	},
 /area/station/service/janitor)
 "jam" = (
-/obj/structure/rack,
-/obj/item/stack/sheet/metal{
-	amount = 50;
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/stack/sheet/metal{
-	amount = 50;
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/stack/sheet/glass{
-	amount = 50
-	},
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/power/apc/engineering/east,
+/obj/structure/cable,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
 	},
@@ -60241,6 +60268,7 @@
 	c_tag = "Medbay Treatment East";
 	dir = 8
 	},
+/obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "whiteblue"
@@ -60367,6 +60395,17 @@
 /obj/effect/decal/cleanable/ash,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"jjy" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/binary/pump{
+	dir = 4;
+	target_pressure = 303;
+	name = "Air to connector"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/aft)
 "jjD" = (
 /obj/structure/grille,
 /obj/structure/barricade/wooden{
@@ -60406,14 +60445,6 @@
 	icon_state = "whitegreen"
 	},
 /area/station/medical/medbay2)
-"jkZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/aft)
 "jlt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/wire_splicing/thirty,
@@ -62382,6 +62413,14 @@
 	icon_state = "darkyellowcorners"
 	},
 /area/station/engineering/hallway)
+"jZQ" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "redcorner"
+	},
+/area/station/security/processing)
 "kaa" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -64323,9 +64362,9 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/aitransit)
 "kLR" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "yellowfull"
 	},
@@ -66175,6 +66214,16 @@
 	icon_state = "darkblue"
 	},
 /area/station/medical/morgue)
+"lwG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "lwY" = (
 /obj/structure/table/wood,
 /obj/structure/cable{
@@ -66873,9 +66922,7 @@
 	},
 /area/station/science/xenobiology)
 "lKP" = (
-/obj/structure/rack,
-/obj/item/cartridge/atmos,
-/obj/item/cartridge/atmos,
+/obj/structure/reagent_dispensers/watertank/high,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
 	},
@@ -66995,6 +67042,18 @@
 	icon_state = "dark"
 	},
 /area/station/service/bar)
+"lNs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "lNE" = (
 /obj/item/storage/box/monkeycubes/wolpincubes{
 	pixel_x = 6;
@@ -67784,6 +67843,9 @@
 	},
 /area/station/security/permabrig)
 "lZV" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
@@ -68128,6 +68190,16 @@
 /obj/item/seeds/orange,
 /turf/simulated/floor/grass,
 /area/station/security/permabrig)
+"mgb" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutral"
+	},
+/area/station/engineering/atmos/storage)
 "mgd" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/plasteel{
@@ -72154,13 +72226,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/xenobiology)
-"nFa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "yellow"
-	},
-/area/station/engineering/atmos)
 "nFc" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/wood/oak,
@@ -74393,16 +74458,6 @@
 /obj/effect/landmark/spawner/rev,
 /turf/simulated/floor/plating,
 /area/station/medical/morgue)
-"oxA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/atmos)
 "oxN" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -74534,7 +74589,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/science/storage)
 "oAS" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -74543,6 +74597,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "oBq" = (
@@ -81657,6 +81715,7 @@
 "raV" = (
 /obj/structure/rack,
 /obj/item/rpd,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "yellow"
@@ -82531,6 +82590,13 @@
 /obj/machinery/light/small/directional/north,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint2)
+"rwb" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "rwc" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -84280,6 +84346,18 @@
 	icon_state = "yellow"
 	},
 /area/station/hallway/primary/aft)
+"sim" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "yellowcorner"
+	},
+/area/station/hallway/primary/aft)
 "sir" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair{
@@ -86175,13 +86253,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/public/dorms)
-"sPg" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/visible/cyan,
-/turf/simulated/floor/plasteel,
-/area/station/engineering/atmos)
 "sPs" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -88255,10 +88326,10 @@
 	},
 /area/station/security/prisonlockers)
 "tDn" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "yellow"
@@ -89159,7 +89230,6 @@
 /area/station/medical/reception)
 "tTj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -89169,6 +89239,9 @@
 	name = "Eng Chief Engineer's Office";
 	sort_type_txt = "5"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft)
 "tTz" = (
@@ -90481,6 +90554,12 @@
 	icon_state = "arrival"
 	},
 /area/station/hallway/secondary/entry)
+"urL" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/station/engineering/atmos)
 "urU" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -90640,6 +90719,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"uuJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/machinery/atmospherics/pipe/simple/visible/cyan,
+/turf/simulated/floor/plating,
+/area/station/engineering/atmos/storage)
 "uuX" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/cable{
@@ -100594,6 +100679,26 @@
 	icon_state = "whiteblue"
 	},
 /area/station/medical/cloning)
+"yfb" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/rack,
+/obj/item/stack/sheet/metal{
+	amount = 50;
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/stack/sheet/metal{
+	amount = 50;
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/stack/sheet/glass{
+	amount = 50
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutral"
+	},
+/area/station/engineering/atmos/storage)
 "yfi" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel{
@@ -128991,7 +129096,7 @@ xuG
 qjZ
 vmA
 piF
-djq
+yfb
 aOS
 nLT
 ylS
@@ -130019,9 +130124,9 @@ cVN
 cSA
 cJp
 dcH
-lZV
+mgb
 aOS
-nFa
+rwb
 dkA
 fXt
 deJ
@@ -130245,7 +130350,7 @@ cnA
 ciN
 csC
 cDA
-ecs
+sim
 ecs
 cHO
 dAq
@@ -130273,7 +130378,7 @@ mdn
 rPZ
 xfI
 ieI
-ioM
+dTI
 dcO
 ciG
 lKP
@@ -130502,7 +130607,7 @@ chc
 chc
 chc
 cGJ
-cGq
+jjy
 cGq
 cHM
 dAq
@@ -130534,13 +130639,13 @@ cQI
 dqO
 ioM
 jam
-aOS
+uuJ
 raV
 fWP
 oAS
-deJ
-cSd
-dfF
+aWX
+dgg
+dfB
 cSd
 gmW
 dfD
@@ -130760,7 +130865,7 @@ dot
 chc
 cGN
 cHU
-jkZ
+cGs
 cTG
 cLM
 cUk
@@ -130790,15 +130895,15 @@ deO
 aOS
 dBd
 aOS
-aOS
+deO
 deO
 cZS
 dkC
-fXt
+lNs
 deJ
 cSd
 dfF
-cSd
+iDh
 ufc
 nVh
 pMy
@@ -131055,7 +131160,7 @@ enG
 deI
 cSd
 cUQ
-dgg
+urL
 bAO
 wQr
 cXW
@@ -131309,7 +131414,7 @@ cUl
 esG
 tDn
 uBJ
-sPg
+aWX
 dgg
 dfB
 fFY
@@ -131566,7 +131671,7 @@ cTF
 qmX
 giQ
 rWB
-fwZ
+cPv
 cSd
 ehE
 dsx
@@ -133250,7 +133355,7 @@ avB
 avB
 aAF
 aAF
-axR
+jZQ
 lSU
 azW
 aBb
@@ -133878,7 +133983,7 @@ dgZ
 cGK
 cGK
 drS
-oxA
+lwG
 deJ
 cSd
 gmW
diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
index 6b44dc1badae..cce58224a6ae 100644
--- a/_maps/map_files220/delta/delta.dmm
+++ b/_maps/map_files220/delta/delta.dmm
@@ -66851,6 +66851,11 @@
 	icon_state = "green"
 	},
 /area/station/medical/virology/lab)
+"lzQ" = (
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/machinery/recharge_station,
+/turf/simulated/floor/plasteel,
+/area/station/public/storage/tools)
 "lAk" = (
 /obj/machinery/power/apc/directional/south,
 /obj/structure/cable,
@@ -94090,9 +94095,7 @@
 	},
 /area/station/public/locker)
 "uXf" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
+/obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "red"
@@ -134633,7 +134636,7 @@ aor
 bOC
 bCg
 bDS
-bFr
+lzQ
 bHc
 bIT
 bFr
diff --git a/modular_ss220/objects/code/beretta.dm b/modular_ss220/objects/code/beretta.dm
index c40b2c934ec6..7eb64a8f52a3 100644
--- a/modular_ss220/objects/code/beretta.dm
+++ b/modular_ss220/objects/code/beretta.dm
@@ -8,6 +8,7 @@
 	righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
 	icon_state = "beretta"
 	item_state = "beretta"
+	w_class = WEIGHT_CLASS_NORMAL
 	can_suppress = FALSE
 	mag_type = /obj/item/ammo_box/magazine/beretta
 	fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/beretta_shot.ogg'
@@ -20,6 +21,8 @@
 	multi_sprite_step = 2
 	ammo_type = /obj/item/ammo_casing/beretta/mmrub919
 	max_ammo = 10
+	multiload = 0
+	slow_loading = TRUE
 	caliber = "919mm"
 
 /obj/item/ammo_box/magazine/beretta/mm919
@@ -120,8 +123,6 @@
 /datum/supply_packs/security/armory/berettarubberammo
 	name = "Beretta M9 Rubber Ammunition Crate"
 	contains = list(/obj/item/ammo_box/beretta,
-					/obj/item/ammo_box/beretta,
-					/obj/item/ammo_box/beretta,
 					/obj/item/ammo_box/beretta,
 					/obj/item/ammo_box/magazine/beretta,
 					/obj/item/ammo_box/magazine/beretta)
@@ -131,8 +132,6 @@
 /datum/supply_packs/security/armory/berettalethalammo
 	name = "Beretta M9 Lethal Ammunition Crate"
 	contains = list(/obj/item/ammo_box/beretta/mm919,
-					/obj/item/ammo_box/beretta/mm919,
-					/obj/item/ammo_box/beretta/mm919,
 					/obj/item/ammo_box/beretta/mm919,
 					/obj/item/ammo_box/magazine/beretta/mm919,
 					/obj/item/ammo_box/magazine/beretta/mm919)
@@ -142,8 +141,6 @@
 /datum/supply_packs/security/armory/berettaexperimentalammo
 	name = "Beretta M9 Bluespace Ammunition Crate"
 	contains = list(/obj/item/ammo_box/beretta/mmbsp919,
-					/obj/item/ammo_box/beretta/mmbsp919,
-					/obj/item/ammo_box/beretta/mmbsp919,
 					/obj/item/ammo_box/beretta/mmbsp919,
 					/obj/item/ammo_box/magazine/beretta/mmbsp919,
 					/obj/item/ammo_box/magazine/beretta/mmbsp919)
@@ -153,8 +150,6 @@
 /datum/supply_packs/security/armory/berettaarmorpiercingammo
 	name = "Beretta M9 Armor-piercing Ammunition Crate"
 	contains = list(/obj/item/ammo_box/beretta/mmap919,
-					/obj/item/ammo_box/beretta/mmap919,
-					/obj/item/ammo_box/beretta/mmap919,
 					/obj/item/ammo_box/beretta/mmap919,
 					/obj/item/ammo_box/magazine/beretta/mmap919,
 					/obj/item/ammo_box/magazine/beretta/mmap919)
@@ -174,7 +169,7 @@
 /datum/design/box_beretta/ap
 	name = "Beretta M9 AP Ammo Box (9mm)"
 	desc = "A box of 20 armor-piercing rounds for Beretta M9"
-	id = "box_beretta"
+	id = "box_beretta_ap"
 	req_tech = list("combat" = 3, "materials" = 2)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
@@ -184,7 +179,7 @@
 /datum/design/box_beretta/bluespace
 	name = "Beretta M9 Bluespace Ammo Box (9mm)"
 	desc = "A box of 20 high velocity bluespace rounds for Beretta M9"
-	id = "box_beretta"
+	id = "box_beretta_bsp"
 	req_tech = list("combat" = 6, "materials" = 5, "bluespace" = 6)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 8000, MAT_SILVER = 600, MAT_BLUESPACE = 1000)
diff --git a/modular_ss220/wire_splicing/wiresplicing.dm b/modular_ss220/wire_splicing/wiresplicing.dm
index 87dd7736ffcd..12b56654186a 100644
--- a/modular_ss220/wire_splicing/wiresplicing.dm
+++ b/modular_ss220/wire_splicing/wiresplicing.dm
@@ -1,3 +1,6 @@
+#define MAX_MESSINESS 10
+#define WALKING_REDUCE_PROBABILITY 50
+
 /obj/effect/spawner/wire_splicing
 	name = "wiring splicing spawner"
 	icon = 'modular_ss220/wire_splicing/structures_spawners.dmi'
@@ -5,14 +8,14 @@
 
 /obj/effect/spawner/wire_splicing/Initialize()
 	. = ..()
-	new/obj/structure/wire_splicing(get_turf(src))
+	new /obj/structure/wire_splicing(get_turf(src))
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/wire_splicing/thirty //70% chance to be nothing
 	name = "wiring splicing spawner 30%"
 
 /obj/effect/spawner/wire_splicing/thirty/Initialize(mapload)
-	if (prob(70))
+	if(prob(70))
 		return INITIALIZE_HINT_QDEL
 	. = ..()
 
@@ -26,19 +29,18 @@
 	flags = CONDUCT
 	layer = WIRE_TERMINAL_LAYER
 	var/messiness = 0 // How bad the splicing was, determines the chance of shock
+	var/shock_chance_per_messiness = 10
 
 /obj/structure/wire_splicing/Initialize(mapload)
 	. = ..()
-	messiness = rand (1,10)
-	icon_state = "wire_splicing[messiness]"
-
+	messiness = rand(1, MAX_MESSINESS)
+	update_icon(UPDATE_ICON_STATE)
 
 	//At messiness of 2 or below, triggering when walking on a catwalk is impossible
 	//Above that it becomes possible, so we will change the layer to make it poke through catwalks
 	if (messiness > 2)
 		layer = LOW_OBJ_LAYER  // I wont do such stuff on splicing "reinforcement". Take it as nasty feature
 
-
 	//Wire splice can only exist on a cable. Lets try to place it in a good location
 	if (locate(/obj/structure/cable) in get_turf(src)) //if we're already in a good location, no problem!
 		return
@@ -90,60 +92,69 @@
 
 	loc = pick(candidates)
 
+/obj/structure/wire_splicing/update_icon_state()
+	icon_state = "wire_splicing[messiness]"
+
 /obj/structure/wire_splicing/examine(mob/user)
-	..()
-	to_chat(user, "It has [messiness] wire[messiness > 1?"s":""] dangling around.")
+	. = ..()
+	. += span_warning("It has [messiness] wire[messiness > 1 ? "s" : ""] dangling around.")
 
-/obj/structure/wire_splicing/Crossed(AM as mob|obj)
+/obj/structure/wire_splicing/Crossed(atom/movable/AM, oldloc)
 	. = ..()
 	if(isliving(AM))
-		var/mob/living/L = AM
-		//var/turf/T = get_turf(src)
-		var/chance_to_shock = messiness * 10
+		var/chance_to_shock = messiness * shock_chance_per_messiness
 		/*
+		var/turf/T = get_turf(src)
 		if(locate(/obj/structure/catwalk) in T)
 			chance_to_shock -= 20
 		*/
-		shock(L, chance_to_shock)
+		shock(AM, chance_to_shock)
 
-/obj/structure/wire_splicing/proc/shock(mob/user, prb, siemens_coeff = 1)
-	if(!in_range(src, user))//To prevent TK and mech users from getting shocked
-		return FALSE
+/obj/structure/wire_splicing/proc/shock(mob/living/user, prb, siemens_coeff = 1)
+	. = FALSE
+	if(!in_range(src, user)) //To prevent TK and mech users from getting shocked
+		return
+	if(user.m_intent == MOVE_INTENT_WALK) // Walk slowly to try to step over
+		prb = max(prb - WALKING_REDUCE_PROBABILITY, 0)
 	if(!prob(prb))
-		return FALSE
+		return
 	var/turf/T = get_turf(src)
 	var/obj/structure/cable/C = locate(/obj/structure/cable) in T
 	if(!C)
-		return FALSE
-	if (electrocute_mob(user, C.powernet, src, siemens_coeff))
+		return
+	if(electrocute_mob(user, C.powernet, src, siemens_coeff))
 		do_sparks(5, TRUE, src)
-		return TRUE
-	else
-		return FALSE
+		. = TRUE
 
+/obj/structure/wire_splicing/wirecutter_act(mob/living/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 2 SECONDS, volume = I.tool_volume))
+		return
+	if(shock(user, 50))
+		return
+	user.visible_message(span_notice("[user] cuts the splicing."), span_notice("You cut the splicing."))
+	investigate_log(" was cut by [key_name(usr)] in [AREACOORD(src)]")
+	qdel(src)
 
 /obj/structure/wire_splicing/attackby(obj/item/I, mob/user, params)
-	if(I.tool_behaviour == TOOL_WIRECUTTER)
-		if(I.use_tool(src, user, 2 SECONDS, volume = 50))
-			if (shock(user, 50))
-				return
-			user.visible_message("[user] cuts the splicing.", span_notice("You cut the splicing."))
-			investigate_log(" was cut by [key_name(usr)] in [AREACOORD(src)]")
-			qdel(src)
-
 	if(istype(I, /obj/item/stack/cable_coil) && user.a_intent == INTENT_HARM)
 		var/obj/item/stack/cable_coil/coil = I
-		if(coil.get_amount() >= 1)
-			reinforce(user, coil)
+		reinforce(user, coil)
+		return
+	. = ..()
 
 /obj/structure/wire_splicing/proc/reinforce(mob/user, obj/item/stack/cable_coil/coil)
-	if(messiness >= 10)
-		to_chat(user,span_warning("You can't seem to jam more cable into the splicing!"))
+	if(messiness >= MAX_MESSINESS)
+		to_chat(user, span_warning("You can't seem to jam more cable into the splicing!"))
 		return
-	if(!do_after(user, 2 SECONDS, src))
+	if(!do_after(user, 2 SECONDS, target = src, progress = TRUE))
 		return
-	messiness = min(messiness + 1, 10)
-	investigate_log("wire splicing was reinforced to [messiness] by [key_name(usr)] in [AREACOORD(src)]")
+	if(messiness >= MAX_MESSINESS)
+		return
+	messiness = min(messiness + 1, MAX_MESSINESS)
 	coil.use(1)
-	if(messiness < 10 && coil.get_amount() >= 1)
-		reinforce(user, coil)
+	update_icon(UPDATE_ICON_STATE)
+	investigate_log("wire splicing was reinforced to [messiness] by [key_name(usr)] in [AREACOORD(src)]")
+
+#undef MAX_MESSINESS
+#undef WALKING_REDUCE_PROBABILITY