diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 3b0edcb044a..3b5de5db5c9 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -302,7 +302,7 @@
 	item_state = "hegemony_helmet"
 	armor = list(
 		melee = ARMOR_MELEE_VERY_HIGH,
-		bullet = ARMOR_BALLISTIC_PISTOL,
+		bullet = ARMOR_BALLISTIC_MEDIUM,
 		laser = ARMOR_LASER_PISTOL,
 		energy = ARMOR_ENERGY_MINOR,
 		bomb = ARMOR_BOMB_PADDED,
diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm
index 2babe63c4c3..816cbbb9b8c 100644
--- a/code/modules/clothing/spacesuits/void/misc.dm
+++ b/code/modules/clothing/spacesuits/void/misc.dm
@@ -459,8 +459,8 @@
 	item_state = "rig0-kataphract"
 	armor = list(
 		melee = ARMOR_MELEE_VERY_HIGH,
-		bullet = ARMOR_BALLISTIC_PISTOL,
-		laser = ARMOR_LASER_SMALL,
+		bullet = ARMOR_BALLISTIC_MEDIUM,
+		laser = ARMOR_LASER_PISTOL,
 		energy = ARMOR_ENERGY_SMALL,
 		bomb = ARMOR_BOMB_PADDED,
 		bio = ARMOR_BIO_SHIELDED,
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index bfcd760fb8b..5ed00144c36 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -498,7 +498,7 @@
 	item_state = "hegemony_armor"
 	armor = list(
 		melee = ARMOR_MELEE_VERY_HIGH,
-		bullet = ARMOR_BALLISTIC_PISTOL,
+		bullet = ARMOR_BALLISTIC_MEDIUM,
 		laser = ARMOR_LASER_MAJOR,
 		energy = ARMOR_ENERGY_MINOR,
 		bomb = ARMOR_BOMB_PADDED
diff --git a/html/changelogs/wickedcybs_kata.yml b/html/changelogs/wickedcybs_kata.yml
new file mode 100644
index 00000000000..7d6d17bbb5c
--- /dev/null
+++ b/html/changelogs/wickedcybs_kata.yml
@@ -0,0 +1,14 @@
+author: WickedCybs
+
+delete-after: True
+
+changes:
+  - tweak: "Adds more reinforced armour layers where it could be easily fit on the Kataphract ship."
+  - tweak: "The Kataphract armoury now includes their flags. These act as flamboyant yet effective spears."
+  - tweak: "The Kataphract armoury now includes Hegemony sluggers. These are crude and very heavy projectile weapons."
+  - rscadd: "Adds a CIC to the Kataphract ship. It's a safer place to control the ship if it ends up being fired on. You can find it in the hallway that leads to the warehouse."
+  - tweak: "Adds a carbon dioxide holding tank to the Kataphract ship to eliminate any reliance on filling and removing cans from the fuel line. It's unlikely they will run out of fuel during a round."
+  - tweak: "The Kataphract medical room has an operating theater and some more medical supplies. This includes a nanomed."
+  - tweak: "The Kataphract Quartermaster role has been renamed to 'Kataphract Specialist'."
+  - tweak: "Some more props were added to the map. A few water fountains and punching bags among other things."
+  - tweak: "The Kataphract body armour had its ballistic protection increased. The voidsuit has had its ballistic and laser protection increased. It's on the level of the average merc voidsuit now."
\ No newline at end of file
diff --git a/maps/away/ships/kataphracts/kataphract_areas.dm b/maps/away/ships/kataphracts/kataphract_areas.dm
index 0b4c440352f..1d54772527a 100644
--- a/maps/away/ships/kataphracts/kataphract_areas.dm
+++ b/maps/away/ships/kataphracts/kataphract_areas.dm
@@ -112,6 +112,10 @@
 	ambience = AMBIENCE_HANGAR
 	sound_env = HANGAR
 
+/area/kataphract_chapter/cic 
+	name = "Kataphract Chapter - Combat Information Center"
+	icon_state = "security"
+
 /area/kataphract_chapter/hull
 	name = "Kataphract Chapter - Hull"
 	icon_state = "blue"
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dm b/maps/away/ships/kataphracts/kataphract_ship.dm
index 43ada74ad8d..666b5bc7d71 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dm
@@ -10,7 +10,9 @@
 
 /obj/effect/overmap/visitable/ship/kataphract_ship
 	name = "kataphract chapter ship"
-	desc = "A large corvette manufactured by a Hephaestus sponsered Hegemonic Guild. This is a Kataphract Chapter ship of the venerable 'Voidbreaker' class, a relative of the more common 'Foundation' class used by their counterparts in the Hegemon's navy. These vessels are rarely seen together and strive for maximum self-suffiency as they are the homes and primary means of transportation for questing Kataphracts and their Hopefuls. They carry enough firepower to deter the common pirate as well as a set of boarding pods for offensive actions." 
+	desc = "A large corvette manufactured by a Hephaestus sponsered Hegemonic Guild. This is a heavily armoured Kataphract Chapter ship of the venerable 'Voidbreaker' class, a relative of the more common 'Foundation' \
+	class used by their counterparts in the Hegemony Navy. These vessels are rarely seen together and strive for maximum self-suffiency as they are the homes and primary means of transportation \
+	for questing Kataphracts and their followers. They usually carry enough firepower to deter the common pirate as well as a set of boarding pods for offensive actions. This ship however has no weapon hardpoints detected. It remains capable due to its sturdy design." 
 	class = "IHKV" //Izweski Hegemony Kataphract Vessel 
 	icon_state = "ship_green"
 	moving_state = "ship_green_moving"
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm
index c65faf788fd..b9ccf4a3afb 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dmm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dmm
@@ -31,9 +31,7 @@
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/trading_area)
 "ai" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
-	},
+/obj/effect/map_effect/window_spawner/borosilicate/reinforced/firedoor,
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
 "aj" = (
@@ -78,10 +76,12 @@
 /obj/item/paper_bin,
 /obj/item/pen,
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /obj/structure/window/reinforced{
-	dir = 8
+	dir = 8;
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -501,7 +501,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
 "bu" = (
-/obj/structure/sign/flag/hegemony,
 /turf/simulated/wall,
 /area/kataphract_chapter/bridge)
 "bv" = (
@@ -528,6 +527,7 @@
 /obj/item/clothing/head/helmet/unathi/hegemony,
 /obj/item/clothing/head/helmet/unathi/hegemony,
 /obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/glasses/sunglasses,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "by" = (
@@ -587,6 +587,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/sign/flag/hegemony{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
 "bF" = (
@@ -668,13 +671,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
 "bR" = (
-/obj/machinery/power/apc{
-	dir = 2;
-	is_critical = 1;
-	name = "south bump";
-	pixel_y = -24;
-	req_access = list(113)
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
@@ -685,6 +681,10 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/machinery/power/apc/super/critical{
+	pixel_y = -24;
+	req_access = list(113)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
 "bS" = (
@@ -1302,7 +1302,8 @@
 "dc" = (
 /obj/machinery/photocopier,
 /obj/structure/window/reinforced{
-	dir = 8
+	dir = 8;
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -1331,6 +1332,7 @@
 	dir = 5;
 	icon_state = "corner_white"
 	},
+/obj/structure/weightlifter,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/sparring_chamber)
 "dg" = (
@@ -1341,6 +1343,7 @@
 	dir = 5;
 	icon_state = "corner_white"
 	},
+/obj/structure/weightlifter,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/sparring_chamber)
 "dh" = (
@@ -1687,6 +1690,25 @@
 	dir = 4;
 	status = 2
 	},
+/obj/structure/table/rack,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/gun/energy/pistol/hegemony,
+/obj/item/gun/energy/pistol/hegemony,
+/obj/item/gun/energy/pistol/hegemony,
+/obj/item/gun/energy/pistol/hegemony,
+/obj/item/gun/energy/pistol/hegemony,
+/obj/item/gun/energy/pistol/hegemony,
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 25;
+	pixel_y = 0;
+	req_one_access = list(113)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "dU" = (
@@ -1697,7 +1719,8 @@
 /obj/machinery/alarm{
 	dir = 4;
 	icon_state = "alarm0";
-	pixel_x = -22
+	pixel_x = -22;
+	req_one_access = list(113)
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/main_ring)
@@ -1990,7 +2013,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/glass{
-	name = "Quartermaster";
+	name = "Armoury";
 	req_access = null;
 	req_one_access = list(113)
 	},
@@ -2038,13 +2061,11 @@
 	dir = 9;
 	icon_state = "corner_white"
 	},
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24;
-	req_access = list(113)
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "eH" = (
@@ -2104,6 +2125,14 @@
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 32
 	},
+/obj/structure/table/rack,
+/obj/item/ammo_casing/slugger,
+/obj/item/ammo_casing/slugger,
+/obj/item/ammo_casing/slugger,
+/obj/item/ammo_casing/slugger,
+/obj/item/gun/projectile/heavysniper/unathi{
+	pixel_y = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "eM" = (
@@ -2289,7 +2318,7 @@
 /area/kataphract_chapter/office)
 "eY" = (
 /obj/machinery/door/airlock/glass{
-	name = "Quartermaster";
+	name = "Armoury";
 	req_access = null;
 	req_one_access = list(113)
 	},
@@ -2344,6 +2373,11 @@
 	pixel_x = -22;
 	req_one_access = list(113)
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "fe" = (
@@ -2367,6 +2401,12 @@
 	dir = 4;
 	icon_state = "map_scrubber_on"
 	},
+/obj/machinery/button/remote/blast_door{
+	id = "kata_armoury";
+	name = "Armoury Entrance Control";
+	pixel_x = -25;
+	req_one_access = list(113)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "fh" = (
@@ -2448,9 +2488,22 @@
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/main_ring)
 "fm" = (
-/obj/structure/foamedmetal,
-/turf/simulated/floor/plating,
-/area/kataphract_chapter/medical)
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/table/standard,
+/obj/machinery/power/apc/super/critical{
+	dir = 1;
+	pixel_y = 24;
+	req_access = list(113)
+	},
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "fn" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 4
@@ -2615,7 +2668,7 @@
 	dir = 2;
 	icon_state = "shutter0";
 	id = "kataqmblast";
-	name = "Quartermaster Shutters";
+	name = "Armoury Shutters";
 	opacity = 0
 	},
 /obj/item/device/gps,
@@ -2625,6 +2678,30 @@
 /obj/item/device/gps,
 /obj/item/device/gps,
 /obj/machinery/door/firedoor/noid,
+/obj/item/device/radio{
+	pixel_x = 9
+	},
+/obj/item/device/radio{
+	pixel_x = 9
+	},
+/obj/item/device/radio{
+	pixel_x = 9
+	},
+/obj/item/device/radio{
+	pixel_x = 9
+	},
+/obj/item/device/radio{
+	pixel_x = 9
+	},
+/obj/item/device/radio{
+	pixel_x = 9
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/recharger,
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "fE" = (
@@ -2891,6 +2968,11 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/filingcabinet/filingcabinet{
+	pixel_x = -40;
+	pixel_y = 1;
+	density = 0
+	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "gn" = (
@@ -2933,34 +3015,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "gq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/table/rack,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/obj/item/device/radio,
-/turf/simulated/floor/tiled/dark,
-/area/kataphract_chapter/commissary)
-"gr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9;
-	pixel_y = 0
+/obj/effect/landmark/entry_point/south{
+	name = "Fore - Captain's Office"
 	},
-/obj/structure/table/rack,
-/obj/item/gun/energy/pistol/hegemony,
-/obj/item/gun/energy/pistol/hegemony,
-/obj/item/gun/energy/pistol/hegemony,
-/obj/item/gun/energy/pistol/hegemony,
-/obj/item/clothing/accessory/holster/hip,
-/obj/item/clothing/accessory/holster/hip,
-/obj/item/clothing/accessory/holster/hip,
-/obj/item/clothing/accessory/holster/hip,
-/obj/item/gun/energy/pistol/hegemony,
-/obj/item/gun/energy/pistol/hegemony,
-/obj/item/clothing/accessory/holster/hip,
-/obj/item/clothing/accessory/holster/hip,
+/turf/simulated/wall/r_wall,
+/area/kataphract_chapter/office)
+"gr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "gs" = (
@@ -3174,6 +3235,7 @@
 	dir = 10;
 	icon_state = "corner_white"
 	},
+/obj/structure/punching_bag,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/sparring_chamber)
 "gK" = (
@@ -3236,9 +3298,15 @@
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "gQ" = (
-/obj/structure/filingcabinet/filingcabinet,
-/turf/simulated/floor/tiled,
-/area/kataphract_chapter/commissary)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6;
+	pixel_y = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "gR" = (
 /obj/machinery/door/airlock/glass{
 	name = "Chapter Cafeteria";
@@ -3326,7 +3394,8 @@
 "ha" = (
 /obj/machinery/computer/ship/helm,
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -3521,7 +3590,7 @@
 /area/kataphract_chapter/main_ring)
 "hv" = (
 /obj/machinery/door/airlock/glass{
-	name = "Quartermaster";
+	name = "Armoury";
 	req_one_access = list(115,113)
 	},
 /obj/machinery/door/blast/shutters{
@@ -3529,7 +3598,7 @@
 	dir = 2;
 	icon_state = "shutter0";
 	id = "kataqmblast";
-	name = "Quartermaster Shutters";
+	name = "Armoury Shutters";
 	opacity = 0
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3833,8 +3902,9 @@
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
 "ik" = (
-/turf/simulated/wall/r_wall,
-/area/kataphract_chapter/engineering)
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/black,
+/turf/simulated/floor/plating,
+/area/kataphract_chapter/starboardpropulsion)
 "il" = (
 /obj/structure/table/standard,
 /obj/machinery/button/remote/blast_door{
@@ -3847,6 +3917,11 @@
 /obj/structure/sign/securearea{
 	pixel_x = 32
 	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -25;
+	req_one_access = list(113)
+	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "im" = (
@@ -4830,7 +4905,12 @@
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboard_solars)
 "jV" = (
-/obj/machinery/atmospherics/portables_connector,
+/obj/machinery/computer/general_air_control/large_tank_control{
+	frequency = 1984;
+	name = "Carbon Dioxide Supply Monitor";
+	output_tag = "kata_out";
+	sensors = list("kata_sensor"="Tank")
+	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
 "jW" = (
@@ -4851,8 +4931,11 @@
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboard_solars)
 "jX" = (
-/turf/simulated/wall/r_wall,
-/area/space)
+/obj/machinery/computer/ship/navigation{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/kataphract_chapter/hangar)
 "jY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 9
@@ -5309,8 +5392,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/hangar)
 "kR" = (
-/obj/structure/sign/flag/hegemony/left{
-	pixel_y = 32
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_x = 0;
+	pixel_y = 24;
+	req_access = list(113)
+	},
+/obj/structure/cable/green{
+	d2 = 8;
+	icon_state = "0-8"
 	},
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
@@ -5353,7 +5444,8 @@
 /obj/machinery/recharger,
 /obj/structure/window/reinforced{
 	dir = 4;
-	icon_state = "rwindow"
+	icon_state = "rwindow";
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -5564,7 +5656,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/tank/air,
+/obj/machinery/atmospherics/pipe/tank/air{
+	start_pressure = 3000
+	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/engineering)
 "lv" = (
@@ -5723,19 +5817,14 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/structure/window/reinforced{
 	dir = 4;
-	icon_state = "rwindow"
+	icon_state = "rwindow";
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
 "lS" = (
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide{
-	start_pressure = 8000.63
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/kataphract_chapter/starboardpropulsion)
+/turf/simulated/wall/r_wall,
+/area/kataphract_chapter/trading_area)
 "lT" = (
 /obj/machinery/atmospherics/pipe/tank/air{
 	dir = 8
@@ -6150,9 +6239,13 @@
 /obj/machinery/body_scanconsole{
 	dir = 4
 	},
-/obj/structure/sign/flag/hegemony/right{
+/obj/structure/closet/walllocker/medical/secure{
+	name = "O- Blood Locker";
+	req_access = list(113);
 	pixel_y = 32
 	},
+/obj/item/reagent_containers/blood/OMinus,
+/obj/item/reagent_containers/blood/OMinus,
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "mO" = (
@@ -6245,8 +6338,8 @@
 /obj/structure/bed,
 /obj/item/bedsheet/orange,
 /obj/effect/ghostspawpoint/repeat{
-	identifier = "kataphract_quartermaster";
-	name = "igs kataphract QM"
+	identifier = "kataphract_specialist";
+	name = "igs kataphract specialist"
 	},
 /turf/simulated/floor/wood,
 /area/kataphract_chapter/dorms)
@@ -6365,9 +6458,18 @@
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/portpropulsion)
 "nh" = (
-/obj/effect/map_effect/window_spawner/full/reinforced,
+/obj/machinery/door/airlock/medical{
+	name = "Operating Theatre";
+	req_access = list(113)
+	},
 /obj/machinery/door/firedoor/noid,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "ni" = (
 /obj/effect/floor_decal/corner/red{
@@ -6433,6 +6535,7 @@
 	dir = 10;
 	icon_state = "corner_white"
 	},
+/obj/structure/punching_bag,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/sparring_chamber)
 "nn" = (
@@ -6517,7 +6620,7 @@
 	dir = 2;
 	icon_state = "shutter0";
 	id = "kataqmblast";
-	name = "Quartermaster Shutters";
+	name = "Armoury Shutters";
 	opacity = 0
 	},
 /obj/machinery/recharger,
@@ -6632,7 +6735,9 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/portable_atmospherics/canister/air{
+	start_pressure = 8000.63
+	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/engineering)
 "nE" = (
@@ -6668,6 +6773,20 @@
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/wood,
 /area/kataphract_chapter/office)
+"oa" = (
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/vending/medical{
+	density = 0;
+	pixel_x = -1;
+	pixel_y = 31;
+	req_access = list(113)
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "op" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5;
@@ -6920,6 +7039,16 @@
 	},
 /turf/simulated/floor,
 /area/kataphract_chapter/entry)
+"qu" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/kataphract_chapter/trading_area)
 "qA" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Cell";
@@ -6971,6 +7100,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/warehouse)
+"rc" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'SERVER ROOM'.";
+	name = "TELECOMMS ROOM - COLD!";
+	pixel_y = -32
+	},
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/plating,
+/area/kataphract_chapter/medical)
 "rd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7065,6 +7208,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/entry)
+"rx" = (
+/obj/machinery/door/airlock/highsecurity{
+	name = "CIC";
+	req_one_access = list(113)
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "rA" = (
 /obj/machinery/power/solar,
 /obj/structure/cable/yellow{
@@ -7090,6 +7247,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/table/rack,
 /obj/item/inflatable_dispenser,
+/obj/item/storage/bag/inflatable,
 /obj/item/clothing/gloves/yellow/specialu,
 /obj/item/clothing/gloves/yellow/specialu,
 /obj/item/clothing/gloves/yellow/specialu,
@@ -7125,6 +7283,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
+"st" = (
+/obj/structure/table/rack,
+/obj/item/melee/hammer/powered/hegemony,
+/obj/item/melee/hammer/powered/hegemony,
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/commissary)
 "sB" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10;
@@ -7159,6 +7323,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/portpropulsion)
+"sU" = (
+/obj/machinery/atmospherics/binary/pump/high_power{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/kataphract_chapter/starboardpropulsion)
 "sX" = (
 /obj/structure/cable/green{
 	d2 = 4;
@@ -7197,7 +7367,11 @@
 	name = "Telecommunications"
 	},
 /obj/machinery/door/firedoor/noid,
-/turf/simulated/floor/plating,
+/obj/structure/plasticflaps/airtight,
+/turf/simulated/floor/tiled{
+	name = "cooled floor";
+	temperature = 278
+	},
 /area/kataphract_chapter/medical)
 "tH" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -7224,6 +7398,7 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/machinery/meter,
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/portpropulsion)
 "ud" = (
@@ -7249,6 +7424,22 @@
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
+"ug" = (
+/obj/machinery/door/airlock/glass{
+	name = "Armoury";
+	req_one_access = list(115,113)
+	},
+/obj/machinery/door/firedoor/noid,
+/obj/machinery/door/blast/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "shutter0";
+	id = "kataqmblast";
+	name = "Armoury Shutters";
+	opacity = 0
+	},
+/turf/simulated/floor/tiled,
+/area/kataphract_chapter/commissary)
 "uh" = (
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/tiled/dark,
@@ -7462,6 +7653,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
+"wA" = (
+/obj/machinery/vending/wallmed2{
+	req_access = null;
+	pixel_y = -31
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "wB" = (
 /obj/effect/landmark/entry_point/west{
 	name = "starboard, cargo fore side"
@@ -7476,11 +7674,13 @@
 	req_one_access = null
 	},
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /obj/structure/window/reinforced{
 	dir = 4;
-	icon_state = "rwindow"
+	icon_state = "rwindow";
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -7504,11 +7704,18 @@
 /area/shuttle/kataphract_shuttle/engine_compartment)
 "wT" = (
 /obj/structure/table/glass,
+/obj/item/roller{
+	pixel_y = 3
+	},
 /obj/item/storage/firstaid/toxin,
 /obj/item/bodybag/cryobag,
 /obj/item/reagent_containers/hypospray,
-/obj/item/reagent_containers/glass/bottle/inaprovaline,
 /obj/item/storage/pill_bottle/dylovene,
+/obj/item/storage/belt/medical/first_responder,
+/obj/item/auto_cpr{
+	pixel_x = 6;
+	pixel_y = -1
+	},
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "xm" = (
@@ -7626,16 +7833,18 @@
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
 "yk" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_x = 0;
+/obj/machinery/iv_drip,
+/obj/machinery/button/switch/windowtint{
+	id = "katasurgery";
+	pixel_x = 8;
 	pixel_y = 24;
-	req_access = list(113)
+	req_access = list(66)
 	},
-/obj/structure/cable/green{
-	d2 = 4;
-	icon_state = "0-4"
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/sink/kitchen{
+	dir = 8;
+	name = "surgical sink";
+	pixel_x = 20
 	},
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
@@ -7651,6 +7860,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/noid,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/medical)
 "yr" = (
@@ -7694,7 +7905,8 @@
 "yK" = (
 /obj/machinery/computer/ship/engines,
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -7721,9 +7933,20 @@
 /turf/simulated/floor/wood,
 /area/kataphract_chapter/trading_area)
 "yY" = (
-/obj/structure/plasticflaps/airtight,
-/turf/simulated/floor/plating,
-/area/kataphract_chapter/medical)
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/kataphract_chapter/trading_area)
 "zi" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 8
@@ -7775,6 +7998,9 @@
 /area/kataphract_chapter/hangar)
 "Aa" = (
 /obj/machinery/iv_drip,
+/obj/structure/sign/flag/hegemony/left{
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "Af" = (
@@ -7834,6 +8060,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
+"Al" = (
+/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
+	frequency = 1984;
+	id_tag = "kata_out";
+	dir = 1
+	},
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/kataphract_chapter/starboardpropulsion)
 "Ap" = (
 /obj/machinery/light{
 	dir = 1
@@ -7859,6 +8093,11 @@
 "Aw" = (
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
+"Ax" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "AC" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10;
@@ -7926,9 +8165,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/kataphract_shuttle/main_compartment)
 "AZ" = (
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide{
-	start_pressure = 8000.63
-	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -8032,6 +8268,16 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/brig)
+"Cl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10;
+	pixel_y = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "Cm" = (
 /obj/effect/landmark/entry_point/east{
 	name = "aft, bridge port side"
@@ -8077,6 +8323,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/aft_hall)
+"CL" = (
+/obj/machinery/computer/ship/sensors{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "CS" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -8098,7 +8350,8 @@
 /obj/structure/table/reinforced/steel,
 /obj/item/device/flashlight/lamp,
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -8171,6 +8424,11 @@
 	pixel_x = -27;
 	req_one_access = list(113)
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/commissary)
 "DX" = (
@@ -8308,6 +8566,14 @@
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
+"EQ" = (
+/obj/machinery/alarm{
+	pixel_y = 25;
+	req_one_access = list(113)
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "Fc" = (
 /obj/structure/table/steel,
 /obj/structure/flora/pottedplant/random{
@@ -8363,8 +8629,10 @@
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/aft_hall)
 "FK" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled{
+	name = "cooled floor";
+	temperature = 278
+	},
 /area/kataphract_chapter/medical)
 "FL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -8380,6 +8648,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/brig)
+"FP" = (
+/obj/structure/sink/kitchen{
+	name = "water fountain";
+	pixel_y = 26;
+	desc = "A fountain designed for drinking. It could be used to wash things in a pinch."
+	},
+/turf/simulated/floor/tiled,
+/area/kataphract_chapter/main_ring)
 "FS" = (
 /obj/structure/janitorialcart/full,
 /obj/effect/floor_decal/corner/purple/full{
@@ -8452,17 +8728,30 @@
 /turf/simulated/floor/airless,
 /area/kataphract_chapter/port_solars_array)
 "Gx" = (
-/obj/structure/closet/walllocker/medical/secure{
-	name = "O- Blood Locker";
-	pixel_x = -32;
-	req_access = list(113)
-	},
-/obj/item/reagent_containers/blood/OMinus,
-/obj/item/reagent_containers/blood/OMinus,
 /obj/machinery/alarm{
 	pixel_y = 25;
 	req_one_access = list(113)
 	},
+/obj/structure/closet/walllocker/medical/secure{
+	name = "Theatre Locker";
+	pixel_x = -32;
+	req_access = list(113)
+	},
+/obj/item/reagent_containers/spray/cleaner{
+	desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+	icon_state = "sterilesprayblue";
+	name = "surgery cleaner";
+	pixel_y = -7;
+	pixel_x = 10
+	},
+/obj/item/storage/box/gloves,
+/obj/item/storage/box/masks{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/blood/OMinus{
+	pixel_x = -7
+	},
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "GG" = (
@@ -8471,6 +8760,13 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/shuttle/kataphract_shuttle/engine_compartment)
+"GH" = (
+/obj/machinery/air_sensor{
+	frequency = 1984;
+	id_tag = "kata_sensor"
+	},
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/kataphract_chapter/starboardpropulsion)
 "GO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -8493,7 +8789,7 @@
 /area/kataphract_chapter/hangar)
 "GV" = (
 /obj/machinery/door/airlock/glass{
-	name = "Quartermaster";
+	name = "Armoury";
 	req_one_access = list(115,113)
 	},
 /obj/machinery/door/firedoor/noid,
@@ -8555,6 +8851,20 @@
 /obj/machinery/hologram/holopad/long_range,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
+"HG" = (
+/obj/structure/bed/roller,
+/obj/structure/curtain/open/medical,
+/obj/structure/sign/flag/hegemony/right{
+	pixel_y = -32
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
+"HH" = (
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "HK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
@@ -8568,9 +8878,51 @@
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
 "HS" = (
-/obj/machinery/atmospherics/pipe/tank/air,
+/obj/machinery/atmospherics/pipe/tank/air{
+	start_pressure = 3000
+	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/engineering)
+"HX" = (
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28;
+	req_one_access = list(113)
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/structure/table/glass,
+/obj/item/storage/firstaid/adv{
+	pixel_x = -3;
+	pixel_y = 4
+	},
+/obj/item/storage/firstaid/fire{
+	pixel_x = 3;
+	pixel_y = 4
+	},
+/obj/item/storage/firstaid/regular{
+	pixel_x = -4
+	},
+/obj/item/storage/firstaid/o2{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/item/reagent_containers/hypospray/autoinjector/survival{
+	pixel_y = 5;
+	pixel_x = 18
+	},
+/obj/item/reagent_containers/hypospray/autoinjector/survival{
+	pixel_y = 5;
+	pixel_x = 18
+	},
+/obj/item/reagent_containers/hypospray/autoinjector/survival{
+	pixel_y = 5;
+	pixel_x = 18
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "Ig" = (
 /obj/effect/landmark{
 	name = "carpspawn"
@@ -8654,6 +9006,21 @@
 /obj/structure/bed/stool/padded/red,
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/cafeteria)
+"Jl" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/rack,
+/obj/item/material/twohanded/pike/flag/hegemony,
+/obj/item/material/twohanded/pike/flag/hegemony,
+/obj/item/shield/energy/hegemony,
+/obj/item/shield/energy/hegemony,
+/obj/item/shield/energy/hegemony,
+/obj/item/shield/energy/hegemony,
+/obj/item/shield/energy/hegemony,
+/obj/item/shield/energy/hegemony,
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/commissary)
 "Jr" = (
 /obj/machinery/door/airlock/glass{
 	name = "Chapter Trading Area"
@@ -8774,9 +9141,6 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
 "Kq" = (
@@ -8815,6 +9179,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
+"Kz" = (
+/obj/structure/bed/stool/chair/office/bridge/generic{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "KB" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -8889,8 +9259,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/kataphract_shuttle/main_compartment)
 "Lq" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/black,
 /obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
 "LD" = (
@@ -8934,6 +9306,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
+"LM" = (
+/obj/effect/floor_decal/corner/yellow{
+	dir = 5;
+	icon_state = "corner_white"
+	},
+/obj/structure/sink/kitchen{
+	name = "water fountain";
+	pixel_y = 26;
+	desc = "A fountain designed for drinking. It could be used to wash things in a pinch."
+	},
+/turf/simulated/floor/tiled,
+/area/kataphract_chapter/entry)
 "LS" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
@@ -8974,6 +9358,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
+"Mm" = (
+/obj/effect/map_effect/window_spawner/borosilicate/reinforced/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/black,
+/turf/simulated/floor/plating,
+/area/kataphract_chapter/starboardpropulsion)
 "Mv" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/railing/mapped{
@@ -9130,6 +9519,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/aft_hall)
+"Nr" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/plating,
+/area/kataphract_chapter/medical)
 "Nv" = (
 /obj/structure/lattice/catwalk/indoor,
 /obj/structure/bed/handrail{
@@ -9143,6 +9541,12 @@
 	},
 /turf/unsimulated/floor/plating,
 /area/shuttle/kataphract_shuttle/main_compartment)
+"NB" = (
+/obj/effect/landmark/entry_point/south{
+	name = "Fore, showers"
+	},
+/turf/simulated/wall/r_wall,
+/area/kataphract_chapter/toilets)
 "NF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -9200,6 +9604,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/bridge)
+"NZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "Oa" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 6;
@@ -9381,6 +9791,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/entry)
+"PH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "PI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9450,6 +9869,16 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/engineering)
+"QB" = (
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24;
+	req_access = list(113)
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled,
+/area/kataphract_chapter/commissary)
 "QD" = (
 /obj/structure/flora/pottedplant,
 /obj/effect/floor_decal/corner/red{
@@ -9515,6 +9944,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/main_ring)
 "Rm" = (
@@ -9528,20 +9959,17 @@
 /turf/unsimulated/wall/fakepdoor,
 /area/kataphract_chapter/hangar)
 "Ru" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/table/rack,
-/obj/item/shield/energy/hegemony,
-/obj/item/shield/energy/hegemony,
-/obj/item/shield/energy/hegemony,
-/obj/item/shield/energy/hegemony,
-/obj/item/shield/energy/hegemony,
-/obj/item/shield/energy/hegemony,
+/obj/structure/bed/stool/chair/office/bridge/generic{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/kataphract_chapter/commissary)
+/area/kataphract_chapter/cic)
 "Rv" = (
-/obj/machinery/iv_drip,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
+/obj/effect/map_effect/window_spawner/full/reinforced/polarized{
+	id = "katasurgery"
+	},
+/obj/machinery/door/firedoor/noid,
+/turf/simulated/floor/tiled/dark/full,
 /area/kataphract_chapter/medical)
 "Rz" = (
 /turf/space,
@@ -9549,7 +9977,8 @@
 "RA" = (
 /obj/machinery/computer/ship/sensors,
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/bridge)
@@ -9629,22 +10058,7 @@
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
 "Sp" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/adv{
-	pixel_x = -3;
-	pixel_y = 4
-	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = 3;
-	pixel_y = 4
-	},
-/obj/item/storage/firstaid/regular{
-	pixel_x = -4
-	},
-/obj/item/storage/firstaid/o2{
-	pixel_x = 6;
-	pixel_y = -4
-	},
+/obj/machinery/optable,
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "Sw" = (
@@ -9746,6 +10160,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/janitorial)
+"To" = (
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "Tp" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -9776,9 +10202,6 @@
 /area/shuttle/kataphract_shuttle/main_compartment)
 "TF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/table/rack,
-/obj/item/melee/hammer/powered/hegemony,
-/obj/item/melee/hammer/powered/hegemony,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "TH" = (
@@ -9813,7 +10236,7 @@
 /obj/item/clothing/head/helmet/space/void/kataphract/spec,
 /obj/item/clothing/mask/breath,
 /obj/machinery/door/window{
-	name = "Knight Quartermaster";
+	name = "Specialist";
 	req_one_access = list(114,116)
 	},
 /obj/structure/window/reinforced{
@@ -9862,6 +10285,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/kataphract_shuttle/main_compartment)
+"Ub" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "Ul" = (
 /obj/machinery/computer/shuttle_control/explore/kataphract_transport{
 	dir = 4
@@ -9889,7 +10318,8 @@
 "UE" = (
 /obj/structure/table/reinforced/steel,
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	maxhealth = 80
 	},
 /obj/item/modular_computer/handheld/pda,
 /turf/simulated/floor/tiled/dark,
@@ -9914,9 +10344,11 @@
 "UU" = (
 /obj/structure/cable/green{
 	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
+	d2 = 4;
+	icon_state = "1-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/kataphract_chapter/medical)
 "Ve" = (
@@ -10046,13 +10478,10 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/high{
+/obj/machinery/power/apc/super/critical{
 	pixel_y = -24;
 	req_access = list(113)
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/starboardpropulsion)
 "WV" = (
@@ -10109,6 +10538,15 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/shuttle/kataphract_shuttle/engine_compartment)
+"XQ" = (
+/obj/machinery/light,
+/obj/structure/table/standard,
+/obj/item/storage/box/fancy/tray,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/kataphract_chapter/medical)
 "XS" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -10175,6 +10613,12 @@
 /obj/machinery/meter,
 /turf/simulated/floor/plating,
 /area/kataphract_chapter/engineering)
+"Yr" = (
+/obj/machinery/computer/ship/engines{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "Ys" = (
 /obj/machinery/light{
 	dir = 8
@@ -10194,6 +10638,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/kataphract_shuttle/engine_compartment)
+"Yx" = (
+/turf/simulated/wall/r_wall,
+/area/kataphract_chapter/cic)
 "YE" = (
 /obj/structure/table/rack,
 /obj/item/clothing/shoes/caligae/armor,
@@ -10203,6 +10650,7 @@
 /obj/item/clothing/head/helmet/unathi/hegemony,
 /obj/item/clothing/head/helmet/unathi/hegemony,
 /obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/glasses/sunglasses,
 /turf/simulated/floor/tiled/dark,
 /area/kataphract_chapter/commissary)
 "YP" = (
@@ -10226,6 +10674,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/hangar)
+"YS" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "YT" = (
 /obj/structure/table/wood/gamblingtable,
 /obj/item/spacecash/c200,
@@ -10234,6 +10693,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/kataphract_chapter/dorms)
+"YW" = (
+/obj/machinery/light,
+/obj/structure/bed/stool/chair/office/bridge/generic{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "YX" = (
 /obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -10247,6 +10713,12 @@
 /obj/machinery/door/firedoor/noid,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/kataphract_shuttle/engine_compartment)
+"YZ" = (
+/obj/machinery/computer/ship/helm{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/kataphract_chapter/cic)
 "Ze" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 4
@@ -10259,12 +10731,6 @@
 	icon_state = "corner_white"
 	},
 /obj/effect/floor_decal/corner/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -10275,6 +10741,12 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/kataphract_chapter/main_ring)
 "Zf" = (
@@ -20114,21 +20586,21 @@ iB
 iB
 iB
 iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
+kr
+ig
+ig
+Ro
+ig
+ig
+ig
+Fn
+ig
+ig
+ig
+MZ
+ig
+ig
+kr
 iB
 iB
 iB
@@ -20250,7 +20722,7 @@ Ig
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cn
@@ -20276,21 +20748,21 @@ iB
 iB
 iB
 iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
-iB
+kr
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+kr
 iB
 iB
 iB
@@ -20412,7 +20884,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cw
@@ -20437,23 +20909,23 @@ yM
 iB
 iB
 iB
-iB
+ou
 kr
 ig
 ig
 ig
-Ro
-ig
-ig
-Fn
 ig
 ig
 ig
-MZ
+ig
+ig
+ig
+ig
+ig
 ig
 ig
 kr
-iB
+kr
 iB
 iB
 iB
@@ -20574,7 +21046,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cx
@@ -20599,7 +21071,7 @@ jv
 ey
 mZ
 Pb
-jX
+ou
 kr
 aa
 aa
@@ -20736,7 +21208,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cy
@@ -20761,7 +21233,7 @@ Pb
 Pb
 yM
 Pb
-jX
+ou
 kr
 Yg
 aa
@@ -20898,7 +21370,7 @@ iB
 iB
 iB
 iB
-iB
+NB
 jg
 cn
 cz
@@ -21060,7 +21532,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cz
@@ -21086,7 +21558,7 @@ Sy
 jj
 jL
 ou
-ik
+kr
 aa
 aa
 ae
@@ -21222,7 +21694,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cy
@@ -21248,7 +21720,7 @@ yw
 jm
 yw
 ou
-ik
+kr
 aa
 ae
 ae
@@ -21271,7 +21743,7 @@ kr
 pj
 kr
 kr
-iB
+JF
 iB
 iB
 iB
@@ -21384,7 +21856,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cx
@@ -21410,7 +21882,7 @@ iO
 jo
 DE
 Ea
-ia
+kN
 aa
 ae
 ae
@@ -21434,7 +21906,7 @@ kr
 kr
 kr
 JF
-iB
+JF
 iB
 iB
 iB
@@ -21546,7 +22018,7 @@ iB
 iB
 iB
 iB
-iB
+jg
 jg
 cn
 cA
@@ -21572,7 +22044,7 @@ iS
 Kd
 kW
 Ea
-ia
+kN
 aa
 jF
 JD
@@ -21597,7 +22069,7 @@ Nh
 kr
 JF
 JF
-iB
+JF
 iB
 iB
 iB
@@ -21734,7 +22206,7 @@ iT
 Dx
 kd
 Ea
-ia
+kN
 aa
 rp
 xX
@@ -21869,7 +22341,7 @@ iB
 iB
 iB
 iB
-iB
+ab
 jg
 jg
 cn
@@ -21896,7 +22368,7 @@ Ea
 js
 Ea
 Ea
-ia
+kN
 aa
 jF
 mc
@@ -22031,7 +22503,7 @@ ms
 ms
 ms
 ms
-ms
+ab
 ab
 cf
 cf
@@ -22394,7 +22866,7 @@ mt
 KP
 al
 al
-aa
+jX
 hh
 ny
 ij
@@ -22695,7 +23167,7 @@ fN
 io
 nj
 cP
-cf
+FP
 cp
 cf
 ia
@@ -23217,7 +23689,7 @@ mw
 kr
 JF
 JF
-iB
+JF
 iB
 iB
 iB
@@ -23861,9 +24333,9 @@ FX
 mi
 Hh
 Hh
-mI
-MP
-th
+sU
+ai
+GH
 th
 iB
 iB
@@ -24023,9 +24495,9 @@ QE
 mp
 Hh
 Av
-MP
-ai
-th
+ik
+Mm
+Al
 Wl
 iB
 iB
@@ -24150,7 +24622,7 @@ eG
 fd
 fD
 DG
-gl
+QB
 gP
 cQ
 cf
@@ -24186,7 +24658,7 @@ mi
 Hh
 gS
 Pr
-lS
+th
 th
 th
 iB
@@ -24313,8 +24785,8 @@ fe
 nv
 fS
 gm
-gQ
-cQ
+gl
+ug
 cf
 cp
 cf
@@ -24348,7 +24820,7 @@ mq
 Hh
 aE
 Pr
-ai
+er
 th
 th
 iB
@@ -24625,7 +25097,7 @@ bp
 bN
 bY
 ab
-cf
+FP
 cp
 cf
 cR
@@ -24644,8 +25116,8 @@ cp
 fI
 ly
 yk
-Aw
-bo
+gQ
+XQ
 ly
 uN
 ly
@@ -24796,20 +25268,20 @@ dQ
 dq
 dq
 fg
-dq
-dQ
+st
+Jl
 gp
 Vj
 cR
 cf
 cp
 cf
+ly
+Rv
 nh
-gv
-Aw
 Rv
 ly
-jM
+rc
 ly
 ly
 la
@@ -24834,7 +25306,7 @@ mi
 Hh
 Hr
 lc
-Pr
+MP
 th
 th
 th
@@ -24959,7 +25431,7 @@ dq
 dq
 fh
 TF
-Ru
+TF
 Sf
 Vj
 cR
@@ -24968,10 +25440,10 @@ Ze
 Rj
 ym
 UU
-Aw
+Ax
 bo
 ly
-jM
+Nr
 ty
 FK
 la
@@ -25120,7 +25592,7 @@ dq
 dq
 dq
 fi
-gq
+gr
 gr
 AG
 Vj
@@ -25129,13 +25601,13 @@ cf
 cp
 cf
 ed
-Aw
-Aw
+gv
+PH
 Aa
 ly
-jM
+rc
 ly
-yY
+MD
 la
 la
 Er
@@ -25290,16 +25762,16 @@ cR
 cf
 cp
 cf
-nh
-Aw
-Aw
-bo
+ly
+oa
+Cl
+HG
 ly
 jM
-ly
-MD
-la
-la
+Yx
+Yx
+Yx
+lS
 po
 Od
 la
@@ -25454,16 +25926,16 @@ hu
 hE
 ly
 kR
-Aw
+Ub
 Aw
 ka
 jM
-ly
-ly
-la
-la
-kP
-kS
+Yx
+EQ
+To
+rx
+qu
+yY
 la
 lt
 la
@@ -25616,14 +26088,14 @@ cp
 cf
 ly
 mN
-Aw
-bo
+NZ
+HX
 ly
 jM
-ly
+Yx
 fm
-fm
-la
+YS
+Yx
 ii
 kU
 ld
@@ -25782,11 +26254,11 @@ nq
 wT
 ly
 uN
-ly
-fm
-fm
-iR
-iR
+Yx
+CL
+wA
+Yx
+kJ
 lh
 qW
 iR
@@ -25800,7 +26272,7 @@ iR
 iR
 jc
 jc
-lz
+LM
 ca
 mi
 Xf
@@ -25944,11 +26416,11 @@ ly
 ly
 ly
 jM
-ly
-fm
-fm
-iR
-iR
+Yx
+Ru
+HH
+HH
+kJ
 lh
 lf
 lj
@@ -26106,11 +26578,11 @@ cH
 uR
 uR
 jN
-uR
-uR
-fm
-iR
-iR
+Yx
+Yx
+Kz
+YW
+kJ
 lh
 lf
 lh
@@ -26269,10 +26741,10 @@ uR
 jq
 mD
 jU
-uR
-uR
-iR
-iR
+Yx
+YZ
+Yr
+kJ
 bj
 qm
 mj
@@ -26406,7 +26878,7 @@ iB
 iB
 iB
 iB
-iB
+cv
 cv
 cu
 jx
@@ -26431,10 +26903,10 @@ uR
 jw
 eI
 mu
-uR
-uR
-iR
-iR
+pf
+pf
+kJ
+kJ
 lh
 lh
 lh
@@ -26457,7 +26929,7 @@ FS
 qq
 qq
 qq
-iB
+th
 iB
 iB
 iB
@@ -26568,7 +27040,7 @@ iB
 iB
 iB
 iB
-iB
+cv
 cv
 cu
 cG
@@ -26593,10 +27065,10 @@ uR
 PO
 jQ
 kb
-uR
+pf
 uR
 iR
-iR
+kJ
 NU
 li
 ll
@@ -26618,7 +27090,7 @@ qq
 qq
 qq
 qq
-iB
+qq
 iB
 iB
 iB
@@ -26730,7 +27202,7 @@ iB
 iB
 iB
 iB
-iB
+cv
 cv
 cu
 Sz
@@ -26778,8 +27250,8 @@ sB
 qq
 qq
 qq
-Wx
-iB
+qq
+qq
 iB
 iB
 iB
@@ -26892,7 +27364,7 @@ iB
 iB
 iB
 iB
-iB
+cv
 cv
 cu
 jz
@@ -26940,7 +27412,7 @@ FX
 Cp
 kw
 kw
-iB
+Wx
 iB
 iB
 iB
@@ -27054,7 +27526,7 @@ iB
 iB
 iB
 iB
-iB
+gq
 cv
 cu
 Eh
@@ -27216,7 +27688,7 @@ iB
 iB
 iB
 iB
-iB
+iV
 iV
 lI
 lI
@@ -27378,7 +27850,7 @@ iB
 iB
 iB
 iB
-iB
+iV
 iV
 ce
 cK
@@ -27702,7 +28174,7 @@ iB
 iB
 iB
 iB
-iB
+iV
 iV
 RR
 Ck
@@ -27864,7 +28336,7 @@ iB
 iB
 iB
 iB
-iB
+iV
 iV
 iV
 Fc
@@ -28027,7 +28499,7 @@ iB
 iB
 iB
 iB
-iB
+iV
 iV
 iV
 iV
@@ -28190,7 +28662,7 @@ iB
 iB
 iB
 iB
-iB
+iV
 iV
 iV
 iV
diff --git a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
index d009330b159..981ee92d65c 100644
--- a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
+++ b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
@@ -52,20 +52,20 @@
 	assigned_role = "Kataphract Knight Captain"
 	special_role = "Kataphract Knight Captain"
 
-/datum/ghostspawner/human/kataphract/quartermaster
-	short_name = "kataphract_quart"
-	name = "Kataphract Knight Quartermaster"
-	desc = "A Saa (Knight) of the traveling Kataphract Guild. Display honour in everything you do. Be an excellent person. Ensure the Kataphracts are well-stocked and ready for anything. Lead by example with the Knight Captain. Remember, you serve the Izweski Hegemony."
+/datum/ghostspawner/human/kataphract/specialist
+	short_name = "kataphract_specialist"
+	name = "Kataphract Specialist"
+	desc = "A Saa (Knight) of the traveling Kataphract Guild. Display honour in everything you do. Support your Knight Captain and lead by example. Remember, you serve the Izweski Hegemony."
 	max_count = 1
 
 	mob_name_prefix = "Saa "
 
-	spawnpoints = list("kataphract_quartermaster")
+	spawnpoints = list("kataphract_specialist")
 
-	outfit = /datum/outfit/admin/kataphract/quartermaster
+	outfit = /datum/outfit/admin/kataphract/specialist
 
-	assigned_role = "Kataphract Knight Quartermaster"
-	special_role = "Kataphract Knight Quartermaster"
+	assigned_role = "Kataphract Specialist"
+	special_role = "Kataphract Specialist"
 
 // Kataphract who are not combat ready
 /datum/outfit/admin/kataphract
@@ -134,8 +134,8 @@
 /datum/outfit/admin/kataphract/knight/get_id_access()
 	return list(access_kataphract, access_kataphract_knight, access_external_airlocks)
 
-/datum/outfit/admin/kataphract/quartermaster
-	name = "Kataphract Quartermaster"
+/datum/outfit/admin/kataphract/specialist
+	name = "Kataphract Specialist"
 	
 	back = /obj/item/storage/backpack/satchel/hegemony