diff --git a/mods/_fd/_maps/farfleet_fd/assets.dm b/mods/_fd/_maps/farfleet_fd/assets.dm
index 519b208325e1e..0efe9d63a3dd4 100644
--- a/mods/_fd/_maps/farfleet_fd/assets.dm
+++ b/mods/_fd/_maps/farfleet_fd/assets.dm
@@ -56,14 +56,3 @@
 /obj/floor_decal/industrial/outline/green
 	name = "green outline" //INF, WAS orange outline
 	color = COLOR_GREEN_GRAY //INF, WAS COLOR_GREEN
-
-
-//dogshit\\
-
-/obj/structure/ship_munition/disperser_charge/fire/military
-
-/obj/structure/ship_munition/disperser_charge/explosive/military
-
-/obj/structure/ship_munition/disperser_charge/emp/military
-
-/obj/machinery/computer/ship/disperser/military
diff --git a/mods/_fd/_maps/farfleet_fd/code/farfleet.dm b/mods/_fd/_maps/farfleet_fd/code/farfleet.dm
index dcd6bee008ed8..cc16733909dd2 100644
--- a/mods/_fd/_maps/farfleet_fd/code/farfleet.dm
+++ b/mods/_fd/_maps/farfleet_fd/code/farfleet.dm
@@ -40,9 +40,10 @@
 	name = "Pioneer Corps Gunboat (ICGNV)"
 	id = "awaysite_recon_ship"
 	description = "Garibaldi-class Gunboat, ICCG Pioneer Corps Reconnaissance Craft."
-	prefix = "mods/_maps/farfleet/maps/"
-	suffixes = list("farfleet-1.dmm", "farfleet-2.dmm")
+//	prefix = "mods/_fd/_maps/farfleet/maps/"
+//	suffixes = list("farfleet-1.dmm", "farfleet-2.dmm")
 //	ban_ruins = list(/datum/map_template/ruin/away_site/patrol)
+	mappaths = list("mods/_fd/_maps/farfleet_fd/maps/farfleet-1.dmm", "mods/_fd/_maps/farfleet_fd/maps/farfleet-2.dmm")
 	spawn_cost = 0.5
 	player_cost = 7
 	spawn_weight = 1
diff --git a/mods/_fd/_maps/farfleet_fd/maps/farfleet-1.dmm b/mods/_fd/_maps/farfleet_fd/maps/farfleet-1.dmm
index 9a0e3d69cb818..569cad9ba4744 100644
--- a/mods/_fd/_maps/farfleet_fd/maps/farfleet-1.dmm
+++ b/mods/_fd/_maps/farfleet_fd/maps/farfleet-1.dmm
@@ -281,13 +281,17 @@
 	name = "light fixture";
 	dir = 1
 	},
-/obj/machinery/disperser/middle{
+/obj/machinery/ship_weapon/middle_part/autocannon{
 	dir = 8
 	},
 /turf/simulated/floor/reinforced{
 	map_airless = 1
 	},
 /area/ship/farfleet/command/launcher)
+"aV" = (
+/obj/floor_decal/techfloor,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "aW" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -807,7 +811,6 @@
 /area/ship/farfleet/crew/hallway)
 "cG" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/structure/closet/bombcloset,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/farfleet/command/launcher)
 "cI" = (
@@ -983,9 +986,17 @@
 /turf/simulated/floor/plating,
 /area/ship/farfleet/maintenance/waste)
 "di" = (
+/obj/floor_decal/techfloor/blood_red,
 /obj/floor_decal/industrial/loading{
 	dir = 8
 	},
+/obj/floor_decal/techfloor/blood_red/corner{
+	dir = 4
+	},
+/obj/structure/railing/mapped{
+	dir = 4;
+	icon_state = "railing0-1"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "dk" = (
@@ -1007,6 +1018,28 @@
 /obj/structure/window/boron_reinforced{
 	dir = 1
 	},
+/obj/machinery/conveyor_switch/oneway{
+	id = "bsapc";
+	pixel_x = 20;
+	pixel_y = -8
+	},
+/obj/floor_decal/hull{
+	dir = 9
+	},
+/obj/machinery/button/blast_door{
+	dir = 4;
+	id_tag = "iccg_space";
+	name = "Obstruction Field Disperser Space Shield"
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
+"dn" = (
+/obj/floor_decal/techfloor{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "do" = (
@@ -1432,8 +1465,12 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/engineering/shield)
 "eL" = (
-/obj/machinery/mech_recharger,
-/mob/living/exosuit/premade/powerloader,
+/obj/floor_decal/techfloor{
+	dir = 6
+	},
+/obj/floor_decal/industrial/hatch/red{
+	color = "#940004"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "eN" = (
@@ -1571,11 +1608,11 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/farfleet/command/bridge)
 "fw" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
+/obj/floor_decal/techfloor,
+/obj/floor_decal/industrial/hatch/red{
+	color = "#50a0d3"
 	},
-/obj/structure/ship_munition/disperser_charge/explosive/military,
-/obj/floor_decal/industrial/outline/red,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "fx" = (
@@ -1750,6 +1787,11 @@
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/farfleet/dock)
+"gs" = (
+/obj/floor_decal/industrial/warning/fulltile,
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "gt" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -1774,20 +1816,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/dock)
 "gw" = (
-/obj/floor_decal/industrial/outline/orange,
-/obj/structure/ship_munition/disperser_charge/fire/military,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/floor_decal/techfloor/corner{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "gy" = (
 /obj/floor_decal/industrial/warning/corner{
@@ -1888,12 +1920,15 @@
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/command/eva)
 "gV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/floor_decal/techfloor{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "gX" = (
@@ -2001,16 +2036,12 @@
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/command/eva)
 "hp" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10;
-	pixel_y = 0
+/obj/structure/window/boron_reinforced{
+	dir = 2
 	},
+/obj/floor_decal/techfloor/blood_red,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "hu" = (
@@ -2107,6 +2138,25 @@
 	},
 /turf/simulated/wall/ocp_wall,
 /area/ship/farfleet/engineering/atmospherics)
+"hM" = (
+/obj/structure/window/boron_reinforced{
+	dir = 8
+	},
+/obj/structure/window/boron_reinforced{
+	dir = 1
+	},
+/obj/floor_decal/hull{
+	dir = 9
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/computer/ship/ship_weapon/autocannon{
+	dir = 2;
+	link_range = 8
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "hP" = (
 /obj/overmap/visitable/ship/farfleet,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2177,6 +2227,23 @@
 /obj/paint/dark_gunmetal,
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/engineering/atmospherics)
+"ib" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_y = 0
+	},
+/obj/structure/window/boron_reinforced{
+	dir = 1
+	},
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "ic" = (
 /obj/machinery/light{
 	dir = 8
@@ -2212,6 +2279,25 @@
 /obj/paint/dark_gunmetal,
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/medbay/storage)
+"iw" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_y = 0
+	},
+/obj/machinery/door/window/phoronreinforced{
+	dir = 1;
+	name = "Missile Storage"
+	},
+/obj/floor_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "iz" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
 	dir = 8
@@ -2308,18 +2394,15 @@
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/crew/hallway/lower)
 "iU" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/floor_decal/industrial/outline/grey,
+/obj/item/ammo_magazine/ammobox/autocannon/anti_hull,
+/obj/floor_decal/techfloor/blood_red/corner{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+	dir = 6
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "iV" = (
@@ -2445,6 +2528,12 @@
 /obj/machinery/power/smes/buildable/preset/farfleet/engine_main,
 /turf/simulated/floor,
 /area/ship/farfleet/engineering/fussion/control)
+"jJ" = (
+/obj/floor_decal/techfloor/corner{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "jO" = (
 /obj/machinery/sleeper{
 	dir = 1
@@ -2530,6 +2619,11 @@
 	pixel_x = 24;
 	req_access = list("ACCESS_ICCGN")
 	},
+/obj/floor_decal/techfloor{
+	dir = 4;
+	icon_state = "techfloor_edges"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "kj" = (
@@ -2562,6 +2656,20 @@
 /obj/paint/blue,
 /turf/simulated/floor,
 /area/ship/farfleet/engineering/atmospherics)
+"kv" = (
+/obj/machinery/computer/ship/missiles,
+/obj/structure/window/boron_reinforced{
+	dir = 4
+	},
+/obj/structure/window/boron_reinforced{
+	dir = 1
+	},
+/obj/floor_decal/hull{
+	dir = 5
+	},
+/obj/floor_decal/techfloor/blood_red/corner,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "ky" = (
 /obj/paint/dark_gunmetal,
 /turf/simulated/wall/r_wall,
@@ -2688,9 +2796,6 @@
 /turf/simulated/floor/tiled/white/monotile,
 /area/ship/farfleet/medbay)
 "kT" = (
-/obj/machinery/computer/ship/disperser/military{
-	dir = 1
-	},
 /obj/machinery/firealarm{
 	dir = 1;
 	pixel_y = -24
@@ -2698,6 +2803,17 @@
 /obj/structure/window/boron_reinforced{
 	dir = 4
 	},
+/obj/structure/window/boron_reinforced,
+/obj/floor_decal/hull{
+	dir = 6
+	},
+/obj/floor_decal/techfloor/blood_red/corner{
+	dir = 4
+	},
+/obj/machinery/computer/ship/missiles{
+	pixel_y = 0;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "kU" = (
@@ -3366,7 +3482,7 @@
 /obj/structure/table/steel_reinforced,
 /obj/machinery/button/alternate/door/bolts{
 	pixel_y = 28;
-	name = "Impulse Cannon Access";
+	name = "Fire Control Access";
 	id_tag = "pcannon"
 	},
 /obj/machinery/button/blast_door{
@@ -3487,6 +3603,14 @@
 	pixel_x = -24;
 	pixel_y = -5
 	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 9
+	},
+/obj/floor_decal/industrial/outline/grey,
+/obj/random/ship_ammo_autocannon,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "nZ" = (
@@ -3497,6 +3621,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/wood/maple,
 /area/ship/farfleet/maintenance)
+"ob" = (
+/obj/structure/missile/antispace,
+/obj/structure/missile/antispace{
+	pixel_y = 9
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/floor_decal/techfloor,
+/obj/floor_decal/industrial/outline/orange,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "of" = (
 /obj/paint/hull,
 /turf/simulated/wall/ocp_wall,
@@ -3511,10 +3647,20 @@
 	},
 /area/ship/farfleet/engineering/atmospherics)
 "oi" = (
-/obj/structure/table/steel_reinforced,
 /obj/structure/window/boron_reinforced{
 	dir = 8
 	},
+/obj/structure/window/boron_reinforced,
+/obj/floor_decal/hull{
+	dir = 10
+	},
+/obj/machinery/computer/ship/ship_weapon/autocannon{
+	dir = 1;
+	link_range = 8
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "on" = (
@@ -3553,6 +3699,20 @@
 /obj/paint/ocean,
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/command/bridge)
+"or" = (
+/obj/structure/missile/he{
+	dir = 4
+	},
+/obj/structure/missile/he{
+	dir = 4;
+	pixel_y = 10
+	},
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/floor_decal/industrial/outline/dark_red,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "ow" = (
 /obj/machinery/light{
 	dir = 8
@@ -3888,6 +4048,11 @@
 	dir = 1
 	},
 /obj/machinery/light,
+/obj/structure/window/boron_reinforced,
+/obj/floor_decal/hull,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "qS" = (
@@ -4168,14 +4333,17 @@
 	},
 /area/ship/farfleet/engineering/fussion/control)
 "sP" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+/obj/structure/missile/antispace,
+/obj/structure/missile/antispace{
+	pixel_y = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/floor_decal/industrial/outline/orange,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "sQ" = (
@@ -4184,9 +4352,11 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/maintenance/engine)
 "sR" = (
-/obj/floor_decal/industrial/outline/orange,
-/obj/structure/ship_munition/disperser_charge/fire/military,
-/turf/simulated/floor/tiled/techmaint,
+/obj/structure/window/boron_reinforced{
+	dir = 8
+	},
+/obj/floor_decal/techfloor,
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "sS" = (
 /obj/floor_decal/industrial/outline/blue,
@@ -4258,6 +4428,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/crew/hallway)
+"tj" = (
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "to" = (
 /obj/machinery/door/firedoor,
 /obj/wallframe_spawn/reinforced,
@@ -4266,14 +4442,18 @@
 /turf/simulated/floor/plating,
 /area/ship/farfleet/engineering/hallway)
 "tp" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	icon_state = "map_vent_out";
-	dir = 1
-	},
 /obj/structure/bed/chair,
 /obj/structure/window/boron_reinforced{
 	dir = 1
 	},
+/obj/floor_decal/industrial/outline/blood_red,
+/obj/floor_decal/hull{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "tr" = (
@@ -4359,15 +4539,29 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/crew/hallway)
+"uA" = (
+/obj/machinery/door/blast/regular/open{
+	density = 0;
+	dir = 2;
+	id_tag = "iccg_space_missile";
+	name = "Missile Hatch";
+	opacity = 0
+	},
+/turf/simulated/floor/reinforced{
+	map_airless = 1
+	},
+/area/ship/farfleet/command/launcher)
 "uG" = (
 /turf/simulated/floor/reinforced/carbon_dioxide,
 /area/ship/farfleet/engineering/atmospherics)
 "uH" = (
-/obj/floor_decal/industrial/outline/grey,
-/obj/structure/ship_munition/disperser_charge/emp/military,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 10
+	},
+/obj/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "uI" = (
@@ -4462,6 +4656,20 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
+/obj/structure/window/boron_reinforced,
+/obj/machinery/door/window/phoronreinforced{
+	dir = 4;
+	name = "Missile Control"
+	},
+/obj/floor_decal/hull/corner{
+	dir = 8
+	},
+/obj/floor_decal{
+	color = "grey";
+	icon = 'icons/turf/structures.dmi';
+	icon_state = "rampbottom";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "vp" = (
@@ -4481,8 +4689,18 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/engineering/atmospherics)
 "vq" = (
-/obj/floor_decal/industrial/outline/red,
-/obj/structure/ship_munition/disperser_charge/explosive/military,
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/floor_decal/industrial/hatch/red{
+	color = "#50a0d3"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "vx" = (
@@ -4566,6 +4784,25 @@
 /obj/floor_decal/corner_steel_grid/diagonal,
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/crew/hallway/lower)
+"ws" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_y = 0
+	},
+/obj/structure/window/boron_reinforced,
+/obj/structure/bed/chair{
+	dir = 1
+	},
+/obj/floor_decal/industrial/outline/blue,
+/obj/floor_decal/hull,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "wu" = (
 /obj/machinery/fusion_fuel_injector/mapped{
 	anchored = 0;
@@ -4724,12 +4961,11 @@
 	dir = 8;
 	id = "bsapc"
 	},
-/obj/structure/plasticflaps/airtight,
 /obj/machinery/door/blast/regular/open{
 	density = 0;
 	dir = 4;
 	id_tag = "iccg_space";
-	name = "Impulse Cannon Interior Hatch";
+	name = "Autocannon Interior Hatch";
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -4775,6 +5011,26 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/wood/maple,
 /area/ship/farfleet/maintenance)
+"ys" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_y = 0
+	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 1
+	},
+/obj/floor_decal/industrial/loading{
+	dir = 8
+	},
+/obj/floor_decal/techfloor/blood_red/corner,
+/obj/structure/railing/mapped{
+	dir = 4;
+	icon_state = "railing0-1"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "yF" = (
 /obj/floor_decal/industrial/outline/red,
 /obj/structure/closet/secure_closet/farfleet/fleet/engi,
@@ -4836,7 +5092,13 @@
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/crew/hallway/lower)
 "zp" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/floor_decal/industrial/warning/fulltile,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/railing/mapped{
+	dir = 1;
+	icon_state = "railing0-1"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "zr" = (
@@ -4869,8 +5131,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/crew/brig/emergency_armory)
 "zz" = (
+/obj/random/ship_ammo_autocannon,
+/obj/floor_decal/techfloor,
 /obj/floor_decal/industrial/outline/grey,
-/obj/structure/ship_munition/disperser_charge/emp/military,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "zE" = (
@@ -4886,7 +5149,15 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/farfleet/dock)
 "zJ" = (
-/obj/machinery/light,
+/obj/structure/missile/he{
+	dir = 4
+	},
+/obj/structure/missile/he{
+	dir = 4;
+	pixel_y = 10
+	},
+/obj/floor_decal/techfloor,
+/obj/floor_decal/industrial/outline/dark_red,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "zM" = (
@@ -4961,16 +5232,22 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/command/launcher)
 "Ar" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/machinery/power/apc/critical{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24;
+	req_access = list("ACCESS_ICCGN")
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 23
+/obj/structure/cable,
+/obj/structure/window/boron_reinforced{
+	dir = 2
+	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 6
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	icon_state = "map_vent_out";
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
@@ -5221,6 +5498,19 @@
 /obj/paint/dark_gunmetal,
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/maintenance/waste)
+"CN" = (
+/obj/machinery/door/window/phoronreinforced{
+	dir = 2;
+	name = "Missile Storage"
+	},
+/obj/floor_decal/techfloor/corner{
+	dir = 1
+	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "CU" = (
 /obj/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -5380,13 +5670,27 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/dock)
 "EE" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/floor_decal/industrial/warning/fulltile,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
+"EH" = (
+/obj/machinery/door/blast/regular/open{
+	dir = 2;
+	id_tag = "iccg_space_missile";
+	name = "Missile Hatch";
+	begins_closed = 1;
+	icon_state = "pdoor1"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/turf/simulated/floor/reinforced{
+	map_airless = 1
 	},
-/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "EJ" = (
 /obj/structure/table/reinforced,
@@ -5432,6 +5736,23 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/crew/hallway)
+"ET" = (
+/obj/floor_decal/industrial/warning{
+	dir = 1;
+	icon_state = "warning"
+	},
+/obj/floor_decal/industrial/warning,
+/obj/machinery/light/small/red{
+	name = "light fixture";
+	dir = 2
+	},
+/obj/machinery/ship_weapon/middle_part/autocannon{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced{
+	map_airless = 1
+	},
+/area/ship/farfleet/command/launcher)
 "Fk" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5439,8 +5760,9 @@
 /turf/simulated/floor/tiled/monotile,
 /area/ship/farfleet/crew/hallway/lower)
 "Fl" = (
-/obj/structure/ship_munition/disperser_charge/explosive/military,
-/obj/floor_decal/industrial/outline/red,
+/obj/floor_decal/ul_decals/outline/yellow{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Fo" = (
@@ -5512,6 +5834,19 @@
 /obj/paint/dark_gunmetal,
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/engineering/hallway)
+"Gc" = (
+/obj/structure/missile/emp,
+/obj/structure/missile/emp{
+	pixel_y = 10
+	},
+/obj/floor_decal/techfloor{
+	dir = 9
+	},
+/obj/floor_decal/industrial/outline/blue{
+	color = "#50a0d3"
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "Ge" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -5691,11 +6026,19 @@
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/crew/hallway/lower)
 "GO" = (
-/obj/floor_decal/industrial/outline/red,
-/obj/structure/ship_munition/disperser_charge/explosive/military,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/computer/ship/navigation,
+/obj/structure/window/boron_reinforced{
+	dir = 1
+	},
+/obj/floor_decal/hull{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Hd" = (
@@ -5813,11 +6156,12 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/floor_decal/techfloor{
+	dir = 4;
+	icon_state = "techfloor_edges"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	icon_state = "map-scrubbers";
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -5906,6 +6250,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/command/eva)
+"IR" = (
+/obj/machinery/mass_driver,
+/turf/simulated/floor/reinforced{
+	map_airless = 1
+	},
+/area/ship/farfleet/command/launcher)
 "IV" = (
 /obj/floor_decal/iccglogo/bottom_center,
 /turf/simulated/floor/tiled/dark,
@@ -5928,8 +6278,22 @@
 /obj/machinery/portable_atmospherics/powered/scrubber,
 /turf/simulated/floor/plating,
 /area/ship/farfleet/maintenance)
+"Jq" = (
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/floor_decal/industrial/hatch/orange,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "Jy" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/floor_decal/industrial/warning/fulltile,
+/obj/structure/railing/mapped{
+	dir = 1;
+	icon_state = "railing0-1"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "JB" = (
@@ -6018,7 +6382,9 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/farfleet/dock)
 "JY" = (
-/obj/floor_decal/industrial/hatch/grey,
+/obj/floor_decal/techfloor{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Kd" = (
@@ -6041,6 +6407,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/ship/farfleet/medbay)
+"Kp" = (
+/obj/floor_decal/techfloor,
+/obj/floor_decal/industrial/hatch/orange,
+/obj/machinery/light{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "KA" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -6111,9 +6485,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/obj/machinery/conveyor_switch/oneway{
-	id = "bsapc"
+/obj/floor_decal/techfloor{
+	dir = 1
 	},
+/obj/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Lf" = (
@@ -6130,6 +6505,13 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/structure/window/boron_reinforced{
+	dir = 1
+	},
+/obj/floor_decal/techfloor/blood_red{
+	dir = 5
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Lp" = (
@@ -6174,15 +6556,15 @@
 /turf/simulated/floor/plating,
 /area/ship/farfleet/engineering/fussion/control)
 "LM" = (
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
+/obj/structure/missile/emp,
+/obj/structure/missile/emp{
+	pixel_y = 10
 	},
-/obj/machinery/power/apc/critical{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24;
-	req_access = list("ACCESS_ICCGN")
+/obj/floor_decal/techfloor{
+	dir = 10
+	},
+/obj/floor_decal/industrial/outline/blue{
+	color = "#50a0d3"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
@@ -6287,8 +6669,12 @@
 	},
 /area/ship/farfleet/engineering/fussion/control)
 "MP" = (
-/obj/floor_decal/industrial/outline/blue,
-/obj/structure/ship_munition/disperser_charge/emp/military,
+/obj/structure/window/boron_reinforced{
+	dir = 8
+	},
+/obj/floor_decal/techfloor{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "MZ" = (
@@ -6296,7 +6682,12 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/maintenance/waste)
 "Na" = (
-/obj/structure/closet/bombcloset,
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/floor_decal/industrial/hatch/red{
+	color = "#940004"
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Nk" = (
@@ -6523,7 +6914,7 @@
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/highsecurity/bolted{
 	id_tag = "pcannon";
-	name = "Impulse Cannon"
+	name = "Fire Control"
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/ship/farfleet/command/launcher)
@@ -6609,9 +7000,6 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/farfleet/medbay)
 "Pq" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
 /obj/machinery/door/window/phoronreinforced{
 	dir = 4;
 	name = "Impulse Cannon Control"
@@ -6619,6 +7007,18 @@
 /obj/structure/window/boron_reinforced{
 	dir = 1
 	},
+/obj/floor_decal/hull/corner{
+	dir = 1
+	},
+/obj/floor_decal/techfloor{
+	dir = 4
+	},
+/obj/floor_decal{
+	color = "grey";
+	icon = 'icons/turf/structures.dmi';
+	icon_state = "rampbottom";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "Pr" = (
@@ -6700,9 +7100,14 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/farfleet/dock)
 "PL" = (
+/obj/floor_decal/industrial/warning/fulltile,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "PR" = (
@@ -6862,6 +7267,15 @@
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/engineering/atmospherics)
+"Rb" = (
+/obj/structure/window/boron_reinforced{
+	dir = 8
+	},
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "Rc" = (
 /obj/submap_landmark/joinable_submap/farfleet,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -6969,6 +7383,10 @@
 /obj/paint_stripe/yellow,
 /turf/simulated/floor/plating,
 /area/ship/farfleet/engineering/fussion/control)
+"Sf" = (
+/obj/floor_decal/ul_decals/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "Sj" = (
 /obj/paint/ocean,
 /turf/simulated/wall/r_wall,
@@ -7044,6 +7462,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/ship/farfleet/maintenance/waste)
+"SL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "SX" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -7059,6 +7482,45 @@
 	},
 /turf/simulated/floor/tiled/white/monotile,
 /area/ship/farfleet/medbay/storage)
+"Te" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_y = 0
+	},
+/obj/structure/table/steel_reinforced,
+/obj/structure/window/boron_reinforced{
+	dir = 8
+	},
+/obj/structure/window/boron_reinforced,
+/obj/floor_decal/hull{
+	dir = 10
+	},
+/obj/machinery/button/mass_driver{
+	pixel_x = 5;
+	name = "Starboart Launcher";
+	dir = 4;
+	pixel_y = 9
+	},
+/obj/machinery/button/mass_driver{
+	pixel_x = 5;
+	name = "Port Launcher";
+	dir = 4;
+	pixel_y = -1
+	},
+/obj/machinery/button/blast_door{
+	name = "Missile Hatch Control";
+	id_tag = "iccgn_ship_missile";
+	pixel_y = 4;
+	dir = 4;
+	pixel_x = -4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "Tg" = (
 /obj/machinery/atmospherics/pipe/simple/visible/fuel,
 /obj/machinery/button/blast_door{
@@ -7296,6 +7758,21 @@
 /obj/floor_decal/corner_steel_grid/diagonal,
 /turf/simulated/floor/tiled,
 /area/ship/farfleet/crew/hallway/lower)
+"VD" = (
+/obj/floor_decal/industrial/outline/grey,
+/obj/item/ammo_magazine/ammobox/autocannon/anti_hull,
+/obj/floor_decal/techfloor/blood_red/corner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	icon_state = "map_vent_out";
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "VF" = (
 /obj/machinery/floodlight,
 /turf/simulated/floor/plating,
@@ -7339,14 +7816,15 @@
 	icon_state = "warning"
 	},
 /obj/floor_decal/industrial/warning,
-/obj/machinery/disperser/back{
-	dir = 8
-	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/random/ship_ammo_autocannon,
+/obj/machinery/ship_weapon/back_part/autocannon{
+	dir = 8
+	},
 /turf/simulated/floor/reinforced,
 /area/ship/farfleet/command/launcher)
 "Wc" = (
@@ -7642,6 +8120,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/ship/farfleet/medbay)
+"Yw" = (
+/obj/item/ammo_magazine/ammobox/autocannon/aphe,
+/obj/floor_decal/techfloor/blood_red{
+	dir = 1
+	},
+/obj/floor_decal/techfloor{
+	dir = 1
+	},
+/obj/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "YB" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -7680,6 +8169,15 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/maintenance)
+"YT" = (
+/obj/machinery/mass_driver{
+	dir = 1;
+	icon_state = "mass_driver"
+	},
+/turf/simulated/floor/reinforced{
+	map_airless = 1
+	},
+/area/ship/farfleet/command/launcher)
 "YV" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -7728,13 +8226,18 @@
 /obj/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/disperser/front{
+/obj/machinery/ship_weapon/front_part/autocannon{
 	dir = 8
 	},
 /turf/simulated/floor/reinforced{
 	map_airless = 1
 	},
 /area/ship/farfleet/command/launcher)
+"ZA" = (
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/farfleet/command/launcher)
 "ZD" = (
 /obj/structure/bed/chair/comfy/blue,
 /obj/floor_decal/borderfloorblack{
@@ -7743,12 +8246,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/command/bridge)
 "ZH" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	icon_state = "map_vent_out";
-	dir = 1
-	},
-/obj/structure/ship_munition/disperser_charge/explosive/military,
-/obj/floor_decal/industrial/outline/red,
+/obj/item/ammo_magazine/ammobox/autocannon/aphe,
+/obj/floor_decal/techfloor,
+/obj/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/command/launcher)
 "ZN" = (
@@ -11401,7 +11901,7 @@ aa
 aa
 aa
 gX
-gX
+PW
 PW
 gX
 aa
@@ -11523,7 +12023,7 @@ aa
 aa
 aa
 gX
-gX
+Zt
 Zt
 gX
 aa
@@ -11645,8 +12145,8 @@ aa
 aa
 gE
 gX
-gX
 aU
+ET
 gX
 gE
 aa
@@ -11767,7 +12267,7 @@ aa
 gX
 MM
 mo
-lv
+VU
 VU
 lv
 Al
@@ -11889,7 +12389,7 @@ aa
 gX
 rR
 tZ
-rR
+xT
 xT
 rR
 rR
@@ -12011,7 +12511,7 @@ aa
 gX
 rR
 nY
-uH
+Wh
 Wh
 uH
 rR
@@ -12133,7 +12633,7 @@ Do
 gX
 rR
 KX
-zz
+Wh
 Wh
 zz
 rR
@@ -12254,8 +12754,8 @@ aa
 Do
 rR
 rR
-vg
-di
+ys
+JY
 JY
 di
 rR
@@ -12375,10 +12875,10 @@ aa
 aa
 Do
 rR
-vq
-vg
-TB
-TB
+hM
+Te
+Jy
+gs
 dm
 oi
 rR
@@ -12498,7 +12998,7 @@ Do
 Do
 rR
 GO
-vg
+ws
 zp
 PL
 tp
@@ -12619,7 +13119,7 @@ aa
 Do
 rR
 rR
-vq
+kv
 vg
 Jy
 EE
@@ -12741,12 +13241,12 @@ aa
 Do
 rR
 MP
-TB
-vg
-TB
+sR
+iw
+dn
 gV
-TB
-TB
+CN
+Rb
 sR
 rR
 Do
@@ -12860,18 +13360,18 @@ aa
 aa
 aa
 DO
-Do
 rR
-MP
-TB
-vg
-TB
-gV
-TB
-TB
-sR
 rR
-Do
+tj
+iU
+ib
+SL
+ZA
+hp
+VD
+aV
+rR
+rR
 DO
 aa
 aa
@@ -12982,17 +13482,17 @@ aa
 aa
 aa
 DO
-gX
 rR
-MP
-TB
+Gc
+jJ
+ob
 Li
 ki
 HQ
 Ar
 sP
 gw
-rR
+LM
 rR
 DO
 aa
@@ -13107,13 +13607,13 @@ DO
 rR
 vq
 TB
-TB
+Kp
 rR
 rR
 Oy
 rR
+Jq
 TB
-iU
 fw
 rR
 DO
@@ -13227,15 +13727,15 @@ aa
 DO
 DO
 rR
-vq
+Yw
 TB
 zJ
 rR
 cG
 NJ
 rR
+or
 TB
-hp
 ZH
 rR
 DO
@@ -13346,22 +13846,22 @@ aa
 aa
 aa
 aa
-DO
-gX
-rR
-vq
-TB
+EH
+YT
+uA
+Sf
+JY
 eL
 rR
 te
 bL
 rR
 Na
-LM
+JY
 Fl
-rR
-gX
-DO
+uA
+IR
+EH
 aa
 aa
 aa
diff --git a/mods/_fd/_maps/farfleet_fd/maps/farfleet-2.dmm b/mods/_fd/_maps/farfleet_fd/maps/farfleet-2.dmm
index 573a09a1d56cf..ca2e6c49741fa 100644
--- a/mods/_fd/_maps/farfleet_fd/maps/farfleet-2.dmm
+++ b/mods/_fd/_maps/farfleet_fd/maps/farfleet-2.dmm
@@ -48,8 +48,20 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/ship/farfleet/barracks/armory)
 "aO" = (
-/obj/machinery/photocopier,
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/floor_decal/corner/red{
+	dir = 6
+	},
+/obj/floor_decal/corner/red{
+	dir = 8
+	},
+/obj/structure/filingcabinet{
+	pixel_x = 10
+	},
+/obj/structure/filingcabinet,
+/obj/structure/filingcabinet{
+	pixel_x = -10
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "aP" = (
 /obj/floor_decal/corner/grey_alt/diagonal{
@@ -267,13 +279,14 @@
 /area/ship/farfleet/crew/hallway/upper)
 "cD" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/device/flashlight/lamp{
-	pixel_y = 12
+/obj/floor_decal/corner/red{
+	dir = 6
 	},
-/obj/structure/flora/pottedplant/smallcactus{
-	pixel_y = 7
+/obj/item/modular_computer/laptop{
+	pixel_x = 0;
+	pixel_y = 5
 	},
-/turf/simulated/floor/tiled/dark/monotile,
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "cK" = (
 /obj/paint/dark_gunmetal,
@@ -284,14 +297,21 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/crew/canteen)
 "cW" = (
-/obj/machinery/psi_meter,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/structure/table/steel_reinforced,
+/obj/item/paper_bin{
+	pixel_y = 1
+	},
+/obj/item/device/flashlight/lamp{
+	pixel_y = 15;
+	pixel_x = 0
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "cZ" = (
 /obj/catwalk_plated,
@@ -358,7 +378,13 @@
 	dir = 8;
 	icon_state = "tube_map"
 	},
-/turf/simulated/floor/carpet/purple,
+/obj/floor_decal/corner/red{
+	dir = 9
+	},
+/obj/floor_decal/corner/red{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "dy" = (
 /obj/paint/ocean,
@@ -450,6 +476,9 @@
 /obj/floor_decal/corner/red/three_quarters{
 	dir = 8
 	},
+/obj/structure/bed/chair{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/crew/brig)
 "eo" = (
@@ -548,19 +577,34 @@
 /area/ship/farfleet/barracks)
 "ff" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/modular_computer/laptop,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/turf/simulated/floor/carpet/purple,
+/obj/item/folder/yellow{
+	pixel_x = -4
+	},
+/obj/item/folder/yellow{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/pen/fancy{
+	pixel_x = 4;
+	pixel_y = 2
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "fi" = (
 /obj/paint/ocean,
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/command/hangar_canisters)
 "fr" = (
-/obj/structure/bed/chair/comfy/red,
-/turf/simulated/floor/carpet/purple,
+/obj/structure/bed/chair/comfy/red{
+	dir = 1
+	},
+/obj/floor_decal/corner/red{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "fu" = (
 /turf/simulated/floor/tiled/dark,
@@ -882,8 +926,14 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/maintenance/anomaly)
 "iv" = (
-/obj/structure/closet/secure_closet/farfleet/css,
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/floor_decal/corner/red/mono,
+/obj/structure/backup_server{
+	anchored = 1;
+	pixel_x = 3;
+	pixel_y = 0;
+	density = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "iG" = (
 /obj/floor_decal/industrial/outline/yellow,
@@ -1195,7 +1245,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/carpet/purple,
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "mc" = (
 /obj/floor_decal/industrial/hatch/yellow,
@@ -1590,7 +1640,10 @@
 /area/ship/snz)
 "pM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet/purple,
+/obj/floor_decal/corner/red{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "pN" = (
 /obj/machinery/pointdefense{
@@ -1941,7 +1994,14 @@
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/floor_decal/corner/red{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 4;
+	pixel_y = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "tf" = (
 /obj/structure/handrail{
@@ -2366,7 +2426,10 @@
 	dir = 4;
 	pixel_x = 26
 	},
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/floor_decal/corner/red{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "xc" = (
 /obj/machinery/atmospherics/unary/engine{
@@ -2709,10 +2772,10 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/light/small,
 /obj/structure/sign/iccg{
 	pixel_x = 32
 	},
-/obj/machinery/light/small,
 /turf/simulated/floor/plating,
 /area/ship/snz)
 "Ab" = (
@@ -2907,7 +2970,10 @@
 /turf/simulated/wall,
 /area/ship/farfleet/crew/freezer)
 "BA" = (
-/turf/simulated/floor/carpet/purple,
+/obj/floor_decal/corner/red{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "BI" = (
 /obj/floor_decal/industrial/hatch/yellow,
@@ -2933,7 +2999,8 @@
 "BP" = (
 /obj/structure/bed/chair,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet/purple,
+/obj/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "Cm" = (
 /obj/paint/dark_gunmetal,
@@ -3831,8 +3898,15 @@
 /turf/simulated/floor/tiled/monotile,
 /area/ship/farfleet/crew/hydroponics)
 "Lf" = (
-/obj/machinery/papershredder,
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/machinery/papershredder{
+	pixel_x = -8
+	},
+/obj/floor_decal/corner/red/mono,
+/obj/machinery/photocopier{
+	pixel_y = -3;
+	pixel_x = 11
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "Ll" = (
 /obj/paint/dark_gunmetal,
@@ -4186,8 +4260,17 @@
 /turf/simulated/wall/r_wall,
 /area/ship/farfleet/crew/freezer)
 "Po" = (
-/obj/machinery/psi_monitor,
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/floor_decal/corner/red{
+	dir = 6
+	},
+/obj/floor_decal/corner/red{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 9;
+	pixel_y = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "Pr" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal{
@@ -4293,7 +4376,17 @@
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/dark/monotile,
+/obj/floor_decal/corner/red{
+	dir = 9
+	},
+/obj/floor_decal/corner/red{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 5;
+	pixel_y = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "QR" = (
 /obj/floor_decal/industrial/outline/yellow,
@@ -4687,7 +4780,7 @@
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/terran{
-	name = "Consultant's Office"
+	name = "Interrogation room"
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -4772,6 +4865,10 @@
 /obj/floor_decal/corner/red{
 	dir = 10
 	},
+/obj/structure/closet/secure_closet{
+	req_access = list("ACCESS_ICCGN");
+	anchored = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/farfleet/crew/brig)
 "UQ" = (
@@ -5021,7 +5118,13 @@
 	pixel_x = -22;
 	req_access = list("ACCESS_ICCGN")
 	},
-/turf/simulated/floor/carpet/purple,
+/obj/floor_decal/corner/red{
+	dir = 10
+	},
+/obj/floor_decal/corner/red{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
 /area/ship/farfleet/crew/brig/css)
 "Wx" = (
 /obj/floor_decal/corner/red{
diff --git a/mods/_fd/_maps/gccv_ulyanovsk/code/gccv_ulyanovsk.dm b/mods/_fd/_maps/gccv_ulyanovsk/code/gccv_ulyanovsk.dm
index 94ddb76fc5b49..b636e16826bef 100644
--- a/mods/_fd/_maps/gccv_ulyanovsk/code/gccv_ulyanovsk.dm
+++ b/mods/_fd/_maps/gccv_ulyanovsk/code/gccv_ulyanovsk.dm
@@ -1160,7 +1160,7 @@
 
 /obj/floor_decal/corner/blood_red/bordercee
 	icon_state = "bordercolorcee"
-
+/*
 /obj/floor_decal/hull
 	name = "hull edges"
 	icon = 'mods/_fd/_maps/gccv_ulyanovsk/icons/ulyanovsk.dmi'
@@ -1170,7 +1170,7 @@
 /obj/floor_decal/hull/corner
 	name = "hull corner"
 	icon_state = "hull_corners"
-
+*/
 /obj/floor_decal/techfloor/blood_red
 	name = "techfloor edges"
 	icon = 'mods/_fd/_maps/gccv_ulyanovsk/icons/ulyanovsk.dmi'