diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
index 87472fd1364..efa050e7517 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
@@ -260,8 +260,8 @@
 "Ab" = (
 /obj/structure/closet/syndicate,
 /obj/item/clothing/glasses/regular,
-/obj/item/storage/firstaid,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/syndicate_listening_station)
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
index 3131e93a9a5..e5a071b709a 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -184,7 +184,7 @@
 	pixel_x = 3;
 	pixel_y = 6
 	},
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -1106,7 +1106,7 @@
 "de" = (
 /obj/machinery/light,
 /obj/structure/table,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/abandonedbridge)
 "dg" = (
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index be961785408..7f85c69cd99 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -11756,7 +11756,7 @@
 /area/centcom/specops)
 "OZ" = (
 /obj/structure/table,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "bot"
diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm
index 7cab651db9a..a2800392825 100644
--- a/_maps/map_files/shuttles/admin_armory.dmm
+++ b/_maps/map_files/shuttles/admin_armory.dmm
@@ -24,7 +24,7 @@
 /area/shuttle/administration)
 "bi" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/item/storage/firstaid/brute,
 /obj/item/storage/box/bodybags,
 /obj/item/storage/firstaid/surgery,
diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm
index 120d18bf47c..2b04da3ce57 100644
--- a/_maps/map_files/shuttles/admin_hospital.dmm
+++ b/_maps/map_files/shuttles/admin_hospital.dmm
@@ -227,8 +227,8 @@
 /area/shuttle/administration)
 "bg" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/firstaid,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/regular,
 /obj/item/storage/firstaid/adv,
 /obj/item/storage/firstaid/adv,
 /turf/simulated/floor/mineral/titanium,
diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm
index c96a6d1ab9b..1f1b21fde37 100644
--- a/_maps/map_files/shuttles/emergency_cramped.dmm
+++ b/_maps/map_files/shuttles/emergency_cramped.dmm
@@ -47,7 +47,7 @@
 	layer = 2.9
 	},
 /obj/structure/table,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "o" = (
diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm
index 0577f3c6e12..817c268bda3 100644
--- a/_maps/map_files/shuttles/emergency_cyb.dmm
+++ b/_maps/map_files/shuttles/emergency_cyb.dmm
@@ -442,7 +442,7 @@
 /area/shuttle/escape)
 "by" = (
 /obj/structure/table,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
diff --git a/_maps/map_files/shuttles/emergency_jungle.dmm b/_maps/map_files/shuttles/emergency_jungle.dmm
index 13184bd06f1..46009bb4ad7 100644
--- a/_maps/map_files/shuttles/emergency_jungle.dmm
+++ b/_maps/map_files/shuttles/emergency_jungle.dmm
@@ -313,7 +313,7 @@
 /area/shuttle/escape)
 "by" = (
 /obj/structure/table/wood,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /turf/simulated/floor/grass,
 /area/shuttle/escape)
 "bz" = (
diff --git a/_maps/map_files/shuttles/emergency_lance.dmm b/_maps/map_files/shuttles/emergency_lance.dmm
index b8f4b8cd695..51c69054098 100644
--- a/_maps/map_files/shuttles/emergency_lance.dmm
+++ b/_maps/map_files/shuttles/emergency_lance.dmm
@@ -126,7 +126,7 @@
 /area/shuttle/escape)
 "fH" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/firstaid/doctor,
+/obj/item/storage/firstaid/regular/doctor,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluecorners"
 	},
@@ -464,7 +464,7 @@
 /area/shuttle/escape)
 "ut" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/firstaid/doctor,
+/obj/item/storage/firstaid/regular/doctor,
 /turf/simulated/floor/plasteel/dark,
 /area/shuttle/escape)
 "uW" = (
@@ -766,7 +766,7 @@
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/storage/firstaid/doctor,
+/obj/item/storage/firstaid/regular/doctor,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/escape)
 "HK" = (
diff --git a/_maps/map_files/shuttles/emergency_raven.dmm b/_maps/map_files/shuttles/emergency_raven.dmm
index c92d211f102..50946c6255a 100644
--- a/_maps/map_files/shuttles/emergency_raven.dmm
+++ b/_maps/map_files/shuttles/emergency_raven.dmm
@@ -419,7 +419,7 @@
 "bM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/reinforced,
-/obj/item/storage/firstaid/doctor,
+/obj/item/storage/firstaid/regular/doctor,
 /obj/item/storage/firstaid/toxin,
 /turf/simulated/floor/plasteel/white,
 /area/shuttle/escape)
diff --git a/_maps/map_files/shuttles/emergency_shadow.dmm b/_maps/map_files/shuttles/emergency_shadow.dmm
index 60af6c23957..a7d91591e32 100644
--- a/_maps/map_files/shuttles/emergency_shadow.dmm
+++ b/_maps/map_files/shuttles/emergency_shadow.dmm
@@ -752,7 +752,7 @@
 /area/shuttle/escape)
 "GB" = (
 /obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/storage/firstaid/doctor,
+/obj/item/storage/firstaid/regular/doctor,
 /obj/machinery/light{
 	dir = 8
 	},
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 6597cda95a0..1491321c940 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -37472,7 +37472,7 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/item/radio/intercom{
 	name = "east bump";
 	pixel_x = 28
@@ -69862,7 +69862,7 @@
 /area/station/maintenance/apmaint)
 "mCO" = (
 /obj/structure/table,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular/empty,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitecorner"
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 43fef9766d2..eba1a4522aa 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -6846,12 +6846,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/simulated/floor/plating,
 /area/station/maintenance/disposal/east)
-"aUB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
-	icon_state = "darkgreenfull"
-	},
-/area/station/service/hydroponics)
 "aUE" = (
 /obj/machinery/light{
 	dir = 8
@@ -26887,11 +26881,6 @@
 	icon_state = "redcorner"
 	},
 /area/station/security/prison/cell_block/A)
-"dcR" = (
-/obj/structure/table,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/port)
 "dda" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -28025,6 +28014,17 @@
 /obj/machinery/ai_status_display,
 /turf/simulated/wall/r_wall,
 /area/station/security/prisonlockers)
+"dkb" = (
+/obj/machinery/requests_console/directional/south,
+/obj/structure/cable/orange{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "grimy"
+	},
+/area/station/security/detective)
 "dkc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -35875,12 +35875,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
-"eTe" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/station/service/hydroponics)
 "eTg" = (
 /obj/machinery/recharge_station,
 /turf/simulated/floor/plasteel{
@@ -35927,7 +35921,8 @@
 /turf/simulated/floor/grass,
 /area/station/hallway/spacebridge/scidock)
 "eTI" = (
-/obj/effect/decal/cleanable/blood/splatter,
+/obj/structure/table,
+/obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/plating/asteroid/ancient,
 /area/station/maintenance/port)
 "eTJ" = (
@@ -37600,6 +37595,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/central/west)
+"fvV" = (
+/obj/structure/chair/office/dark{
+	dir = 4
+	},
+/obj/effect/landmark/start/detective,
+/turf/simulated/floor/carpet,
+/area/station/security/detective)
 "fwd" = (
 /obj/effect/decal/cleanable/crayon,
 /turf/simulated/floor/wood,
@@ -38737,6 +38739,12 @@
 	icon_state = "dark"
 	},
 /area/station/engineering/control)
+"fPD" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating{
+	icon_state = "asteroidplating"
+	},
+/area/station/maintenance/port)
 "fPE" = (
 /obj/structure/disposalpipe/segment/corner{
 	dir = 4
@@ -41245,25 +41253,6 @@
 	icon_state = "whitepurple"
 	},
 /area/station/science/genetics)
-"gEI" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Walkway"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/preopen{
-	id_tag = "servlockdown";
-	layer = 2.6;
-	name = "Service Lockdown"
-	},
-/obj/structure/disposalpipe/segment{
-	color = "#954535"
-	},
-/obj/effect/turf_decal/caution/red,
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "neutralcorner"
-	},
-/area/station/hallway/spacebridge/sercom)
 "gEJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -43789,7 +43778,6 @@
 /area/station/service/bar)
 "htz" = (
 /obj/effect/spawner/random_spawners/dirt_often,
-/obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgreenfull"
 	},
@@ -46052,13 +46040,13 @@
 /area/station/command/office/blueshield)
 "hXD" = (
 /obj/structure/table,
-/obj/item/storage/firstaid{
+/obj/item/storage/firstaid/regular/empty{
 	name = "first-aid kit (empty)"
 	},
-/obj/item/storage/firstaid{
+/obj/item/storage/firstaid/regular/empty{
 	name = "first-aid kit (empty)"
 	},
-/obj/item/storage/firstaid{
+/obj/item/storage/firstaid/regular/empty{
 	name = "first-aid kit (empty)"
 	},
 /obj/item/healthanalyzer,
@@ -47241,6 +47229,13 @@
 	icon_state = "browncorner"
 	},
 /area/station/hallway/primary/fore/east)
+"inP" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance,
+/turf/simulated/floor/plating{
+	icon_state = "asteroidplating"
+	},
+/area/station/maintenance/port)
 "inQ" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Port Asteroid Maintenance"
@@ -50457,6 +50452,21 @@
 	icon_state = "dark"
 	},
 /area/station/hallway/primary/starboard/south)
+"jeu" = (
+/obj/machinery/hologram/holopad,
+/obj/structure/cable/orange{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/station/service/hydroponics)
 "jeB" = (
 /obj/structure/transit_tube/station/reverse/flipped{
 	dir = 4
@@ -51121,6 +51131,22 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
 /area/station/security/lobby)
+"joS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/station/service/hydroponics)
 "joZ" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -55761,15 +55787,6 @@
 /area/station/medical/medbay)
 "kAT" = (
 /obj/machinery/hologram/holopad,
-/obj/structure/cable/orange{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -57731,12 +57748,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
-"lhc" = (
-/obj/effect/spawner/random_spawners/dirt_often,
-/turf/simulated/floor/plasteel{
-	icon_state = "darkgreenfull"
-	},
-/area/station/service/hydroponics)
 "lhf" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable/orange{
@@ -57970,6 +57981,10 @@
 	},
 /turf/simulated/floor/plasteel/freezer,
 /area/station/service/kitchen)
+"ljz" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/port)
 "ljL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment,
@@ -61270,11 +61285,12 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
 "mgq" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating{
-	icon_state = "asteroidplating"
+/obj/effect/spawner/random_spawners/dirt_often,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreenfull"
 	},
-/area/station/maintenance/port)
+/area/station/service/hydroponics)
 "mgu" = (
 /obj/docking_port/stationary{
 	dir = 4;
@@ -65355,16 +65371,8 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/tech_storage)
 "nsy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/orange{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -84445,14 +84453,6 @@
 	icon_state = "asteroidplating"
 	},
 /area/station/maintenance/port)
-"sNb" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/station/service/hydroponics)
 "sNm" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/stripes/line{
@@ -87975,6 +87975,12 @@
 /obj/effect/spawner/airlock/s_to_n,
 /turf/simulated/wall,
 /area/station/hallway/primary/central/north)
+"tMD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreenfull"
+	},
+/area/station/service/hydroponics)
 "tMN" = (
 /obj/machinery/door/airlock/external{
 	id_tag = "laborcamp_home";
@@ -91986,7 +91992,7 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/tech_storage)
 "uQB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgreenfull"
 	},
@@ -101943,13 +101949,25 @@
 	icon_state = "dark"
 	},
 /area/station/engineering/control)
-"xCH" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating{
-	icon_state = "asteroidplating"
+"xCu" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Walkway"
 	},
-/area/station/maintenance/port)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+	id_tag = "servlockdown";
+	layer = 2.6;
+	name = "Service Lockdown"
+	},
+/obj/structure/disposalpipe/segment{
+	color = "#954535"
+	},
+/obj/effect/turf_decal/caution/red,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "neutralcorner"
+	},
+/area/station/hallway/spacebridge/sercom)
 "xCR" = (
 /obj/machinery/computer/security/telescreen/entertainment,
 /turf/simulated/mineral/ancient,
@@ -102326,13 +102344,6 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/plating/asteroid/ancient,
 /area/station/maintenance/port)
-"xHt" = (
-/obj/structure/chair/office/dark{
-	dir = 4
-	},
-/obj/effect/landmark/start/detective,
-/turf/simulated/floor/carpet,
-/area/station/security/detective)
 "xHF" = (
 /obj/structure/cable/orange{
 	d1 = 4;
@@ -103158,17 +103169,6 @@
 	icon_state = "whitepurple"
 	},
 /area/station/maintenance/apmaint)
-"xTG" = (
-/obj/machinery/requests_console/directional/south,
-/obj/structure/cable/orange{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "grimy"
-	},
-/area/station/security/detective)
 "xTL" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -113220,7 +113220,7 @@ rho
 uSf
 ygl
 wzC
-mgq
+fPD
 aXn
 aXn
 aXn
@@ -113477,7 +113477,7 @@ aXn
 wGX
 ygl
 wzC
-xCH
+inP
 aXn
 aXn
 aXn
@@ -114513,7 +114513,7 @@ eHn
 ohJ
 gUw
 xZV
-eTI
+ljz
 iuf
 mkL
 aXn
@@ -115030,7 +115030,7 @@ aXn
 aXn
 dLa
 hwS
-eTI
+ljz
 kad
 uCK
 aXn
@@ -116012,7 +116012,7 @@ eHu
 aXn
 aXn
 aXn
-xCH
+inP
 eCI
 ltk
 wzC
@@ -117801,7 +117801,7 @@ uCK
 aXn
 aXn
 hvI
-dcR
+eTI
 pAV
 pXy
 dHZ
@@ -119848,7 +119848,7 @@ aXn
 aXn
 eCI
 pDl
-xCH
+inP
 aXn
 aXn
 ock
@@ -120082,8 +120082,8 @@ chV
 evL
 qwd
 pPN
-xHt
-xTG
+fvV
+dkb
 emw
 abW
 nxA
@@ -122721,7 +122721,7 @@ btd
 btd
 uql
 cBs
-nsy
+joS
 cBs
 cBs
 biB
@@ -122924,7 +122924,7 @@ bpf
 pbY
 pbY
 pbY
-gEI
+xCu
 abT
 jSU
 grv
@@ -122978,9 +122978,9 @@ cuk
 prN
 mcu
 pcu
-kAT
+jeu
 jKU
-sNb
+nsy
 biB
 hqe
 btd
@@ -123755,7 +123755,7 @@ biB
 biB
 xNP
 biB
-eTe
+kAT
 kDy
 biB
 etV
@@ -124529,7 +124529,7 @@ lJR
 lJR
 btd
 pNE
-htz
+mgq
 btd
 cEM
 eQC
@@ -125290,11 +125290,11 @@ muv
 lYO
 riS
 mcu
-aUB
-aUB
-aUB
-hpP
 uQB
+uQB
+uQB
+hpP
+tMD
 haI
 lUc
 xAS
@@ -125547,7 +125547,7 @@ baF
 jUW
 fPp
 cxx
-lhc
+htz
 xnz
 wFD
 rxy
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 12bf1d3ccd1..fbdb6239c85 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -59085,8 +59085,8 @@
 /area/station/science/research)
 "dyM" = (
 /obj/structure/rack,
-/obj/item/storage/firstaid,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular/empty,
+/obj/item/storage/firstaid/regular/empty,
 /obj/item/paicard,
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/delivery/hollow,
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 63fb7cad390..0cf48b9be0f 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -50179,7 +50179,7 @@
 /area/station/maintenance/starboard)
 "jqS" = (
 /obj/structure/closet/crate,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular/empty,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint2)
 "jqU" = (
@@ -120465,7 +120465,7 @@
 /area/station/maintenance/starboard)
 "wpd" = (
 /obj/structure/closet/crate,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular/empty,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
 "wpk" = (
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index ed6bbd5d7f3..7cb54e3bcf3 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -59464,7 +59464,7 @@
 	pixel_y = 5
 	},
 /obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid{
+/obj/item/storage/firstaid/regular{
 	pixel_x = -3;
 	pixel_y = -5
 	},
diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm
index 33e8fd9525a..b370b2064ab 100644
--- a/code/game/jobs/job/medical_jobs.dm
+++ b/code/game/jobs/job/medical_jobs.dm
@@ -45,7 +45,7 @@
 	l_ear = /obj/item/radio/headset/heads/cmo
 	id = /obj/item/card/id/cmo
 	suit_store = /obj/item/flashlight/pen
-	l_hand = /obj/item/storage/firstaid/doctor
+	l_hand = /obj/item/storage/firstaid/regular/doctor
 	pda = /obj/item/pda/heads/cmo
 	backpack_contents = list(
 		/obj/item/melee/classic_baton/telescopic = 1
@@ -86,7 +86,7 @@
 	l_ear = /obj/item/radio/headset/headset_med
 	id = /obj/item/card/id/medical
 	suit_store = /obj/item/flashlight/pen
-	l_hand = /obj/item/storage/firstaid/doctor
+	l_hand = /obj/item/storage/firstaid/regular/doctor
 	pda = /obj/item/pda/medical
 
 	backpack = /obj/item/storage/backpack/medic
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 088781d37e9..8fdfc8c4b56 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -9,9 +9,9 @@
  * First Aid Kits
  */
 /obj/item/storage/firstaid
-	name = "first-aid kit"
-	desc = "It's an emergency medical kit for those serious boo-boos."
-	icon_state = "firstaid"
+	name = "generic first-aid kit"
+	desc = "If you can see this, make a bug report on GitHub, something went wrong!"
+	icon_state = "genericfirstaid"
 	throw_speed = 2
 	throw_range = 8
 	req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
@@ -25,6 +25,35 @@
 	var/robot_arm // This is for robot construction
 
 
+/obj/item/storage/firstaid/regular
+	name = "first-aid kit"
+	desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer."
+	icon_state = "firstaid"
+
+/obj/item/storage/firstaid/regular/populate_contents()
+	new /obj/item/reagent_containers/patch/styptic(src)
+	new /obj/item/reagent_containers/patch/styptic(src)
+	new /obj/item/reagent_containers/pill/salicylic(src)
+	new /obj/item/reagent_containers/patch/silver_sulf(src)
+	new /obj/item/reagent_containers/patch/silver_sulf(src)
+	new /obj/item/healthanalyzer(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src)
+
+/obj/item/storage/firstaid/regular/empty/populate_contents()
+	return
+
+/obj/item/storage/firstaid/regular/doctor
+	desc = "A medical kit designed for Nanotrasen medical personnel."
+
+/obj/item/storage/firstaid/regular/doctor/populate_contents()
+	new /obj/item/reagent_containers/applicator/brute(src)
+	new /obj/item/reagent_containers/applicator/burn(src)
+	new /obj/item/reagent_containers/patch/styptic(src)
+	new /obj/item/reagent_containers/patch/silver_sulf(src)
+	new /obj/item/reagent_containers/pill/salicylic(src)
+	new /obj/item/healthanalyzer/advanced(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src)
+
 /obj/item/storage/firstaid/fire
 	name = "fire first-aid kit"
 	desc = "A medical kit that contains several medical patches and pills for treating burns. Contains one epinephrine syringe for emergency use and a health analyzer."
@@ -46,35 +75,6 @@
 /obj/item/storage/firstaid/fire/empty/populate_contents()
 	return
 
-/obj/item/storage/firstaid/regular
-	desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer"
-	icon_state = "firstaid"
-
-/obj/item/storage/firstaid/regular/populate_contents()
-	new /obj/item/reagent_containers/patch/styptic(src)
-	new /obj/item/reagent_containers/patch/styptic(src)
-	new /obj/item/reagent_containers/pill/salicylic(src)
-	new /obj/item/reagent_containers/patch/silver_sulf(src)
-	new /obj/item/reagent_containers/patch/silver_sulf(src)
-	new /obj/item/healthanalyzer(src)
-	new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src)
-
-/obj/item/storage/firstaid/regular/empty/populate_contents()
-	return
-
-/obj/item/storage/firstaid/doctor
-	desc = "A general medical kit that contains medical patches for both brute damage and burn damage. Also contains an epinephrine syringe for emergency use and a health analyzer"
-	icon_state = "firstaid"
-
-/obj/item/storage/firstaid/doctor/populate_contents()
-	new /obj/item/reagent_containers/applicator/brute(src)
-	new /obj/item/reagent_containers/applicator/burn(src)
-	new /obj/item/reagent_containers/patch/styptic(src)
-	new /obj/item/reagent_containers/patch/silver_sulf(src)
-	new /obj/item/reagent_containers/pill/salicylic(src)
-	new /obj/item/healthanalyzer/advanced(src)
-	new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src)
-
 /obj/item/storage/firstaid/toxin
 	name = "toxin first aid kit"
 	desc = "A medical kit designed to counter poisoning by common toxins. Contains three pills and syringes, and a health analyzer to determine the health of the patient."
@@ -171,8 +171,8 @@
 
 /obj/item/storage/firstaid/tactical
 	name = "first-aid kit"
-	icon_state = "bezerk"
 	desc = "I hope you've got insurance."
+	icon_state = "bezerk"
 	max_w_class = WEIGHT_CLASS_NORMAL
 	treatment_oxy = "perfluorodecalin"
 	treatment_brute = "bicaridine"
@@ -195,8 +195,10 @@
 
 /obj/item/storage/firstaid/surgery
 	name = "field surgery kit"
-	icon_state = "duffel-med"
 	desc = "A kit for surgery in the field."
+	icon_state = "duffel-med"
+	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
 	max_w_class = WEIGHT_CLASS_BULKY
 	max_combined_w_class = 21
 	storage_slots = 10
@@ -217,8 +219,8 @@
 
 /obj/item/storage/firstaid/ert
 	name = "ert first-aid kit"
-	icon_state = "bezerk"
 	desc = "A medical kit used by Nanotrasen emergency response team personnel."
+	icon_state = "bezerk"
 	med_bot_skin = "bezerk"
 
 /obj/item/storage/firstaid/ert/populate_contents()
@@ -233,8 +235,8 @@
 
 /obj/item/storage/firstaid/ert_amber
 	name = "amber ert first-aid kit"
-	icon_state = "firstaid"
 	desc = "A medical kit used by Amber level emergency response team personnel."
+	icon_state = "firstaid"
 
 /obj/item/storage/firstaid/ert_amber/populate_contents()
 	new /obj/item/healthanalyzer/advanced(src)
@@ -247,8 +249,8 @@
 
 /obj/item/storage/firstaid/fake_tactical
 	name = "tactical first-aid kit"
-	icon_state = "bezerk"
 	desc = "I hope you've got insurance. The paint is still wet."
+	icon_state = "bezerk"
 	med_bot_skin = "bezerk"
 
 /obj/item/storage/firstaid/fake_tactical/populate_contents()
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index e8fcc65ec94..d3245101d07 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -538,7 +538,7 @@
 			if("machine")
 				new /obj/item/storage/firstaid/machine/empty(Tsec)
 			else
-				new /obj/item/storage/firstaid(Tsec)
+				new /obj/item/storage/firstaid/regular/empty(Tsec)
 
 		new /obj/item/assembly/prox_sensor(Tsec)
 
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 453aaf85f3a..689d9a513e7 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/tools/UpdatePaths/Scripts/26947_first_aid_kits.txt b/tools/UpdatePaths/Scripts/26947_first_aid_kits.txt
new file mode 100644
index 00000000000..1553b7b4bfc
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/26947_first_aid_kits.txt
@@ -0,0 +1 @@
+/obj/item/storage/firstaid : /obj/item/storage/firstaid/regular