diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
index 6d315bdb48d8..dbd2a278e777 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
@@ -1829,10 +1829,7 @@
 	pixel_x = 8;
 	pixel_y = 21
 	},
-/obj/item/shield/riot/goliath{
-	pixel_x = -12;
-	pixel_y = 16
-	},
+/obj/item/shield/buckler,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "Vt" = (
diff --git a/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_claw_ruin.dmm b/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_claw_ruin.dmm
index 6e2054826cd6..2949556478c9 100644
--- a/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_claw_ruin.dmm
+++ b/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_claw_ruin.dmm
@@ -1101,15 +1101,15 @@
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/restraints/legcuffs/bola/energy,
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = 8;
 	pixel_y = 4
 	},
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -7;
 	pixel_y = 4
 	},
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/reagent_containers/spray/pepper,
 /obj/item/reagent_containers/spray/pepper,
 /obj/effect/turf_decal/trimline/opaque/red/warning{
diff --git a/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_oldminer.dmm b/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_oldminer.dmm
index 289034afa88b..4897ec993059 100644
--- a/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_oldminer.dmm
+++ b/_maps/_mod_celadon/RandomRuins/AnimaRuins/anima_oldminer.dmm
@@ -141,7 +141,7 @@
 /obj/item/clothing/suit/hooded/cloak/bone{
 	pixel_y = 3
 	},
-/obj/item/shield/riot/goliath{
+/obj/item/shield/goliath{
 	pixel_x = -12;
 	pixel_y = -6
 	},
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
index 760bf98d3a57..7f54029c0b1b 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
@@ -1811,7 +1811,7 @@
 	pixel_x = 8;
 	pixel_y = 21
 	},
-/obj/item/shield/riot/goliath{
+/obj/item/shield/goliath{
 	pixel_x = -12;
 	pixel_y = 16
 	},
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
index b531e0220647..c4cfe6eef285 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
@@ -238,8 +238,8 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "PB" = (
 /obj/structure/table/wood,
-/obj/item/shield/riot/buckler,
-/obj/item/shield/riot/buckler,
+/obj/item/shield/buckler,
+/obj/item/shield/buckler,
 /turf/open/floor/plating/asteroid/basalt,
 /area/overmap_encounter/planetoid/cave/explored)
 "PW" = (
diff --git a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
index 4c14919ab54d..3cb938aee546 100644
--- a/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
+++ b/_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -1695,7 +1695,7 @@
 /turf/open/floor/plating/ashplanet/ash,
 /area/ruin/unpowered/scorched_hut)
 "WE" = (
-/obj/item/shield/riot/buckler{
+/obj/item/shield/buckler{
 	pixel_x = 6;
 	pixel_y = 16
 	},
diff --git a/_maps/_mod_celadon/RandomRuins/PlasmaRuins/oldminer.dmm b/_maps/_mod_celadon/RandomRuins/PlasmaRuins/oldminer.dmm
index 10af81dcf857..5906f0d04de1 100644
--- a/_maps/_mod_celadon/RandomRuins/PlasmaRuins/oldminer.dmm
+++ b/_maps/_mod_celadon/RandomRuins/PlasmaRuins/oldminer.dmm
@@ -140,7 +140,7 @@
 /obj/item/clothing/suit/hooded/cloak/bone{
 	pixel_y = 3
 	},
-/obj/item/shield/riot/goliath{
+/obj/item/shield/goliath{
 	pixel_x = -12;
 	pixel_y = -6
 	},
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm
index 2dce7c678c80..2626cd5bdafd 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_chokepoint.dmm
@@ -72,7 +72,7 @@
 /obj/item/clothing/head/helmet/knight/blue,
 /obj/item/clothing/suit/armor/riot/knight/blue,
 /obj/item/melee/spear,
-/obj/item/shield/riot/buckler,
+/obj/item/shield/buckler,
 /turf/open/floor/plating/asteroid/whitesands,
 /area/ruin)
 "u" = (
diff --git a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_ruinsofweh.dmm b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_ruinsofweh.dmm
index 2d4359a6e581..7c1d50e2127b 100644
--- a/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_ruinsofweh.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_ruinsofweh.dmm
@@ -1945,7 +1945,7 @@
 /obj/item/clothing/mask/mummy,
 /obj/item/clothing/under/costume/mummy,
 /obj/item/melee/sword/scrap,
-/obj/item/shield/riot/goliath,
+/obj/item/shield/goliath,
 /obj/item/clothing/head/hooded/cloakhood/bone,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/rockvault/sandstone,
diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm
index 4f484001a9f3..c22baabaf735 100644
--- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm
+++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -721,9 +721,6 @@
 	},
 /turf/open/floor/mineral/titanium/white,
 /area/ruin/space/has_grav/astraeus/munitions)
-"tV" = (
-/turf/open/floor/mineral/titanium/white,
-/area/ruin/space/has_grav/astraeus/munitions)
 "tZ" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -3926,7 +3923,7 @@ kc
 mB
 pt
 sE
-tV
+pb
 wb
 wp
 fO
diff --git a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm
index 8417098821bb..703f914c0ba4 100644
--- a/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm
+++ b/_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm
@@ -1100,15 +1100,15 @@
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/restraints/legcuffs/bola/energy,
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = 8;
 	pixel_y = 4
 	},
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -7;
 	pixel_y = 4
 	},
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/reagent_containers/spray/pepper,
 /obj/item/reagent_containers/spray/pepper,
 /obj/effect/turf_decal/trimline/opaque/red/warning{
diff --git a/_maps/_mod_celadon/map_files/runtime_check_map.dmm b/_maps/_mod_celadon/map_files/runtime_check_map.dmm
index 196d08cc1da8..f2704bb1797d 100644
--- a/_maps/_mod_celadon/map_files/runtime_check_map.dmm
+++ b/_maps/_mod_celadon/map_files/runtime_check_map.dmm
@@ -639,11 +639,11 @@
 /obj/item/shield/energy,
 /obj/item/shield/energy/bananium,
 /obj/item/shield/riot,
-/obj/item/shield/riot/buckler,
+/obj/item/shield/buckler,
 /obj/item/shield/riot/flash,
-/obj/item/shield/riot/goliath,
+/obj/item/shield/goliath,
 /obj/item/shield/riot/roman,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/ship_in_a_bottle,
 /obj/item/shockpaddles,
 /obj/item/shockpaddles/cyborg,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executioner.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executioner.dmm
index 427226c12817..cd142bf26c78 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_executioner.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_executioner.dmm
@@ -238,8 +238,8 @@
 	req_access_txt = "1"
 	},
 /obj/item/clothing/suit/armor/laserproof,
-/obj/item/shield/riot/tele,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
+/obj/item/shield/tele,
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
index daf90eabdf06..eb0b6413b765 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
@@ -4005,7 +4005,7 @@
 /obj/item/radio/headset/inteq/alt,
 /obj/item/clothing/accessory/holster,
 /obj/item/clothing/suit/armor/vest/inteq,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/clothing/head/helmet/swat,
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/ammo_box/magazine/usp45_standart,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
index f51fa23b7699..022bbaf1b938 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
@@ -963,7 +963,7 @@
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/head/beret/sec/hos/inteq,
 /obj/item/radio/headset/inteq/alt/captain,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/item/gun/ballistic/revolver/horizonx,
 /obj/item/ammo_box/a357,
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
index 9b4e75d79cc5..90eaf23d811e 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_talos.dmm
@@ -7976,7 +7976,7 @@
 /obj/item/clothing/under/syndicate/inteq,
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/head/beret/sec/hos/inteq,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/structure/closet/secure_closet{
 	anchored = 1;
 	can_be_unanchored = 1;
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_daggerfall.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_daggerfall.dmm
index c38045eb43d7..12eb28b4c575 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_daggerfall.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_daggerfall.dmm
@@ -773,7 +773,7 @@
 	icon_state = "duffel-sec";
 	name = "breaching charges duffel bag"
 	},
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -7;
 	pixel_y = 4
 	},
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
index 7ee0a3a126fa..7d5999652902 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -1504,15 +1504,15 @@
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/restraints/legcuffs/bola/energy,
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = 8;
 	pixel_y = 4
 	},
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -7;
 	pixel_y = 4
 	},
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/reagent_containers/spray/pepper,
 /obj/item/reagent_containers/spray/pepper,
 /obj/effect/turf_decal/corner/opaque/vired/half{
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm
index 8301c8fa0d99..f00a0e9eeaf5 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -2192,7 +2192,7 @@
 	req_access_txt = "1"
 	},
 /obj/item/storage/box/handcuffs,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/storage/box/flashes,
 /obj/item/melee/knife/combat,
@@ -12374,7 +12374,7 @@
 	req_access_txt = "1"
 	},
 /obj/item/storage/box/handcuffs,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/storage/box/flashes,
 /obj/item/melee/knife/combat,
@@ -13309,7 +13309,7 @@
 	req_access_txt = "1"
 	},
 /obj/item/storage/box/handcuffs,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
 /obj/item/restraints/legcuffs/bola/energy,
 /obj/item/storage/box/flashes,
 /obj/item/melee/knife/combat,
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
index cc67cdf13cbf..9fdd3205d8a2 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -3667,8 +3667,8 @@
 	},
 /obj/item/storage/lockbox/medal,
 /obj/item/clothing/gloves/krav_maga/sec,
-/obj/item/shield/riot/tele,
-/obj/item/shield/riot/tele,
+/obj/item/shield/tele,
+/obj/item/shield/tele,
 /turf/open/floor/wood,
 /area/ship/crew/dorm/captain)
 "Hd" = (
diff --git a/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm b/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
index ad1c968f0071..e461b47f77d8 100644
--- a/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
+++ b/_maps/_mod_celadon/shuttles/pirate/pirate_crying_sun.dmm
@@ -3838,7 +3838,7 @@
 	pixel_x = -4;
 	pixel_y = -4
 	},
-/obj/item/shield/riot/buckler{
+/obj/item/shield/buckler{
 	pixel_x = 6;
 	pixel_y = -3
 	},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_beetle.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_beetle.dmm
index 5a594d1ba28c..2878741f1448 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_beetle.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_beetle.dmm
@@ -591,7 +591,7 @@
 /obj/item/stock_parts/cell/gun/kalix,
 /obj/item/stock_parts/cell/gun/kalix,
 /obj/item/stock_parts/cell/gun/kalix,
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -7;
 	pixel_y = -1
 	},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
index 26c381d8c96b..42b9eacf37c8 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
@@ -709,11 +709,11 @@
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -5;
 	pixel_y = 6
 	},
-/obj/item/shield/riot/tele{
+/obj/item/shield/tele{
 	pixel_x = -7;
 	pixel_y = -1
 	},
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index 5ec7c1e0deeb..5f702d17ecc4 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -1908,6 +1908,20 @@
 "qe" = (
 /turf/open/floor/carpet/black,
 /area/ship/hallway/starboard)
+"qt" = (
+/obj/structure/table,
+/obj/item/plate,
+/obj/item/reagent_containers/food/drinks/sillycup{
+	pixel_y = 10;
+	pixel_x = -8
+	},
+/obj/item/food/ration/pack/grape_beverage{
+	pixel_y = 10;
+	pixel_x = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "qy" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
 	dir = 1
@@ -2704,6 +2718,72 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"wQ" = (
+/obj/structure/closet/secure_closet/armorycage{
+	anchored = 1;
+	can_be_unanchored = 1;
+	name = "equipment locker";
+	req_access = null;
+	req_access_txt = "1"
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/line,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/item/storage/box/teargas{
+	pixel_y = -4;
+	pixel_x = 8
+	},
+/obj/item/storage/box/zipties{
+	pixel_y = -4;
+	pixel_x = -7
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_y = 10;
+	pixel_x = -11
+	},
+/obj/item/reagent_containers/spray/pepper{
+	pixel_y = 10;
+	pixel_x = -3
+	},
+/obj/item/storage/pouch/ammo{
+	pixel_y = -10
+	},
+/obj/item/storage/pouch/ammo{
+	pixel_y = -10
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/melee/knife/survival{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/attachment/rail_light{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/item/attachment/rail_light{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/item/attachment/rail_light{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/shield/heavy,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security)
 "wU" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -3497,72 +3577,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security)
-"Db" = (
-/obj/structure/closet/secure_closet/armorycage{
-	anchored = 1;
-	can_be_unanchored = 1;
-	name = "equipment locker";
-	req_access = null;
-	req_access_txt = "1"
-	},
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/item/storage/box/teargas{
-	pixel_y = -4;
-	pixel_x = 8
-	},
-/obj/item/storage/box/zipties{
-	pixel_y = -4;
-	pixel_x = -7
-	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_y = 10;
-	pixel_x = -11
-	},
-/obj/item/reagent_containers/spray/pepper{
-	pixel_y = 10;
-	pixel_x = -3
-	},
-/obj/item/storage/pouch/ammo{
-	pixel_y = -10
-	},
-/obj/item/storage/pouch/ammo{
-	pixel_y = -10
-	},
-/obj/item/melee/knife/survival{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/melee/knife/survival{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/melee/knife/survival{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/attachment/rail_light{
-	pixel_x = 6;
-	pixel_y = -4
-	},
-/obj/item/attachment/rail_light{
-	pixel_x = 6;
-	pixel_y = -4
-	},
-/obj/item/attachment/rail_light{
-	pixel_x = 6;
-	pixel_y = -4
-	},
-/obj/item/shield/riot,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security)
 "Dh" = (
 /obj/effect/turf_decal/techfloor,
 /obj/structure/table/reinforced,
@@ -5774,20 +5788,6 @@
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
-"Xv" = (
-/obj/structure/table,
-/obj/item/plate,
-/obj/item/reagent_containers/food/drinks/sillycup{
-	pixel_y = 10;
-	pixel_x = -8
-	},
-/obj/item/food/ration/pack/grape_beverage{
-	pixel_y = 10;
-	pixel_x = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
 "XA" = (
 /obj/structure/closet/secure_closet/armorycage{
 	anchored = 1;
@@ -6657,7 +6657,7 @@ LQ
 mg
 GI
 Fm
-Xv
+qt
 XW
 EB
 aw
@@ -6861,7 +6861,7 @@ vT
 Xi
 gO
 eL
-Db
+wQ
 DP
 ww
 ww
diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
index c4f42e997497..cc09b6c14a35 100644
--- a/_maps/shuttles/pirate/pirate_tortuga.dmm
+++ b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -583,6 +583,25 @@
 "fv" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/cargo)
+"fx" = (
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/blue{
+	dir = 8
+	},
+/obj/structure/table/glass,
+/obj/item/storage/case/surgery{
+	pixel_y = 3
+	},
+/obj/item/clothing/suit/apron/surgical{
+	pixel_x = -7;
+	pixel_y = 10
+	},
+/turf/open/floor/plating{
+	icon_state = "plating_rust"
+	},
+/area/ship/medical)
 "fA" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -671,6 +690,19 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"gz" = (
+/obj/machinery/door/window/brigdoor/eastleft,
+/obj/machinery/shower{
+	pixel_y = 17
+	},
+/obj/effect/turf_decal/techfloor/hole/right{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "gB" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
@@ -712,20 +744,6 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
-"gK" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/toilet{
-	pixel_y = 10
-	},
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_x = -24;
-	id = "toilet1";
-	name = "privacy lock";
-	normaldoorcontrol = 1
-	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/toilet)
 "gM" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -734,27 +752,6 @@
 /obj/structure/chair/comfy/grey/old/directional/south,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
-"gO" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/ammo/c9mm{
-	pixel_x = -10;
-	pixel_y = 10
-	},
-/obj/item/storage/toolbox/ammo/a308{
-	pixel_x = -10
-	},
-/obj/item/storage/toolbox/ammo/c9mm{
-	pixel_x = 10;
-	pixel_y = 10
-	},
-/obj/item/storage/toolbox/ammo/a308{
-	pixel_x = 10
-	},
-/obj/item/storage/toolbox/ammo/shotgun{
-	pixel_y = 9
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security/armory)
 "gQ" = (
 /obj/machinery/firealarm/directional/east,
 /obj/structure/table,
@@ -1226,20 +1223,6 @@
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
-"la" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "sboard_engine"
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
 "ld" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
@@ -1299,6 +1282,25 @@
 "lJ" = (
 /turf/closed/mineral/ship,
 /area/ship/maintenance)
+"lK" = (
+/obj/machinery/griddle,
+/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/wrapping,
+/turf/open/floor/plasteel/mono,
+/area/ship/cargo)
+"lO" = (
+/obj/machinery/door/window/brigdoor/eastright,
+/obj/machinery/shower{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole,
+/obj/effect/turf_decal/techfloor/hole/right,
+/obj/item/bikehorn/rubberducky/plasticducky{
+	pixel_y = 7;
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "lQ" = (
 /obj/machinery/telecomms/hub{
 	autolinkers = list("hub","bus","relay","messaging","pirate","broadcasterB","receiverB");
@@ -1440,81 +1442,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/port)
-"mG" = (
-/obj/structure/closet/secure_closet{
-	icon_state = "sec";
-	name = "equipment locker";
-	req_access_txt = "3"
-	},
-/obj/effect/turf_decal/box,
-/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
-	pixel_y = 6;
-	pixel_x = 7
-	},
-/obj/machinery/light/directional/north,
-/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
-	pixel_y = 6;
-	pixel_x = 7
-	},
-/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
-	pixel_y = 6;
-	pixel_x = 7
-	},
-/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
-	pixel_y = 6;
-	pixel_x = 7
-	},
-/obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
-/obj/item/melee/knife/survival,
-/obj/item/storage/belt/security/military/frontiersmen{
-	pixel_x = -4;
-	pixel_y = -10
-	},
-/obj/item/storage/belt/security/military/frontiersmen{
-	pixel_x = -4;
-	pixel_y = -10
-	},
-/obj/item/storage/belt/security/military/frontiersmen{
-	pixel_x = -4;
-	pixel_y = -10
-	},
-/obj/item/storage/belt/security/military/frontiersmen{
-	pixel_x = -4;
-	pixel_y = -10
-	},
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
-	pixel_x = 8;
-	pixel_y = -4
-	},
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/flashlight/seclite,
-/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
-	pixel_y = 6;
-	pixel_x = 7
-	},
-/obj/item/melee/boarding_axe,
-/obj/item/melee/boarding_axe,
-/obj/item/melee/boarding_axe,
-/obj/item/melee/boarding_axe,
-/obj/item/melee/boarding_axe,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security/armory)
 "mZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
@@ -1597,6 +1524,20 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
+"nH" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "sboard_engine"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/starboard)
 "nT" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 4
@@ -1619,6 +1560,20 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"nW" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "port_engine"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/port)
 "oe" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
@@ -2015,20 +1970,6 @@
 "so" = (
 /turf/closed/wall/rust,
 /area/ship/crew)
-"sr" = (
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "sboard_engine"
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
 "ss" = (
 /obj/machinery/button/door{
 	dir = 1;
@@ -2611,29 +2552,6 @@
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
-"xB" = (
-/obj/structure/closet/secure_closet{
-	icon_door = "tac";
-	icon_state = "tac";
-	name = "boarding tools locker";
-	req_access_txt = "3"
-	},
-/obj/effect/turf_decal/box,
-/obj/item/storage/backpack/duffelbag/syndie/c4{
-	pixel_y = 8
-	},
-/obj/item/door_seal{
-	pixel_y = -7
-	},
-/obj/item/door_seal{
-	pixel_y = -7
-	},
-/obj/item/shield/riot/spike,
-/obj/item/storage/box/smokebombs,
-/obj/item/storage/toolbox/ammo/frag,
-/obj/item/crowbar/power,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/security/armory)
 "xV" = (
 /obj/effect/turf_decal/borderfloor,
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -2738,6 +2656,20 @@
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/cargo)
+"yF" = (
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "sboard_engine"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/starboard)
 "yH" = (
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech/grid,
@@ -2822,6 +2754,21 @@
 "zJ" = (
 /turf/closed/wall/r_wall/rust,
 /area/ship/maintenance/starboard)
+"zV" = (
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/small/directional/north,
+/obj/structure/toilet{
+	pixel_y = 10
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -24;
+	id = "toilet2";
+	name = "privacy lock";
+	normaldoorcontrol = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "zZ" = (
 /obj/effect/turf_decal/corner/opaque/black{
 	dir = 9
@@ -2920,6 +2867,28 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
+"AX" = (
+/obj/structure/closet/secure_closet{
+	icon_door = "tac";
+	icon_state = "tac";
+	name = "boarding tools locker";
+	req_access_txt = "3"
+	},
+/obj/effect/turf_decal/box,
+/obj/item/storage/backpack/duffelbag/syndie/c4{
+	pixel_y = 8
+	},
+/obj/item/door_seal{
+	pixel_y = -7
+	},
+/obj/item/door_seal{
+	pixel_y = -7
+	},
+/obj/item/storage/box/smokebombs,
+/obj/item/storage/toolbox/ammo/frag,
+/obj/item/crowbar/power,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "AZ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2932,8 +2901,7 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
-"Be" = (
-/obj/effect/decal/cleanable/glass,
+"Bb" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/toilet{
 	pixel_y = 10
@@ -2941,7 +2909,7 @@
 /obj/machinery/button/door{
 	dir = 4;
 	pixel_x = -24;
-	id = "toilet2";
+	id = "toilet1";
 	name = "privacy lock";
 	normaldoorcontrol = 1
 	},
@@ -3112,6 +3080,29 @@
 	icon_state = "plating_rust"
 	},
 /area/ship/maintenance)
+"Dw" = (
+/obj/machinery/light/directional/north,
+/obj/item/storage/pouch/squad,
+/obj/item/clothing/suit/armor/vest/marine/frontier,
+/obj/item/clothing/head/helmet/frontier,
+/obj/item/megaphone,
+/obj/item/clothing/under/frontiersmen/officer{
+	pixel_x = -5
+	},
+/obj/item/clothing/shoes/jackboots{
+	pixel_y = -13
+	},
+/obj/item/clothing/head/beret/sec/frontier/officer,
+/obj/item/radio/headset/pirate/alt,
+/obj/item/binoculars,
+/obj/structure/closet/secure_closet{
+	icon_state = "hos";
+	name = "Deck Boss' Locker";
+	req_access_txt = "3"
+	},
+/obj/item/storage/guncase/slammer,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "DF" = (
 /obj/structure/cable/yellow{
 	icon_state = "6-8"
@@ -3259,20 +3250,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance)
-"EI" = (
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "port_engine"
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
 "EL" = (
 /obj/effect/decal/cleanable/glass,
 /obj/item/broken_bottle,
@@ -3499,6 +3476,20 @@
 /obj/structure/curtain/cloth,
 /turf/open/floor/plating/catwalk_floor,
 /area/ship/security/armory)
+"Gv" = (
+/obj/machinery/shower{
+	pixel_y = 17
+	},
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole/right{
+	dir = 1
+	},
+/obj/machinery/light/small/directional/west,
+/obj/item/soap/homemade,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "Gx" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -3537,6 +3528,81 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/maintenance/starboard)
+"GJ" = (
+/obj/structure/closet/secure_closet{
+	icon_state = "sec";
+	name = "equipment locker";
+	req_access_txt = "3"
+	},
+/obj/effect/turf_decal/box,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
+	pixel_y = 6;
+	pixel_x = 7
+	},
+/obj/machinery/light/directional/north,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
+	pixel_y = 6;
+	pixel_x = 7
+	},
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
+	pixel_y = 6;
+	pixel_x = 7
+	},
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
+	pixel_y = 6;
+	pixel_x = 7
+	},
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
+/obj/item/storage/belt/security/military/frontiersmen{
+	pixel_x = -4;
+	pixel_y = -10
+	},
+/obj/item/storage/belt/security/military/frontiersmen{
+	pixel_x = -4;
+	pixel_y = -10
+	},
+/obj/item/storage/belt/security/military/frontiersmen{
+	pixel_x = -4;
+	pixel_y = -10
+	},
+/obj/item/storage/belt/security/military/frontiersmen{
+	pixel_x = -4;
+	pixel_y = -10
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/flashlight/seclite,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier{
+	pixel_y = 6;
+	pixel_x = 7
+	},
+/obj/item/melee/boarding_axe,
+/obj/item/melee/boarding_axe,
+/obj/item/melee/boarding_axe,
+/obj/item/melee/boarding_axe,
+/obj/item/melee/boarding_axe,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "GM" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
@@ -3708,20 +3774,6 @@
 	icon_state = "wood-broken5"
 	},
 /area/ship/crew/crewtwo)
-"Iu" = (
-/obj/machinery/shower{
-	pixel_y = 17
-	},
-/obj/effect/turf_decal/techfloor/hole{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor/hole/right{
-	dir = 1
-	},
-/obj/machinery/light/small/directional/west,
-/obj/item/soap/homemade,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/toilet)
 "Iw" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -3782,29 +3834,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"IF" = (
-/obj/machinery/light/directional/north,
-/obj/item/storage/pouch/squad,
-/obj/item/clothing/suit/armor/vest/marine/frontier,
-/obj/item/clothing/head/helmet/frontier,
-/obj/item/megaphone,
-/obj/item/clothing/under/frontiersmen/officer{
-	pixel_x = -5
-	},
-/obj/item/clothing/shoes/jackboots{
-	pixel_y = -13
-	},
-/obj/item/clothing/head/beret/sec/frontier/officer,
-/obj/item/radio/headset/pirate/alt,
-/obj/item/binoculars,
-/obj/structure/closet/secure_closet{
-	icon_state = "hos";
-	name = "Deck Boss' Locker";
-	req_access_txt = "3"
-	},
-/obj/item/storage/guncase/slammer,
-/turf/open/floor/plasteel/tech,
-/area/ship/bridge)
 "II" = (
 /obj/machinery/door/airlock/hatch,
 /obj/structure/cable/yellow{
@@ -4013,12 +4042,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"KE" = (
-/obj/machinery/griddle,
-/obj/machinery/light/directional/east,
-/obj/effect/decal/cleanable/wrapping,
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
 "KM" = (
 /obj/structure/railing{
 	dir = 1
@@ -4077,19 +4100,6 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/crew/toilet)
-"KZ" = (
-/obj/machinery/door/window/brigdoor/eastright,
-/obj/machinery/shower{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor/hole,
-/obj/effect/turf_decal/techfloor/hole/right,
-/obj/item/bikehorn/rubberducky/plasticducky{
-	pixel_y = 7;
-	pixel_x = -6
-	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/toilet)
 "Lb" = (
 /obj/structure/table,
 /obj/item/reagent_containers/glass/bowl{
@@ -4632,39 +4642,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
-"Po" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/structure/table/glass,
-/obj/item/storage/case/surgery{
-	pixel_y = 3
-	},
-/obj/item/clothing/suit/apron/surgical{
-	pixel_x = -7;
-	pixel_y = 10
-	},
-/turf/open/floor/plating{
-	icon_state = "plating_rust"
-	},
-/area/ship/medical)
-"Pu" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/power/smes/shuttle/precharged,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "port_engine"
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
 "Pw" = (
 /obj/structure/cable{
 	icon_state = "4-9"
@@ -5099,6 +5076,27 @@
 /obj/effect/turf_decal/borderfloor,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
+"Tg" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_x = -10;
+	pixel_y = 10
+	},
+/obj/item/storage/toolbox/ammo/a308{
+	pixel_x = -10
+	},
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/storage/toolbox/ammo/a308{
+	pixel_x = 10
+	},
+/obj/item/storage/toolbox/ammo/shotgun{
+	pixel_y = 9
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security/armory)
 "Tk" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -5559,6 +5557,20 @@
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/crewtwo)
+"Xv" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/power/smes/shuttle/precharged,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "port_engine"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/port)
 "XC" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5821,19 +5833,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
-"ZV" = (
-/obj/machinery/door/window/brigdoor/eastleft,
-/obj/machinery/shower{
-	pixel_y = 17
-	},
-/obj/effect/turf_decal/techfloor/hole/right{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor/hole{
-	dir = 1
-	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/toilet)
 "ZY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/red{
@@ -6093,8 +6092,8 @@ Ek
 Ek
 Ek
 jA
-Pu
-EI
+Xv
+nW
 TR
 Ek
 rd
@@ -6112,8 +6111,8 @@ xV
 fv
 Ek
 wK
-sr
-la
+yF
+nH
 zJ
 Ek
 Ek
@@ -6585,7 +6584,7 @@ Xs
 fj
 aT
 bx
-KE
+lK
 wQ
 fU
 hC
@@ -6646,7 +6645,7 @@ lJ
 Px
 Px
 pF
-Iu
+Gv
 bI
 pF
 td
@@ -6686,8 +6685,8 @@ Ek
 Px
 Px
 pF
-ZV
-KZ
+gz
+lO
 pF
 DU
 KU
@@ -6867,7 +6866,7 @@ VO
 VO
 VO
 Vt
-xB
+AX
 RH
 hP
 FP
@@ -6887,7 +6886,7 @@ Px
 Px
 Px
 pF
-gK
+Bb
 Ez
 jp
 gG
@@ -6905,9 +6904,9 @@ nv
 VO
 yj
 iW
-Po
+fx
 Vt
-gO
+Tg
 gD
 yH
 FP
@@ -6947,7 +6946,7 @@ BB
 UJ
 fC
 Vt
-mG
+GJ
 Kr
 FB
 SD
@@ -6967,7 +6966,7 @@ Px
 Px
 Px
 pF
-Be
+zV
 ao
 Cx
 XC
@@ -7097,7 +7096,7 @@ fE
 YE
 ah
 ah
-IF
+Dw
 VH
 qT
 gB
diff --git a/_maps/shuttles/roumain/srm_sojourner.dmm b/_maps/shuttles/roumain/srm_sojourner.dmm
index d12e60a0d36f..2de4d20e274d 100644
--- a/_maps/shuttles/roumain/srm_sojourner.dmm
+++ b/_maps/shuttles/roumain/srm_sojourner.dmm
@@ -2402,14 +2402,8 @@
 /obj/effect/turf_decal/box/red/corners{
 	dir = 8
 	},
-/obj/item/shield/riot/buckler{
-	pixel_x = 5;
-	pixel_y = 8
-	},
-/obj/item/shield/riot/buckler{
-	pixel_x = 5;
-	pixel_y = 8
-	},
+/obj/item/shield/buckler,
+/obj/item/shield/buckler,
 /obj/item/storage/belt/security/military/frontiersmen{
 	pixel_y = -1;
 	pixel_x = 4
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 7b26d084ada0..2762dadba58e 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 		/obj/item/restraints/legcuffs/bola = 1,
 		/obj/item/restraints/handcuffs/cable = 1,
 		/obj/item/melee/spear = 1,
-		/obj/item/shield/riot/buckler = 1,
+		/obj/item/shield/buckler = 1,
 		/obj/item/grenade/iedcasing/spawned = 1,
 		/obj/item/melee/baton/cattleprod = 1,
 		/obj/item/throwing_star = 1,
diff --git a/code/datums/components/crafting/recipes/weapon.dm b/code/datums/components/crafting/recipes/weapon.dm
index 0c069e1db98a..80075ca0b184 100644
--- a/code/datums/components/crafting/recipes/weapon.dm
+++ b/code/datums/components/crafting/recipes/weapon.dm
@@ -10,6 +10,7 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
+// [CELADON-ADD]
 /datum/crafting_recipe/strobeshield
 	name = "Strobe Shield"
 	result = /obj/item/shield/riot/flash
@@ -23,6 +24,7 @@
 /datum/crafting_recipe/strobeshield/New()
 	..()
 	blacklist |= subtypesof(/obj/item/shield/riot/)
+// [CELADON-ADD]
 
 /datum/crafting_recipe/molotov
 	name = "Molotov"
@@ -290,14 +292,16 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
+// [CELADON-ADD]
 /datum/crafting_recipe/goliathshield
 	name = "Goliath shield"
-	result = /obj/item/shield/riot/goliath
+	result = /obj/item/shield/goliath
 	time = 60
 	reqs = list(/obj/item/stack/sheet/bone = 4,
 				/obj/item/stack/sheet/animalhide/goliath_hide = 3)
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
+// [/CELADON-ADD]
 
 /datum/crafting_recipe/watcherbola
 	name = "Watcher Bola"
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 1c330b0ffa4f..07c18c8bde05 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -13,8 +13,8 @@
 	slot_flags = ITEM_SLOT_BACK
 	force = 10
 	item_flags = SLOWS_WHILE_IN_HAND
-	//slowdown = 0.5		// [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
-	//drag_slowdown = 1.25	// [CELADON-REMOVE]
+	slowdown = 0	// [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
+	integrity_failure = 0.1
 	block_chance = 50
 	throwforce = 5
 	throw_speed = 2
@@ -22,6 +22,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("shoved", "bashed")
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
+	uses_integrity = TRUE
 	/// makes beam projectiles pass through the shield
 	var/transparent = FALSE
 	/// threshold where armor piercing works
@@ -36,9 +37,13 @@
 	var/shield_bash_sound = 'sound/effects/shieldbash.ogg'
 	var/recoil_bonus = -2
 	var/broken = FALSE
+	/// material used to repair
+	var/obj/item/stack/sheet/repair_material = /obj/item/stack/sheet/plasteel
+	/// whether or not it is repairable
+	var/is_repairable = TRUE
 
 // [CELADON-ADD] - Флаг на включение сломаных щитов из модов - BALLISTIC_SHIELD - Extended Edition
-	var/broken_shield
+	var/broken_shield = FALSE
 	var/spread_bonus = 0
 	var/braking_sound = 'sound/effects/glassbr3.ogg'
 	var/braking_alert = "cracks!"
@@ -68,7 +73,6 @@
 		name = "broken [src::name]"
 		block_chance = 0
 		slowdown = 0
-		//drag_slowdown = 0	// [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
 		broken = TRUE
 
 /obj/item/shield/examine(mob/user)
@@ -115,7 +119,7 @@
 			to_chat(owner, span_boldwarning("Your shield is penetrated by [hitby]!"))
 			return FALSE
 	. = ..()
-	if(.)
+	if(. && !broken)
 		on_block(owner, hitby, attack_text, damage, attack_type, damage_type)
 
 // [CELADON-ADD] - BALLISTIC_SHIELD - Rebalance
@@ -138,63 +142,70 @@
 			if(abs(dy) <= dx * -2)
 				. = FALSE
 	return
-// [/CELADON-ADD]
 
 /obj/item/shield/riot
 	name = "ballistic shield"
 	desc = "A shield adept at blocking blunt objects and bullets from connecting with the torso of the shield wielder. Use 10 plasteel to repair."
+	icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields.dmi'
+	lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi'
+	righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi'
+	mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi'
 	icon_state = "ballistic"
-	custom_materials = list(/datum/material/iron=8500)
 
 	force = 15
-	max_integrity = 600
+	max_integrity = 400
 	block_chance = 60
-	integrity_failure = 0.1
-	material_flags = MATERIAL_NO_EFFECTS
-
-// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition + Rebalance
+	recoil_bonus = -3
 	spread_bonus = -3
 	slowdown = 0.5
-	max_integrity = 600
-	block_chance = 60
-	icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields.dmi'
-	lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi'
-	righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi'
-	mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi'
+
+	custom_materials = list(/datum/material/iron=8500)
+	material_flags = MATERIAL_NO_EFFECTS
 	broken_shield = TRUE
 // [/CELADON-ADD]
 
-/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/melee))
-		if(COOLDOWN_FINISHED(src, baton_bash))
-			user.visible_message(span_warning("[user] bashes [src] with [W]!"))
-			playsound(src, shield_bash_sound, 50, TRUE)
-			COOLDOWN_START(src, baton_bash, BATON_BASH_COOLDOWN)
-	else if(istype(W, /obj/item/stack/sheet/plasteel))
+/obj/item/shield/proc/repair(attacking_item, obj/item/stack/sheet, user)
+	if (istype(attacking_item, repair_material))
 		if (atom_integrity >= max_integrity)
 			to_chat(user, span_warning("[src] is already in perfect condition."))
-		while(atom_integrity < max_integrity)
-			if(!do_after(user, 3 SECONDS, target= src)) //if(!do_after(user, 30, target= src)) // [CELADON-EDIT] - ORIGIRAL
-				return
-			var/obj/item/stack/sheet/plasteel/T = W
-			T.use(10)
+		else
+			while(atom_integrity < max_integrity)
+				var/obj/item/stack/sheet/material_used = attacking_item
+				if(material_used.get_amount() < 10)
+					to_chat(user, span_notice("You do not have enough [material_used] to repair!"))
+					return
+				if(!do_after(user, 3 SECONDS, target= src))  // [CELADON-EDIT] - SECONDS, WHY NOT USE SECONDS ?
+					return
+				material_used.use(10)
 //	[CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition
-			if(broken_shield)
-				if(istype(src, /obj/item/shield/riot/tele))
-					icon_state = "teleriot1"
-				else
-					icon_state = initial(icon_state)
+				if(broken_shield)
+					if(istype(src, /obj/item/shield/tele))
+						icon_state = "teleriot1"
+					else
+						icon_state = initial(icon_state)
 //	[/CELADON-ADD]
-			atom_integrity = max_integrity
-			to_chat(user, span_notice("You repair [src] with [T]."))
-			name = src::name
-			broken = FALSE
-// [CELADON-EDIT] - BALLISTIC_SHIELD - Extended Edition
-			block_chance = initial(block_chance)	//block_chance = 60
-			slowdown = initial(slowdown)			//slowdown = 1.25
-			//drag_slowdown = initial(drag_slowdown) // drag_slowdown = 1.25
-// [/CELADON-EDIT]
+				update_integrity(max_integrity)
+				to_chat(user, span_notice("You repair [src] with [material_used]."))
+				name = src::name
+				broken = FALSE
+				block_chance = initial(block_chance)
+				slowdown = initial(slowdown)
+	else
+		to_chat(user, span_warning("[src] isn't made of this material!"))
+
+/obj/item/shield/attackby(obj/item/attacking_item, mob/user, params)
+	if(istype(attacking_item, /obj/item/melee))
+		if(COOLDOWN_FINISHED(src, baton_bash))
+			user.visible_message(span_warning("[user] bashes [src] with [attacking_item]!"))
+			playsound(src, shield_bash_sound, 50, TRUE)
+			COOLDOWN_START(src, baton_bash, BATON_BASH_COOLDOWN)
+	else if(istype(attacking_item, /obj/item/stack/sheet))
+		if(is_repairable == TRUE)
+			repair(attacking_item, /obj/item/stack/sheet, user)
+		else
+			to_chat(user, span_warning("[src] cannot be repaired!"))
 
+// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition
 /obj/item/shield/riot/spike
 	name = "spike shield"
 	desc = "A ballistic shield adept at blocking blunt objects and bullets, adorned with a vicious spike. Use 10 plasteel to repair"
@@ -202,63 +213,62 @@
 	force = 24
 	attack_verb = list("stabbed", "gashed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+// [/CELADON-ADD]
 
+// [CELADON-EDIT] - BALLISTIC_SHIELD - Extended Edition
 /obj/item/shield/riot/roman
 	name = "\improper Roman shield"
 	desc = "Bears an inscription on the inside: <i>\"Romanes venio domus\"</i>."
 	icon_state = "roman_shield"
 	item_state = "roman_shield"
-	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
 	transparent = FALSE
 	custom_materials = list(/datum/material/iron=8500)
 	max_integrity = 65
-
-// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition
-	icon = 'icons/obj/shields.dmi'
 	broken_shield = FALSE
-// [/CELADON-ADD]
 
 /obj/item/shield/riot/roman/fake
 	desc = "Bears an inscription on the inside: <i>\"Romanes venio domus\"</i>. It appears to be a bit flimsy."
-	block_chance = 0
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	max_integrity = 30
+	block_chance = 0
 	recoil_bonus = 0 //it's PLASTIC
-	slowdown = 0		// [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
+	spread_bonus = 0
+	slowdown = 0
+// [/CELADON-ADD]
 
-/obj/item/shield/riot/buckler
+/obj/item/shield/buckler
 	name = "wooden buckler"
 	desc = "A medieval wooden buckler."
-	icon_state = "buckler"
-	item_state = "buckler"
-	slowdown = 0
-	//drag_slowdown = 0		// [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
+	icon = 'icons/obj/shields.dmi'
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	icon_state = "buckler"
+	item_state = "buckler"
 	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 10)
 	resistance_flags = FLAMMABLE
-	block_chance = 25
 	transparent = FALSE
+
 	max_integrity = 55
+	block_chance = 25
+	recoil_bonus = 0
+	spread_bonus = 0
+	slowdown = 0
+
 	integrity_failure = 0.2
 	w_class = WEIGHT_CLASS_NORMAL
+	repair_material = /obj/item/stack/sheet/mineral/wood
 	var/shield_break_leftover = /obj/item/stack/sheet/mineral/wood
 	var/shield_break_sound = 'sound/effects/bang.ogg'
-
-// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition
-	icon = 'icons/obj/shields.dmi'
 	broken_shield = FALSE
-// [/CELADON-ADD]
-
-/obj/item/shield/riot/buckler/atom_destruction(damage_flag)
 
+/obj/item/shield/buckler/atom_destruction(damage_flag)
 	playsound(src, shield_break_sound, 50)
 	new shield_break_leftover(get_turf(src))
 	if(isliving(loc))
 		loc.balloon_alert(loc, "shield broken!")
 	return ..()
 
+// [CELADON-ADD] - RETURN-LEGACY-SHIELD
 /obj/item/shield/riot/flash
 	name = "strobe shield"
 	desc = "A shield with a built in, high intensity light capable of blinding and disorienting suspects. Takes regular handheld flashes as bulbs. Use 10 plasteel to repair."
@@ -325,6 +335,7 @@
 	. = ..()
 	if (embedded_flash?.burnt_out)
 		. += span_info("The mounted bulb has burnt out. You can try replacing it with a new one.")
+// [/CELADON-ADD]
 
 /obj/item/shield/energy
 	name = "energy combat shield"
@@ -339,6 +350,7 @@
 	throw_speed = 3
 	base_icon_state = "eshield" // [base_icon_state]1 for expanded, [base_icon_state]0 for contracted
 	breakable_by_damage = FALSE
+	is_repairable = FALSE
 	var/on_force = 10
 	var/on_throwforce = 8
 	var/on_throw_speed = 2
@@ -378,41 +390,42 @@
 		to_chat(user, span_notice("[src] can now be concealed."))
 	add_fingerprint(user)
 
-/obj/item/shield/riot/tele
+// [CELADON-EDIT] - BALLISTIC_SHIELD - Extended Edition
+/obj/item/shield/tele
 	name = "telescopic shield"
-	desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
+	desc = "An advanced riot shield made of lightweight materials that collapses for easy storage. Use 10 plasteel to repair."
+	icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields.dmi'
+	lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi'
+	righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi'
+	mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi'
 	icon_state = "teleriot0"
-	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
 	custom_materials = list(/datum/material/iron = 3600, /datum/material/glass = 3600, /datum/material/silver = 270, /datum/material/titanium = 180)
 	slot_flags = null
 	force = 3
 	throwforce = 3
 	throw_speed = 3
 	throw_range = 4
-	w_class = WEIGHT_CLASS_NORMAL
-	var/active = 0
 
-// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition
-	desc = "An advanced riot shield made of lightweight materials that collapses for easy storage. Use 10 plasteel to repair."
-	lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi'
-	righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi'
-	max_integrity = 400
+	max_integrity = 300
 	block_chance = 50
+	recoil_bonus = -2
+	spread_bonus = -2
 	slowdown = 0.3
+
+	//repair_material = /obj/item/stack/sheet/rglass
+	w_class = WEIGHT_CLASS_NORMAL
+	var/active = 0
 	broken_shield = TRUE
-// [/CELADON-ADD]
+// [/CELADON-ADD] - FULL-EDIT
 
-/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+/obj/item/shield/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(active)
 		return ..()
 	return 0
 
-/obj/item/shield/riot/tele/attack_self(mob/living/user)
-// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition - Сломаный щит нельзя сложить
-	if(broken)
+/obj/item/shield/tele/attack_self(mob/living/user)
+	if(broken)	// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition - Сломаный щит нельзя сложить
 		return
-// [/CELADON-ADD]
 	active = !active
 	icon_state = "teleriot[active]"
 	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
@@ -433,19 +446,83 @@
 		to_chat(user, span_notice("[src] can now be concealed."))
 	add_fingerprint(user)
 
-/obj/item/shield/riot/goliath
+// [CELADON-ADD] - BALLISTIC_SHIELD - Rebalance
+/obj/item/shield/goliath
 	name = "Goliath shield"
 	desc = "A shield made from interwoven plates of goliath hide."
+	icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields.dmi'
+	lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi'
+	righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi'
+	mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi'
 	icon_state = "goliath_shield"
-	icon = 'icons/obj/shields.dmi'
-	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
-	mob_overlay_icon = 'icons/mob/clothing/back.dmi'
 	custom_materials = list()
 	transparent = FALSE
-	block_chance = 25
+
 	max_integrity = 70
+	block_chance = 25
+	recoil_bonus = 0
+	spread_bonus = 0
+	slowdown = 0
+
 	w_class = WEIGHT_CLASS_BULKY
-	slowdown = 0		// [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
+// [/CELADON-ADD]
+
+// [CELADON-EDIT]
+/obj/item/shield/heavy
+	name = "heavy ballistic shield"
+	desc = "A heavy shield designed to keep everything behind it safe from any due harm. Use 10 plasteel to repair."
+	icon = 'icons/obj/shields.dmi'
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/back.dmi'
+	icon_state = "heavy"
+
+	// It's a heavy shield. So it'll obviously weigh more, but it can certainly take more of a beating; as well as dish out some
+	force = 10
+	throwforce = 10
+	throw_range = 2
+	ap_threshold = 30
+
+	max_integrity = 500
+	block_chance = 60
+	recoil_bonus = -4
+	spread_bonus = 8
+	slowdown = 1.5
+
+	armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
+	var/wielded = FALSE
+// [/CELADON-EDIT]
+
+/obj/item/shield/heavy/Initialize()
+	. = ..()
+	RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+	RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+
+/obj/item/shield/heavy/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/two_handed, force_unwielded = 10, force_wielded = 20)
+
+/// triggered on wield of two handed item
+/obj/item/shield/heavy/proc/on_wield(obj/item/source, mob/user)
+	slowdown = 2
+	wielded = TRUE
+	INVOKE_ASYNC(src, PROC_REF(do_wield), user)
+
+/obj/item/shield/heavy/proc/do_wield(mob/user)
+	if(!broken)
+		if(do_after(user, 1.5 SECONDS, user, IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE, TRUE,
+		CALLBACK(src, PROC_REF(is_wielded))))
+			block_chance = 80
+
+/// triggered on unwield of two handed item
+/obj/item/shield/heavy/proc/on_unwield(obj/item/source, mob/user)
+	SIGNAL_HANDLER
+	wielded = FALSE
+	if(!broken)
+		block_chance = initial(block_chance)
+		slowdown = initial(slowdown)
+
+/obj/item/shield/heavy/proc/is_wielded()
+	return wielded
 
 #undef BATON_BASH_COOLDOWN
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 1d948105b5fe..55ebdc3b7a80 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
 	new/datum/stack_recipe("easel", /obj/structure/easel, 4, time = 10),\
 	new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \
-	new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
+	new/datum/stack_recipe("wooden buckler", /obj/item/shield/buckler, 20, time = 40), \
 	new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
 	new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
 	new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
index 27909ed24b93..61ec48215187 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
@@ -31,7 +31,7 @@
 	new /obj/item/storage/box/teargas(src)
 	new /obj/item/storage/box/flashes(src)
 	new /obj/item/storage/box/handcuffs(src)
-	new /obj/item/shield/riot/tele(src)
+	new /obj/item/shield/tele(src)
 
 /obj/structure/closet/secure_closet/ertMed
 	name = "emergency response team medical locker"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 0f570c8bc594..8e5412faa544 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -109,7 +109,7 @@
 	new /obj/item/storage/lockbox/loyalty(src)
 	new /obj/item/clothing/mask/gas/sechailer/swat(src)
 	new /obj/item/storage/box/flashbangs(src)
-	new /obj/item/shield/riot/tele(src)
+	new /obj/item/shield/tele(src)
 	new /obj/item/storage/belt/security/full(src)
 	new /obj/item/gun/energy/sharplite/x01(src)
 	new /obj/item/gun/energy/e_gun/e_old/hos(src)	// [CELADON-ADD] - CELADON_RETURN_EGUN
@@ -302,7 +302,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/helmet/riot(src)
 	for(var/i in 1 to 3)
-		new /obj/item/shield/riot(src)
+		new /obj/item/shield/tele(src)
 
 /obj/structure/closet/secure_closet/armory2
 	name = "armory ballistics locker"
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 3a6d59b6ef58..8dbb51462820 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -241,8 +241,8 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
 	// [CELADON-ADD] - CELADON_RETURN_CONTENT_SPAWN
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
-	// [/CELADON-ADD]
 	H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
+	// [/CELADON-ADD]
 	H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
 	H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
 
diff --git a/code/modules/cargo/blackmarket/packs/tools.dm b/code/modules/cargo/blackmarket/packs/tools.dm
index b97589e9f191..ba67b7e2c6ce 100644
--- a/code/modules/cargo/blackmarket/packs/tools.dm
+++ b/code/modules/cargo/blackmarket/packs/tools.dm
@@ -76,19 +76,17 @@
 	stock_max = 4
 	availability_prob = 80
 
+// [CELADON-EDIT] - CELADON_BLACK_MARKET
 /datum/blackmarket_item/tool/riot_shield
 	name = "Riot Shield"
 	desc = "Protect yourself from an unexpected Riot at your local Police department!"
 	item = /obj/item/shield/riot
 
-	// [CELADON-EDIT] - CELADON_BLACK_MARKET
-	// cost_min = 300
-	// cost_max = 800	// ORIGINAL
 	cost_min = 1500
 	cost_max = 2000
-	// [/CELADON-EDIT]
 	stock_max = 3
 	availability_prob = 50
+// [/CELADON-EDIT]
 
 /datum/blackmarket_item/tool/thermite_bottle
 	name = "Thermite Bottle"
diff --git a/code/modules/cargo/blackmarket/packs/weapons.dm b/code/modules/cargo/blackmarket/packs/weapons.dm
index 6f5bf1a78a05..eb8ccfd2f710 100644
--- a/code/modules/cargo/blackmarket/packs/weapons.dm
+++ b/code/modules/cargo/blackmarket/packs/weapons.dm
@@ -68,15 +68,28 @@
 	new /obj/item/gun/ballistic/shotgun/blasting_hammer(B)
 	new /obj/item/storage/box/ammo/a12g_blank(B)
 	return B
+
+// [CELADON-ADD]
+/datum/blackmarket_item/weapon/heavyshield
+	name = "Heavy Ballistic Shield"
+	desc = "Protecting everything behind it safe the user from light arms fire. Can struggle against stronger firepower."
+	item = /obj/item/shield/heavy
+
+	cost_min = 3500
+	cost_max = 4000
+	stock_max = 2
+	availability_prob = 25
+
 /datum/blackmarket_item/weapon/spikeshield
 	name = "Spiked Ballistic Shield"
 	desc = "Be the ancient warrior you always wanted to be. Block bullets and impale your enemies."
 	item = /obj/item/shield/riot/spike
 
-	cost_min = 1000
-	cost_max = 1500
+	cost_min = 1500
+	cost_max = 2000
 	stock_max = 2
 	availability_prob = 50
+// [/CELADON-ADD]
 
 /datum/blackmarket_item/weapon/powerfist
 	name = "Powerfist"
diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm
index 09ee133dc06b..fd5ae3f46b04 100644
--- a/code/modules/cargo/packs/sec_supply.dm
+++ b/code/modules/cargo/packs/sec_supply.dm
@@ -121,18 +121,18 @@
 		Misc. weapons / protection
 */
 
-/datum/supply_pack/sec_supply/riotshields
-	name = "Ballistic Shield Crate"
-	desc = "Contains a ballistic shield, effective at holding back hostile fauna, xenofauna, or large crowds."
-	cost = 1000
-	contains = list(/obj/item/shield/riot)
+/datum/supply_pack/sec_supply/heavyshields
+	name = "Heavy Ballistic Shield Crate"
+	desc = "Contains a heavy ballistic shield, very effective at protecting the user from light arms fire. Can struggle against stronger firepower."
+	cost = 1200
+	contains = list(/obj/item/shield/heavy)
 	crate_name = "riot shield crate"
 
-/datum/supply_pack/sec_supply/teleriotshields
+/datum/supply_pack/sec_supply/telescopicshields
 	name = "Telescopic Riot Shield Crate"
-	desc = "Contains a telescopic riot shield, effective at holding back hostile fauna, xenofauna, or large crowds in tight spaces."
+	desc = "Contains a telescopic riot shield, effective at protecting the user in close quarters combat. Assuming a gun isn't involved of course."
 	cost = 750
-	contains = list(/obj/item/shield/riot/tele)
+	contains = list(/obj/item/shield/tele)
 	crate_name = "riot shield crate"
 
 /datum/supply_pack/sec_supply/survknives
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index f32258c622ee..ed901c700085 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -169,10 +169,10 @@
 	backpack_contents = null
 	box = null
 
-	backpack = /obj/item/shield/riot
-	duffelbag = /obj/item/shield/riot
-	courierbag = /obj/item/shield/riot
-	satchel = /obj/item/shield/riot
+	backpack = /obj/item/shield/heavy
+	duffelbag = /obj/item/shield/heavy
+	courierbag = /obj/item/shield/heavy
+	satchel = /obj/item/shield/heavy
 
 /datum/outfit/job/clip/minutemen/military_police/leader
 	name = "ERT - C-MM Chief Military Police"
@@ -202,10 +202,10 @@
 	backpack_contents = null
 	box = null
 
-	backpack = /obj/item/shield/riot/flash
-	duffelbag = /obj/item/shield/riot/flash
-	courierbag = /obj/item/shield/riot/flash
-	satchel = /obj/item/shield/riot/flash
+	backpack = /obj/item/shield/heavy
+	duffelbag = /obj/item/shield/heavy
+	courierbag = /obj/item/shield/heavy
+	satchel = /obj/item/shield/heavy
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
 	name = "ERT - CLIP Minutemen - Minuteman (Spotter Hardsuit)"
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 2261aa17ffd1..3926b5dce752 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -660,8 +660,8 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
 	// [CELADON-ADD] - CELADON_RETURN_CONTENT_SPAWN
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
-	// [/CELADON-ADD]
 	H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
+	// [/CELADON-ADD]
 	H.put_in_hands(new /obj/item/melee/sword/claymore(H), TRUE)
 	H.equip_to_slot_or_del(new /obj/item/melee/spear(H), ITEM_SLOT_BACK)
 
diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
index c2997445daff..afb722671d88 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
@@ -79,7 +79,7 @@
 	desc = "A stanced figure sheltered behind a shoddy, makeshift wooden buckler. A jagged machete is held within their clutch."
 	mob_spawner = /obj/effect/mob_spawn/human/corpse/damaged/whitesands
 	r_hand = /obj/item/melee/sword/mass
-	l_hand = /obj/item/shield/riot/buckler
+	l_hand = /obj/item/shield/buckler
 	projectile_deflect_chance = 25
 
 /mob/living/simple_animal/hostile/human/hermit/ranged
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 20caa3691994..7c85aeb25d75 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -83,7 +83,7 @@
 	id = "tele_shield"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron = 4000, /datum/material/glass = 4000, /datum/material/silver = 300, /datum/material/titanium = 200)
-	build_path = /obj/item/shield/riot/tele
+	build_path = /obj/item/shield/tele
 	category = list("Weapons")
 
 /datum/design/beamrifle
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 4883e71bd91e..f06e80811868 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -143,7 +143,6 @@
 		/obj/item/clothing/head/helmet/roman/fake = 1,
 		/obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
 		/obj/item/clothing/under/costume/roman = 1,
-		/obj/item/shield/riot/roman/fake = 1,
 		/obj/item/skub = 1)
 	contraband = list(
 		/obj/item/clothing/suit/judgerobe = 1,
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 1abe6f945ac8..9aa3d409377d 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/inhands/equipment/shields_lefthand.dmi b/icons/mob/inhands/equipment/shields_lefthand.dmi
index aceeee6bcb4c..a68578cc47a6 100644
Binary files a/icons/mob/inhands/equipment/shields_lefthand.dmi and b/icons/mob/inhands/equipment/shields_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/shields_righthand.dmi b/icons/mob/inhands/equipment/shields_righthand.dmi
index 8c106cb82549..8d2bd44e64a8 100644
Binary files a/icons/mob/inhands/equipment/shields_righthand.dmi and b/icons/mob/inhands/equipment/shields_righthand.dmi differ
diff --git a/icons/obj/shields.dmi b/icons/obj/shields.dmi
index b9c30b7c5cc1..64b89069781c 100644
Binary files a/icons/obj/shields.dmi and b/icons/obj/shields.dmi differ
diff --git a/mod_celadon/_storage_icons/icons/items/weapons/shields.dmi b/mod_celadon/_storage_icons/icons/items/weapons/shields.dmi
index 15a058e19147..23960aa201ec 100644
Binary files a/mod_celadon/_storage_icons/icons/items/weapons/shields.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/shields.dmi differ
diff --git a/mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi b/mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi
index 292ade08d493..ddf3a1abf384 100644
Binary files a/mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/shields_back.dmi differ
diff --git a/mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi b/mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi
index 9239a57d357c..7cc024843722 100644
Binary files a/mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/shields_lefthand.dmi differ
diff --git a/mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi b/mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi
index 7ffe276ad13e..bc761e5d4272 100644
Binary files a/mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/shields_righthand.dmi differ
diff --git a/mod_celadon/inteq_vendor/code/inteq_vendor.dm b/mod_celadon/inteq_vendor/code/inteq_vendor.dm
index 250a25e811b6..9873cd76e765 100644
--- a/mod_celadon/inteq_vendor/code/inteq_vendor.dm
+++ b/mod_celadon/inteq_vendor/code/inteq_vendor.dm
@@ -40,7 +40,7 @@
 				new /obj/item/mod/control/pre_equipped/inteq(drop_location)
 			if("Rig suit")
 				new /obj/item/clothing/suit/space/hardsuit/syndi/inteq(drop_location)
-				new /obj/item/shield/riot/tele(drop_location)
+				new /obj/item/shield/tele(drop_location)
 
 	SSblackbox.record_feedback("tally", "inteq_voucher_redeemed", 1, selection)
 	qdel(voucher)
diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/security/sec_supply.dm b/mod_celadon/outpost_console/code/supply_pack/independent/security/sec_supply.dm
index f689135a0324..3e421f58d626 100644
--- a/mod_celadon/outpost_console/code/supply_pack/independent/security/sec_supply.dm
+++ b/mod_celadon/outpost_console/code/supply_pack/independent/security/sec_supply.dm
@@ -140,7 +140,7 @@
 	name = "Telescopic Shield"
 	desc = "Contains a telescopic shield, effective at holding back hostile fauna, xenofauna, or large crowds in tight spaces."
 	cost = 3000
-	contains = list(/obj/item/shield/riot/tele)
+	contains = list(/obj/item/shield/tele)
 	crate_name = "telescopic shield crate"
 
 /datum/supply_pack/faction/independent/sec_supply/survknives
diff --git a/tools/UpdatePaths/Scripts/5505_shields_kill_repaths.txt b/tools/UpdatePaths/Scripts/5505_shields_kill_repaths.txt
new file mode 100644
index 000000000000..824bd8df082f
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/5505_shields_kill_repaths.txt
@@ -0,0 +1,4 @@
+/obj/item/shield/riot : /obj/item/shield/heavy {@OLD}
+/obj/item/shield/riot/goliath : /obj/item/shield/buckler {@OLD}
+/obj/item/shield/riot/buckler : /obj/item/shield/buckler {@OLD}
+/obj/item/shield/riot/tele : /obj/item/shield/tele {@OLD}
\ No newline at end of file
diff --git a/tools/UpdatePaths/Scripts/celadon/2781_shields_rework_v2.txt b/tools/UpdatePaths/Scripts/celadon/2781_shields_rework_v2.txt
new file mode 100644
index 000000000000..8ed127a44ab4
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/celadon/2781_shields_rework_v2.txt
@@ -0,0 +1,3 @@
+/obj/item/shield/riot/goliath : /obj/item/shield/goliath {@OLD}
+/obj/item/shield/riot/buckler : /obj/item/shield/buckler {@OLD}
+/obj/item/shield/riot/tele : /obj/item/shield/tele {@OLD}