diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json
index 531cf53f7f2a..92162ac1a5da 100644
--- a/_maps/configs/inteq_valor.json
+++ b/_maps/configs/inteq_valor.json
@@ -14,25 +14,25 @@
 	"limit": 1,
 	"job_slots": {
 		"Vanguard": {
-			"outfit": "/datum/outfit/job/captain/inteq/naked",
+			"outfit": "/datum/outfit/job/inteq/captain",
 			"officer": true,
 			"slots": 1
 		},
 		"Honorable Corpsman": {
-			"outfit": "/datum/outfit/job/cmo/inteq/naked",
+			"outfit": "/datum/outfit/job/inteq/cmo/empty",
 			"officer": true,
 			"slots": 1
 		},
 		"Corpsman": {
-			"outfit": "/datum/outfit/job/paramedic/inteq/naked",
+			"outfit": "/datum/outfit/job/inteq/paramedic/empty",
 			"slots": 3
 		},
 		"Enforcer": {
-			"outfit": "/datum/outfit/job/security/inteq/naked",
+			"outfit": "/datum/outfit/job/inteq/security/empty",
 			"slots": 2
 		},
 		"Recruit": {
-			"outfit": "/datum/outfit/job/assistant/inteq",
+			"outfit": "/datum/outfit/job/inteq/assistant",
 			"slots": 2
 		}
 	},
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index 8a9c4e7bd2b8..f1eeda68064e 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -35,6 +35,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "ar" = (
@@ -282,11 +283,24 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "cW" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "cZ" = (
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
@@ -301,6 +315,9 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/effect/turf_decal/industrial/traffic/corner{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "dk" = (
@@ -531,8 +548,8 @@
 /obj/item/megaphone/sec,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/suit/armor/vest/alt,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/baton/loaded,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "ey" = (
@@ -610,15 +627,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
-"fo" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
 "fE" = (
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 9
@@ -719,7 +727,7 @@
 /obj/machinery/stasis,
 /obj/effect/turf_decal/box/white,
 /obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "gm" = (
 /obj/machinery/power/smes/shuttle/precharged{
@@ -939,10 +947,10 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "iI" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
 	},
-/obj/effect/turf_decal/industrial/traffic,
+/obj/effect/turf_decal/industrial/traffic/corner,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "iN" = (
@@ -1028,12 +1036,15 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "jG" = (
-/obj/effect/turf_decal/techfloor{
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/traffic{
 	dir = 8
 	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "jL" = (
 /obj/structure/grille,
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -1076,11 +1087,12 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "jT" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 8
+/obj/effect/decal/fakelattice{
+	color = "#808080"
+	},
+/turf/open/floor/plasteel/elevatorshaft{
+	color = "#808080"
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "jU" = (
 /obj/effect/turf_decal/siding/thinplating{
@@ -1142,6 +1154,9 @@
 /obj/structure/cable{
 	icon_state = "4-9"
 	},
+/obj/effect/turf_decal/industrial/traffic/corner{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "kK" = (
@@ -1196,6 +1211,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "ln" = (
@@ -1390,6 +1408,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "mz" = (
@@ -1637,9 +1656,6 @@
 /obj/structure/cable{
 	icon_state = "6-8"
 	},
-/obj/effect/turf_decal/industrial/traffic/corner{
-	dir = 8
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "oC" = (
@@ -1725,6 +1741,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "pz" = (
@@ -1818,12 +1835,7 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "qe" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 4
-	},
+/obj/effect/turf_decal/industrial/traffic,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "qk" = (
@@ -1866,16 +1878,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/traffic/corner,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "qL" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/hallway/port)
 "qQ" = (
-/obj/machinery/shower{
-	dir = 8
-	},
+/obj/machinery/shower,
 /obj/item/soap,
 /obj/structure/curtain/bounty,
 /obj/effect/turf_decal/steeldecal/steel_decals10,
@@ -1983,7 +1992,7 @@
 	pixel_x = -2;
 	pixel_y = 2
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "se" = (
 /obj/effect/turf_decal/siding/thinplating{
@@ -2079,6 +2088,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "sJ" = (
@@ -2220,9 +2232,6 @@
 "un" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/coffeemaker{
-	pixel_y = 3
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "uo" = (
@@ -2317,7 +2326,7 @@
 	},
 /obj/effect/turf_decal/box/white,
 /obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "vx" = (
 /obj/effect/turf_decal/siding/thinplating/dark/end,
@@ -2335,13 +2344,13 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "vy" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "vI" = (
@@ -2354,7 +2363,7 @@
 	},
 /obj/structure/table,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/medical)
 "vK" = (
 /obj/machinery/cryopod{
@@ -2411,6 +2420,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "wA" = (
@@ -2516,6 +2526,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "xs" = (
@@ -2537,12 +2548,12 @@
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/traffic/corner{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/industrial/traffic/corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "xH" = (
@@ -2571,6 +2582,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "xJ" = (
@@ -2769,6 +2781,9 @@
 	dir = 4;
 	name = "Sick Bay"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "zG" = (
@@ -2845,7 +2860,7 @@
 /obj/structure/sign/poster/official/walk{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/medical)
 "zT" = (
 /obj/structure/railing,
@@ -3208,7 +3223,7 @@
 /obj/structure/sign/poster/official/cleanliness{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "DL" = (
 /obj/machinery/door/airlock/external{
@@ -3253,12 +3268,15 @@
 /turf/open/floor/plating,
 /area/ship/hallway/port)
 "Ea" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Ed" = (
@@ -3396,6 +3414,9 @@
 "Fs" = (
 /obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
 /obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Ft" = (
@@ -3435,7 +3456,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light/floor,
-/obj/effect/turf_decal/industrial/traffic,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "FJ" = (
@@ -3688,15 +3708,17 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "IB" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/brown/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
 "IL" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 4
@@ -3897,7 +3919,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/traffic/corner{
+/obj/effect/turf_decal/industrial/traffic{
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
@@ -4012,13 +4034,13 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "LH" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 1
-	},
 /obj/machinery/light/floor,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "LI" = (
@@ -4200,6 +4222,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "ND" = (
@@ -4250,6 +4275,9 @@
 	},
 /obj/effect/turf_decal/siding/thinplating/dark/corner,
 /obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "NM" = (
@@ -4285,6 +4313,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Od" = (
@@ -4539,6 +4568,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Qo" = (
@@ -4870,6 +4900,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Um" = (
@@ -4900,6 +4931,10 @@
 	icon_state = "0-8"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "UC" = (
@@ -5140,7 +5175,7 @@
 	name = "\improper InteqMed Plus"
 	},
 /obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/medical)
 "Xi" = (
 /obj/structure/chair{
@@ -5182,6 +5217,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/arrow_ccw{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Xx" = (
@@ -5268,6 +5306,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Yi" = (
@@ -5412,6 +5451,10 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "ZZ" = (
@@ -5537,7 +5580,7 @@ Td
 xj
 xj
 qG
-Cb
+iI
 Cb
 Cb
 Cb
@@ -5570,7 +5613,7 @@ Td
 xj
 og
 FI
-OM
+qe
 OM
 OM
 OM
@@ -5602,13 +5645,13 @@ Td
 Td
 xj
 rL
-iI
-OM
+uS
+qe
 OM
 OM
 OM
 OM
-Ea
+Kz
 RI
 xj
 Td
@@ -5635,13 +5678,13 @@ Td
 Td
 xj
 sZ
-iI
-OM
+uS
+qe
 OM
 OM
 OM
 OM
-Ea
+Kz
 kL
 xj
 Td
@@ -5668,13 +5711,13 @@ Td
 Td
 xj
 GF
-iI
-OM
+uS
+qe
 OM
 OM
 OM
 OM
-Ea
+Kz
 rL
 xj
 Td
@@ -5702,7 +5745,7 @@ Td
 xj
 Ch
 FI
-OM
+qe
 OM
 OM
 OM
@@ -5736,10 +5779,10 @@ HC
 Zf
 oz
 qe
-Mn
-fo
-IB
-qe
+OM
+OM
+OM
+OM
 Kz
 ZF
 LI
@@ -5769,10 +5812,10 @@ DR
 Qd
 FY
 kH
-ZF
-uS
-Kn
-ZF
+Mn
+Ea
+jG
+Mn
 de
 KU
 zI
@@ -6060,8 +6103,8 @@ gn
 qZ
 DT
 jT
-cW
-cW
+jT
+jT
 Tw
 Lb
 lE
@@ -6073,9 +6116,9 @@ zO
 lE
 WX
 Tw
-cW
-cW
-jG
+jT
+jT
+jT
 Tw
 zA
 mx
@@ -6178,7 +6221,7 @@ Td
 LI
 xJ
 xp
-Fs
+IB
 xs
 LI
 Td
@@ -6210,7 +6253,7 @@ Td
 Ct
 WC
 eN
-xp
+cW
 Fs
 eN
 WC
diff --git a/_maps/shuttles/subshuttles/inteq_haste.dmm b/_maps/shuttles/subshuttles/inteq_haste.dmm
index 7c928fd2b325..9fa14787aaa9 100644
--- a/_maps/shuttles/subshuttles/inteq_haste.dmm
+++ b/_maps/shuttles/subshuttles/inteq_haste.dmm
@@ -3,69 +3,66 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "e" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/space)
-"f" = (
+/obj/machinery/power/shieldwallgen/atmos{
+	dir = 1;
+	id = "haste_holo";
+	anchored = 1
+	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 8;
 	id = "haste_door"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/docking_port/mobile{
 	dir = 8;
 	name = "ambulance dock";
-	port_direction = 4;
-	preferred_direction = 8
+	port_direction = 8;
+	preferred_direction = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
 	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
-"s" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
+"f" = (
+/obj/machinery/power/terminal{
+	dir = 1
 	},
-/obj/structure/railing,
-/obj/item/radio/intercom/wideband/directional/north,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"t" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /obj/structure/cable/yellow{
-	icon_state = "0-8"
+	icon_state = "0-2"
 	},
-/turf/open/floor/engine/hull/interior,
-/area/space)
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "B" = (
-/obj/machinery/power/smes,
-/obj/structure/cable{
+/obj/machinery/power/smes/engineering{
+	charge = 1e+006
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
 	icon_state = "0-5"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "D" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
-	dir = 1
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-10"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/light_switch{
+	pixel_y = 22;
+	pixel_x = 10
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
@@ -86,23 +83,46 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "I" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/structure/rack,
+/obj/item/storage/firstaid/regular{
+	pixel_x = 4;
+	pixel_y = 2
+	},
+/obj/item/storage/firstaid/medical{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/item/defibrillator/loaded{
+	pixel_x = -4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-5"
+	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "J" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "haste_door"
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/obj/machinery/power/shieldwallgen/atmos{
-	id = "haste_holo";
-	anchored = 1
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/structure/window/reinforced{
+	dir = 4
 	},
-/turf/open/floor/engine/hull/interior,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/smes/shuttle/precharged,
+/turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "K" = (
 /obj/structure/grille,
@@ -110,65 +130,47 @@
 /turf/open/floor/plating,
 /area/ship/bridge)
 "M" = (
-/obj/machinery/power/terminal,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
+/obj/structure/bed/roller,
+/obj/effect/turf_decal/spline/fancy/opaque/black/corner{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
 	},
-/obj/structure/cable,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "O" = (
-/obj/machinery/computer/helm{
-	dir = 4
-	},
-/obj/structure/railing{
-	dir = 10
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_y = 22;
-	pixel_x = 9;
-	id = "haste_holo"
-	},
-/obj/machinery/button/door{
-	pixel_x = -2;
-	pixel_y = 23;
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
 	id = "haste_door"
 	},
-/obj/machinery/light_switch{
-	pixel_y = 22;
-	pixel_x = -12
-	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/bridge)
-"R" = (
 /obj/machinery/power/shieldwallgen/atmos{
-	dir = 1;
 	id = "haste_holo";
 	anchored = 1
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id = "haste_door"
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
 	},
-/obj/structure/cable,
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
-"S" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
+"R" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/structure/window/reinforced{
-	dir = 4
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
 /obj/structure/cable/yellow{
-	icon_state = "0-4"
+	icon_state = "1-8"
 	},
-/obj/machinery/power/smes/shuttle/precharged,
 /turf/open/floor/plasteel/tech,
-/area/space)
+/area/ship/bridge)
 "T" = (
 /obj/machinery/power/shuttle/engine/electric{
 	dir = 8
@@ -179,81 +181,72 @@
 /turf/open/floor/engine/hull/interior,
 /area/ship/bridge)
 "X" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/machinery/computer/helm{
+	dir = 4;
+	layer = 3
 	},
-/obj/structure/rack,
-/obj/item/storage/firstaid/regular{
-	pixel_x = 4;
-	pixel_y = 2
+/obj/structure/railing{
+	dir = 10
 	},
-/obj/item/storage/firstaid/medical{
-	pixel_x = -4;
-	pixel_y = 6
+/obj/machinery/button/shieldwallgen{
+	pixel_y = 21;
+	pixel_x = 9;
+	id = "haste_holo"
 	},
-/obj/item/defibrillator/loaded{
-	pixel_x = -4
+/obj/machinery/button/door{
+	pixel_x = -2;
+	pixel_y = 23;
+	id = "haste_door"
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
-"Y" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+"Z" = (
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
-"Z" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/structure/railing,
+/obj/item/radio/intercom/wideband/directional/north{
+	pixel_x = -9
 	},
-/obj/machinery/light/floor,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
 	icon_state = "4-10"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 
 (1,1,1) = {"
-e
-K
+a
 K
 K
 a
 "}
 (2,1,1) = {"
-e
-O
+a
 X
 B
 a
 "}
 (3,1,1) = {"
-e
-s
+a
 Z
 I
 a
 "}
 (4,1,1) = {"
-S
-Y
+a
 D
 M
-F
+a
 "}
 (5,1,1) = {"
-t
 J
 f
 R
+F
+"}
+(6,1,1) = {"
+T
+O
+e
 T
 "}
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index 79acfa569804..48702c064447 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -114,6 +114,14 @@
 	suit_store = /obj/item/flashlight/pen
 	backpack_contents = list(/obj/item/roller=1)
 
+/datum/outfit/job/inteq/paramedic/empty
+	name = "IRMG Corpsman (Inteq) (Naked)"
+
+	head = null
+	suit = null
+	suit_store = null
+	belt = null
+
 ///Security Officers
 
 /datum/outfit/job/inteq/security
@@ -193,3 +201,31 @@
 
 	courierbag = /obj/item/storage/backpack/messenger/inteq
 	backpack_contents = list(/obj/item/melee/classic_baton=1)
+
+// cmo
+
+/datum/outfit/job/inteq/cmo
+	name = "IRMG Honorable Corpsman (Inteq)"
+	jobtype = /datum/job/cmo
+	job_icon = "chiefmedicalofficer"
+
+	belt = /obj/item/storage/belt/medical/webbing/paramedic
+	ears = /obj/item/radio/headset/inteq/captain
+	uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
+	alt_uniform = /obj/item/clothing/under/syndicate/inteq/skirt/corpsman
+	shoes = /obj/item/clothing/shoes/combat
+	suit = /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
+	alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman
+	dcoat = /obj/item/clothing/suit/armor/hos/inteq
+	r_pocket = /obj/item/pda/medical
+
+	chameleon_extras = null
+
+/datum/outfit/job/inteq/cmo/empty
+	name = "IRMG Honorable Corpsman (Inteq) (Naked)"
+	belt = null
+	suit = null
+	alt_suit = null
+	suit_store = null
+	dcoat = null
+	r_pocket = null