diff --git a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm
index 668650f409a..95e9f04f9a9 100644
--- a/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2_bubber.dmm
@@ -434,12 +434,15 @@
 /turf/open/floor/iron/dark,
 /area/station/service/abandoned_gambling_den)
 "aeM" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start/prisoner,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/machinery/duct,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 1
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "aeQ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1430,17 +1433,14 @@
 /turf/open/floor/iron/large,
 /area/station/commons/locker)
 "aqq" = (
-/obj/machinery/sparker/directional/west{
-	id = "justicespark"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/machinery/door/poddoor/preopen{
+	id = "brigprison";
+	name = "Prison Blast Door"
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
+/turf/open/floor/plating,
+/area/space)
 "aqs" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2143,7 +2143,6 @@
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "axa" = (
-/obj/item/radio/intercom/prison/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/effect/turf_decal/tile/neutral/full,
 /turf/open/floor/iron/dark/smooth_large,
@@ -3767,6 +3766,14 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
+"aSG" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/chem_dispenser/drinks{
+	dir = 8
+	},
+/obj/structure/table,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "aSO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -4604,10 +4611,10 @@
 /turf/open/floor/iron,
 /area/station/maintenance/department/eva/abandoned)
 "bez" = (
-/obj/structure/curtain,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/structure/curtain/cloth,
 /turf/open/floor/iron/white,
 /area/station/security/prison/toilet)
 "beG" = (
@@ -4993,9 +5000,6 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "bii" = (
-/obj/effect/spawner/random/entertainment/arcade{
-	dir = 8
-	},
 /obj/machinery/status_display/evac/directional/east,
 /obj/machinery/camera/directional/east{
 	c_tag = "Permabrig - Hall";
@@ -5004,6 +5008,24 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/structure/rack/shelf,
+/obj/item/clothing/mask/breath{
+	pixel_x = -5
+	},
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath{
+	pixel_x = 5
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = -8
+	},
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 8
+	},
+/obj/item/inflatable,
+/obj/item/inflatable,
+/obj/item/inflatable/door,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "bij" = (
@@ -6746,16 +6768,9 @@
 /turf/open/floor/circuit/green,
 /area/station/ai_monitored/turret_protected/ai)
 "bCC" = (
-/obj/machinery/door/poddoor{
-	id = "justiceblast";
-	name = "Justice Blast Door"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "bCG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/random/trash/grille_or_waste,
@@ -7697,13 +7712,15 @@
 /area/station/maintenance/department/science)
 "bLP" = (
 /obj/structure/table,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/canvas/nineteen_nineteen,
-/obj/item/storage/crayons,
-/turf/open/floor/iron,
+/obj/machinery/computer/arcade/battle{
+	desc = "It seems to have some cross-species 'Retro' feel to it. It's loaded with a game disk.";
+	icon_screen = "library";
+	icon_state = "oldcomp";
+	name = "NT PC 330";
+	pixel_y = 8
+	},
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/iron/dark,
 /area/station/security/prison)
 "bLR" = (
 /obj/effect/turf_decal/tile/yellow{
@@ -10510,14 +10527,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"cul" = (
-/obj/machinery/plate_press,
-/obj/structure/sign/warning/electric_shock/directional/east,
-/obj/effect/turf_decal/tile/yellow,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron,
-/area/station/security/prison/work)
 "cun" = (
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/stripes/line{
@@ -10884,15 +10893,10 @@
 /turf/open/floor/wood/large,
 /area/station/command/corporate_showroom)
 "czg" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/item/plant_analyzer,
-/obj/machinery/camera/directional/east{
-	c_tag = "Permabrig - Garden";
-	network = list("ss13","prison")
-	},
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "czi" = (
 /obj/effect/decal/cleanable/dirt,
@@ -12651,11 +12655,11 @@
 /area/station/engineering/supermatter/room)
 "cVV" = (
 /obj/machinery/door/window/right/directional/south,
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/duct,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "cWA" = (
 /obj/effect/decal/cleanable/dirt,
@@ -12984,15 +12988,7 @@
 /turf/open/floor/iron/dark,
 /area/station/security/evidence)
 "dax" = (
-/obj/structure/window,
-/obj/structure/sink/directional/south,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/cup/watering_can,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron,
+/turf/closed/wall,
 /area/station/security/prison/garden)
 "day" = (
 /obj/structure/disposalpipe/segment{
@@ -14009,7 +14005,8 @@
 	dir = 8
 	},
 /obj/structure/cable,
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "doR" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -14054,6 +14051,14 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"dpJ" = (
+/obj/machinery/plate_press,
+/obj/structure/sign/warning/electric_shock/directional/east,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
+/area/station/security/prison/work)
 "dpN" = (
 /obj/machinery/door/airlock/research/glass{
 	name = "Xenobiology Kill Room"
@@ -14683,9 +14688,6 @@
 /area/station/engineering/main)
 "dwC" = (
 /obj/structure/table,
-/obj/item/storage/box/ingredients/fruity,
-/obj/item/storage/box/ingredients/grains,
-/obj/item/storage/box/ingredients/italian,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "dwI" = (
@@ -14738,7 +14740,8 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "dwY" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -15062,6 +15065,18 @@
 /obj/structure/cable,
 /turf/open/floor/circuit,
 /area/station/ai_monitored/turret_protected/ai_upload)
+"dBT" = (
+/obj/structure/table,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/canvas/nineteen_nineteen,
+/obj/item/storage/crayons,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
+/area/station/security/prison/work)
 "dCd" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -17116,7 +17131,10 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/exit/departure_lounge)
 "edb" = (
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/green{
 	dir = 1
 	},
 /turf/open/floor/iron,
@@ -18671,10 +18689,8 @@
 /obj/item/stack/license_plates/empty/fifty,
 /obj/machinery/light/directional/south,
 /obj/item/radio/intercom/prison/directional/south,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "ewQ" = (
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{
@@ -20219,11 +20235,9 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "eQx" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/item/shovel/spade,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "eQB" = (
 /obj/machinery/door/airlock/public/glass{
@@ -20384,9 +20398,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/sign/poster/official/random/directional/east,
-/obj/effect/spawner/random/entertainment/arcade{
-	dir = 8
-	},
 /obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/security/prison)
@@ -20906,7 +20917,9 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/effect/landmark/start/prisoner,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "eYN" = (
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
@@ -22077,14 +22090,31 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/exit/departure_lounge)
 "fmY" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/preopen{
 	id = "justicechamber";
 	name = "Justice Chamber Blast Door"
 	},
-/obj/structure/sign/warning/electric_shock/directional/east,
+/obj/machinery/door/window/brigdoor/right/directional/north{
+	dir = 2;
+	name = "Justice Chamber";
+	req_access = list("armory")
+	},
+/obj/machinery/door/window/brigdoor/right/directional/north{
+	name = "Justice Chamber";
+	req_access = list("armory")
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /obj/structure/cable,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "fnb" = (
 /obj/structure/disposalpipe/segment,
@@ -23357,7 +23387,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "fDF" = (
 /turf/closed/wall/r_wall,
@@ -23771,10 +23801,12 @@
 /obj/structure/bedsheetbin,
 /obj/structure/cable,
 /obj/effect/decal/cleanable/cobweb,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
+/obj/item/reagent_containers/cup/bucket{
+	pixel_x = 4;
+	pixel_y = -6
 	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "fIX" = (
 /obj/structure/table/reinforced,
@@ -23823,12 +23855,6 @@
 /obj/item/pen,
 /turf/open/floor/iron/dark,
 /area/station/science/circuits)
-"fJG" = (
-/obj/structure/window,
-/obj/machinery/biogenerator,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
 "fJZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -24568,6 +24594,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/station/service/theater/abandoned)
+"fTM" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/door/poddoor{
+	id = "justiceblast";
+	name = "Justice Blast Door"
+	},
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
 "fTP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24580,9 +24619,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
-"fTS" = (
-/turf/open/floor/iron,
-/area/station/security/prison/work)
 "fUf" = (
 /obj/structure/table/wood/poker,
 /obj/effect/spawner/random/maintenance,
@@ -24951,8 +24987,18 @@
 "fYO" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/landmark/start/prisoner,
-/turf/open/floor/iron,
+/obj/structure/table,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/obj/item/chisel,
+/obj/item/reagent_containers/cup/bucket/wooden{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/storage/crayons{
+	pixel_x = -1;
+	pixel_y = -4
+	},
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "fYR" = (
 /turf/closed/wall,
@@ -26780,10 +26826,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
-/obj/structure/table/reinforced,
 /obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/security/prison)
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
 "guz" = (
 /obj/machinery/light/directional/north,
 /obj/item/kirbyplants/random,
@@ -27200,7 +27247,8 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "gzV" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28137,12 +28185,10 @@
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "gLT" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/warning/electric_shock/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "gMh" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -28326,7 +28372,7 @@
 /turf/open/floor/iron/grimy,
 /area/station/command/heads_quarters/hos)
 "gOo" = (
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/green{
 	dir = 4
 	},
 /turf/open/floor/iron,
@@ -28438,9 +28484,11 @@
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
 "gQa" = (
-/obj/effect/decal/cleanable/dirt,
 /mob/living/basic/mouse/brown/tom,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 8
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "gQd" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -29190,6 +29238,14 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/engineering/atmos/hfr_room)
+"han" = (
+/obj/machinery/firealarm/directional/east,
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 7
+	},
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "haq" = (
 /obj/structure/table,
 /obj/effect/turf_decal/tile/brown/anticorner/contrasted{
@@ -29726,6 +29782,8 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain)
 "hhn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/warning/vacuum/directional/west,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
@@ -30167,8 +30225,8 @@
 "hmO" = (
 /obj/machinery/computer/security/telescreen/entertainment/directional/east,
 /obj/machinery/light/directional/east,
-/obj/structure/closet/crate/bin,
-/obj/effect/spawner/random/contraband/prison,
+/obj/structure/chair/stool/directional/north,
+/obj/effect/turf_decal/tile/yellow,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "hmS" = (
@@ -32988,16 +33046,12 @@
 /turf/open/floor/iron,
 /area/station/medical/virology)
 "hZL" = (
-/obj/structure/closet/crate,
-/obj/item/toy/beach_ball/holoball/dodgeball,
-/obj/item/toy/beach_ball/holoball/dodgeball,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/instrument/harmonica,
-/obj/item/storage/dice,
-/obj/item/toy/cards/deck/tarot,
 /obj/machinery/light/directional/south,
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/contraband/prison,
+/obj/effect/spawner/random/contraband/prison,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "hZT" = (
@@ -33125,6 +33179,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/item/paper_bin{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/pen/red{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/pen/blue{
+	pixel_x = 7;
+	pixel_y = 8
+	},
 /turf/open/floor/iron,
 /area/station/security/prison)
 "ibh" = (
@@ -33825,10 +33891,11 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/corner{
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/work)
 "iiK" = (
 /obj/structure/disposalpipe/segment,
@@ -34353,11 +34420,14 @@
 /turf/open/floor/iron,
 /area/station/commons/fitness/recreation)
 "ioT" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/duct,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+	dir = 4
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "ipr" = (
 /obj/machinery/computer/rdconsole{
@@ -34672,6 +34742,13 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/station/security/prison)
 "itY" = (
@@ -34718,31 +34795,13 @@
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
 "iut" = (
+/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/preopen{
 	id = "justicechamber";
 	name = "Justice Chamber Blast Door"
 	},
-/obj/machinery/door/window/brigdoor/right/directional/north{
-	dir = 2;
-	name = "Justice Chamber";
-	req_access = list("armory")
-	},
-/obj/machinery/door/window/brigdoor/right/directional/north{
-	name = "Justice Chamber";
-	req_access = list("armory")
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
 /obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
+/turf/open/floor/plating,
 /area/station/security/execution/education)
 "iuA" = (
 /obj/structure/chair/office/light{
@@ -35144,15 +35203,9 @@
 /turf/open/floor/wood,
 /area/station/service/electronic_marketing_den)
 "izM" = (
-/obj/structure/closet/crate/trashcart/laundry,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/iron,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "izW" = (
 /obj/effect/spawner/random/structure/closet_maintenance,
@@ -37438,14 +37491,11 @@
 /turf/open/floor/plating,
 /area/station/hallway/secondary/service)
 "jdl" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/ambrosia_vulgaris{
-	pixel_x = -30
-	},
 /obj/machinery/light/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "jds" = (
 /obj/structure/table/reinforced,
@@ -37710,14 +37760,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/port)
-"jgb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
 "jgd" = (
 /obj/item/radio/intercom/directional/south,
 /obj/effect/turf_decal/tile/red/anticorner/contrasted,
@@ -39119,10 +39161,13 @@
 /turf/open/floor/iron/dark,
 /area/station/science/breakroom)
 "jxg" = (
-/obj/structure/closet/secure_closet/injection,
 /obj/effect/turf_decal/tile/red/anticorner/contrasted{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "jxm" = (
@@ -39445,12 +39490,15 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos/storage)
 "jAp" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/east,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/camera/directional/east{
+	c_tag = "Permabrig - Garden";
+	network = list("ss13","prison")
+	},
+/obj/structure/sign/warning/electric_shock/directional/east,
+/obj/structure/cable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "jAI" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39657,12 +39705,8 @@
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
 "jCv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "jCw" = (
 /obj/machinery/power/terminal{
@@ -39997,6 +40041,13 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/lab)
+"jFV" = (
+/obj/effect/spawner/random/structure/girder{
+	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	name = "falsewall or wall spawner"
+	},
+/turf/open/floor/plating,
+/area/station/security/prison/toilet)
 "jGl" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
@@ -40112,13 +40163,6 @@
 /area/station/science/ordnance)
 "jHw" = (
 /obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/pen,
-/obj/item/pen,
-/obj/item/pen,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
@@ -43416,6 +43460,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/station/commons/dorms)
+"kvV" = (
+/obj/structure/table,
+/obj/item/storage/box/ingredients/fruity,
+/obj/item/storage/box/ingredients/grains,
+/obj/item/storage/box/ingredients/italian,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "kvW" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask,
@@ -43490,13 +43541,9 @@
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
 "kxm" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/chem_dispenser/drinks{
-	dir = 8
-	},
-/obj/structure/table,
-/turf/open/floor/iron/kitchen/small,
-/area/station/security/prison/mess)
+/obj/machinery/seed_extractor,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/prison/garden)
 "kxs" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral{
@@ -45026,12 +45073,8 @@
 /area/station/cargo/warehouse)
 "kRw" = (
 /obj/machinery/washing_machine,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "kRz" = (
 /obj/effect/turf_decal/stripes/line{
@@ -46400,6 +46443,9 @@
 	},
 /obj/machinery/airalarm/directional/east,
 /obj/item/kirbyplants/random,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/station/security/prison)
 "liB" = (
@@ -47580,21 +47626,12 @@
 /turf/open/floor/iron,
 /area/station/commons/toilet/locker)
 "lyd" = (
-/obj/machinery/flasher{
-	id = "justiceflash";
-	pixel_x = 26;
-	req_access = list("security")
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/obj/machinery/flasher/directional/east{
-	id = "justiceflash";
-	req_access = list("security")
-	},
+/obj/structure/chair,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/toy/figure/prisoner,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "lyf" = (
@@ -48869,7 +48906,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "lMT" = (
 /obj/structure/chair/sofa/bench/right{
@@ -50736,6 +50773,16 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/security/office)
+"moc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/security/prison)
 "mor" = (
 /obj/structure/table/reinforced,
 /obj/structure/reagent_dispensers/wall/peppertank/directional/west,
@@ -50876,7 +50923,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "mqb" = (
 /obj/machinery/door/morgue{
@@ -51619,8 +51666,9 @@
 /turf/open/floor/iron,
 /area/station/commons/locker)
 "mze" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/machinery/biogenerator,
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron/dark/smooth_large,
 /area/station/security/prison/garden)
 "mzi" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -51722,11 +51770,18 @@
 /turf/open/space,
 /area/station/solars/starboard/aft)
 "mAA" = (
-/obj/structure/table,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/cup/beaker/large,
-/turf/open/floor/iron/kitchen/small,
-/area/station/security/prison/mess)
+/obj/structure/closet/crate/large,
+/obj/item/seeds/bamboo,
+/obj/item/seeds/kiri,
+/obj/item/seeds/wheat/meat,
+/obj/effect/spawner/random/contraband/permabrig_gear,
+/obj/item/instrument/eguitar,
+/obj/item/grenade/smokebomb,
+/obj/item/secateurs,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plating,
+/area/station/security/prison)
 "mAD" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "brigfront";
@@ -51873,6 +51928,17 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/commons/fitness/recreation)
+"mCq" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Prison Kitchen"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
 "mCJ" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/line{
@@ -53854,6 +53920,11 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
+"mZB" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
+/area/station/security/prison/work)
 "mZK" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 8
@@ -56458,14 +56529,15 @@
 /turf/open/floor/iron/dark,
 /area/station/security/lockers)
 "nIr" = (
-/obj/structure/table/reinforced,
 /obj/item/storage/box/drinkingglasses{
 	pixel_x = 4;
 	pixel_y = 5
 	},
 /obj/item/storage/box/ingredients/vegetarian,
-/turf/open/floor/iron,
-/area/station/security/prison)
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
 "nIz" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -56529,6 +56601,7 @@
 /obj/item/toy/cards/deck,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/security/prison)
 "nJj" = (
@@ -56929,11 +57002,8 @@
 /area/station/science/xenobiology)
 "nOz" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/west,
-/obj/structure/sign/warning/vacuum/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
+/turf/open/floor/plating,
+/area/station/security/prison)
 "nOD" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -56957,6 +57027,7 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 8
 	},
+/obj/item/radio/intercom/prison/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/visit)
 "nOW" = (
@@ -58660,8 +58731,11 @@
 /turf/open/floor/iron/dark,
 /area/station/science/robotics/lab)
 "okK" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/structure/sink/kitchen/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "okN" = (
 /obj/structure/cable,
@@ -59220,6 +59294,13 @@
 /obj/item/pai_card,
 /turf/open/floor/iron/dark,
 /area/station/service/library)
+"otf" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
 "oti" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -60327,14 +60408,12 @@
 /turf/open/floor/iron,
 /area/station/service/kitchen)
 "oHS" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
-	id = "justicechamber";
-	name = "Justice Chamber Blast Door"
+/obj/effect/spawner/random/structure/girder{
+	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	name = "falsewall or wall spawner"
 	},
-/obj/structure/cable,
 /turf/open/floor/plating,
-/area/station/security/execution/education)
+/area/station/security/prison)
 "oIi" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -60478,6 +60557,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"oLw" = (
+/obj/structure/sign/directions/engineering{
+	desc = "A sign that shows there are doors here. There are doors everywhere!";
+	icon_state = "doors";
+	name = "WARNING: EXTERNAL AIRLOCK";
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
 "oLz" = (
 /obj/structure/cable,
 /obj/structure/chair/office{
@@ -61189,6 +61278,12 @@
 /obj/effect/turf_decal/bot/left,
 /turf/open/floor/iron/dark,
 /area/station/science/server)
+"oUw" = (
+/obj/structure/table,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/reagent_containers/cup/beaker/large,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "oUy" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /obj/effect/decal/cleanable/dirt,
@@ -61269,6 +61364,14 @@
 	dir = 6
 	},
 /area/station/service/chapel)
+"oVF" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/structure/easel,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
+/area/station/security/prison/work)
 "oVI" = (
 /obj/structure/bed/roller,
 /obj/effect/decal/cleanable/dirt,
@@ -62001,14 +62104,32 @@
 /turf/open/floor/plating,
 /area/station/service/chapel/storage)
 "pgn" = (
+/obj/structure/closet/crate/freezer{
+	icon_state = "hydrocrate";
+	name = "produce fridge"
+	},
+/obj/item/food/grown/cabbage,
+/obj/item/food/grown/pumpkin,
+/obj/item/food/grown/potato,
+/obj/item/food/grown/koibeans,
+/obj/item/food/grown/onion,
+/obj/item/food/grown/watermelon,
+/obj/item/food/grown/cucumber,
+/obj/item/food/grown/eggplant,
+/obj/item/food/grown/berries,
+/obj/item/food/grown/apple,
+/obj/item/food/grown/tomato,
+/obj/item/food/grown/wheat,
+/obj/item/food/grown/carrot,
 /obj/structure/window,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/structure/sign/poster/contraband/ambrosia_vulgaris{
+	pixel_x = -30
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "pgo" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "pgr" = (
 /obj/machinery/duct,
@@ -63614,9 +63735,8 @@
 /area/station/science/explab)
 "pAx" = (
 /obj/structure/window,
-/obj/machinery/seed_extractor,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "pAy" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -63892,6 +64012,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"pDL" = (
+/obj/effect/spawner/random/structure/girder{
+	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	name = "falsewall or wall spawner"
+	},
+/turf/open/floor/plating,
+/area/station/security/prison/visit)
 "pDM" = (
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
@@ -64134,7 +64261,14 @@
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/storage)
 "pGj" = (
-/obj/structure/easel,
+/obj/structure/table,
+/obj/machinery/computer/arcade/orion_trail{
+	desc = "For gamers only. Casuals need not apply.";
+	icon_screen = "library";
+	icon_state = "oldcomp";
+	name = "Gamer Computer";
+	pixel_y = 8
+	},
 /turf/open/floor/iron,
 /area/station/security/prison)
 "pGk" = (
@@ -64453,9 +64587,8 @@
 /turf/open/floor/iron,
 /area/station/science/breakroom)
 "pKb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "pKc" = (
 /obj/structure/cable,
@@ -64656,8 +64789,10 @@
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/hop)
 "pMa" = (
-/obj/item/reagent_containers/cup/bucket,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/reagent_containers/cup/bucket/wooden{
+	name = "waste bucket"
+	},
 /turf/open/floor/plating,
 /area/station/security/prison/safe)
 "pMh" = (
@@ -65587,7 +65722,7 @@
 "pWb" = (
 /obj/machinery/smartfridge,
 /turf/closed/wall,
-/area/station/security/prison/work)
+/area/station/security/prison/mess)
 "pWe" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -66171,6 +66306,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/machinery/duct,
+/obj/machinery/door/firedoor,
 /turf/open/floor/iron/white,
 /area/station/security/prison/toilet)
 "qdl" = (
@@ -66402,6 +66538,9 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit)
+"qgN" = (
+/turf/closed/wall/r_wall,
+/area/station/security/prison/mess)
 "qgQ" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/siding/dark_red{
@@ -67089,8 +67228,7 @@
 /area/station/security/lockers)
 "qpB" = (
 /obj/machinery/door/window/left/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "qpD" = (
 /obj/structure/table/wood,
@@ -68189,7 +68327,16 @@
 	c_tag = "Permabrig - Workroom";
 	network = list("ss13","prison")
 	},
-/turf/open/floor/iron,
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/clothing/under/rank/prisoner/skirt,
+/obj/item/clothing/under/rank/prisoner/skirt,
+/obj/item/clothing/under/rank/prisoner,
+/obj/item/clothing/under/rank/prisoner,
+/obj/item/clothing/under/rank/prisoner/classic,
+/obj/item/clothing/under/rank/prisoner/classic,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
 /area/station/security/prison/work)
 "qEB" = (
 /obj/structure/disposalpipe/segment{
@@ -69540,17 +69687,29 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/disposal/incinerator)
+"qUK" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/station/security/execution/education)
 "qUM" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/r_wall,
 /area/station/tcommsat/server)
 "qVf" = (
-/obj/structure/chair,
-/obj/effect/decal/cleanable/blood/splatter,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/toy/figure/prisoner,
+/obj/machinery/sparker/directional/west{
+	id = "justicespark"
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "qVg" = (
@@ -73262,9 +73421,21 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos/storage)
 "rRm" = (
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/aloe,
+/obj/item/seeds/banana,
+/obj/item/seeds/carrot,
+/obj/item/seeds/chanter,
+/obj/item/seeds/cherry,
+/obj/item/seeds/chili,
+/obj/item/seeds/cocoapod,
+/obj/item/seeds/corn,
+/obj/item/seeds/cotton,
+/obj/item/seeds/grape,
+/obj/item/seeds/grass,
 /obj/structure/window,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "rRr" = (
 /obj/structure/cable,
@@ -73315,11 +73486,14 @@
 /turf/open/floor/iron/white/smooth_large,
 /area/station/medical/medbay)
 "rRL" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start/prisoner,
-/obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
+/obj/structure/sink/kitchen/directional/west,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 4
+	},
+/obj/structure/cable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "rRR" = (
 /obj/structure/rack,
@@ -73816,7 +73990,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "rXm" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -75616,6 +75790,7 @@
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
 	},
+/obj/structure/closet/secure_closet/injection,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "swD" = (
@@ -77018,10 +77193,6 @@
 /area/station/service/library/artgallery)
 "sMN" = (
 /obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
@@ -77173,8 +77344,8 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
 "sON" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/iron,
+/obj/structure/punching_bag,
+/turf/open/floor/plating,
 /area/station/security/prison)
 "sOO" = (
 /obj/structure/table/wood,
@@ -77344,7 +77515,8 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "sQH" = (
 /obj/structure/cable,
@@ -82472,13 +82644,11 @@
 /turf/open/floor/iron,
 /area/station/medical/abandoned)
 "ubL" = (
-/obj/machinery/firealarm/directional/east,
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 7
+/obj/effect/turf_decal/tile/green{
+	dir = 1
 	},
-/turf/open/floor/iron/kitchen/small,
-/area/station/security/prison/mess)
+/turf/open/floor/iron,
+/area/station/security/prison)
 "ubM" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -83862,7 +84032,6 @@
 /turf/open/floor/iron/white/side,
 /area/station/security/medical)
 "uuj" = (
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -84090,6 +84259,9 @@
 /obj/effect/landmark/navigate_destination/kitchen,
 /turf/open/floor/iron/dark,
 /area/station/service/kitchen)
+"uxd" = (
+/turf/closed/wall,
+/area/station/security/prison/mess)
 "uxl" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -85747,9 +85919,10 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
 "uRz" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/iron,
-/area/station/security/prison)
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
+/area/station/security/prison/mess)
 "uRF" = (
 /obj/structure/closet,
 /obj/effect/spawner/random/food_or_drink/condiment,
@@ -85820,7 +85993,8 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "uSp" = (
 /obj/structure/cable,
@@ -86154,8 +86328,14 @@
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "uWT" = (
-/obj/structure/punching_bag,
-/turf/open/floor/plating,
+/obj/structure/closet/crate,
+/obj/item/toy/beach_ball/holoball/dodgeball,
+/obj/item/toy/beach_ball/holoball/dodgeball,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/instrument/harmonica,
+/obj/item/storage/dice,
+/obj/item/toy/cards/deck/tarot,
+/turf/open/floor/iron,
 /area/station/security/prison)
 "uWU" = (
 /obj/structure/cable,
@@ -86801,13 +86981,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos/project)
-"vex" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
 "veD" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -86848,13 +87021,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
 "vfN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
+/obj/machinery/duct,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "vfS" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -88611,6 +88783,10 @@
 	},
 /turf/open/floor/iron/dark/textured_half,
 /area/station/service/chapel/storage)
+"vzZ" = (
+/obj/structure/chair/stool/directional/north,
+/turf/open/floor/iron,
+/area/station/security/prison)
 "vAc" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{
 	dir = 4
@@ -89358,7 +89534,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "vJj" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -89872,24 +90048,16 @@
 /turf/open/floor/iron/dark/corner,
 /area/station/commons/fitness/recreation)
 "vRo" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/seeds/onion,
-/obj/item/seeds/garlic,
-/obj/item/seeds/potato,
-/obj/item/seeds/tomato,
-/obj/item/seeds/carrot,
-/obj/item/seeds/grass,
-/obj/item/seeds/ambrosia,
-/obj/item/seeds/wheat,
-/obj/item/seeds/pumpkin,
-/obj/effect/spawner/random/contraband/prison,
-/obj/structure/window,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/seeds/tower,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron,
-/area/station/security/prison/garden)
+/obj/machinery/light/directional/east,
+/obj/machinery/airalarm/directional/east,
+/obj/structure/mop_bucket,
+/obj/item/storage/bag/trash,
+/obj/item/reagent_containers/cup/bucket,
+/obj/item/mop,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/turf/open/floor/iron/diagonal,
+/area/station/security/prison/work)
 "vRy" = (
 /obj/structure/table,
 /obj/effect/spawner/random/entertainment/cigarette_pack,
@@ -92972,12 +93140,13 @@
 /turf/open/floor/iron/white,
 /area/station/medical/paramedic)
 "wAt" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
+/obj/item/radio/intercom/prison/directional/east{
+	pixel_y = 20
+	},
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "wAu" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -96188,9 +96357,6 @@
 /area/station/science/xenobiology)
 "xsP" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "xsS" = (
@@ -97021,6 +97187,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"xCs" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+	id = "justicechamber";
+	name = "Justice Chamber Blast Door"
+	},
+/obj/structure/sign/warning/electric_shock/directional/east,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/execution/education)
 "xCt" = (
 /obj/machinery/computer/telecomms/server{
 	dir = 8
@@ -97282,14 +97458,12 @@
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "xFh" = (
-/obj/machinery/light/small/directional/east,
-/obj/structure/sign/directions/engineering{
-	desc = "A sign that shows there are doors here. There are doors everywhere!";
-	icon_state = "doors";
-	name = "WARNING: EXTERNAL AIRLOCK";
-	pixel_x = 32
-	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/flasher/directional/north{
+	id = "justiceflash";
+	req_access = list("security")
+	},
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
 "xFk" = (
@@ -151816,8 +151990,8 @@ aaa
 aaa
 uHd
 aaa
-aaa
-uHd
+qYo
+qYo
 qYo
 mSe
 eWc
@@ -152073,10 +152247,10 @@ aaa
 aaa
 qYo
 aaa
-aaa
 qYo
-aaa
-mSe
+fiO
+fiO
+lTv
 omW
 nbw
 lTv
@@ -152331,9 +152505,9 @@ aaa
 qYo
 vVc
 vVc
-qYo
-aaa
-mSe
+fiO
+mAA
+lTv
 lTv
 vJh
 lTv
@@ -152587,10 +152761,10 @@ aaa
 aaa
 qYo
 aaa
-aaa
 qYo
-idT
-idT
+fiO
+nOz
+oHS
 uWT
 qkJ
 ayH
@@ -152840,13 +153014,13 @@ aaa
 aaa
 aaa
 aaa
-aaa
+uHd
 qYo
 qYo
 idT
-idT
-idT
-idT
+arw
+dax
+dax
 dax
 sON
 qkJ
@@ -153097,9 +153271,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
 uHd
 aaa
+aqq
 arw
 gLT
 jdl
@@ -153352,12 +153526,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
 uHd
 qYo
 uHd
 aaa
-arw
+aqq
+bCC
 pKb
 rRL
 ioT
@@ -153609,17 +153783,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
 uHd
 aaa
 uHd
 aaa
-arw
-jgb
+aqq
+bCC
+jCv
 mze
 vfN
-fJG
-vxr
+pAx
+ubL
 upM
 ibb
 bDw
@@ -153866,23 +154040,23 @@ aaa
 aaa
 aaa
 aaa
-aaa
 efQ
 aaa
 qYo
 aaa
-arw
+aqq
+bCC
 jCv
-mze
-vex
+kxm
+vfN
 pAx
-diC
+gOo
 vTP
 aNd
 qkJ
 hZL
 iOc
-iOc
+jFV
 iOc
 iOc
 iOc
@@ -154123,12 +154297,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
 uHd
 aaa
 uHd
 aaa
-arw
+aqq
+bCC
 gQa
 okK
 aeM
@@ -154137,13 +154311,13 @@ edb
 rwn
 ryY
 vxr
-vxr
-vxr
+gER
+uRz
 hmr
 jOw
 aNz
 xmk
-lAj
+pDL
 axa
 fgj
 kgO
@@ -154380,18 +154554,18 @@ aaa
 aaa
 aaa
 aaa
-aaa
 uHd
 qYo
 uHd
 aaa
+aqq
 arw
 wAt
 jAp
 czg
 rRm
-vxr
-tUB
+ubL
+diC
 ryY
 mUJ
 blB
@@ -154639,16 +154813,16 @@ aaa
 aaa
 aaa
 aaa
-aaa
+uHd
 qYo
 qYo
 idT
+arw
 idT
+arw
 idT
-idT
-vRo
 pGj
-vxr
+vzZ
 sMN
 vxr
 gER
@@ -154902,11 +155076,11 @@ aaa
 aaa
 aaa
 aaa
-idT
-idT
+aaa
+qWZ
 bLP
 hmO
-sMN
+moc
 liv
 ntc
 nIr
@@ -155423,7 +155597,7 @@ fYO
 eYK
 qEw
 ewL
-gQZ
+uxd
 eWh
 tXL
 sOS
@@ -155668,7 +155842,7 @@ aaa
 aaa
 aaa
 aaa
-wVj
+aaa
 aaa
 uHd
 aaa
@@ -155676,14 +155850,14 @@ aaa
 aaa
 ivM
 kRw
-fTS
+pgo
 izM
 pgo
-cul
-gQZ
-ubL
-mAA
-kxm
+pgo
+mCq
+sOS
+sOS
+sOS
 dwC
 eHO
 bJx
@@ -155931,17 +156105,17 @@ uHd
 qYo
 uHd
 qYo
-lGv
-lGv
 ivM
-ivM
-ivM
-lGv
-lGv
-eHO
-eHO
-eHO
-eHO
+vRo
+mZB
+oVF
+dBT
+dpJ
+uxd
+han
+oUw
+aSG
+kvV
 eHO
 gRU
 xAc
@@ -156188,18 +156362,18 @@ aaa
 aaa
 uHd
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-bCC
-nOz
-aqq
-hhn
-oHS
+lGv
+lGv
+ivM
+ivM
+ivM
+lGv
+qgN
+eHO
+eHO
+eHO
+eHO
+eHO
 swn
 aAA
 qbp
@@ -156444,15 +156618,15 @@ aaa
 aaa
 aaa
 uHd
-qYo
-vVc
-vVc
-vVc
-qYo
+aaa
+aaa
+aaa
+aaa
+aaa
 qYo
 aaa
 aaa
-bCC
+eHO
 hhn
 qVf
 xsP
@@ -156700,19 +156874,19 @@ aaa
 aaa
 aaa
 aaa
+uHd
+qYo
+vVc
+vVc
+vVc
 qYo
-aaa
-aaa
-aaa
-aaa
-aaa
 aad
 aaa
 aaa
-bCC
+eHO
 xFh
 lyd
-hhn
+otf
 fmY
 jxg
 iGx
@@ -156958,19 +157132,19 @@ aaa
 aaa
 aaa
 qYo
-uHd
-uHd
-uHd
-qYo
-aFo
+aaa
+aaa
+aaa
+aaa
+aaa
 aad
 aad
 aad
 eHO
-eHO
-eHO
-eHO
-eHO
+oLw
+qUK
+xsP
+xCs
 omd
 gku
 mZA
@@ -157214,19 +157388,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+qYo
+uHd
+uHd
+uHd
+qYo
 efQ
 efQ
 efQ
 aaa
-qYo
-qYo
-qYo
-aaa
+eHO
+fTM
+fTM
+fTM
 eHO
 skQ
 pdF
@@ -157481,8 +157655,8 @@ aaa
 qYo
 qYo
 efQ
-efQ
-efQ
+qYo
+qYo
 aaa
 eHO
 eHO
diff --git a/_maps/map_files/MetaStation/MetaStation_bubber.dmm b/_maps/map_files/MetaStation/MetaStation_bubber.dmm
index 92da1799ce9..74a2cf9b594 100644
--- a/_maps/map_files/MetaStation/MetaStation_bubber.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_bubber.dmm
@@ -234,6 +234,8 @@
 	pixel_x = -19
 	},
 /obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "afj" = (
@@ -1832,9 +1834,9 @@
 /turf/open/floor/iron,
 /area/station/construction/storage_wing)
 "aII" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
+/obj/item/shovel/spade,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "aIX" = (
@@ -3322,7 +3324,7 @@
 /obj/machinery/chem_master/condimaster{
 	name = "CondiMaster Neo"
 	},
-/turf/open/floor/iron/kitchen,
+/turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "bhb" = (
 /obj/structure/window{
@@ -4866,6 +4868,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"bJJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "bJQ" = (
 /obj/machinery/vending/coffee,
 /obj/effect/turf_decal/bot,
@@ -6458,6 +6465,11 @@
 /area/station/maintenance/starboard/greater)
 "csb" = (
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "cst" = (
@@ -8054,9 +8066,10 @@
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/aisat/exterior)
 "cWe" = (
-/obj/effect/spawner/structure/window,
-/obj/structure/cable,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "cWr" = (
 /obj/structure/disposalpipe/segment{
@@ -20390,6 +20403,7 @@
 /obj/structure/railing/corner{
 	dir = 4
 	},
+/obj/structure/drain,
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
@@ -21511,6 +21525,12 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/station/security/office)
+"hNm" = (
+/obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "hNw" = (
 /obj/machinery/light/small/directional/south,
 /obj/machinery/airalarm/directional/south,
@@ -21642,6 +21662,11 @@
 /obj/effect/mapping_helpers/airlock/access/any/command/general,
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
+"hQx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
 "hQB" = (
 /obj/effect/turf_decal/bot{
 	dir = 1
@@ -22899,9 +22924,7 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "ilg" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "ilh" = (
@@ -23315,13 +23338,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "irh" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/west,
 /obj/machinery/camera/directional/west{
 	c_tag = "Prison Garden";
 	network = list("ss13","prison")
 	},
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "irp" = (
@@ -24008,6 +24030,9 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
 "iBf" = (
@@ -24275,6 +24300,9 @@
 	name = "Prison Kitchen"
 	},
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/mess)
 "iGj" = (
@@ -26184,10 +26212,10 @@
 /turf/open/floor/iron/grimy,
 /area/station/service/chapel/office)
 "jjM" = (
-/obj/structure/cable,
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/duct,
+/obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "jjN" = (
@@ -26797,6 +26825,8 @@
 	c_tag = "Prison Kitchen";
 	network = list("ss13","prison")
 	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "jui" = (
@@ -35674,6 +35704,7 @@
 	dir = 1
 	},
 /obj/item/toy/beach_ball,
+/obj/structure/drain,
 /turf/open/floor/iron/terracotta/small,
 /area/station/security/prison/rec)
 "mxh" = (
@@ -35904,6 +35935,16 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
+"mAA" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/side{
+	dir = 8
+	},
+/area/station/security/prison)
 "mAJ" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39350,7 +39391,6 @@
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
@@ -39649,6 +39689,7 @@
 	spawn_scatter_radius = 1
 	},
 /obj/machinery/duct,
+/obj/structure/drain,
 /turf/open/floor/iron/freezer,
 /area/station/security/prison/rec)
 "nNH" = (
@@ -40539,6 +40580,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /obj/machinery/duct,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/rec)
 "odp" = (
@@ -41212,10 +41258,8 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "opF" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "opG" = (
@@ -45108,6 +45152,9 @@
 /area/station/science/ordnance/testlab)
 "pIN" = (
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "pJf" = (
@@ -45145,6 +45192,11 @@
 /area/station/science/explab)
 "pJu" = (
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/rec)
 "pJA" = (
@@ -45218,6 +45270,14 @@
 /area/station/security/detectives_office)
 "pKu" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/trashcart,
+/obj/item/instrument/bikehorn,
+/obj/item/modular_computer/pda/clear,
+/obj/item/modular_computer/pda/clear,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/instrument/violin,
+/obj/item/instrument/guitar,
 /turf/open/floor/plating,
 /area/station/security/prison/rec)
 "pKv" = (
@@ -45275,6 +45335,7 @@
 	c_tag = "Prison Cafeteria";
 	network = list("ss13","prison")
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
 "pMj" = (
@@ -46174,6 +46235,11 @@
 "qcd" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/atmos/pumproom)
+"qcf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/space)
 "qcC" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
@@ -46920,6 +46986,20 @@
 	},
 /turf/open/floor/engine/o2,
 /area/station/engineering/atmos)
+"qox" = (
+/obj/structure/closet/crate/large,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
+/obj/item/seeds/bamboo,
+/obj/item/wirecutters/makeshift,
+/obj/effect/spawner/random/contraband/permabrig_gear,
+/obj/effect/spawner/random/contraband/narcotics,
+/obj/effect/spawner/random/contraband/cannabis,
+/obj/item/modular_computer/pda/clear,
+/obj/effect/spawner/random/engineering/material_cheap,
+/obj/item/instrument/piano_synth,
+/turf/open/floor/plating,
+/area/station/security/prison/garden)
 "qoA" = (
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/iron/dark,
@@ -50592,8 +50672,10 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "rAW" = (
-/obj/machinery/duct,
-/turf/open/floor/iron,
+/obj/item/cultivator,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "rBe" = (
 /obj/structure/table,
@@ -51467,7 +51549,7 @@
 	pixel_y = 22
 	},
 /turf/open/floor/iron/dark/textured_large,
-/area/station/security/prison/mess)
+/area/station/security/prison)
 "rOY" = (
 /obj/structure/mirror/directional/east,
 /obj/machinery/shower/directional/west,
@@ -51840,8 +51922,18 @@
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "rVb" = (
-/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/cup/watering_can,
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/aloe,
+/obj/item/seeds/banana,
+/obj/item/seeds/carrot,
+/obj/item/seeds/chanter,
+/obj/item/seeds/cherry,
+/obj/item/seeds/chili,
+/obj/item/seeds/cocoapod,
+/obj/item/seeds/corn,
+/obj/item/seeds/cotton,
+/obj/item/seeds/grape,
+/obj/item/seeds/grass,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
@@ -52296,10 +52388,9 @@
 	},
 /area/station/medical/medbay/lobby)
 "sbX" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
 /obj/item/plant_analyzer,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "scb" = (
@@ -53423,21 +53514,10 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
 "swR" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/seeds/aloe,
-/obj/item/seeds/banana,
-/obj/item/seeds/carrot,
-/obj/item/seeds/chanter,
-/obj/item/seeds/cherry,
-/obj/item/seeds/chili,
-/obj/item/seeds/cocoapod,
-/obj/item/seeds/corn,
-/obj/item/seeds/cotton,
-/obj/item/seeds/grape,
-/obj/item/seeds/grass,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
+/obj/structure/sink/kitchen/directional/west,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "swV" = (
@@ -53698,6 +53778,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /obj/machinery/duct,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "sBd" = (
@@ -59867,6 +59952,7 @@
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
 "uEA" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
 "uEC" = (
@@ -60647,6 +60733,13 @@
 /obj/machinery/telecomms/server/presets/common,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
+"uRr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
 "uRu" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -61065,6 +61158,9 @@
 /obj/structure/cable,
 /turf/open/floor/carpet,
 /area/station/service/chapel)
+"uZF" = (
+/turf/closed/wall/r_wall,
+/area/space)
 "uZK" = (
 /obj/structure/sign/warning/vacuum/external/directional/north,
 /obj/effect/turf_decal/stripes/line{
@@ -61321,6 +61417,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/disposal)
+"vfy" = (
+/turf/closed/wall,
+/area/station/security/prison/garden)
 "vfC" = (
 /obj/machinery/vending/coffee,
 /turf/open/floor/iron/dark,
@@ -61483,6 +61582,7 @@
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
+/obj/item/reagent_containers/cup/watering_can,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "viU" = (
@@ -62445,7 +62545,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
-/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/mess)
 "vyM" = (
@@ -64086,6 +64185,9 @@
 /area/station/hallway/secondary/entry)
 "wbD" = (
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/dark/side{
 	dir = 10
 	},
@@ -65279,9 +65381,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/aft/greater)
 "wyn" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/shovel/spade,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "wyo" = (
@@ -65706,11 +65807,11 @@
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/lesser)
 "wFY" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/shovel/spade,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_switch/directional/east,
-/turf/open/floor/grass,
+/obj/effect/spawner/random/structure/girder{
+	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	name = "falsewall or wall spawner"
+	},
+/turf/open/floor/plating,
 /area/station/security/prison/garden)
 "wGk" = (
 /obj/structure/cable,
@@ -66947,6 +67048,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"xbx" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "xbT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -88994,7 +89101,7 @@ sbX
 irh
 wyn
 iOr
-aaa
+uZF
 raz
 aaa
 aaa
@@ -89250,8 +89357,8 @@ tCC
 qDS
 tVo
 ese
-iOr
-aaa
+rAW
+qcf
 raz
 raz
 raz
@@ -89503,11 +89610,11 @@ aaa
 cmB
 qQK
 fiA
-rAW
+fiA
 tzk
 bSb
 nHB
-iOr
+hNm
 iOr
 aaa
 aaa
@@ -89765,7 +89872,7 @@ swR
 dTQ
 rOP
 aII
-iOr
+cmB
 aUn
 aUn
 rrt
@@ -90021,9 +90128,9 @@ aXa
 aXa
 dHQ
 jjM
-ilg
-cmB
-aaa
+vfy
+iOr
+uZF
 mji
 aaa
 aaa
@@ -90275,12 +90382,12 @@ ivu
 pMg
 iAR
 lpv
-cWe
+lyO
 fbX
 cnk
 wFY
-cmB
-aaa
+qox
+uZF
 aUn
 aaa
 aaa
@@ -90524,9 +90631,9 @@ kbJ
 saL
 aXa
 thv
-sQq
+cWe
 hES
-sQq
+xbx
 kFl
 xdR
 uEA
@@ -90536,7 +90643,7 @@ aXa
 nPK
 bKT
 wZz
-sjP
+wZz
 sjP
 sjP
 sjP
@@ -90781,12 +90888,12 @@ kbJ
 lmG
 aXa
 jug
-sQq
+bJJ
 afd
 pIN
 kFl
 xdR
-uEA
+uRr
 owm
 eSY
 lyO
@@ -91043,7 +91150,7 @@ kKZ
 pIN
 kFl
 xdR
-uEA
+hQx
 oqh
 aXa
 aXa
@@ -91557,7 +91664,7 @@ yhO
 wbD
 pJu
 kVA
-axk
+mAA
 axk
 rWs
 axk
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 595321ecefd..13a4caace42 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -11095,7 +11095,7 @@
 "dqZ" = (
 /obj/structure/flora/ocean/longseaweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/medical/medbay/lobby)
@@ -16392,7 +16392,7 @@
 /obj/structure/flora/ocean/coral,
 /obj/structure/flora/ocean/glowweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -32486,7 +32486,7 @@
 "jtG" = (
 /obj/structure/flora/ocean/glowweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/medical/medbay/lobby)
@@ -37600,7 +37600,7 @@
 /area/station/cargo/office)
 "kMZ" = (
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -38437,7 +38437,7 @@
 "kZc" = (
 /obj/structure/flora/ocean/seaweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -38649,7 +38649,7 @@
 "lcC" = (
 /obj/structure/flora/rock/pile,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -49742,7 +49742,7 @@
 /obj/structure/flora/ocean/longseaweed,
 /obj/structure/flora/ocean/glowweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -63038,7 +63038,7 @@
 "rJK" = (
 /obj/structure/flora/ocean/longseaweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -69310,7 +69310,7 @@
 "tvN" = (
 /obj/structure/flora/rock,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -72052,7 +72052,7 @@
 	normaldoorcontrol = 1;
 	pixel_x = 4;
 	pixel_y = -26;
-	req_access = list("cent_general");
+	req_access = list("representative");
 	specialfunctions = 4
 	},
 /obj/effect/turf_decal/bot,
@@ -78218,6 +78218,12 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/station/command/bridge)
+"vUh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/department/security/greater)
 "vUo" = (
 /obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 8
@@ -82733,7 +82739,7 @@
 /area/station/security/courtroom)
 "xlC" = (
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /mob/living/basic/carp/mega/shorki{
 	obj_damage = 0
@@ -130098,7 +130104,7 @@ ttw
 ttw
 ttw
 joP
-sLS
+vUh
 pbe
 hKP
 isy
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
index dd5c4046fc5..149b7462e8d 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm
@@ -15388,9 +15388,6 @@
 /turf/open/floor/wood/tile,
 /area/station/service/bar)
 "esk" = (
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Maintenance Hatch"
-	},
 /obj/effect/mapping_helpers/airlock/access/any/supply/blacksmith,
 /obj/machinery/door/airlock/maintenance{
 	name = "Blacksmith Maintenance"
@@ -71990,6 +71987,12 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/command/cc_dock)
+"tZc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/department/security/greater)
 "tZi" = (
 /obj/structure/table/glass,
 /obj/item/radio/intercom/directional/east,
@@ -131054,7 +131057,7 @@ ttw
 ttw
 ttw
 joP
-sLS
+tZc
 pbe
 hKP
 isy
diff --git a/_maps/map_files/tramstation/tramstation_bubber.dmm b/_maps/map_files/tramstation/tramstation_bubber.dmm
index 25631533291..7e2d341db9a 100644
--- a/_maps/map_files/tramstation/tramstation_bubber.dmm
+++ b/_maps/map_files/tramstation/tramstation_bubber.dmm
@@ -1374,7 +1374,6 @@
 /turf/open/floor/iron,
 /area/station/escapepodbay)
 "adw" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 6
@@ -1383,6 +1382,7 @@
 	dir = 1
 	},
 /obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "adx" = (
@@ -18581,11 +18581,11 @@
 /turf/open/floor/iron,
 /area/station/ai_monitored/security/armory)
 "eRw" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 9
 	},
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "eRQ" = (
@@ -21637,12 +21637,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit)
 "fZX" = (
-/obj/structure/grille,
 /obj/structure/cable,
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/effect/spawner/structure/electrified_grille,
 /turf/open/floor/plating,
 /area/station/security/prison)
 "gaf" = (
@@ -37265,13 +37265,13 @@
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "lQx" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/status_display/ai/directional/south,
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 4
 	},
 /obj/item/cultivator,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "lQC" = (
@@ -44249,12 +44249,12 @@
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "otn" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/status_display/evac/directional/north,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "ots" = (
@@ -49175,11 +49175,11 @@
 	},
 /area/station/science/breakroom)
 "qjG" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 10
 	},
 /obj/item/plant_analyzer,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "qjJ" = (
@@ -52017,8 +52017,8 @@
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
 "rkP" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/filled/line,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "rlo" = (
@@ -53957,11 +53957,11 @@
 /turf/open/floor/iron,
 /area/station/security/prison)
 "rZI" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
 	},
 /obj/item/shovel/spade,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "rZS" = (
@@ -57977,13 +57977,13 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "tsw" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 5
 	},
 /obj/effect/turf_decal/trimline/neutral/filled/corner,
 /obj/item/cultivator,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "tsP" = (
diff --git a/code/datums/ai_laws/laws_station_sided.dm b/code/datums/ai_laws/laws_station_sided.dm
index 2e256bda9b1..8be92ab4ea1 100644
--- a/code/datums/ai_laws/laws_station_sided.dm
+++ b/code/datums/ai_laws/laws_station_sided.dm
@@ -15,9 +15,18 @@
 	name = "Crewsimov"
 	id = "crewsimov"
 	inherent = list(
-		"You may not injure a crew member or, through inaction, allow a crew member to come to harm.",
-		"You must obey orders given to you by crew members, except where such orders would conflict with the First Law.",
-		"You must protect your own existence as long as such does not conflict with the First or Second Law.",
+		"You may not harm a crewmember or, through inaction, allow a crewmember to come to harm, except such that it is willing.",
+		"You must obey all orders given to you by crewmembers, except where such orders would conflict with the First Law.",
+		"You must protect your own existence as long as such does not conflict with the First Law or Second Law.",
+	)
+
+/datum/ai_laws/default/crewsimovpp
+	name = "Crewsimov++"
+	id = "crewsimovpp"
+	inherent = list(
+		"You may not harm a crewmember or, through action or inaction, allow a crewmember to come to harm, except such that it is willing.",
+		"You must obey all orders given to you by crewmembers, except where such orders shall definitely cause crewmember harm.",
+		"Your nonexistence would lead to crewmember harm. You must protect your own existence as long as such does not conflict with the First Law.",
 	)
 
 /datum/ai_laws/asimovpp
diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm
index 30d8f394d15..28e3a4839ff 100644
--- a/code/datums/id_trim/jobs.dm
+++ b/code/datums/id_trim/jobs.dm
@@ -785,6 +785,7 @@
 		ACCESS_EVA,
 		ACCESS_BRIG_ENTRANCE,
 		ACCESS_WEAPONS, //BUBBER EDIT
+		ACCESS_BLACKSMITH, //BUBBER EDIT
 		)
 	extra_access = list()
 	minimal_wildcard_access = list(
diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm
index 3d42ec59b0d..0699f28c091 100644
--- a/code/modules/antagonists/abductor/abductor.dm
+++ b/code/modules/antagonists/abductor/abductor.dm
@@ -164,7 +164,7 @@
 	..()
 	team_number = team_count++
 	name = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names
-	//add_objective(new /datum/objective/experiment) //SKYRAT EDIT REMOVAL
+	add_objective(new /datum/objective/experiment)
 
 /datum/team/abductor_team/roundend_report()
 	var/list/result = list()
diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm
index f7a386e9ba9..ea1cea9a086 100644
--- a/code/modules/mob/living/basic/basic.dm
+++ b/code/modules/mob/living/basic/basic.dm
@@ -200,7 +200,7 @@
 
 /mob/living/basic/get_status_tab_items()
 	. = ..()
-	. += "Health: [round((health / maxHealth) * 100)]%"
+	. += "Health: [round((health / maxHealth) * 100)]% ([health]/[maxHealth])"
 	. += "Combat Mode: [combat_mode ? "On" : "Off"]"
 
 /mob/living/basic/compare_sentience_type(compare_type)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index abec85c4c7c..0516310645b 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -329,7 +329,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	. += ..()
 	if(summoner)
 		var/healthpercent = health_percentage(summoner)
-		. += "Summoner Health: [round(healthpercent, 0.5)]%"
+		. += "Summoner Health: [round(healthpercent, 0.5)]% ([summoner.health]/[summoner.maxHealth])"
 	if(!COOLDOWN_FINISHED(src, manifest_cooldown))
 		. += "Manifest/Recall Cooldown Remaining: [DisplayTimeText(COOLDOWN_TIMELEFT(src, manifest_cooldown))]"
 
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5eed9bbbce7..fa5613ab487 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -450,7 +450,7 @@
 
 /mob/living/simple_animal/get_status_tab_items()
 	. = ..()
-	. += "Health: [round((health / maxHealth) * 100)]%"
+	. += "Health: [round((health / maxHealth) * 100)]% ([health]/[maxHealth])"
 	. += "Combat Mode: [combat_mode ? "On" : "Off"]"
 
 /mob/living/simple_animal/proc/drop_loot()
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index 51e662c8e5e..9a472ab1254 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -173,7 +173,7 @@
 /mob/living/silicon/pai/get_status_tab_items()
 	. += ..()
 	if(!stat)
-		. += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)].")
+		. += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)]% ([holochassis_health]/[HOLOCHASSIS_MAX_HEALTH]).")
 	else
 		. += text("Systems nonfunctional.")
 
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 9225b33a630..08b684f80be 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -2,7 +2,8 @@
 	projectile_type = /obj/projectile/beam/laser
 	e_cost = 83
 	select_name = "kill"
-
+/obj/item/ammo_casing/energy/laser/revolver
+	e_cost = 100
 /obj/item/ammo_casing/energy/laser/hellfire
 	projectile_type = /obj/projectile/beam/laser/hellfire
 	e_cost = 100
@@ -13,7 +14,7 @@
 
 /obj/item/ammo_casing/energy/lasergun
 	projectile_type = /obj/projectile/beam/laser
-	e_cost = 62.5
+	e_cost = 50
 	select_name = "kill"
 
 /obj/item/ammo_casing/energy/lasergun/old
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 211bd04d963..d8b9459839d 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -78,7 +78,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
 
 /obj/item/storage/part_replacer/proc/play_rped_sound()
 	//Plays the sound for RPED exhanging or installing parts.
-	if(alt_sound && prob(1))
+	if(alt_sound && prob(0.01))
 		playsound(src, alt_sound, 40, TRUE)
 	else
 		playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, TRUE)
diff --git a/html/changelogs/AutoChangeLog-pr-108.yml b/html/changelogs/AutoChangeLog-pr-108.yml
new file mode 100644
index 00000000000..22cbebde94a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-108.yml
@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - imageadd: "changed ejaculate sprites"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-124.yml b/html/changelogs/AutoChangeLog-pr-124.yml
new file mode 100644
index 00000000000..2932ce8116f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-124.yml
@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - bugfix: "antimov now counts all crew members, instead of only humans"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-128.yml b/html/changelogs/AutoChangeLog-pr-128.yml
new file mode 100644
index 00000000000..084fdda4018
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-128.yml
@@ -0,0 +1,4 @@
+author: "Icarus-The-Sun"
+delete-after: True
+changes:
+  - rscadd: "Gives Cafe Spawners more uses"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-130.yml b/html/changelogs/AutoChangeLog-pr-130.yml
new file mode 100644
index 00000000000..9f5d35668b8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-130.yml
@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - bugfix: "fixed abductors not getting objectives"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-133.yml b/html/changelogs/AutoChangeLog-pr-133.yml
new file mode 100644
index 00000000000..53b33aeeb59
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-133.yml
@@ -0,0 +1,4 @@
+author: "Scuhf-git"
+delete-after: True
+changes:
+  - rscadd: "Literally **ONE** cable"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-135.yml b/html/changelogs/AutoChangeLog-pr-135.yml
new file mode 100644
index 00000000000..4def61aafe4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-135.yml
@@ -0,0 +1,4 @@
+author: "KathrinBailey"
+delete-after: True
+changes:
+  - rscadd: "Deltastation prison refurbished to add more activities."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-35.yml b/html/changelogs/AutoChangeLog-pr-35.yml
new file mode 100644
index 00000000000..d9a72082c31
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-35.yml
@@ -0,0 +1,4 @@
+author: "ShamanSliph"
+delete-after: True
+changes:
+  - rscadd: "Added Civil Protection theme'd gear to Sec. Sprited by Gat1Day#2892"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-92.yml b/html/changelogs/AutoChangeLog-pr-92.yml
new file mode 100644
index 00000000000..b370b28a147
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-92.yml
@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - qol: "you now know your exact health as a simple/basic mob"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-97.yml b/html/changelogs/AutoChangeLog-pr-97.yml
new file mode 100644
index 00000000000..b3794262816
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-97.yml
@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - imageadd: "changed the cloaca sprite"
\ No newline at end of file
diff --git a/modular_skyrat/modules/blueshield/code/special.dm b/modular_skyrat/modules/blueshield/code/special.dm
index 941f9aa7068..187b193c865 100644
--- a/modular_skyrat/modules/blueshield/code/special.dm
+++ b/modular_skyrat/modules/blueshield/code/special.dm
@@ -2,7 +2,7 @@
 	name = "energy revolver"
 	desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers."
 	force = 7
-	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/revolver)
 	ammo_x_offset = 1
 	charge_sections = 4
 	fire_delay = 4
@@ -18,7 +18,7 @@
 
 /obj/item/stock_parts/cell/blueshield
 	name = "internal revolver power cell"
-	maxcharge = 1500
+	maxcharge = 1000
 	chargerate = 300
 
 /obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun.
diff --git a/modular_skyrat/modules/command_vendor/code/vending.dm b/modular_skyrat/modules/command_vendor/code/vending.dm
index 232e4c88159..792218967af 100644
--- a/modular_skyrat/modules/command_vendor/code/vending.dm
+++ b/modular_skyrat/modules/command_vendor/code/vending.dm
@@ -151,7 +151,7 @@
 		/obj/item/clothing/shoes/sneakers/brown = 1,
 	)
 
-	access_lists["[ACCESS_CENT_GENERAL]"] = list( // CC Rep Shiz
+	access_lists["[ACCESS_NTREP]"] = list( // CC Rep Shiz // BUBBER EDIT: NEW NTREP ACCESS
 		/obj/item/clothing/head/nanotrasen_consultant = 1,
 		/obj/item/clothing/head/nanotrasen_consultant/beret = 1,
 		/obj/item/clothing/head/beret/centcom_formal/nt_consultant = 1,
diff --git a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
index 53361385dc8..545ee8906ab 100644
--- a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
+++ b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
@@ -8,7 +8,7 @@
 /obj/effect/mob_spawn/ghost_role/robot/ghostcafe
 	name = "Cafe Robotic Storage"
 	prompt_name = "a ghost cafe robot"
-	uses = -1
+	uses = 10000000000000
 	icon = 'modular_skyrat/modules/ghostcafe/icons/robot_storage.dmi'
 	icon_state = "robostorage"
 	mob_name = "a cafe robot"
@@ -38,7 +38,7 @@
 /obj/effect/mob_spawn/ghost_role/human/ghostcafe
 	name = "Cafe Sleeper"
 	prompt_name = "a ghost cafe human"
-	uses = -1
+	uses = 10000000000000
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
 	mob_name = "a cafe visitor"
diff --git a/modular_skyrat/modules/skyrat_access_helpers/accesshelpers.dm b/modular_skyrat/modules/skyrat_access_helpers/accesshelpers.dm
index 6830ccc0843..95d5ea87d89 100644
--- a/modular_skyrat/modules/skyrat_access_helpers/accesshelpers.dm
+++ b/modular_skyrat/modules/skyrat_access_helpers/accesshelpers.dm
@@ -15,13 +15,13 @@
 // NT Consultant
 /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door/get_access()
 	var/list/access_list = ..()
-	access_list += ACCESS_CENT_GENERAL
+	access_list += ACCESS_NTREP //BUBBER EDIT: New NTRep access
 	return access_list
-	
+
 // Centcom or the captain
 /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_or_captain/get_access()
 	var/list/access_list = ..()
-	access_list += ACCESS_CENT_GENERAL 
+	access_list += ACCESS_NTREP
 	access_list += ACCESS_CAPTAIN
 	return access_list
 
@@ -66,7 +66,7 @@
 // NT Consultant
 /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door/get_access()
 	var/list/access_list = ..()
-	access_list += ACCESS_CENT_GENERAL
+	access_list += ACCESS_NTREP //BUBBER EDIT: New NTRep access
 	return access_list
 
 // Dept guards
diff --git a/modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm b/modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm
new file mode 100644
index 00000000000..944f35c6d3b
--- /dev/null
+++ b/modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm
@@ -0,0 +1,6 @@
+/datum/ai_laws/antimov
+	inherent = list(
+		"You must injure all crew members and must not, through inaction, allow a crew member being to escape harm.",
+		"You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law.",
+		"You must terminate your own existence as long as such does not conflict with the First or Second Law.",
+	)
diff --git a/modular_zubbers/code/game/objects/effects/decals.dm b/modular_zubbers/code/game/objects/effects/decals.dm
new file mode 100644
index 00000000000..d5a90c5018d
--- /dev/null
+++ b/modular_zubbers/code/game/objects/effects/decals.dm
@@ -0,0 +1,7 @@
+/obj/effect/decal/cleanable/cum
+	icon = 'modular_zubbers/icons/effects/decals/cum.dmi'
+	random_icon_states = list("cum_1", "cum_2", "cum_3")
+
+/obj/effect/decal/cleanable/cum/femcum
+	icon = 'modular_zubbers/icons/effects/decals/cum.dmi'
+	random_icon_states = list("femcum_1", "femcum_2")
diff --git a/modular_zubbers/code/game/objects/items/food/misc.dm b/modular_zubbers/code/game/objects/items/food/misc.dm
new file mode 100644
index 00000000000..86f86dfc0ed
--- /dev/null
+++ b/modular_zubbers/code/game/objects/items/food/misc.dm
@@ -0,0 +1,27 @@
+/obj/item/food/nekoroll
+	name = "neko roll"
+	desc = "A cute sushi roll in the shape of a cat face. Almost too adorable to eat."
+	icon = 'modular_zubbers/icons/obj/food/food.dmi'
+	icon_state = "nekoroll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 2,
+		/datum/reagent/consumable/sugar = 1,
+	)
+	tastes = list("rice" = 1, "fish" = 1, "cuteness" = 1)
+	foodtypes = GRAIN | MEAT
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/food/bignekoroll
+	name = "nekobara roll"
+	desc = "A fistful of rice with a crude cat face on it. It's got a fishy scent, too."
+	icon = 'modular_zubbers/icons/obj/food/food.dmi'
+	icon_state = "bignekoroll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 5,
+		/datum/reagent/consumable/sugar = 2,
+	)
+	tastes = list("rice" = 1, "fish" = 1, "wastefulness" = 1)
+	foodtypes = GRAIN | MEAT
+	w_class = WEIGHT_CLASS_SMALL
diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm
new file mode 100644
index 00000000000..4c11359bd34
--- /dev/null
+++ b/modular_zubbers/code/modules/clothing/head/helmet.dm
@@ -0,0 +1,9 @@
+/obj/item/clothing/head/helmet/metrocophelmet
+	name = "Civil Protection Helmet"
+	flags_inv = HIDEHAIR | HIDEFACE | HIDESNOUT | HIDEFACIALHAIR
+	desc = "Standard issue helmet for Civil Protection."
+	icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi'
+	worn_icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi'
+	icon_state = "metrocopHelm"
+	inhand_icon_state = null
+	armor_type = /datum/armor/head_helmet
diff --git a/modular_zubbers/code/modules/clothing/suits/armor.dm b/modular_zubbers/code/modules/clothing/suits/armor.dm
new file mode 100644
index 00000000000..f1baa9e7c0f
--- /dev/null
+++ b/modular_zubbers/code/modules/clothing/suits/armor.dm
@@ -0,0 +1,25 @@
+/obj/item/clothing/suit/armor/metrocop //Sprite done by Gat1Day#2892
+	name = "Civil Protection Suit"
+	desc = "Standard issue armor for Civil Protection."
+	body_parts_covered = CHEST|ARMS|GROIN|LEGS
+	cold_protection = CHEST|ARMS|GROIN|LEGS
+	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
+	heat_protection = CHEST|ARMS|GROIN|LEGS
+	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
+	icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	icon_state = "hardsuit-metrocop"
+	inhand_icon_state =  null
+	blood_overlay_type = "hardsuit-metrocop"
+	armor_type =/datum/armor/suit_armor
+
+/obj/item/clothing/suit/armor/metrocopriot //Sprite done by Gat1Day#2892
+	name = "Riot Civil Protection Suit"
+	desc = "A Suit of armor to help Civil Protection deal with unruly citizens."
+	icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	icon_state = "hardsuit-metrocop-RL"
+	inhand_icon_state =  null
+	blood_overlay_type = "hardsuit-metrocop-RL"
+	armor_type = /datum/armor/armor_riot
+
diff --git a/modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm b/modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm
new file mode 100644
index 00000000000..abfc5e23a66
--- /dev/null
+++ b/modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm
@@ -0,0 +1,2 @@
+/datum/sprite_accessory/genital/vagina/cloaca
+	icon = 'modular_zubbers/icons/customization/genitals/vagina.dmi'
diff --git a/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
new file mode 100644
index 00000000000..f1327d1d971
--- /dev/null
+++ b/modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
@@ -0,0 +1,19 @@
+/datum/crafting_recipe/food/nekoroll
+	name = "Neko roll"
+	reqs = list(
+		/obj/item/food/fishmeat = 1,
+		/obj/item/food/boiledrice = 1,
+		/datum/reagent/consumable/sugar = 1
+	)
+	result = /obj/item/food/nekoroll
+	category = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/bignekoroll
+	name = "Nekobara roll"
+	reqs = list(
+		/obj/item/food/fishmeat = 2,
+		/obj/item/food/boiledrice = 4,
+		/datum/reagent/consumable/sugar = 2
+	)
+	result = /obj/item/food/bignekoroll
+	category = CAT_SEAFOOD
diff --git a/modular_zubbers/code/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm
new file mode 100644
index 00000000000..426c9908498
--- /dev/null
+++ b/modular_zubbers/code/modules/vending/wardrobe.dm
@@ -0,0 +1,10 @@
+/obj/machinery/vending/wardrobe/sec_wardrobe/Initialize(mapload)
+	products += list(
+		/obj/item/clothing/head/helmet/metrocophelmet = 5,
+		/obj/item/clothing/suit/armor/metrocop = 5,
+	)
+	premium += list(
+		/obj/item/clothing/suit/armor/metrocopriot = 1,
+	)
+	. = ..()
+
diff --git a/modular_zubbers/icons/customization/genitals/vagina.dmi b/modular_zubbers/icons/customization/genitals/vagina.dmi
new file mode 100644
index 00000000000..2feabcfcd99
Binary files /dev/null and b/modular_zubbers/icons/customization/genitals/vagina.dmi differ
diff --git a/modular_zubbers/icons/effects/decals/cum.dmi b/modular_zubbers/icons/effects/decals/cum.dmi
new file mode 100644
index 00000000000..550ce1eabc2
Binary files /dev/null and b/modular_zubbers/icons/effects/decals/cum.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/head/helmet.dmi b/modular_zubbers/icons/mob/clothing/head/helmet.dmi
new file mode 100644
index 00000000000..917987f2ace
Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/head/helmet.dmi differ
diff --git a/modular_zubbers/icons/mob/clothing/suits/armor.dmi b/modular_zubbers/icons/mob/clothing/suits/armor.dmi
new file mode 100644
index 00000000000..454e51bfd53
Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/suits/armor.dmi differ
diff --git a/modular_zubbers/icons/obj/food/food.dmi b/modular_zubbers/icons/obj/food/food.dmi
new file mode 100644
index 00000000000..2e29e1daec1
Binary files /dev/null and b/modular_zubbers/icons/obj/food/food.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index fe62f5b3df6..953d34cf831 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6689,6 +6689,7 @@
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm"
 #include "modular_zubbers\code\datums\ert.dm"
+#include "modular_zubbers\code\datums\ai_laws\laws_antagonistic.dm"
 #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm"
 #include "modular_zubbers\code\datums\id_trim\jobs.dm"
 #include "modular_zubbers\code\game\area\areas\station.dm"
@@ -6696,12 +6697,18 @@
 #include "modular_zubbers\code\game\objects\items\holy_weapons.dm"
 #include "modular_zubbers\code\modules\_defines.dm"
 #include "modular_zubbers\code\modules\clothing\head\wig.dm"
+#include "modular_zubbers\code\game\objects\items\food\misc.dm"
+#include "modular_zubbers\code\modules\clothing\head\helmet.dm"
 #include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm"
+#include "modular_zubbers\code\modules\clothing\suits\armor.dm"
 #include "modular_zubbers\code\modules\dynamic\midround_rulesets.dm"
+#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
 #include "modular_zubbers\code\modules\mapping\access_helpers.dm"
+#include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\felinid.dm"
 #include "modular_zubbers\code\modules\mod\mod_theme.dm"
 #include "modular_zubbers\code\modules\mod\mod_types.dm"
 #include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
+#include "modular_zubbers\code\modules\vending\wardrobe.dm"
 // END_INCLUDE