diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 2e9df0b3616..697b0f4feef 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1264,7 +1264,7 @@
 	},
 /area/awaymission/caves/bmp_asteroid/level_two)
 "kE" = (
-/mob/living/basic/giant_spider/hunter,
+/mob/living/basic/spider/giant/hunter,
 /turf/open/floor/iron,
 /area/awaymission/caves/bmp_asteroid)
 "kL" = (
@@ -1336,7 +1336,7 @@
 /area/awaymission/caves/northblock)
 "pC" = (
 /obj/item/mjollnir,
-/mob/living/basic/giant_spider/nurse,
+/mob/living/basic/spider/giant/nurse,
 /turf/open/misc/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
 	},
@@ -1440,7 +1440,7 @@
 /obj/machinery/sleeper{
 	dir = 8
 	},
-/mob/living/basic/giant_spider/hunter,
+/mob/living/basic/spider/giant/hunter,
 /turf/open/floor/iron,
 /area/awaymission/caves/bmp_asteroid)
 "uO" = (
@@ -1598,7 +1598,7 @@
 	},
 /area/awaymission/caves/bmp_asteroid/level_two)
 "Bz" = (
-/mob/living/basic/giant_spider/nurse,
+/mob/living/basic/spider/giant/nurse,
 /turf/open/misc/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
 	},
@@ -1680,7 +1680,7 @@
 "FS" = (
 /obj/machinery/light/small/built/directional/north,
 /obj/structure/spider/stickyweb,
-/mob/living/basic/giant_spider/hunter,
+/mob/living/basic/spider/giant/hunter,
 /turf/open/floor/iron,
 /area/awaymission/caves/bmp_asteroid)
 "FV" = (
@@ -1966,7 +1966,7 @@
 /turf/open/floor/iron,
 /area/awaymission/caves/northblock)
 "Xs" = (
-/mob/living/basic/giant_spider/hunter,
+/mob/living/basic/spider/giant/hunter,
 /turf/open/misc/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
 	},
@@ -1988,7 +1988,7 @@
 /area/awaymission/caves/bmp_asteroid/level_two)
 "XR" = (
 /obj/structure/spider/stickyweb,
-/mob/living/basic/giant_spider/hunter,
+/mob/living/basic/spider/giant/hunter,
 /turf/open/misc/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
 	},
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 24b7983c031..2914a951787 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -22,6 +22,14 @@
 "ae" = (
 /turf/closed/mineral/snowmountain,
 /area/awaymission/snowdin/cave/mountain)
+"af" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "ah" = (
 /obj/effect/baseturf_helper/asteroid/snow,
 /turf/closed/wall/ice,
@@ -95,10 +103,6 @@
 "az" = (
 /turf/closed/wall,
 /area/awaymission/snowdin/post/research)
-"aA" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "aB" = (
 /obj/structure/table,
 /obj/item/pen,
@@ -400,6 +404,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/dorm)
+"bz" = (
+/obj/machinery/door/firedoor,
+/obj/structure/holosign/barrier/atmos,
+/obj/structure/grille/broken,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "bA" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	piping_layer = 4;
@@ -437,6 +448,19 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/research)
+"bG" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = 4;
+	pixel_y = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/engineering)
 "bH" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	dir = 4;
@@ -1012,13 +1036,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/dorm)
-"dc" = (
-/obj/structure/door_assembly/door_assembly_min{
-	anchored = 1;
-	name = "broken airlock"
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "dd" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	dir = 4;
@@ -1215,12 +1232,6 @@
 /obj/structure/table,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/dorm)
-"dJ" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "dK" = (
 /turf/closed/wall,
 /area/awaymission/snowdin/post)
@@ -1370,6 +1381,19 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post)
+"em" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/caution/stand_clear{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "eo" = (
 /turf/open/misc/ice/smooth,
 /area/awaymission/snowdin/outside)
@@ -1689,11 +1713,6 @@
 	},
 /turf/open/floor/wood,
 /area/awaymission/snowdin/outside)
-"fq" = (
-/obj/machinery/holopad,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "fr" = (
 /turf/open/lava/plasma,
 /area/awaymission/snowdin/cave/cavern)
@@ -1763,28 +1782,10 @@
 	},
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post)
-"fB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	piping_layer = 4;
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/research)
 "fD" = (
 /obj/effect/spawner/random/structure/crate_abandoned,
 /turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/cave/cavern)
-"fE" = (
-/obj/machinery/conveyor{
-	id = "snowdin_belt_mine"
-	},
-/obj/machinery/light/small/directional/east,
-/turf/open/misc/asteroid/snow/ice,
-/area/awaymission/snowdin/post/mining_dock)
 "fF" = (
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/gateway)
@@ -2162,6 +2163,15 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
+"gR" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "gS" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -2269,13 +2279,6 @@
 /obj/item/clothing/shoes/winterboots,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/dorm)
-"hf" = (
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "hg" = (
 /obj/item/shard,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -2283,13 +2286,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post)
-"hh" = (
-/obj/structure/plasticflaps,
-/obj/machinery/conveyor{
-	id = "snowdin_belt_mine"
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "hj" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
@@ -3026,6 +3022,13 @@
 "iW" = (
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
+"iX" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "iZ" = (
 /obj/item/clothing/head/cone,
 /obj/effect/light_emitter{
@@ -3304,14 +3307,6 @@
 /obj/item/storage/toolbox/mechanical/old,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
-"jN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4;
-	piping_layer = 4
-	},
-/obj/structure/sign/warning/xeno_mining/directional/east,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "jO" = (
 /mob/living/basic/blankbody{
 	desc = "It's Jacob Ullman, but their flesh has an ashy texture, and their face is featureless save an eerie smile.";
@@ -3581,20 +3576,6 @@
 	},
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/snowdin/post/dorm)
-"kC" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
-"kD" = (
-/obj/structure/sign/warning/no_smoking/directional/south,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "kF" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
@@ -3607,6 +3588,14 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post)
+"kH" = (
+/obj/machinery/airalarm/directional/north,
+/obj/structure/sign/warning/docking/directional/east,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "kI" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
@@ -3733,11 +3722,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
-"la" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "lb" = (
 /obj/machinery/light/directional/west,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
@@ -3757,11 +3741,6 @@
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/garage)
-"le" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "lf" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	dir = 9;
@@ -3782,12 +3761,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/snowdin/post/dorm)
-"li" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "lj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	dir = 9;
@@ -3815,6 +3788,12 @@
 /obj/item/mop,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/post/custodials)
+"ln" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille/broken,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "lo" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	dir = 8;
@@ -4455,13 +4434,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/garage)
-"mD" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "mE" = (
 /obj/structure/table,
 /turf/open/floor/iron/dark,
@@ -4592,6 +4564,11 @@
 /obj/structure/barricade/wooden/snowed,
 /turf/open/misc/asteroid/snow/ice,
 /area/awaymission/snowdin/cave/cavern)
+"mZ" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "na" = (
 /turf/closed/wall/ice,
 /area/awaymission/snowdin/post/custodials)
@@ -4693,14 +4670,6 @@
 /obj/effect/baseturf_helper/asteroid/snow,
 /turf/closed/wall,
 /area/awaymission/snowdin/post/engineering)
-"nm" = (
-/obj/item/shard,
-/obj/item/stack/rods{
-	amount = 2
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "no" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
@@ -4763,6 +4732,13 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/outside)
+"nz" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "nA" = (
 /obj/structure/reagent_dispensers/watertank/high,
 /obj/item/reagent_containers/cup/bucket,
@@ -4797,12 +4773,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/secpost)
-"nI" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "nJ" = (
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
 	dir = 8
@@ -4932,6 +4902,10 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/secpost)
+"oi" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "ol" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -4981,6 +4955,10 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/engineering)
+"oq" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "or" = (
 /obj/structure/table,
 /obj/item/cultivator,
@@ -5216,11 +5194,6 @@
 /obj/item/pen,
 /turf/open/floor/iron/grimy,
 /area/awaymission/snowdin/post/cavern2)
-"pc" = (
-/obj/structure/spider/stickyweb,
-/mob/living/basic/giant_spider/hunter/ice,
-/turf/open/misc/asteroid/snow/ice,
-/area/awaymission/snowdin/cave/cavern)
 "pd" = (
 /obj/structure/bed,
 /turf/open/floor/iron/grimy,
@@ -5734,12 +5707,6 @@
 /obj/structure/closet/secure_closet/freezer/fridge/open,
 /turf/open/floor/iron/cafeteria,
 /area/awaymission/snowdin/post/cavern2)
-"qJ" = (
-/obj/structure/closet/crate/preopen,
-/obj/item/storage/toolbox/emergency,
-/obj/item/clothing/suit/hooded/wintercoat,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "qK" = (
 /obj/structure/rack,
 /obj/item/storage/box/lethalshot,
@@ -5779,6 +5746,10 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/engineering)
+"qR" = (
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "qS" = (
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/cave)
@@ -5874,10 +5845,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/cavern2)
-"rg" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "rh" = (
 /obj/structure/window/spawner/directional/south,
 /turf/open/floor/engine/cult,
@@ -6128,6 +6095,14 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/cavern2)
+"se" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 8
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post)
 "sf" = (
 /obj/machinery/computer/monitor,
 /obj/structure/cable,
@@ -6287,18 +6262,6 @@
 	},
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/outside)
-"sL" = (
-/obj/machinery/computer/shuttle/snowdin/mining{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "sO" = (
 /obj/structure/fence{
 	dir = 4
@@ -6410,12 +6373,6 @@
 /obj/structure/window/spawner/directional/east,
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/snowdin/post/cavern2)
-"tj" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "tk" = (
 /obj/structure/toilet{
 	dir = 1
@@ -6429,11 +6386,6 @@
 	},
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/outside)
-"tn" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "tp" = (
 /turf/closed/wall/mineral/snow,
 /area/awaymission/snowdin/cave/cavern)
@@ -6476,17 +6428,19 @@
 /obj/effect/baseturf_helper/asteroid/snow,
 /turf/closed/mineral/snowmountain,
 /area/awaymission/snowdin/cave)
+"tM" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "tR" = (
 /obj/structure/barricade/wooden/snowed,
 /turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/cave/cavern)
-"tS" = (
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "tY" = (
 /turf/closed/wall,
 /area/awaymission/snowdin/post/cavern1)
@@ -6497,9 +6451,18 @@
 /obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/cavern1)
+"ud" = (
+/obj/machinery/holopad,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "ue" = (
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/cavern1)
+"uf" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "ug" = (
 /obj/structure/table,
 /turf/open/floor/plating,
@@ -6528,6 +6491,11 @@
 /obj/machinery/light/small/broken/directional/east,
 /turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/post/cavern2)
+"uo" = (
+/obj/structure/barricade/sandbags,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "up" = (
 /obj/effect/spawner/random/exotic/snow_gear,
 /turf/open/floor/wood,
@@ -6546,6 +6514,31 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/cavern1)
+"ut" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8;
+	piping_layer = 4;
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/structure/table,
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/stack/sheet/iron/fifty{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/engineering)
+"uu" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "ux" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
@@ -6688,6 +6681,12 @@
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/cavern1)
+"vg" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "vh" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 8
@@ -6801,25 +6800,20 @@
 	},
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/snowdin/post/cavern1)
+"vF" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/caution/stand_clear{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "vG" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector{
 	dir = 1
 	},
 /turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/post/cavern1)
-"vH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 4;
-	pixel_y = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/engineering)
 "vL" = (
 /turf/closed/wall/mineral/titanium,
 /area/awaymission/snowdin/post/broken_shuttle)
@@ -6884,6 +6878,18 @@
 	},
 /turf/open/floor/plating/snowed/smoothed,
 /area/awaymission/snowdin/cave)
+"wq" = (
+/obj/machinery/holopad,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
+"wr" = (
+/obj/machinery/door/airlock/mining/glass{
+	name = "Mining Dock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "ws" = (
 /obj/effect/light_emitter{
 	name = "cave light";
@@ -6894,44 +6900,8 @@
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/cave)
 "wt" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
-"ww" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8;
-	piping_layer = 4;
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty{
-	pixel_x = 1;
-	pixel_y = -1
-	},
-/obj/item/stack/sheet/iron/fifty{
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/engineering)
-"wx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 8
-	},
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post)
-"wz" = (
-/obj/machinery/conveyor{
-	dir = 10;
-	id = "snowdin_belt_mine"
-	},
+/obj/structure/sign/warning/electric_shock/directional/east,
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "wD" = (
@@ -7025,6 +6995,13 @@
 /obj/effect/turf_decal/stripes/white/line,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
+"xd" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "xe" = (
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating,
@@ -7195,13 +7172,6 @@
 /obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
-"xG" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "xH" = (
 /obj/structure/bed{
 	dir = 4
@@ -7535,10 +7505,6 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/outside)
-"yN" = (
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "yO" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -7570,12 +7536,6 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
-"yV" = (
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "yW" = (
 /turf/closed/wall/ice,
 /area/awaymission/snowdin/post/minipost)
@@ -7621,29 +7581,6 @@
 	},
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
-"zg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
-	piping_layer = 4;
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/storage/box{
-	illustration = "donk_kit";
-	name = "box of donkpockets"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/kitchen)
-"zi" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "zj" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/structure/fence/corner{
@@ -7785,12 +7722,6 @@
 /obj/structure/rack,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
-"zO" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
-	dir = 8
-	},
-/turf/open/floor/plating/snowed/cavern,
-/area/awaymission/snowdin/post/mining_dock)
 "zQ" = (
 /obj/item/hatchet{
 	pixel_x = 4;
@@ -7975,9 +7906,8 @@
 /turf/open/floor/wood,
 /area/awaymission/snowdin/igloo)
 "AB" = (
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
-	dir = 4
-	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
 "AC" = (
@@ -8024,6 +7954,14 @@
 	},
 /turf/open/floor/wood,
 /area/awaymission/snowdin/igloo)
+"AJ" = (
+/obj/machinery/light/small/directional/west,
+/obj/item/stack/rods{
+	amount = 2
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "AK" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -8163,12 +8101,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post/minipost)
-"Bn" = (
-/obj/machinery/conveyor{
-	id = "snowdin_belt_mine"
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Bo" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -8302,6 +8234,18 @@
 	},
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
+"BL" = (
+/obj/machinery/computer/shuttle/snowdin/mining{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "BM" = (
 /obj/structure/table/wood,
 /obj/item/knife/combat/bone,
@@ -8425,6 +8369,13 @@
 "Cl" = (
 /turf/closed/wall/ice,
 /area/awaymission/snowdin/cave/cavern)
+"Co" = (
+/obj/structure/door_assembly/door_assembly_min{
+	anchored = 1;
+	name = "broken airlock"
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Ct" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/awaymission/snowdin/outside)
@@ -8501,10 +8452,9 @@
 	},
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
-"CM" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
+"CN" = (
+/obj/structure/sign/warning/docking/directional/east,
+/turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "CO" = (
 /obj/machinery/recharge_station,
@@ -8547,6 +8497,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"CU" = (
+/obj/structure/closet/crate/preopen,
+/obj/item/storage/toolbox/emergency,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "CW" = (
 /obj/item/shard,
 /obj/item/stack/cable_coil{
@@ -8621,6 +8578,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"Dk" = (
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Dl" = (
 /obj/machinery/power/shuttle_engine/propulsion/right{
 	dir = 4
@@ -8642,12 +8603,6 @@
 	},
 /turf/open/floor/plating/snowed/smoothed,
 /area/awaymission/snowdin/cave)
-"Dp" = (
-/obj/machinery/door/firedoor,
-/obj/structure/grille/broken,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Dq" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -8668,6 +8623,12 @@
 /obj/structure/closet/crate/wooden,
 /turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/cave/cavern)
+"Dt" = (
+/obj/structure/sign/warning/no_smoking/directional/south,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Dv" = (
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/plating/snowed/smoothed,
@@ -8718,6 +8679,12 @@
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
+"DP" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "DR" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -8749,6 +8716,23 @@
 /mob/living/basic/bear/snow,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/cave)
+"DZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+	piping_layer = 4;
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/storage/box{
+	illustration = "donk_kit";
+	name = "box of donkpockets"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/kitchen)
 "Ea" = (
 /obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
@@ -8770,14 +8754,6 @@
 /obj/effect/decal/cleanable/vomit/old,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/snowdin/cave)
-"Eh" = (
-/obj/machinery/door/airlock/mining/glass{
-	name = "Mining Dock"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Ej" = (
 /obj/structure/grille/broken,
 /obj/item/stack/rods,
@@ -8849,6 +8825,16 @@
 	},
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"Ex" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Ez" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron/dark,
@@ -8924,6 +8910,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"EL" = (
+/mob/living/basic/spider/giant/nurse/ice,
+/turf/open/misc/asteroid/snow/ice,
+/area/awaymission/snowdin/cave/cavern)
 "EM" = (
 /obj/structure/table/optable,
 /obj/effect/turf_decal/bot_white,
@@ -8978,10 +8968,6 @@
 	},
 /turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/cave/cavern)
-"EY" = (
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "EZ" = (
 /obj/effect/turf_decal/weather/snow,
 /obj/effect/light_emitter{
@@ -9006,13 +8992,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plating/snowed/smoothed,
 /area/awaymission/snowdin/outside)
-"Fm" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Fn" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/portable_atmospherics/canister/plasma,
@@ -9027,19 +9006,6 @@
 /obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/outside)
-"Fq" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
-"Fs" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Ft" = (
 /obj/structure/fence/door,
 /turf/open/misc/asteroid/snow,
@@ -9084,6 +9050,17 @@
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating/snowed/smoothed,
 /area/awaymission/snowdin/outside)
+"FM" = (
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 2;
+	height = 5;
+	shuttle_id = "snowdin_mining_down";
+	name = "snowdin mining bottom";
+	width = 5
+	},
+/turf/open/floor/plating/elevatorshaft,
+/area/awaymission/snowdin/post/mining_dock)
 "FO" = (
 /obj/machinery/computer/monitor{
 	dir = 8
@@ -9099,9 +9076,13 @@
 /obj/structure/ore_box,
 /turf/closed/mineral/snowmountain/cavern,
 /area/awaymission/snowdin/cave/cavern)
-"FV" = (
-/obj/item/disk/holodisk/snowdin/ripjacob,
-/obj/structure/cable,
+"FW" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille/broken,
+/obj/item/stack/rods{
+	amount = 2
+	},
+/obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "FZ" = (
@@ -9210,6 +9191,15 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_main/robotics)
+"GD" = (
+/obj/machinery/mineral/processing_unit{
+	dir = 1
+	},
+/obj/machinery/conveyor{
+	id = "snowdin_belt_mine"
+	},
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "GH" = (
 /turf/closed/wall/rust,
 /area/awaymission/snowdin/post/mining_main/mechbay)
@@ -9356,6 +9346,11 @@
 /obj/machinery/portable_atmospherics/canister,
 /turf/open/floor/plating/snowed/smoothed,
 /area/awaymission/snowdin/outside)
+"Hr" = (
+/obj/item/shard,
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Hs" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
@@ -9371,10 +9366,6 @@
 /obj/machinery/holopad,
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post/mining_main/robotics)
-"Hv" = (
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Hy" = (
 /obj/machinery/door/airlock/research/glass{
 	name = "Mech Lab"
@@ -9542,11 +9533,6 @@
 /obj/machinery/mech_bay_recharge_port,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/post/mining_main/mechbay)
-"In" = (
-/obj/vehicle/sealed/mecha/ripley/mining,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/recharge_floor,
-/area/awaymission/snowdin/post/mining_main/mechbay)
 "Io" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -9718,6 +9704,10 @@
 	},
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/dorm)
+"Jg" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Ji" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -9731,20 +9721,14 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_main)
-"Jk" = (
-/obj/machinery/mineral/processing_unit{
-	dir = 1
+"Jo" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 5
 	},
-/obj/machinery/conveyor{
-	id = "snowdin_belt_mine"
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
-"Jl" = (
-/obj/structure/barricade/sandbags,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
+/obj/structure/spider/stickyweb,
+/mob/living/basic/spider/giant/hunter/ice,
+/turf/open/floor/iron/freezer,
+/area/awaymission/snowdin/post/kitchen)
 "Jq" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
@@ -9800,6 +9784,20 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_main)
+"JA" = (
+/obj/machinery/door/airlock/maintenance{
+	name = "Misc Storage"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
+"JC" = (
+/obj/machinery/light/small/directional/south,
+/obj/structure/sign/nanotrasen{
+	pixel_y = -32
+	},
+/turf/open/misc/asteroid/snow/ice,
+/area/awaymission/snowdin/post/mining_dock)
 "JL" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 1
@@ -9850,6 +9848,13 @@
 "JV" = (
 /turf/open/misc/ice,
 /area/awaymission/snowdin/outside)
+"JY" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Kc" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 8
@@ -9892,6 +9897,13 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_main)
+"Kn" = (
+/obj/structure/plasticflaps,
+/obj/machinery/conveyor{
+	id = "snowdin_belt_mine"
+	},
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "Ko" = (
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/stripes/line{
@@ -9942,10 +9954,6 @@
 /obj/structure/flora/grass/both/style_random,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/cave)
-"KH" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "KI" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical,
@@ -10034,12 +10042,11 @@
 /obj/effect/turf_decal/tile/brown/anticorner/contrasted,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_main)
-"Ld" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 4
+"Le" = (
+/obj/machinery/conveyor{
+	id = "snowdin_belt_mine"
 	},
-/turf/open/floor/iron,
+/turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "Lf" = (
 /obj/machinery/power/apc/auto_name/directional/north,
@@ -10065,13 +10072,6 @@
 /obj/structure/fence/door/opened,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
-"Lj" = (
-/obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Lk" = (
 /obj/machinery/button/door/directional/west{
 	id = "snowdindormabandoned1";
@@ -10136,12 +10136,11 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/minipost)
-"LH" = (
-/obj/machinery/light/small/directional/south,
-/obj/structure/sign/nanotrasen{
-	pixel_y = -32
+"LE" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+	dir = 8
 	},
-/turf/open/misc/asteroid/snow/ice,
+/turf/open/floor/plating/snowed/cavern,
 /area/awaymission/snowdin/post/mining_dock)
 "LI" = (
 /obj/effect/turf_decal/weather/snow,
@@ -10164,6 +10163,14 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post)
+"LL" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/firealarm/directional/north,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/research)
 "LM" = (
 /obj/effect/mob_spawn/corpse/human/assistant,
 /turf/open/misc/asteroid/snow/ice,
@@ -10236,11 +10243,6 @@
 	temperature = 120
 	},
 /area/awaymission/snowdin/cave/cavern)
-"Md" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/tile/brown/half/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Mg" = (
 /obj/structure/table,
 /obj/item/clothing/neck/stethoscope,
@@ -10265,6 +10267,14 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/engineering)
+"Mn" = (
+/obj/item/shard,
+/obj/item/stack/rods{
+	amount = 2
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "Mo" = (
 /mob/living/simple_animal/hostile/asteroid/basilisk,
 /turf/open/misc/asteroid/snow{
@@ -10278,20 +10288,11 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/cave)
-"Ms" = (
-/obj/effect/turf_decal/stripes/line{
+"Mw" = (
+/obj/machinery/power/terminal{
 	dir = 4
 	},
-/obj/effect/turf_decal/caution/stand_clear{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
-"Mw" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "snowdin_belt_mine"
-	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "Mz" = (
@@ -10309,9 +10310,12 @@
 	},
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
-"MD" = (
-/obj/structure/sign/warning/docking/directional/east,
-/turf/open/floor/plating,
+"MF" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
 "MG" = (
 /obj/effect/decal/remains/human,
@@ -10343,14 +10347,6 @@
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/kitchen)
-"MM" = (
-/obj/structure/plasticflaps,
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "snowdin_belt_mine"
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "MN" = (
 /obj/item/stack/rods,
 /turf/open/misc/asteroid/snow,
@@ -10376,6 +10372,14 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/outside)
+"MS" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4;
+	piping_layer = 4
+	},
+/obj/structure/sign/warning/xeno_mining/directional/east,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "MT" = (
 /obj/effect/turf_decal/weather/snow,
 /obj/effect/turf_decal/weather/snow/corner{
@@ -10405,6 +10409,12 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
+"MX" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "MZ" = (
 /obj/structure/fence{
 	dir = 4
@@ -10428,39 +10438,12 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/carpet,
 /area/awaymission/snowdin/post/dorm)
-"Nc" = (
-/obj/machinery/door/firedoor,
-/obj/structure/holosign/barrier/atmos,
-/obj/structure/grille/broken,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
-"Nd" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 2;
-	height = 5;
-	shuttle_id = "snowdin_mining_down";
-	name = "snowdin mining bottom";
-	width = 5
-	},
-/turf/open/floor/plating/elevatorshaft,
-/area/awaymission/snowdin/post/mining_dock)
 "Nf" = (
 /obj/structure/fence/corner{
 	dir = 6
 	},
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
-"Ng" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Nh" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/suit/hooded/wintercoat/science,
@@ -10494,12 +10477,6 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/hydro)
-"Ns" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Nt" = (
 /obj/structure/sink/directional/west,
 /obj/structure/mirror/directional/east,
@@ -10515,6 +10492,11 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/engineering)
+"Nw" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Nz" = (
 /obj/structure/flora/rock/icy/style_random,
 /turf/open/misc/asteroid/snow/ice,
@@ -10573,6 +10555,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
+"NI" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "snowdin_belt_mine"
+	},
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "NL" = (
 /obj/machinery/airalarm/directional/north,
 /obj/structure/spider/stickyweb,
@@ -10604,12 +10593,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/outside)
-"NW" = (
-/obj/machinery/door/airlock/external/glass/ruin,
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "NX" = (
 /obj/structure/noticeboard/directional/north,
 /obj/item/paper/crumpled/ruins/snowdin/shovel,
@@ -10626,6 +10609,10 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/secpost)
+"Od" = (
+/mob/living/basic/spider/giant/hunter/ice,
+/turf/open/misc/asteroid/snow/ice,
+/area/awaymission/snowdin/cave/cavern)
 "Oe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -10660,6 +10647,23 @@
 /obj/structure/fence,
 /turf/open/misc/asteroid/snow/ice,
 /area/awaymission/snowdin/cave/cavern)
+"Ok" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
+	dir = 4;
+	piping_layer = 4;
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/storage/box{
+	illustration = "donk_kit";
+	name = "box of donkpockets"
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/kitchen)
 "Om" = (
 /obj/structure/table,
 /obj/machinery/light/small/directional/north,
@@ -10680,15 +10684,6 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/dorm)
-"Ow" = (
-/obj/machinery/door/firedoor,
-/obj/structure/grille/broken,
-/obj/item/stack/rods{
-	amount = 2
-	},
-/obj/item/shard,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Ox" = (
 /obj/structure/table,
 /obj/item/disk/holodisk/snowdin/welcometodie,
@@ -10718,10 +10713,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
-"OG" = (
-/obj/structure/sign/warning/electric_shock/directional/east,
-/obj/structure/cable,
-/turf/open/floor/plating,
+"OF" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
 "OH" = (
 /obj/effect/turf_decal/weather/snow,
@@ -10744,6 +10741,15 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"OS" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/caution/stand_clear{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "OT" = (
 /obj/structure/toilet{
 	dir = 1
@@ -10752,10 +10758,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/snowdin/post/dorm)
-"OU" = (
-/obj/item/shard,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "OV" = (
 /obj/structure/table/wood,
 /turf/open/misc/asteroid/snow{
@@ -10771,6 +10773,17 @@
 /obj/item/paper/fluff/awaymissions/snowdin/secnotice,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/secpost)
+"OX" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	piping_layer = 4;
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/research)
 "OZ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	piping_layer = 4;
@@ -10850,14 +10863,6 @@
 	},
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
-"Pr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 5
-	},
-/obj/structure/spider/stickyweb,
-/mob/living/basic/giant_spider/hunter/ice,
-/turf/open/floor/iron/freezer,
-/area/awaymission/snowdin/post/kitchen)
 "Ps" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 1
@@ -10877,14 +10882,26 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/post/mining_main)
+"Px" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/brown/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "PC" = (
 /obj/machinery/space_heater,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_main)
-"PD" = (
-/obj/structure/cable,
-/obj/effect/mapping_helpers/broken_floor,
+"PE" = (
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
+"PF" = (
+/obj/structure/plasticflaps,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "snowdin_belt_mine"
+	},
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "PH" = (
@@ -10920,6 +10937,11 @@
 	initial_gas_mix = "o2=22;n2=82;TEMP=180"
 	},
 /area/awaymission/snowdin/cave)
+"PO" = (
+/obj/structure/spider/stickyweb,
+/mob/living/basic/spider/giant/hunter/ice,
+/turf/open/misc/asteroid/snow/ice,
+/area/awaymission/snowdin/cave/cavern)
 "PQ" = (
 /obj/item/reagent_containers/cup/glass/bottle/beer{
 	list_reagents = null
@@ -10927,6 +10949,13 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"PR" = (
+/obj/machinery/conveyor{
+	id = "snowdin_belt_mine"
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/misc/asteroid/snow/ice,
+/area/awaymission/snowdin/post/mining_dock)
 "PU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	piping_layer = 4;
@@ -10965,23 +10994,6 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/outside)
-"Qa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
-	dir = 4;
-	piping_layer = 4;
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/storage/box{
-	illustration = "donk_kit";
-	name = "box of donkpockets"
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/kitchen)
 "Qc" = (
 /obj/structure/flora/tree/stump,
 /obj/effect/light_emitter{
@@ -11007,6 +11019,10 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/cave)
+"Qg" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Qh" = (
 /obj/structure/table,
 /obj/item/clothing/glasses/hud/health,
@@ -11059,11 +11075,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/engineering)
-"Qz" = (
-/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/structure/crate_abandoned,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "QB" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1;
@@ -11089,6 +11100,9 @@
 	},
 /turf/open/misc/ice/smooth,
 /area/awaymission/snowdin/outside)
+"QG" = (
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "QH" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 4
@@ -11115,10 +11129,6 @@
 /obj/item/disk/holodisk/snowdin/weregettingpaidright,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/post/research)
-"QM" = (
-/mob/living/basic/giant_spider/nurse/ice,
-/turf/open/misc/asteroid/snow/ice,
-/area/awaymission/snowdin/cave/cavern)
 "QN" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
 	piping_layer = 4;
@@ -11195,11 +11205,10 @@
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/cave)
 "Rb" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/caution/stand_clear{
-	dir = 1
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 8
 	},
-/obj/effect/turf_decal/tile/brown/half/contrasted,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
 "Rd" = (
@@ -11253,6 +11262,13 @@
 	},
 /turf/open/misc/asteroid/snow/ice,
 /area/awaymission/snowdin/cave/cavern)
+"Rx" = (
+/obj/machinery/conveyor{
+	dir = 10;
+	id = "snowdin_belt_mine"
+	},
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "RB" = (
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/misc/asteroid/snow,
@@ -11342,6 +11358,10 @@
 /mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer,
 /turf/open/misc/asteroid/snow/ice,
 /area/awaymission/snowdin/cave/cavern)
+"Sc" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Sd" = (
 /obj/item/stack/rods,
 /obj/effect/turf_decal/weather/snow,
@@ -11353,10 +11373,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/cave)
-"Si" = (
-/mob/living/basic/giant_spider/hunter/ice,
-/turf/open/misc/asteroid/snow/ice,
-/area/awaymission/snowdin/cave/cavern)
 "Sj" = (
 /obj/machinery/button/door/directional/south{
 	id = "snowdinturbineoutlet";
@@ -11434,6 +11450,10 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_main)
+"Sv" = (
+/mob/living/basic/migo,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Sw" = (
 /obj/structure/statue/snow/snowman{
 	name = "Snow-Luc Price"
@@ -11565,12 +11585,16 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
 "Ta" = (
-/obj/machinery/airalarm/directional/north,
-/obj/structure/sign/warning/docking/directional/east,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
-	dir = 4
+/obj/machinery/mineral/unloading_machine{
+	dir = 1;
+	icon_state = "unloader-corner";
+	input_dir = 1;
+	output_dir = 2
 	},
-/turf/open/floor/iron,
+/obj/machinery/conveyor{
+	id = "snowdin_belt_mine"
+	},
+/turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "Tb" = (
 /obj/effect/light_emitter{
@@ -11590,6 +11614,12 @@
 /mob/living/basic/bear/snow,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
+"Th" = (
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Tk" = (
 /obj/effect/turf_decal/weather/snow/corner,
 /turf/open/misc/asteroid/snow{
@@ -11609,24 +11639,12 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
-"To" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 1
+"Tp" = (
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+	dir = 4
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
-"Tp" = (
-/obj/machinery/light/small/directional/west,
-/obj/item/stack/rods{
-	amount = 2
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Tr" = (
 /obj/effect/turf_decal/weather/snow,
 /obj/effect/turf_decal/weather/snow/corner{
@@ -11635,6 +11653,11 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/outside)
+"Tu" = (
+/obj/structure/cable,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "Tv" = (
 /obj/structure/table,
 /obj/item/storage/medkit/ancient,
@@ -11660,20 +11683,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/engine/n2,
 /area/awaymission/snowdin/post/engineering)
-"TF" = (
-/obj/item/shard,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
-"TH" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "TI" = (
 /obj/structure/flora/grass/both/style_random,
 /turf/open/misc/asteroid/snow,
@@ -11711,10 +11720,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
-"TU" = (
-/obj/machinery/holopad,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "TW" = (
 /mob/living/simple_animal/hostile/skeleton/plasmaminer,
 /turf/open/floor/plating/snowed/cavern,
@@ -11746,6 +11751,10 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plating/snowed,
 /area/awaymission/snowdin/cave)
+"Ud" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "Ui" = (
 /obj/machinery/light/small/directional/west,
 /turf/open/misc/ice/smooth,
@@ -11825,14 +11834,6 @@
 /obj/item/clothing/head/cone,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/cave)
-"Uz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/research)
 "UA" = (
 /obj/machinery/light/small/directional/east,
 /obj/structure/closet/cabinet,
@@ -11892,8 +11893,10 @@
 /obj/structure/flora/rock/pile/icy/style_random,
 /turf/open/misc/asteroid/snow/ice,
 /area/awaymission/snowdin/cave/cavern)
-"UZ" = (
-/turf/open/floor/iron,
+"UW" = (
+/obj/item/disk/holodisk/snowdin/ripjacob,
+/obj/structure/cable,
+/turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "Va" = (
 /obj/structure/fence{
@@ -11907,6 +11910,12 @@
 /obj/effect/mob_spawn/corpse/human/syndicatesoldier,
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/cave)
+"Vc" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "Vd" = (
 /mob/living/basic/migo,
 /turf/open/floor/iron/white,
@@ -11947,10 +11956,6 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/outside)
-"Vo" = (
-/mob/living/basic/giant_spider/ice,
-/turf/open/misc/asteroid/snow/ice,
-/area/awaymission/snowdin/cave/cavern)
 "Vp" = (
 /obj/item/paper/crumpled/ruins/snowdin/misc1,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -11960,15 +11965,6 @@
 /obj/machinery/light/broken/directional/south,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
-"Vs" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Vt" = (
 /obj/docking_port/stationary{
 	dir = 4;
@@ -11985,6 +11981,12 @@
 /obj/machinery/light/broken/directional/north,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/hydro)
+"Vv" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Vw" = (
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plating/snowed/smoothed,
@@ -12013,19 +12015,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
-"VD" = (
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/caution/stand_clear{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "VE" = (
 /obj/structure/table/wood,
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -12040,11 +12029,20 @@
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
+"VH" = (
+/mob/living/basic/spider/giant/ice,
+/turf/open/misc/asteroid/snow/ice,
+/area/awaymission/snowdin/cave/cavern)
 "VJ" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/hydro)
+"VL" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "VO" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/sign/nanotrasen{
@@ -12067,18 +12065,6 @@
 	slowdown = 1
 	},
 /area/awaymission/snowdin/cave)
-"VR" = (
-/obj/machinery/mineral/unloading_machine{
-	dir = 1;
-	icon_state = "unloader-corner";
-	input_dir = 1;
-	output_dir = 2
-	},
-/obj/machinery/conveyor{
-	id = "snowdin_belt_mine"
-	},
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "VU" = (
 /obj/structure/closet/crate/wooden,
 /obj/effect/spawner/random/exotic/antag_gear_weak,
@@ -12110,6 +12096,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post)
+"Wo" = (
+/obj/structure/closet/crate/preopen,
+/obj/item/storage/toolbox/emergency,
+/obj/item/clothing/suit/hooded/wintercoat,
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
 "Wp" = (
 /obj/structure/statue/snow/snowman{
 	anchored = 1;
@@ -12197,6 +12189,11 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/minipost)
+"WK" = (
+/obj/vehicle/sealed/mecha/ripley/mining,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/recharge_floor,
+/area/awaymission/snowdin/post/mining_main/mechbay)
 "WM" = (
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
@@ -12241,10 +12238,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
-"Xf" = (
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Xh" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible,
@@ -12263,10 +12256,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post/mining_main/robotics)
-"Xn" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Xo" = (
 /obj/structure/flora/grass/both/style_random,
 /obj/effect/light_emitter{
@@ -12276,13 +12265,6 @@
 	},
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
-"Xr" = (
-/obj/structure/closet/crate/preopen,
-/obj/item/storage/toolbox/emergency,
-/obj/item/clothing/suit/hooded/wintercoat,
-/obj/item/clothing/suit/hooded/wintercoat,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "Xt" = (
 /obj/structure/rack,
 /obj/item/storage/box/rubbershot,
@@ -12301,8 +12283,10 @@
 	},
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post/minipost)
-"Xz" = (
-/mob/living/basic/migo,
+"Xx" = (
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
 "XB" = (
@@ -12320,6 +12304,20 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/cave)
+"XE" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/awaymission/snowdin/post/mining_dock)
+"XF" = (
+/obj/effect/baseturf_helper/asteroid/snow{
+	baseturf = /turf/open/misc/asteroid/snow/ice;
+	name = "asteroid snowice baseturf editor"
+	},
+/turf/closed/wall/ice,
+/area/awaymission/snowdin/post/mining_dock)
 "XI" = (
 /obj/effect/spawner/random/exotic/snow_gear,
 /turf/open/misc/asteroid/snow,
@@ -12360,6 +12358,15 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/snowdin/cave)
+"XU" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "XV" = (
 /obj/effect/light_emitter{
 	name = "cave light";
@@ -12390,9 +12397,8 @@
 /turf/open/floor/iron/showroomfloor,
 /area/awaymission/snowdin/post/cavern1)
 "Yc" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
+/obj/effect/spawner/random/structure/crate_abandoned,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
 "Yd" = (
@@ -12454,6 +12460,14 @@
 	},
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post)
+"Yq" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Yr" = (
 /obj/item/shard,
 /obj/effect/turf_decal/weather/snow,
@@ -12487,13 +12501,6 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/grimy,
 /area/awaymission/snowdin/post/mining_main)
-"Yy" = (
-/obj/effect/baseturf_helper/asteroid/snow{
-	baseturf = /turf/open/misc/asteroid/snow/ice;
-	name = "asteroid snowice baseturf editor"
-	},
-/turf/closed/wall/ice,
-/area/awaymission/snowdin/post/mining_dock)
 "Yz" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
@@ -12532,6 +12539,13 @@
 /obj/structure/sign/warning/fire/directional/south,
 /turf/open/floor/engine,
 /area/awaymission/snowdin/post/engineering)
+"YI" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "YK" = (
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/grimy,
@@ -12548,13 +12562,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/dark/snowdin,
 /area/awaymission/snowdin/cave)
-"YS" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Misc Storage"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/open/floor/plating,
-/area/awaymission/snowdin/post/mining_dock)
 "YT" = (
 /obj/effect/turf_decal/weather/snow,
 /obj/effect/turf_decal/weather/snow/corner{
@@ -12583,6 +12590,15 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/gateway)
+"Zh" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/awaymission/snowdin/post/mining_dock)
 "Zj" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	piping_layer = 4;
@@ -12625,13 +12641,6 @@
 /obj/machinery/light/broken/directional/north,
 /turf/open/floor/engine/cult,
 /area/awaymission/snowdin/post/cavern2)
-"Zt" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "Zu" = (
 /obj/machinery/light/small/directional/east,
 /turf/open/misc/asteroid/snow,
@@ -12708,13 +12717,6 @@
 	},
 /turf/open/misc/asteroid/snow,
 /area/awaymission/snowdin/outside)
-"ZO" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/awaymission/snowdin/post/mining_dock)
 "ZT" = (
 /obj/structure/chair/stool/directional/west,
 /turf/open/misc/asteroid/snow{
@@ -12728,10 +12730,8 @@
 /turf/open/floor/iron/cafeteria,
 /area/awaymission/snowdin/post/messhall)
 "ZW" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/brown/anticorner/contrasted{
-	dir = 8
+	dir = 1
 	},
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/mining_dock)
@@ -21511,7 +21511,7 @@ iu
 jm
 jT
 kF
-wx
+se
 md
 xw
 QB
@@ -23037,7 +23037,7 @@ az
 aC
 aC
 az
-Uz
+LL
 bF
 bV
 cA
@@ -24065,7 +24065,7 @@ aC
 aC
 aC
 az
-fB
+OX
 bJ
 Sp
 bp
@@ -25353,7 +25353,7 @@ be
 bu
 bL
 Lg
-Pr
+Jo
 dn
 dO
 et
@@ -26399,9 +26399,9 @@ ZU
 dO
 ST
 nU
-ww
+ut
 oQ
-vH
+bG
 pV
 Nv
 Mb
@@ -26895,7 +26895,7 @@ Zy
 Zy
 bf
 SE
-Qa
+Ok
 ds
 dR
 ey
@@ -27154,7 +27154,7 @@ bf
 ch
 cN
 dt
-zg
+DZ
 ez
 fj
 fQ
@@ -50352,7 +50352,7 @@ wN
 wN
 WN
 WN
-Vo
+VH
 WN
 WN
 wN
@@ -50855,13 +50855,13 @@ eJ
 wN
 WN
 WN
-Vo
+VH
 wN
 wN
 WN
 WN
 WN
-QM
+EL
 WN
 WN
 eJ
@@ -51127,7 +51127,7 @@ eJ
 eJ
 eJ
 WN
-QM
+EL
 WN
 wN
 WN
@@ -51622,7 +51622,7 @@ eJ
 eJ
 eJ
 WN
-QM
+EL
 eJ
 eJ
 eJ
@@ -52147,10 +52147,10 @@ eJ
 eJ
 eJ
 WN
-Si
+Od
 WN
 WN
-pc
+PO
 eJ
 eJ
 eJ
@@ -57441,7 +57441,7 @@ HL
 IA
 GU
 vW
-Xf
+PE
 wL
 wO
 wE
@@ -57700,7 +57700,7 @@ Gx
 wM
 wL
 wL
-hf
+Mw
 wE
 eJ
 eJ
@@ -57956,7 +57956,7 @@ IB
 IJ
 wM
 wM
-OG
+wt
 wG
 wE
 eJ
@@ -58465,16 +58465,16 @@ wT
 xN
 wL
 xN
-Zt
-Zt
-Zt
-ZO
-Eh
-zi
-dJ
-kC
-kC
+Rb
+Rb
+Rb
+nz
+wr
 ZW
+DP
+Yq
+Yq
+af
 wD
 eJ
 eJ
@@ -58711,25 +58711,25 @@ WN
 WN
 WN
 WN
-LH
-Yy
+JC
+XF
 xW
 xW
 xW
 wL
 xN
-li
-Fs
+Vv
+oi
 xy
-UZ
+QG
 wL
 wL
-le
-TF
-Ow
-tj
-Fs
-UZ
+AB
+Hr
+FW
+MX
+oi
+QG
 xy
 xy
 wD
@@ -58969,25 +58969,25 @@ WN
 WN
 WN
 PV
-Nc
-nm
-Tp
-Dp
-xG
-le
-FV
-KH
-PD
-PD
-PD
-Ld
-wM
-yN
-Eh
+bz
+Mn
+AJ
+ln
+MF
 AB
+UW
+Sc
+Tu
+Tu
+Tu
+JY
+wM
+Dk
+wr
+Tp
 wL
 xy
-UZ
+QG
 xy
 wD
 eJ
@@ -59226,26 +59226,26 @@ WN
 cF
 WN
 WN
-NW
-OU
+vg
+qR
 wL
-Lj
+XE
 xy
-UZ
+QG
 xy
-Xz
-fq
+Sv
+ud
 xy
-Jl
+uo
 wD
-Yc
+Vc
 wE
 wD
 wD
 wD
-tj
-Fs
-Md
+MX
+oi
+Px
 wD
 eJ
 eJ
@@ -59483,26 +59483,26 @@ UI
 WN
 WN
 WN
-NW
+vg
 wL
-jN
-Lj
+MS
+XE
 xy
 xy
 wL
-UZ
-Fs
-UZ
-kD
+QG
+oi
+QG
+Dt
 wD
 wM
 wE
-EY
-EY
+oq
+oq
 wE
-tj
-TU
-Hv
+MX
+wq
+Jg
 wD
 eJ
 eJ
@@ -59587,7 +59587,7 @@ eJ
 eJ
 UT
 WN
-Si
+Od
 eJ
 eJ
 eJ
@@ -59739,26 +59739,26 @@ WN
 WN
 WN
 WN
-LH
+JC
 xW
 xW
 zI
 xW
-tS
+iX
 ya
-Ns
+uu
 xy
 wL
 xy
-Xn
+Qg
 wD
 wM
 wD
-Qz
+Yc
 wL
-YS
-tj
-Fs
+JA
+MX
+oi
 xy
 wD
 eJ
@@ -59999,24 +59999,24 @@ WN
 WN
 WN
 WN
-zO
+LE
 xW
 xW
 xW
-yV
+Xx
 wL
 ya
 ya
-yN
+Dk
 wD
-la
+mZ
 wD
-Xr
-qJ
+CU
+Wo
 wD
-Ta
-nI
-MD
+kH
+Th
+CN
 wD
 eJ
 eJ
@@ -60272,7 +60272,7 @@ wD
 wE
 wE
 wD
-dc
+Co
 wD
 wD
 wE
@@ -60526,13 +60526,13 @@ GN
 wM
 wL
 wD
-tn
-tn
-rg
+VL
+VL
+uf
 wL
-Fs
+oi
 wL
-UZ
+QG
 wD
 bh
 bh
@@ -60783,13 +60783,13 @@ GH
 wM
 wL
 wD
-mD
-Ng
+OF
+gR
 xO
-Ms
-Ng
-sL
-Fm
+OS
+gR
+BL
+xd
 wE
 bh
 bh
@@ -61040,13 +61040,13 @@ GH
 wM
 wL
 wE
-CM
+Nw
 Ys
 Ys
-Nd
+FM
 Ys
 Ys
-Vs
+XU
 wE
 bh
 bh
@@ -61297,13 +61297,13 @@ GH
 WX
 wL
 wE
-CM
+Nw
 Ys
 Ys
 Ys
 Ys
 Ys
-Vs
+XU
 wE
 bh
 bh
@@ -61554,13 +61554,13 @@ GN
 wL
 wL
 wE
-Rb
+vF
 Ys
 Ys
 Ys
 Ys
 Ys
-To
+Ex
 wE
 bh
 bh
@@ -61806,18 +61806,18 @@ GJ
 He
 HA
 HO
-In
+WK
 GH
 wL
 wL
 wE
-CM
+Nw
 Ys
 Ys
 Ys
 Ys
 Ys
-Vs
+XU
 wE
 bh
 bh
@@ -62068,13 +62068,13 @@ GN
 wL
 wL
 wD
-CM
+Nw
 Ys
 Ys
 Ys
 Ys
 Ys
-Vs
+XU
 wD
 bh
 bh
@@ -62323,15 +62323,15 @@ Um
 Io
 IE
 wL
-aA
+Ud
 wD
-Fq
-TH
-TH
-VD
-TH
-TH
-wt
+Zh
+tM
+tM
+em
+tM
+tM
+YI
 wD
 bh
 bh
@@ -62580,7 +62580,7 @@ HS
 Hh
 GN
 wD
-MM
+PF
 wE
 wD
 wE
@@ -62837,7 +62837,7 @@ GN
 GH
 GH
 wL
-Mw
+NI
 wD
 eJ
 eJ
@@ -63085,16 +63085,16 @@ WN
 WN
 WN
 Bw
-fE
-hh
-VR
-Bn
-Jk
-Bn
-Bn
-Bn
-Bn
-wz
+PR
+Kn
+Ta
+Le
+GD
+Le
+Le
+Le
+Le
+Rx
 wE
 eJ
 eJ
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 85c65890f87..82f5a8571ea 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3768,20 +3768,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/cytology)
-"bqN" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
-	dir = 4
-	},
-/obj/effect/spawner/random/armory/disablers,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/requests_console/directional/west{
-	department = "Security";
-	name = "Security Requests Console"
-	},
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
 "bqX" = (
 /turf/closed/wall/r_wall,
 /area/station/medical/chemistry)
@@ -13972,19 +13958,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/station/science/research)
-"fkh" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/blue{
-	pixel_y = 2
-	},
-/obj/item/pen,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/requests_console/directional/west{
-	department = "AI Chamber";
-	name = "AI Chamber Requests Console"
-	},
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai)
 "fkk" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -18307,25 +18280,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/rd)
-"gUi" = (
-/obj/machinery/newscaster/directional/north,
-/obj/machinery/camera/directional/north{
-	c_tag = "Chapel - Fore"
-	},
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/food/grown/poppy{
-	pixel_y = 11
-	},
-/obj/item/book/bible{
-	pixel_y = 3
-	},
-/obj/item/food/grown/harebell{
-	pixel_x = -11;
-	pixel_y = 2
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
 "gUt" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
@@ -20735,6 +20689,19 @@
 	},
 /turf/open/floor/iron/freezer,
 /area/station/security/prison/shower)
+"hOV" = (
+/obj/structure/table/wood,
+/obj/machinery/fax{
+	fax_name = "Law Office";
+	name = "Law Office Fax Machine"
+	},
+/obj/machinery/light/small/directional/south,
+/obj/machinery/button/door/directional/west{
+	name = "Privacy Shutters";
+	id = "lawyer_shutters"
+	},
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
 "hPu" = (
 /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
 	dir = 5
@@ -28204,12 +28171,6 @@
 /obj/machinery/status_display/evac,
 /turf/closed/wall,
 /area/station/commons/lounge)
-"kms" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/basic/giant_spider/sgt_araneus,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/hos)
 "kmN" = (
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/lesser)
@@ -29591,19 +29552,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/commons/fitness/recreation)
-"kPh" = (
-/obj/machinery/dna_scannernew,
-/obj/effect/turf_decal/siding/purple{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/requests_console/directional/east{
-	department = "Genetics";
-	name = "Genetics Requests Console"
-	},
-/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
 "kPw" = (
 /obj/structure/table,
 /obj/item/screwdriver{
@@ -30340,6 +30288,25 @@
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen/coldroom)
+"laW" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/turf_decal/trimline/brown/warning{
+	dir = 6
+	},
+/obj/machinery/camera/directional/west{
+	c_tag = "Kitchen"
+	},
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
 "lbh" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 8
@@ -31018,6 +30985,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/aft/lesser)
+"lqv" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/mob/living/basic/spider/giant/sgt_araneus,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/hos)
 "lqL" = (
 /obj/effect/turf_decal/siding{
 	dir = 1
@@ -31707,6 +31680,25 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/grimy,
 /area/station/security/detectives_office)
+"lGs" = (
+/obj/machinery/light_switch/directional/west,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/food/grown/poppy{
+	pixel_y = 3;
+	pixel_x = -3
+	},
+/obj/item/food/grown/poppy{
+	pixel_y = 7;
+	pixel_x = 7
+	},
+/obj/item/flashlight/flare/candle{
+	pixel_x = 12;
+	pixel_y = 4
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
 "lGL" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
@@ -33566,6 +33558,18 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/command/gateway)
+"mnt" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/food/grown/poppy{
+	pixel_y = 7;
+	pixel_x = -8
+	},
+/obj/item/food/grown/poppy{
+	pixel_y = 2
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
 "mnx" = (
 /obj/structure/sign/directions/evac,
 /obj/structure/sign/directions/medical{
@@ -36609,6 +36613,25 @@
 	},
 /turf/open/floor/wood,
 /area/station/commons/dorms)
+"noY" = (
+/obj/machinery/newscaster/directional/north,
+/obj/machinery/camera/directional/north{
+	c_tag = "Chapel - Fore"
+	},
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/food/grown/poppy{
+	pixel_y = 11
+	},
+/obj/item/book/bible{
+	pixel_y = 3
+	},
+/obj/item/food/grown/harebell{
+	pixel_x = -11;
+	pixel_y = 2
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
 "npv" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible{
 	dir = 4
@@ -37988,6 +38011,17 @@
 "nNL" = (
 /turf/closed/mineral/volcanic,
 /area/space/nearstation)
+"nNM" = (
+/obj/item/flashlight/flare/candle{
+	pixel_y = 10;
+	pixel_x = 1
+	},
+/obj/machinery/light_switch/directional/north,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
 "nNW" = (
 /obj/structure/disposaloutlet{
 	dir = 4;
@@ -39881,6 +39915,22 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/station/service/bar)
+"ozd" = (
+/obj/structure/cable,
+/obj/machinery/camera/directional/south{
+	c_tag = "Chief Medical Officer's Office";
+	network = list("ss13","medbay")
+	},
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
+/obj/effect/mapping_helpers/requests_console/information,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/effect/mapping_helpers/requests_console/announcement,
+/obj/machinery/requests_console/directional/south{
+	department = "Chief Medical Officer's Desk";
+	name = "Chief Medical Officer's Requests Console"
+	},
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/cmo)
 "ozm" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 1
@@ -40294,6 +40344,26 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload_foyer)
+"oGX" = (
+/obj/structure/table/wood,
+/obj/item/food/grown/harebell{
+	pixel_y = 10;
+	pixel_x = -6
+	},
+/obj/item/food/grown/harebell{
+	pixel_x = 8;
+	pixel_y = 12
+	},
+/obj/item/food/grown/harebell{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/food/grown/harebell{
+	pixel_y = 7
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/service/chapel)
 "oGZ" = (
 /obj/structure/table,
 /obj/item/storage/bag/tray/cafeteria,
@@ -40370,25 +40440,6 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/lesser)
-"oHP" = (
-/obj/machinery/light_switch/directional/west,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/food/grown/poppy{
-	pixel_y = 3;
-	pixel_x = -3
-	},
-/obj/item/food/grown/poppy{
-	pixel_y = 7;
-	pixel_x = 7
-	},
-/obj/item/flashlight/flare/candle{
-	pixel_x = 12;
-	pixel_y = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
 "oIa" = (
 /turf/closed/wall,
 /area/station/commons/vacant_room/commissary)
@@ -43295,6 +43346,19 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/engine/n2,
 /area/station/engineering/atmos)
+"pMl" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/blue{
+	pixel_y = 2
+	},
+/obj/item/pen,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/requests_console/directional/west{
+	department = "AI Chamber";
+	name = "AI Chamber Requests Console"
+	},
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai)
 "pMs" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
@@ -45140,17 +45204,6 @@
 	dir = 1
 	},
 /area/station/service/chapel)
-"qxi" = (
-/obj/item/flashlight/flare/candle{
-	pixel_y = 10;
-	pixel_x = 1
-	},
-/obj/machinery/light_switch/directional/north,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
 "qxr" = (
 /obj/structure/cable,
 /obj/effect/mapping_helpers/broken_floor,
@@ -45898,22 +45951,6 @@
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
-"qKU" = (
-/obj/structure/cable,
-/obj/machinery/camera/directional/south{
-	c_tag = "Chief Medical Officer's Office";
-	network = list("ss13","medbay")
-	},
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/machinery/requests_console/directional/south{
-	department = "Chief Medical Officer's Desk";
-	name = "Chief Medical Officer's Requests Console"
-	},
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
 "qLe" = (
 /obj/structure/cable,
 /obj/machinery/door/firedoor,
@@ -47052,18 +47089,6 @@
 	},
 /turf/open/floor/wood,
 /area/station/service/library)
-"rcV" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/food/grown/poppy{
-	pixel_y = 7;
-	pixel_x = -8
-	},
-/obj/item/food/grown/poppy{
-	pixel_y = 2
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
 "rcW" = (
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -47087,26 +47112,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
-"rdK" = (
-/obj/structure/table/wood,
-/obj/item/food/grown/harebell{
-	pixel_y = 10;
-	pixel_x = -6
-	},
-/obj/item/food/grown/harebell{
-	pixel_x = 8;
-	pixel_y = 12
-	},
-/obj/item/food/grown/harebell{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/obj/item/food/grown/harebell{
-	pixel_y = 7
-	},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/service/chapel)
 "rdT" = (
 /obj/structure/toilet{
 	pixel_y = 8
@@ -47490,17 +47495,6 @@
 /obj/structure/table,
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)
-"rmC" = (
-/obj/machinery/vending/wardrobe/sec_wardrobe,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/machinery/requests_console/directional/east{
-	department = "Security";
-	name = "Security Requests Console"
-	},
-/turf/open/floor/iron,
-/area/station/security/checkpoint/customs)
 "rmD" = (
 /obj/effect/turf_decal/trimline/neutral/filled/warning{
 	dir = 4
@@ -50030,19 +50024,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"seC" = (
-/obj/structure/table/wood,
-/obj/machinery/fax{
-	fax_name = "Law Office";
-	name = "Law Office Fax Machine"
-	},
-/obj/machinery/light/small/directional/south,
-/obj/machinery/button/door/directional/west{
-	name = "Privacy Shutters";
-	id = "lawyer_shutters"
-	},
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
 "seN" = (
 /obj/structure/sign/directions/evac,
 /turf/closed/wall/r_wall,
@@ -52048,6 +52029,17 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"sRN" = (
+/obj/machinery/vending/wardrobe/sec_wardrobe,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/requests_console/directional/east{
+	department = "Security";
+	name = "Security Requests Console"
+	},
+/turf/open/floor/iron,
+/area/station/security/checkpoint/customs)
 "sRT" = (
 /obj/structure/cable,
 /turf/open/floor/wood,
@@ -58217,6 +58209,20 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/engineering/supermatter/room)
+"uYI" = (
+/obj/machinery/vending/dinnerware,
+/obj/effect/turf_decal/trimline/brown/warning{
+	dir = 5
+	},
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
 "uYP" = (
 /obj/structure/cable,
 /obj/machinery/door/window/left/directional/north{
@@ -58486,6 +58492,19 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
+"ven" = (
+/obj/machinery/dna_scannernew,
+/obj/effect/turf_decal/siding/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/requests_console/directional/east{
+	department = "Genetics";
+	name = "Genetics Requests Console"
+	},
+/obj/effect/mapping_helpers/requests_console/supplies,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
 "veo" = (
 /obj/structure/weightmachine/weightlifter{
 	desc = "A rusty old bench press machine, who dumped this out here?";
@@ -65507,6 +65526,20 @@
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
 /area/station/science/lab)
+"xAs" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 4
+	},
+/obj/effect/spawner/random/armory/disablers,
+/obj/effect/mapping_helpers/requests_console/supplies,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/machinery/requests_console/directional/west{
+	department = "Security";
+	name = "Security Requests Console"
+	},
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
 "xAt" = (
 /obj/machinery/door/window/right/directional/east{
 	base_state = "left";
@@ -66246,25 +66279,6 @@
 /obj/machinery/status_display/ai/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"xPh" = (
-/obj/structure/table,
-/obj/machinery/microwave,
-/obj/effect/turf_decal/trimline/brown/warning{
-	dir = 6
-	},
-/obj/machinery/camera/directional/west{
-	c_tag = "Kitchen"
-	},
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
 "xPm" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
@@ -67162,20 +67176,6 @@
 /obj/effect/turf_decal/trimline/dark_red/line,
 /turf/open/floor/iron/white/smooth_half,
 /area/station/commons/fitness)
-"yfn" = (
-/obj/machinery/vending/dinnerware,
-/obj/effect/turf_decal/trimline/brown/warning{
-	dir = 5
-	},
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
 "yfq" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -83048,7 +83048,7 @@ fxQ
 fcq
 wsQ
 pTm
-rmC
+sRN
 xjh
 ccP
 bTj
@@ -90313,7 +90313,7 @@ pTL
 rJI
 taX
 tSw
-oHP
+lGs
 gmX
 lHK
 woz
@@ -90570,7 +90570,7 @@ tSw
 tSw
 xtz
 tSw
-gUi
+noY
 iJj
 uZD
 hKv
@@ -90827,7 +90827,7 @@ xaj
 tSw
 xtz
 tSw
-rcV
+mnt
 iJj
 jAm
 lFZ
@@ -91341,7 +91341,7 @@ kNO
 hav
 xGX
 tSw
-rdK
+oGX
 iZi
 kVN
 hKv
@@ -91828,7 +91828,7 @@ jgs
 uyw
 pcM
 cNk
-qKU
+ozd
 bqX
 bqX
 jYy
@@ -91855,7 +91855,7 @@ tSw
 tSw
 xWF
 tSw
-qxi
+nNM
 iZi
 kVN
 laa
@@ -94321,7 +94321,7 @@ aeq
 xCo
 loY
 tTP
-bqN
+xAs
 uou
 agc
 apM
@@ -96723,7 +96723,7 @@ gwf
 gfZ
 gqm
 jZP
-kPh
+ven
 jrb
 vEC
 eOo
@@ -98198,7 +98198,7 @@ iJd
 nVy
 tGI
 daC
-seC
+hOV
 xNU
 eFJ
 usP
@@ -100225,7 +100225,7 @@ aaa
 rrt
 aaa
 rrg
-kms
+lqv
 lfu
 ilR
 kcg
@@ -102339,8 +102339,8 @@ mal
 rFO
 pmZ
 qdI
-xPh
-yfn
+laW
+uYI
 wDh
 uIs
 amu
@@ -121597,7 +121597,7 @@ lro
 aWN
 aVl
 jGa
-fkh
+pMl
 bjQ
 bjQ
 bjQ
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 9b61e51839e..89d0715e4be 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -7079,7 +7079,7 @@
 	},
 /area/station/hallway/primary/central/aft)
 "cgl" = (
-/mob/living/basic/giant_spider/hunter/scrawny,
+/mob/living/basic/spider/giant/hunter/scrawny,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/electrical)
 "cgt" = (
@@ -17396,7 +17396,7 @@
 /area/station/engineering/atmos/storage)
 "fbk" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/giant_spider/tarantula/scrawny,
+/mob/living/basic/spider/giant/tarantula/scrawny,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/electrical)
 "fbl" = (
@@ -55991,7 +55991,7 @@
 	},
 /area/station/medical/virology)
 "pRr" = (
-/mob/living/basic/giant_spider/hunter/scrawny,
+/mob/living/basic/spider/giant/hunter/scrawny,
 /obj/machinery/light/small/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/status_display/ai/directional/south,
@@ -84434,7 +84434,7 @@
 /area/station/hallway/primary/central)
 "xKx" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/giant_spider/hunter/scrawny,
+/mob/living/basic/spider/giant/hunter/scrawny,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/electrical)
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index c70ba5f117f..c64f0236fa9 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -455,7 +455,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/blood/old,
-/mob/living/basic/giant_spider/hunter/scrawny,
+/mob/living/basic/spider/giant/hunter/scrawny,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/bar)
@@ -944,7 +944,7 @@
 	dir = 8
 	},
 /obj/structure/cable,
-/mob/living/basic/giant_spider/tarantula/scrawny,
+/mob/living/basic/spider/giant/tarantula/scrawny,
 /turf/open/floor/iron/dark,
 /area/shuttle/abandoned/bridge)
 "cg" = (
@@ -1504,7 +1504,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/giant_spider/nurse/scrawny,
+/mob/living/basic/spider/giant/nurse/scrawny,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/cargo)
 "dx" = (
@@ -1576,7 +1576,7 @@
 "dG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
-/mob/living/basic/giant_spider/hunter/scrawny,
+/mob/living/basic/spider/giant/hunter/scrawny,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/medbay)
 "dH" = (
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 9b62b3004ae..766f0784742 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 
 #define isclown(A) (istype(A, /mob/living/simple_animal/hostile/retaliate/clown))
 
-#define isspider(A) (istype(A, /mob/living/basic/giant_spider))
+#define isspider(A) (istype(A, /mob/living/basic/spider/giant))
 
 
 //Misc mobs
diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm
index 3d125902e54..5521dbfd0f4 100644
--- a/code/_globalvars/phobias.dm
+++ b/code/_globalvars/phobias.dm
@@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
 		/mob/living/simple_animal/drone,
 	)),
 	"security" = typecacheof(list(/mob/living/simple_animal/bot/secbot)),
-	"spiders" = typecacheof(list(/mob/living/basic/giant_spider)),
+	"spiders" = typecacheof(list(/mob/living/basic/spider/giant)),
 	"skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/skeleton)),
 	"snakes" = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/snake)),
 	"the supernatural" = typecacheof(list(
diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm
index 7bdc3353637..3b1c0683066 100644
--- a/code/controllers/subsystem/minor_mapping.dm
+++ b/code/controllers/subsystem/minor_mapping.dm
@@ -26,7 +26,7 @@ SUBSYSTEM_DEF(minor_mapping)
 
 		to_spawn--
 		if(HAS_TRAIT(SSstation, STATION_TRAIT_SPIDER_INFESTATION) && prob(PROB_SPIDER_REPLACEMENT))
-			new /mob/living/basic/giant_spider/maintenance(proposed_turf)
+			new /mob/living/basic/spider/maintenance(proposed_turf)
 			return
 
 		if (prob(PROB_MOUSE_SPAWN))
diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm
index 808be225ef9..a7ca1b3d9cc 100644
--- a/code/datums/memory/_memory.dm
+++ b/code/datums/memory/_memory.dm
@@ -255,8 +255,8 @@
 		/mob/living/basic/cow,
 		/mob/living/basic/cow/wisdom,
 		/mob/living/basic/crab,
-		/mob/living/basic/giant_spider,
-		/mob/living/basic/giant_spider/hunter,
+		/mob/living/basic/spider/giant,
+		/mob/living/basic/spider/giant/hunter,
 		/mob/living/basic/mining/goliath,
 		/mob/living/basic/headslug,
 		/mob/living/basic/killer_tomato,
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index a80ee924115..78837189561 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -867,13 +867,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		/mob/living/basic/ant,
 		/mob/living/basic/butterfly,
 		/mob/living/basic/cockroach,
-		/mob/living/basic/spiderling,
+		/mob/living/basic/spider/growing/spiderling,
 		/mob/living/basic/bee,
 		/obj/effect/decal/cleanable/ants,
 		/obj/item/queen_bee,
 	))
 	strong_against = typecacheof(list(
-		/mob/living/basic/giant_spider,
+		/mob/living/basic/spider/giant,
 	))
 
 
diff --git a/code/modules/antagonists/abductor/equipment/glands/spider.dm b/code/modules/antagonists/abductor/equipment/glands/spider.dm
index 52fe9a826b0..52ff520a876 100644
--- a/code/modules/antagonists/abductor/equipment/glands/spider.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/spider.dm
@@ -10,5 +10,5 @@
 /obj/item/organ/internal/heart/gland/spiderman/activate()
 	to_chat(owner, span_warning("You feel something crawling in your skin."))
 	owner.faction |= FACTION_SPIDER
-	var/mob/living/basic/spiderling/S = new(owner.drop_location())
-	S.directive = "Protect your nest inside [owner.real_name]."
+	var/mob/living/basic/spider/growing/spiderling/spider = new(owner.drop_location())
+	spider.directive = "Protect your nest inside [owner.real_name]."
diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm
index fc46350aaa3..51a54d99e30 100644
--- a/code/modules/antagonists/traitor/objectives/kill_pet.dm
+++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm
@@ -54,7 +54,7 @@
 	possible_heads = list(
 		JOB_HEAD_OF_SECURITY = list(
 			/mob/living/basic/carp/pet/lia,
-			/mob/living/basic/giant_spider/sgt_araneus,
+			/mob/living/basic/spider/giant/sgt_araneus,
 		),
 		JOB_WARDEN = list(
 			/mob/living/basic/pet/dog/pug/mcgriff
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index eda2bf3ecb2..a1f721180d3 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -42,7 +42,7 @@
 	name = "Duct Spider Crate"
 	desc = "Awww! Straight from the Australicus sector to your station's ventilation system!"
 	cost = CARGO_CRATE_VALUE * 6
-	contains = list(/mob/living/basic/giant_spider/maintenance)
+	contains = list(/mob/living/basic/spider/maintenance)
 	crate_name = "duct spider crate"
 	crate_type = /obj/structure/closet/crate/critter
 
@@ -50,7 +50,7 @@
 	name = "Duct Spider Crate?"
 	desc = "Wait, is this the right crate? It has a frowny face, what does that mean?"
 	cost = CARGO_CRATE_VALUE * 6
-	contains = list(/mob/living/basic/giant_spider/hunter)
+	contains = list(/mob/living/basic/spider/giant/hunter)
 	contraband = TRUE
 
 /datum/supply_pack/imports/bamboo50
diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm
index fbc1dfad9d5..caf49e13b6b 100644
--- a/code/modules/events/ghost_role/sentience.dm
+++ b/code/modules/events/ghost_role/sentience.dm
@@ -4,7 +4,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
 	/mob/living/basic/carp/pet/cayenne,
 	/mob/living/basic/chicken,
 	/mob/living/basic/cow,
-	/mob/living/basic/giant_spider/sgt_araneus,
+	/mob/living/basic/spider/giant/sgt_araneus,
 	/mob/living/basic/lizard,
 	/mob/living/basic/mouse/brown/tom,
 	/mob/living/basic/pet,
diff --git a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
index f8085b2aedd..3cc5a15a507 100644
--- a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
+++ b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
@@ -196,11 +196,11 @@
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/imports/specialops]
 	pack.generate(pick_n_take(empty_shuttle_turfs))
 
-	spawn_list.Add(/mob/living/basic/giant_spider)
-	spawn_list.Add(/mob/living/basic/giant_spider)
-	spawn_list.Add(/mob/living/basic/giant_spider/nurse)
+	spawn_list.Add(/mob/living/basic/spider/giant)
+	spawn_list.Add(/mob/living/basic/spider/giant)
+	spawn_list.Add(/mob/living/basic/spider/giant/nurse)
 	if(prob(50))
-		spawn_list.Add(/mob/living/basic/giant_spider/hunter)
+		spawn_list.Add(/mob/living/basic/spider/giant/hunter)
 
 	var/turf/victim_turf = pick_n_take(empty_shuttle_turfs)
 
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 87e692a787e..70a7900ef8c 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -75,7 +75,7 @@
 	var/static/list/mob_list = list(
 		/mob/living/basic/butterfly,
 		/mob/living/basic/cockroach,
-		/mob/living/basic/giant_spider/maintenance,
+		/mob/living/basic/spider/maintenance,
 		/mob/living/basic/mouse,
 	)
 	return pick(mob_list)
@@ -222,7 +222,7 @@
 	var/static/list/mob_list = list(
 		/mob/living/basic/bee,
 		/mob/living/basic/cockroach/hauberoach,
-		/mob/living/basic/giant_spider,
+		/mob/living/basic/spider/giant,
 		/mob/living/basic/mouse/rat,
 	)
 	return pick(mob_list)
diff --git a/code/modules/events/wizard/petsplosion.dm b/code/modules/events/wizard/petsplosion.dm
index c213c141c9a..7ca7ef2ba2d 100644
--- a/code/modules/events/wizard/petsplosion.dm
+++ b/code/modules/events/wizard/petsplosion.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(petsplosion_candidates, typecacheof(list(
 	/mob/living/basic/carp/pet/cayenne,
 	/mob/living/basic/chicken,
 	/mob/living/basic/cow,
-	/mob/living/basic/giant_spider/sgt_araneus,
+	/mob/living/basic/spider/giant/sgt_araneus,
 	/mob/living/basic/lizard,
 	/mob/living/basic/mothroach,
 	/mob/living/basic/mouse/brown/tom,
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index b297008dd3d..a847d8aef04 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -833,7 +833,7 @@
 		message_admins("[ADMIN_LOOKUPFLW(user)] last altered a hydro tray's contents which spawned spiderlings.")
 		user.log_message("last altered a hydro tray, which spiderlings spawned from.", LOG_GAME)
 		visible_message(span_warning("The pests seem to behave oddly..."))
-		spawn_atom_to_turf(/mob/living/basic/spiderling/hunter, src, 3, FALSE)
+		spawn_atom_to_turf(/mob/living/basic/spider/growing/spiderling/hunter, src, 3, FALSE)
 	else if(myseed)
 		visible_message(span_warning("The pests seem to behave oddly in [myseed.name] tray, but quickly settle down..."))
 
diff --git a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider.dm b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider.dm
deleted file mode 100644
index b7339787bd3..00000000000
--- a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider.dm
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * # Giant Spider
- *
- * A mob which can be created by dynamic event, botany, or xenobiology.
- * The basic type is the guard, which is slow but sturdy and outputs good damage.
- * All spiders can produce webbing.
- */
-/mob/living/basic/giant_spider
-	name = "giant spider"
-	desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes."
-	icon = 'icons/mob/simple/arachnoid.dmi'
-	icon_state = "guard"
-	icon_living = "guard"
-	icon_dead = "guard_dead"
-	mob_biotypes = MOB_ORGANIC|MOB_BUG
-	speak_emote = list("chitters")
-	butcher_results = list(/obj/item/food/meat/slab/spider = 2, /obj/item/food/spiderleg = 8)
-	response_help_continuous = "pets"
-	response_help_simple = "pet"
-	response_disarm_continuous = "gently pushes aside"
-	response_disarm_simple = "gently push aside"
-	initial_language_holder = /datum/language_holder/spider
-	speed = 5
-	maxHealth = 125
-	health = 125
-	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, CLONE = 1, STAMINA = 1, OXY = 1)
-	basic_mob_flags = FLAMMABLE_MOB
-	status_flags = NONE
-	unsuitable_cold_damage = 4
-	unsuitable_heat_damage = 4
-	obj_damage = 30
-	melee_damage_lower = 20
-	melee_damage_upper = 25
-	combat_mode = TRUE
-	faction = list(FACTION_SPIDER)
-	pass_flags = PASSTABLE
-	attack_verb_continuous = "bites"
-	attack_verb_simple = "bite"
-	attack_sound = 'sound/weapons/bite.ogg'
-	attack_vis_effect = ATTACK_EFFECT_BITE
-	unique_name = TRUE
-	gold_core_spawnable = HOSTILE_SPAWN
-	// VERY red, to fit the eyes
-	lighting_cutoff_red = 22
-	lighting_cutoff_green = 5
-	lighting_cutoff_blue = 5
-	ai_controller = /datum/ai_controller/basic_controller/giant_spider
-	/// Speed modifier to apply if controlled by a human player
-	var/player_speed_modifier = -4
-	/// What reagent the mob injects targets with
-	var/poison_type = /datum/reagent/toxin/hunterspider
-	/// How much of a reagent the mob injects on attack
-	var/poison_per_bite = 0
-	/// Multiplier to apply to web laying speed. Fractional numbers make it faster, because it's a multiplier.
-	var/web_speed = 1
-	/// Type of webbing ability to learn.
-	var/web_type = /datum/action/cooldown/lay_web
-	/// The message that the mother spider left for this spider when the egg was layed.
-	var/directive = ""
-	/// Short description of what this mob is capable of, for radial menu uses
-	var/menu_description = "Tanky and strong for the defense of the nest and other spiders."
-	/// If true then you shouldn't be told that you're a spider antagonist as soon as you are placed into this mob
-	var/apply_spider_antag = TRUE
-
-/mob/living/basic/giant_spider/Initialize(mapload)
-	. = ..()
-	ADD_TRAIT(src, TRAIT_WEB_SURFER, INNATE_TRAIT)
-	AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
-	AddElement(/datum/element/nerfed_pulling, GLOB.typecache_general_bad_things_to_easily_move)
-	AddElement(/datum/element/prevent_attacking_of_types, GLOB.typecache_general_bad_hostile_attack_targets, "this tastes awful!")
-	AddElement(/datum/element/cliff_walking)
-
-	if(poison_per_bite)
-		AddElement(/datum/element/venomous, poison_type, poison_per_bite)
-
-	var/datum/action/cooldown/lay_web/webbing = new web_type(src)
-	webbing.webbing_time *= web_speed
-	webbing.Grant(src)
-	ai_controller.set_blackboard_key(BB_SPIDER_WEB_ACTION, webbing)
-
-/mob/living/basic/giant_spider/Login()
-	. = ..()
-	if(!. || !client)
-		return FALSE
-	GLOB.spidermobs[src] = TRUE
-	add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/player_spider_modifier, multiplicative_slowdown = player_speed_modifier)
-	if (apply_spider_antag)
-		var/datum/antagonist/spider/spider_antag = new(directive)
-		mind.add_antag_datum(spider_antag)
-
-/mob/living/basic/giant_spider/Logout()
-	. = ..()
-	remove_movespeed_modifier(/datum/movespeed_modifier/player_spider_modifier)
-
-/mob/living/basic/giant_spider/Destroy()
-	GLOB.spidermobs -= src
-	return ..()
-
-/mob/living/basic/giant_spider/mob_negates_gravity()
-	if(locate(/obj/structure/spider/stickyweb) in loc)
-		return TRUE
-	return ..()
-
-/mob/living/basic/giant_spider/expose_reagents(list/reagents, datum/reagents/source, methods=TOUCH, volume_modifier=1, show_message=TRUE)
-	. = ..()
-	for(var/datum/reagent/toxin/pestkiller/current_reagent in reagents)
-		apply_damage(50 * volume_modifier, STAMINA, BODY_ZONE_CHEST)
diff --git a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_variants.dm b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm
similarity index 85%
rename from code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_variants.dm
rename to code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm
index 648174bd603..b6736a9d2a4 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_variants.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm
@@ -1,9 +1,32 @@
 /**
- * ### Spider Ambush
+ * # Giant Spider
+ *
+ * A mob which can be created by dynamic event, botany, or xenobiology.
+ * The basic type is the guard, which is slow but sturdy and outputs good damage.
+ * All spiders can produce webbing.
+ */
+/mob/living/basic/spider/giant
+	name = "giant spider"
+	desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes."
+	icon_state = "guard"
+	icon_living = "guard"
+	icon_dead = "guard_dead"
+	speed = 5
+	maxHealth = 125
+	health = 125
+	obj_damage = 30
+	melee_damage_lower = 20
+	melee_damage_upper = 25
+	gold_core_spawnable = HOSTILE_SPAWN
+	ai_controller = /datum/ai_controller/basic_controller/giant_spider
+
+
+/**
+ * ### Ambush Spider
  * A subtype of the giant spider which is slower, stronger and able to sneak into its surroundings to pull pray aggressively.
  * This spider is only slightly slower than a human.
  */
-/mob/living/basic/giant_spider/ambush
+/mob/living/basic/spider/giant/ambush
 	name = "ambush spider"
 	desc = "Furry and white, it makes you shudder to look at it. This one has sparkling pink eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -20,7 +43,7 @@
 	player_speed_modifier = -3.1
 	menu_description = "Slow spider variant specializing in stalking and ambushing prey, above avarage health and damage with a strong grip."
 
-/mob/living/basic/giant_spider/ambush/Initialize(mapload)
+/mob/living/basic/spider/giant/ambush/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_STRONG_GRABBER, INNATE_TRAIT)
 
@@ -30,11 +53,11 @@
 	sneak_web.Grant(src)
 
 /**
- * ### Spider Guard
+ * ### Guard Spider
  * A subtype of the giant spider which is similar on every single way,
  * This spider is only slightly slower than a human.
  */
-/mob/living/basic/giant_spider/guard
+/mob/living/basic/spider/giant/guard
 	name = "guard spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -51,7 +74,7 @@
 	player_speed_modifier = -4
 	menu_description = "Tanky and strong for the defense of the nest and other spiders."
 
-/mob/living/basic/giant_spider/guard/Initialize(mapload)
+/mob/living/basic/spider/giant/guard/Initialize(mapload)
 	. = ..()
 
 	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/average_web)
@@ -59,11 +82,11 @@
 	shed.Grant(src)
 
 /**
- * ### Spider Hunter
+ * ### Hunter Spider
  * A subtype of the giant spider which is faster, has toxin injection, but less health and damage.
  * This spider is only slightly slower than a human.
  */
-/mob/living/basic/giant_spider/hunter
+/mob/living/basic/spider/giant/hunter
 	name = "hunter spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has sparkling purple eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -79,17 +102,17 @@
 	player_speed_modifier = -3.1
 	menu_description = "Fast spider variant specializing in catching running prey and toxin injection, but has less health and damage."
 
-/mob/living/basic/giant_spider/hunter/Initialize(mapload)
+/mob/living/basic/spider/giant/hunter/Initialize(mapload)
 	. = ..()
 
 	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/fast_web)
 
 /**
- * ### Spider Scout
+ * ### Scout Spider
  * A subtype of the giant spider which is faster, has thermal vision, but less health and damage.
  * This spider is only slightly faster than a human.
  */
-/mob/living/basic/giant_spider/scout
+/mob/living/basic/spider/giant/scout
 	name = "scout spider"
 	desc = "Furry and blueish black, it makes you shudder to look at it. This one has sparkling blue eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -108,7 +131,7 @@
 	sight = SEE_SELF|SEE_MOBS
 	menu_description = "Fast spider variant specializing in scouting and alerting of prey, with the ability to travel in vents."
 
-/mob/living/basic/giant_spider/scout/Initialize(mapload)
+/mob/living/basic/spider/giant/scout/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
 
@@ -116,13 +139,13 @@
 	spiders_communication.Grant(src)
 
 /**
- * ### Spider Nurse
+ * ### Nurse Spider
  *
  * A subtype of the giant spider which specializes in support skills.
  * Nurses can place down webbing in a quarter of the time that other species can and can wrap other spiders' wounds, healing them.
  * Note that it cannot heal itself.
  */
-/mob/living/basic/giant_spider/nurse
+/mob/living/basic/spider/giant/nurse
 	name = "nurse spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has brilliant green eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -143,7 +166,7 @@
 	///The health HUD applied to the mob.
 	var/health_hud = DATA_HUD_MEDICAL_ADVANCED
 
-/mob/living/basic/giant_spider/nurse/Initialize(mapload)
+/mob/living/basic/spider/giant/nurse/Initialize(mapload)
 	. = ..()
 	var/datum/atom_hud/datahud = GLOB.huds[health_hud]
 	datahud.show_to(src)
@@ -152,7 +175,7 @@
 		heal_brute = 25,\
 		heal_burn = 25,\
 		interaction_key = DOAFTER_SOURCE_SPIDER,\
-		valid_targets_typecache = typecacheof(list(/mob/living/basic/giant_spider)),\
+		valid_targets_typecache = typecacheof(list(/mob/living/basic/spider/giant)),\
 		action_text = "%SOURCE% begins wrapping the wounds of %TARGET%.",\
 		complete_text = "%SOURCE% wraps the wounds of %TARGET%.",\
 	)
@@ -166,7 +189,7 @@
  * Tangle spiders can place down webbing in a quarter of the time that other species plus has an expanded arsenal of traps and web structures to place to benefit the nest.
  * Note that it can heal itself.
  */
-/mob/living/basic/giant_spider/tangle
+/mob/living/basic/spider/giant/tangle
 	name = "tangle spider"
 	desc = "Furry and brown, it makes you shudder to look at it. This one has dim brown eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -188,7 +211,7 @@
 	web_type = /datum/action/cooldown/lay_web/sealer
 	menu_description = "Support spider variant specializing in contruction to protect their brethren, but has very low amount of health and deals low damage."
 
-/mob/living/basic/giant_spider/tangle/Initialize(mapload)
+/mob/living/basic/spider/giant/tangle/Initialize(mapload)
 	. = ..()
 	var/datum/action/cooldown/lay_web/solid_web/web_solid = new(src)
 	web_solid.Grant(src)
@@ -210,14 +233,14 @@
 		heal_time = 3 SECONDS,\
 		self_targetting = HEALING_TOUCH_SELF_ONLY,\
 		interaction_key = DOAFTER_SOURCE_SPIDER,\
-		valid_targets_typecache = typecacheof(list(/mob/living/basic/giant_spider/tangle)),\
+		valid_targets_typecache = typecacheof(list(/mob/living/basic/spider/growing/young/tangle, /mob/living/basic/spider/giant/tangle)),\
 		extra_checks = CALLBACK(src, PROC_REF(can_mend)),\
 		action_text = "%SOURCE% begins mending themselves...",\
 		complete_text = "%SOURCE%'s wounds mend together.",\
 	)
 
 /// Prevent you from healing other tangle spiders, or healing when on fire
-/mob/living/basic/giant_spider/tangle/proc/can_mend(mob/living/source, mob/living/target)
+/mob/living/basic/spider/giant/tangle/proc/can_mend(mob/living/source, mob/living/target)
 	if (on_fire)
 		balloon_alert(src, "on fire!")
 		return FALSE
@@ -229,7 +252,7 @@
  * A subtype of the giant spider which specializes in pure strength and staying power.
  * Is slowed down when not on webbing, but can lunge to throw off attackers and possibly to stun them.
  */
-/mob/living/basic/giant_spider/tarantula
+/mob/living/basic/spider/giant/tarantula
 	name = "tarantula"
 	desc = "Furry and black, it makes you shudder to look at it. This one has abyssal red eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -252,7 +275,7 @@
 	/// Charging ability
 	var/datum/action/cooldown/mob_cooldown/charge/basic_charge/charge
 
-/mob/living/basic/giant_spider/tarantula/Initialize(mapload)
+/mob/living/basic/spider/giant/tarantula/Initialize(mapload)
 	. = ..()
 	var/datum/action/cooldown/lay_web/solid_web/web_solid = new(src)
 	web_solid.Grant(src)
@@ -266,12 +289,12 @@
 	AddElement(/datum/element/tear_wall)
 	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/slow_web)
 
-/mob/living/basic/giant_spider/tarantula/Destroy()
+/mob/living/basic/spider/giant/tarantula/Destroy()
 	QDEL_NULL(charge)
 	return ..()
 
 /// Lunge if you click something at range
-/mob/living/basic/giant_spider/tarantula/ranged_secondary_attack(atom/atom_target, modifiers)
+/mob/living/basic/spider/giant/tarantula/ranged_secondary_attack(atom/atom_target, modifiers)
 	charge.Trigger(target = atom_target)
 
 /**
@@ -280,7 +303,7 @@
  * A subtype of the giant spider which specializes in speed and poison.
  * Injects a deadlier toxin than other spiders, moves extremely fast, but has a limited amount of health.
  */
-/mob/living/basic/giant_spider/viper
+/mob/living/basic/spider/giant/viper
 	name = "viper spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has effervescent purple eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -298,7 +321,7 @@
 	gold_core_spawnable = NO_SPAWN
 	menu_description = "Assassin spider variant with an unmatched speed and very deadly poison, but has very low amount of health and damage."
 
-/mob/living/basic/giant_spider/viper/Initialize(mapload)
+/mob/living/basic/spider/giant/viper/Initialize(mapload)
 	. = ..()
 
 	AddElement(/datum/element/bonus_damage)
@@ -314,7 +337,7 @@
  * After consuming human bodies can lay specialised eggs including more broodmothers.
  * They are also capable of sending messages to all living spiders and setting directives for their children.
  */
-/mob/living/basic/giant_spider/midwife
+/mob/living/basic/spider/giant/midwife
 	name = "broodmother spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has scintillating green eyes. Might also be hiding a real knife somewhere."
 	gender = FEMALE
@@ -333,7 +356,7 @@
 	web_type = /datum/action/cooldown/lay_web/sealer
 	menu_description = "Royal spider variant specializing in reproduction and leadership, deals low damage."
 
-/mob/living/basic/giant_spider/midwife/Initialize(mapload)
+/mob/living/basic/spider/giant/midwife/Initialize(mapload)
 	. = ..()
 	var/datum/action/cooldown/lay_web/solid_web/web_solid = new(src)
 	web_solid.Grant(src)
@@ -370,7 +393,7 @@
  * A subtype of the giant spider which is immune to temperature damage, unlike its normal counterpart.
  * Currently unused in the game unless spawned by admins.
  */
-/mob/living/basic/giant_spider/ice
+/mob/living/basic/spider/giant/ice
 	name = "giant ice spider"
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minimum_survivable_temperature = 0
@@ -384,7 +407,7 @@
  *
  * A temperature-proof nurse spider. Also unused.
  */
-/mob/living/basic/giant_spider/nurse/ice
+/mob/living/basic/spider/giant/nurse/ice
 	name = "giant ice spider"
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minimum_survivable_temperature = 0
@@ -398,7 +421,7 @@
  *
  * A temperature-proof hunter with chilling venom. Also unused.
  */
-/mob/living/basic/giant_spider/hunter/ice
+/mob/living/basic/spider/giant/hunter/ice
 	name = "giant ice spider"
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minimum_survivable_temperature = 0
@@ -414,7 +437,7 @@
  * A hunter spider that trades damage for health, unable to smash enviroments.
  * Used as a minor threat in abandoned places, such as areas in maintenance or a ruin.
  */
-/mob/living/basic/giant_spider/hunter/scrawny
+/mob/living/basic/spider/giant/hunter/scrawny
 	name = "scrawny spider"
 	health = 60
 	maxHealth = 60
@@ -430,7 +453,7 @@
  * A weaker version of the Tarantula, unable to smash enviroments.
  * Used as a moderately strong but slow threat in abandoned places, such as areas in maintenance or a ruin.
  */
-/mob/living/basic/giant_spider/tarantula/scrawny
+/mob/living/basic/spider/giant/tarantula/scrawny
 	name = "scrawny tarantula"
 	health = 150
 	maxHealth = 150
@@ -447,7 +470,7 @@
  * Mainly used as a weak threat in abandoned places, such as areas in maintenance or a ruin.
  * In the future we should give this AI so that it actually heals its teammates.
  */
-/mob/living/basic/giant_spider/nurse/scrawny
+/mob/living/basic/spider/giant/nurse/scrawny
 	name = "scrawny nurse spider"
 	health = 30
 	maxHealth = 30
@@ -462,7 +485,7 @@
  * Has the base stats of a hunter, but they can heal themselves and spin webs faster.
  * They also occasionally leave puddles of blood when they walk around. Flavorful!
  */
-/mob/living/basic/giant_spider/hunter/flesh
+/mob/living/basic/spider/giant/hunter/flesh
 	name = "flesh spider"
 	desc = "A odd fleshy creature in the shape of a spider. Its eyes are pitch black and soulless."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -474,7 +497,7 @@
 	health = 90
 	menu_description = "Self-sufficient spider variant capable of healing themselves and producing webbbing fast."
 
-/mob/living/basic/giant_spider/hunter/flesh/Initialize(mapload)
+/mob/living/basic/spider/giant/hunter/flesh/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/blood_walk, \
 		blood_type = /obj/effect/decal/cleanable/blood/bubblegum, \
@@ -485,7 +508,7 @@
 		heal_burn = 45,\
 		self_targetting = HEALING_TOUCH_SELF_ONLY,\
 		interaction_key = DOAFTER_SOURCE_SPIDER,\
-		valid_targets_typecache = typecacheof(list(/mob/living/basic/giant_spider/hunter/flesh)),\
+		valid_targets_typecache = typecacheof(list(/mob/living/basic/spider/giant/hunter/flesh)),\
 		extra_checks = CALLBACK(src, PROC_REF(can_mend)),\
 		action_text = "%SOURCE% begins mending themselves...",\
 		complete_text = "%SOURCE%'s wounds mend together.",\
@@ -498,7 +521,7 @@
 	web_sticky.Grant(src)
 
 /// Prevent you from healing other flesh spiders, or healing when on fire
-/mob/living/basic/giant_spider/hunter/flesh/proc/can_mend(mob/living/source, mob/living/target)
+/mob/living/basic/spider/giant/hunter/flesh/proc/can_mend(mob/living/source, mob/living/target)
 	if (on_fire)
 		balloon_alert(src, "on fire!")
 		return FALSE
@@ -509,7 +532,7 @@
  *
  * A spider form for wizards. Has the viper spider's extreme speed and strong venom, with additional health and vent crawling abilities.
  */
-/mob/living/basic/giant_spider/viper/wizard
+/mob/living/basic/spider/giant/viper/wizard
 	name = "water spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has effervescent orange eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -525,7 +548,7 @@
 	menu_description = "Stronger assassin spider variant with an unmatched speed, high amount of health and very deadly poison, but deals very low amount of damage. It also has ability to ventcrawl."
 	apply_spider_antag = FALSE
 
-/mob/living/basic/giant_spider/viper/wizard/Initialize(mapload)
+/mob/living/basic/spider/giant/viper/wizard/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
 
@@ -541,7 +564,7 @@
  *
  * This friendly arachnid hangs out in the HoS office on some space stations. Better trained than an average officer and does not attack except in self-defence.
  */
-/mob/living/basic/giant_spider/sgt_araneus
+/mob/living/basic/spider/giant/sgt_araneus
 	name = "Sergeant Araneus"
 	real_name = "Sergeant Araneus"
 	desc = "A fierce companion of the Head of Security, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine."
@@ -554,48 +577,8 @@
 	ai_controller = /datum/ai_controller/basic_controller/giant_spider/retaliate
 	apply_spider_antag = FALSE
 
-/mob/living/basic/giant_spider/sgt_araneus/Initialize(mapload)
+/mob/living/basic/spider/giant/sgt_araneus/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/pet_bonus, "chitters proudly!")
 	AddElement(/datum/element/ai_retaliate)
 	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
-
-/**
- * ### Duct Spider
- *
- * A less giant spider which lives in the maintenance ducts and makes them annoying to traverse.
- */
-/mob/living/basic/giant_spider/maintenance
-	name = "duct spider"
-	desc = "Nanotrasen's imported solution to mice, comes with its own problems."
-	icon = 'icons/mob/simple/arachnoid.dmi'
-	icon_state = "maint_spider"
-	icon_living = "maint_spider"
-	icon_dead = "maint_spider_dead"
-	can_be_held = TRUE
-	mob_size = MOB_SIZE_TINY
-	held_w_class = WEIGHT_CLASS_TINY
-	worn_slot_flags = ITEM_SLOT_HEAD
-	head_icon = 'icons/mob/clothing/head/pets_head.dmi'
-	density = FALSE
-	pass_flags = PASSTABLE|PASSGRILLE|PASSMOB
-	gold_core_spawnable = FRIENDLY_SPAWN
-	maxHealth = 10
-	health = 10
-	melee_damage_lower = 1
-	melee_damage_upper = 1
-	speed = 0
-	player_speed_modifier = 0
-	web_speed = 0.25
-	menu_description = "Fragile spider variant which is not good for much other than laying webs."
-	response_harm_continuous = "splats"
-	response_harm_simple = "splat"
-	ai_controller = /datum/ai_controller/basic_controller/giant_spider/pest
-	apply_spider_antag = FALSE
-
-/mob/living/basic/giant_spider/maintenance/Initialize(mapload)
-	. = ..()
-	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
-	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/average_web)
-	AddElement(/datum/element/ai_retaliate)
-	AddElement(/datum/element/tiny_mob_hunter)
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
new file mode 100644
index 00000000000..c1d11d2cb10
--- /dev/null
+++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
@@ -0,0 +1,176 @@
+/**
+ * Base type of various spider life stages
+ */
+/mob/living/basic/spider
+	name = "abstract spider"
+	desc = "Furry and abstract, it makes you shudder to look at it. This one should not exist."
+	icon = 'icons/mob/simple/arachnoid.dmi'
+	mob_biotypes = MOB_ORGANIC|MOB_BUG
+	speak_emote = list("chitters")
+	butcher_results = list(/obj/item/food/meat/slab/spider = 2, /obj/item/food/spiderleg = 8)
+	response_help_continuous = "pets"
+	response_help_simple = "pet"
+	response_disarm_continuous = "gently pushes aside"
+	response_disarm_simple = "gently push aside"
+	initial_language_holder = /datum/language_holder/spider
+	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, CLONE = 1, STAMINA = 1, OXY = 1)
+	basic_mob_flags = FLAMMABLE_MOB
+	status_flags = NONE
+	unsuitable_cold_damage = 4
+	unsuitable_heat_damage = 4
+	combat_mode = TRUE
+	faction = list(FACTION_SPIDER)
+	pass_flags = PASSTABLE
+	attack_verb_continuous = "bites"
+	attack_verb_simple = "bite"
+	attack_sound = 'sound/weapons/bite.ogg'
+	attack_vis_effect = ATTACK_EFFECT_BITE
+	unique_name = TRUE
+	lighting_cutoff_red = 22
+	lighting_cutoff_green = 5
+	lighting_cutoff_blue = 5
+	/// Speed modifier to apply if controlled by a human player
+	var/player_speed_modifier = -4
+	/// What reagent the mob injects targets with
+	var/poison_type = /datum/reagent/toxin/hunterspider
+	/// How much of a reagent the mob injects on attack
+	var/poison_per_bite = 0
+	/// Multiplier to apply to web laying speed. Fractional numbers make it faster, because it's a multiplier.
+	var/web_speed = 1
+	/// Type of webbing ability to learn.
+	var/web_type = /datum/action/cooldown/lay_web
+	/// The message that the mother spider left for this spider when the egg was layed.
+	var/directive = ""
+	/// Short description of what this mob is capable of, for radial menu uses
+	var/menu_description = "Tanky and strong for the defense of the nest and other spiders."
+	/// If true then you shouldn't be told that you're a spider antagonist as soon as you are placed into this mob
+	var/apply_spider_antag = TRUE
+
+/mob/living/basic/spider/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_WEB_SURFER, INNATE_TRAIT)
+	AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
+	AddElement(/datum/element/nerfed_pulling, GLOB.typecache_general_bad_things_to_easily_move)
+	AddElement(/datum/element/prevent_attacking_of_types, GLOB.typecache_general_bad_hostile_attack_targets, "this tastes awful!")
+	AddElement(/datum/element/cliff_walking)
+
+	if(poison_per_bite)
+		AddElement(/datum/element/venomous, poison_type, poison_per_bite)
+
+	var/datum/action/cooldown/lay_web/webbing = new web_type(src)
+	webbing.webbing_time *= web_speed
+	webbing.Grant(src)
+	ai_controller?.set_blackboard_key(BB_SPIDER_WEB_ACTION, webbing)
+
+/mob/living/basic/spider/Login()
+	. = ..()
+	if(!. || !client)
+		return FALSE
+	GLOB.spidermobs[src] = TRUE
+	add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/player_spider_modifier, multiplicative_slowdown = player_speed_modifier)
+
+/mob/living/basic/spider/Logout()
+	. = ..()
+	remove_movespeed_modifier(/datum/movespeed_modifier/player_spider_modifier)
+
+/mob/living/basic/spider/Destroy()
+	GLOB.spidermobs -= src
+	return ..()
+
+/mob/living/basic/spider/mob_negates_gravity()
+	if(locate(/obj/structure/spider/stickyweb) in loc)
+		return TRUE
+	return ..()
+
+/mob/living/basic/spider/expose_reagents(list/reagents, datum/reagents/source, methods=TOUCH, volume_modifier=1, show_message=TRUE)
+	. = ..()
+	for(var/datum/reagent/toxin/pestkiller/current_reagent in reagents)
+		apply_damage(50 * volume_modifier, STAMINA, BODY_ZONE_CHEST)
+
+/// Spider which turns into another spider over time
+/mob/living/basic/spider/growing
+	/// The mob type we will grow into.
+	var/mob/living/basic/spider/grow_as = null
+	/// The time it takes for the spider to grow into the next stage
+	var/spider_growth_time = 1 MINUTES
+
+/mob/living/basic/spider/growing/Initialize(mapload)
+	. = ..()
+	AddComponent(\
+		/datum/component/growth_and_differentiation,\
+		growth_time = spider_growth_time,\
+		growth_path = grow_as,\
+		growth_probability = 25,\
+		lower_growth_value = 1,\
+		upper_growth_value = 2,\
+		optional_checks = CALLBACK(src, PROC_REF(ready_to_grow)),\
+		optional_grow_behavior = CALLBACK(src, PROC_REF(grow_up))\
+	)
+
+/**
+ * Checks to see if we're ready to grow, primarily if we are on solid ground and not in a vent or something.
+ * The component will automagically grow us when we return TRUE and that threshold has been met.
+ */
+/mob/living/basic/spider/growing/proc/ready_to_grow()
+	if(isturf(loc))
+		return TRUE
+
+	return FALSE
+
+/// Actually grows the young spider into a giant spider. We have to do a bunch of unique behavior that really can't be genericized, so we have to override the component in this manner.
+/**
+ * Actually move to our next stage of life.
+ */
+/mob/living/basic/spider/growing/proc/grow_up()
+	if(isnull(grow_as))
+		if(prob(3))
+			grow_as = pick(/mob/living/basic/spider/giant/tarantula, /mob/living/basic/spider/giant/viper, /mob/living/basic/spider/giant/midwife)
+		else
+			grow_as = pick(/mob/living/basic/spider/giant/guard, /mob/living/basic/spider/giant/ambush, /mob/living/basic/spider/giant/hunter, /mob/living/basic/spider/giant/scout, /mob/living/basic/spider/giant/nurse, /mob/living/basic/spider/giant/tangle)
+
+	var/mob/living/basic/spider/giant/grown = change_mob_type(grow_as, get_turf(src), initial(grow_as.name))
+	ADD_TRAIT(grown, TRAIT_WAS_EVOLVED, REF(src))
+	grown.faction = faction.Copy()
+	grown.directive = directive
+	grown.set_name()
+	grown.setBruteLoss(getBruteLoss())
+	grown.setFireLoss(getFireLoss())
+	qdel(src)
+
+/**
+ * ### Duct Spider
+ * A less than giant spider which lives in the maintenance ducts and makes them annoying to traverse.
+ */
+/mob/living/basic/spider/maintenance
+	name = "duct spider"
+	desc = "Nanotrasen's imported solution to mice, comes with its own problems."
+	icon_state = "maint_spider"
+	icon_living = "maint_spider"
+	icon_dead = "maint_spider_dead"
+	can_be_held = TRUE
+	mob_size = MOB_SIZE_TINY
+	held_w_class = WEIGHT_CLASS_TINY
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'icons/mob/clothing/head/pets_head.dmi'
+	density = FALSE
+	pass_flags = PASSTABLE|PASSGRILLE|PASSMOB
+	gold_core_spawnable = FRIENDLY_SPAWN
+	maxHealth = 10
+	health = 10
+	melee_damage_lower = 1
+	melee_damage_upper = 1
+	speed = 0
+	player_speed_modifier = 0
+	web_speed = 0.25
+	menu_description = "Fragile spider variant which is not good for much other than laying webs."
+	response_harm_continuous = "splats"
+	response_harm_simple = "splat"
+	ai_controller = /datum/ai_controller/basic_controller/giant_spider/pest
+	apply_spider_antag = FALSE
+
+/mob/living/basic/spider/maintenance/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/average_web)
+	AddElement(/datum/element/ai_retaliate)
+	AddElement(/datum/element/tiny_mob_hunter)
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling.dm b/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling.dm
index b8829015980..a09107aebf4 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling.dm
@@ -5,50 +5,28 @@
  * Able to vent-crawl and eventually grow into a full fledged giant spider.
  *
  */
-/mob/living/basic/spiderling
+/mob/living/basic/spider/growing/spiderling
 	name = "spiderling"
 	desc = "It never stays still for long."
-	icon = 'icons/mob/simple/arachnoid.dmi'
 	icon_state = "spiderling"
 	icon_dead = "spiderling_dead"
 	density = FALSE
-	faction = list(FACTION_SPIDER)
 	speed = -0.75
 	move_resist = INFINITY // YOU CAN'T HANDLE ME LET ME BE FREE LET ME BE FREE LET ME BE FREE
 	speak_emote = list("hisses")
 	initial_language_holder = /datum/language_holder/spider
 	basic_mob_flags = FLAMMABLE_MOB | DEL_ON_DEATH
 	mob_size = MOB_SIZE_TINY
-
-	unique_name = TRUE
-
-	// we have _some_ bite
 	melee_damage_lower = 1
 	melee_damage_upper = 2
-
-	health = 5 // very low.
+	health = 5
 	maxHealth = 5
-	unsuitable_cold_damage = 4
-	unsuitable_heat_damage = 4
 	death_message = "lets out a final hiss..."
-
+	player_speed_modifier = 0
+	spider_growth_time = 40 SECONDS
 	ai_controller = /datum/ai_controller/basic_controller/spiderling
 
-	// VERY red, to fit the eyes
-	lighting_cutoff_red = 22
-	lighting_cutoff_green = 5
-	lighting_cutoff_blue = 5
-
-	/// The mob we will grow into.
-	var/mob/living/basic/young_spider/grow_as = null
-	/// The message that the mother left for our big strong selves.
-	var/directive = ""
-	/// Simple boolean that determines if we should apply the spider antag to the player if they possess this mob. TRUE by default since we're always going to evolve into a spider that will have an antagonistic role.
-	var/apply_spider_antag = TRUE
-	/// The time it takes for the spider to grow into the next stage
-	var/spider_growth_time = 40 SECONDS
-
-/mob/living/basic/spiderling/Initialize(mapload)
+/mob/living/basic/spider/growing/spiderling/Initialize(mapload)
 	. = ..()
 	// random placement since we're pretty small and to make the swarming component actually look like it's doing something when we have a buncha these fuckers
 	pixel_x = rand(6,-6)
@@ -56,36 +34,18 @@
 
 	add_overlay(image(icon = src.icon, icon_state = "spiderling_click_underlay", layer = BELOW_MOB_LAYER))
 
-	// the proc that handles passtable is nice but we should always be able to pass through table since we're so small so we can eschew adding that here
-	pass_flags |= PASSTABLE
-	add_traits(list(TRAIT_PASSTABLE, TRAIT_VENTCRAWLER_ALWAYS, TRAIT_WEB_SURFER), INNATE_TRAIT)
+	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
 	AddComponent(/datum/component/swarming)
 	AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW, volume = 0.2) // they're small but you can hear 'em
 	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/spiderling_web)
 
-	// it's A-OKAY for grow_as to be null for the purposes of this component since we override that behavior anyhow.
-	AddComponent(\
-		/datum/component/growth_and_differentiation,\
-		growth_time = spider_growth_time,\
-		growth_path = grow_as,\
-		growth_probability = 25,\
-		lower_growth_value = 1,\
-		upper_growth_value = 2,\
-		optional_checks = CALLBACK(src, PROC_REF(ready_to_grow)),\
-		optional_grow_behavior = CALLBACK(src, PROC_REF(grow_into_young_spider))\
-	)
-
 	// keep in mind we have infinite range (the entire pipenet is our playground, it's just a matter of random choice as to where we end up) so lower and upper both have their gives and takes.
 	// but, also remember the more time we aren't in a vent, the more susceptible we are to dying to anything and everything.
 	// also remember we can't evolve if we're in a vent. lots to keep in mind when you set these variables.
 	ai_controller.set_blackboard_key(BB_LOWER_VENT_TIME_LIMIT, rand(9, 11) SECONDS)
 	ai_controller.set_blackboard_key(BB_UPPER_VENT_TIME_LIMIT, rand(12, 14) SECONDS)
 
-/mob/living/basic/spiderling/Destroy()
-	GLOB.spidermobs -= src
-	return ..()
-
-/mob/living/basic/spiderling/death(gibbed)
+/mob/living/basic/spider/growing/spiderling/death(gibbed)
 	if(isturf(get_turf(loc)) && (basic_mob_flags & DEL_ON_DEATH || gibbed))
 		var/obj/item/food/spiderling/dead_spider = new(loc) // mmm yummy
 		dead_spider.name = name
@@ -93,48 +53,9 @@
 
 	return ..()
 
-/mob/living/basic/spiderling/Login() // this is only really here for admins dragging and dropping players into spiderlings, player control of spiderlings is otherwise unimplemented
-	. = ..()
-	if(!. || isnull(client))
-		return FALSE
-	basic_mob_flags &= ~DEL_ON_DEATH // we don't want to be deleted if we die while player controlled in case there's some revive schenanigans going on that can bring us back
-	GLOB.spidermobs[src] = TRUE
-	if (apply_spider_antag)
-		var/datum/antagonist/spider/spider_antag = new(directive)
-		mind.add_antag_datum(spider_antag)
-
-/mob/living/basic/spiderling/mob_negates_gravity() // in case our sisters want to give us a helping hand
-	if(locate(/obj/structure/spider/stickyweb) in loc)
-		return TRUE
-	return ..()
-
-/mob/living/basic/spiderling/start_pulling(atom/movable/pulled_atom, state, force = move_force, supress_message = FALSE) // we're TOO FUCKING SMALL
+/mob/living/basic/spider/growing/spiderling/start_pulling(atom/movable/pulled_atom, state, force = move_force, supress_message = FALSE) // we're TOO FUCKING SMALL
 	return
 
-/// Checks to see if we're ready to grow, primarily if we are on solid ground and not in a vent or something.
-/// The component will automagically grow us when we return TRUE and that threshold has been met.
-/mob/living/basic/spiderling/proc/ready_to_grow()
-	if(isturf(loc))
-		return TRUE
-
-	return FALSE
-
-/// Actually grows the spiderling into a young spider. We have to do a bunch of unique behavior that really can't be genericized, so we have to override the component in this manner.
-/mob/living/basic/spiderling/proc/grow_into_young_spider()
-	if(isnull(grow_as))
-		if(prob(3))
-			grow_as = pick(/mob/living/basic/young_spider/tarantula, /mob/living/basic/young_spider/viper, /mob/living/basic/young_spider/midwife)
-		else
-			grow_as = pick(/mob/living/basic/young_spider/guard, /mob/living/basic/young_spider/ambush, /mob/living/basic/young_spider/hunter, /mob/living/basic/young_spider/scout, /mob/living/basic/young_spider/nurse, /mob/living/basic/young_spider/tangle)
-
-	var/mob/living/basic/young_spider/grown = change_mob_type(grow_as, get_turf(src), initial(grow_as.name))
-	ADD_TRAIT(grown, TRAIT_WAS_EVOLVED, REF(src))
-	grown.faction = faction.Copy()
-	grown.directive = directive
-	grown.set_name()
-
-	qdel(src)
-
 /// Opportunistically hops in and out of vents, if it can find one. We aren't interested in attacking due to how weak we are, we gotta be quick and hidey.
 /datum/ai_controller/basic_controller/spiderling
 	blackboard = list(
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling_subtypes.dm b/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling_subtypes.dm
index 866a572453c..5d42ca5cb61 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling_subtypes.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling_subtypes.dm
@@ -1,14 +1,14 @@
 // This whole file is just a container for the spiderling subtypes that actually differentiate into different young spiders. None of them are particularly special as of now.
 
 /// Will differentiate into the base young spider (known colloquially as the "guard" spider).
-/mob/living/basic/spiderling/guard
-	grow_as = /mob/living/basic/young_spider/guard
+/mob/living/basic/spider/growing/spiderling/guard
+	grow_as = /mob/living/basic/spider/growing/young/guard
 	name = "guard spiderling"
 	desc = "Furry and brown, it looks defenseless. This one has sparkling red eyes."
 
 /// Will differentiate into the "ambush" young spider.
-/mob/living/basic/spiderling/ambush
-	grow_as = /mob/living/basic/young_spider/ambush
+/mob/living/basic/spider/growing/spiderling/ambush
+	grow_as = /mob/living/basic/spider/growing/young/ambush
 	name = "ambush spiderling"
 	desc = "Furry and white, it looks defenseless. This one has sparkling pink eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -16,8 +16,8 @@
 	icon_dead = "ambush_spiderling_dead"
 
 /// Will differentiate into the "scout" young spider.
-/mob/living/basic/spiderling/scout
-	grow_as = /mob/living/basic/young_spider/scout
+/mob/living/basic/spider/growing/spiderling/scout
+	grow_as = /mob/living/basic/spider/growing/young/scout
 	name = "scout spiderling"
 	desc = "Furry and black, it looks defenseless. This one has sparkling blue eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -26,8 +26,8 @@
 	sight = SEE_SELF|SEE_MOBS
 
 /// Will differentiate into the "hunter" young spider.
-/mob/living/basic/spiderling/hunter
-	grow_as = /mob/living/basic/young_spider/hunter
+/mob/living/basic/spider/growing/spiderling/hunter
+	grow_as = /mob/living/basic/spider/growing/young/hunter
 	name = "hunter spiderling"
 	desc = "Furry and black, it looks defenseless. This one has sparkling purple eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -35,8 +35,8 @@
 	icon_dead = "hunter_spiderling_dead"
 
 /// Will differentiate into the "nurse" young spider.
-/mob/living/basic/spiderling/nurse
-	grow_as = /mob/living/basic/young_spider/nurse
+/mob/living/basic/spider/growing/spiderling/nurse
+	grow_as = /mob/living/basic/spider/growing/young/nurse
 	name = "nurse spiderling"
 	desc = "Furry and black, it looks defenseless. This one has sparkling green eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -44,8 +44,8 @@
 	icon_dead = "nurse_spiderling_dead"
 
 /// Will differentiate into the "tangle" young spider.
-/mob/living/basic/spiderling/tangle
-	grow_as = /mob/living/basic/young_spider/tangle
+/mob/living/basic/spider/growing/spiderling/tangle
+	grow_as = /mob/living/basic/spider/growing/young/tangle
 	name = "tangle spiderling"
 	desc = "Furry and brown, it looks defenseless. This one has dim brown eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -53,8 +53,8 @@
 	icon_dead = "tangle_spiderling_dead"
 
 /// Will differentiate into the "midwife" young spider.
-/mob/living/basic/spiderling/midwife
-	grow_as = /mob/living/basic/young_spider/midwife
+/mob/living/basic/spider/growing/spiderling/midwife
+	grow_as = /mob/living/basic/spider/growing/young/midwife
 	name = "broodmother spiderling"
 	desc = "Furry and black, it looks defenseless. This one has scintillating green eyes. Might also be hiding a real knife somewhere."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -62,8 +62,8 @@
 	icon_dead = "midwife_spiderling_dead"
 
 /// Will differentiate into the "viper" young spider.
-/mob/living/basic/spiderling/viper
-	grow_as = /mob/living/basic/young_spider/viper
+/mob/living/basic/spider/growing/spiderling/viper
+	grow_as = /mob/living/basic/spider/growing/young/viper
 	name = "viper spiderling"
 	desc = "Furry and black, it looks defenseless. This one has sparkling magenta eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -71,20 +71,10 @@
 	icon_dead = "viper_spiderling_dead"
 
 /// Will differentiate into the "tarantula" young spider.
-/mob/living/basic/spiderling/tarantula
-	grow_as = /mob/living/basic/young_spider/tarantula
+/mob/living/basic/spider/growing/spiderling/tarantula
+	grow_as = /mob/living/basic/spider/growing/young/tarantula
 	name = "tarantula spiderling"
 	desc = "Furry and black, it looks defenseless. This one has abyssal red eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
 	icon_state = "tarantula_spiderling"
 	icon_dead = "tarantula_spiderling_dead"
-
-/// Will differentiate into the "flesh" young spider.
-/mob/living/basic/spiderling/hunter/flesh
-	grow_as = /mob/living/basic/young_spider/hunter/flesh
-	name = "flesh spiderling"
-	desc = "Fleshy and red, it looks defenseless. This one has sparkling grey eyes."
-	icon = 'icons/mob/simple/arachnoid.dmi'
-	icon_state = "flesh_spiderling"
-	icon_dead = "flesh_spiderling_dead"
-	spider_growth_time = 20 SECONDS
diff --git a/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider.dm b/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider.dm
index 340ff11c7c2..57b9da542b7 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider.dm
@@ -5,149 +5,26 @@
  * The basic type is the guard, which is slow but sturdy and outputs good damage.
  * All spiders can produce webbing.
  */
-/mob/living/basic/young_spider
+/mob/living/basic/spider/growing/young
 	name = "young spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes."
-	icon = 'icons/mob/simple/arachnoid.dmi'
 	icon_state = "young_guard"
 	icon_living = "young_guard"
 	icon_dead = "young_guard_dead"
-	mob_biotypes = MOB_ORGANIC|MOB_BUG
-	speak_emote = list("chitters")
 	butcher_results = list(/obj/item/food/meat/slab/spider = 1)
-	response_help_continuous = "pets"
-	response_help_simple = "pet"
-	response_disarm_continuous = "gently pushes aside"
-	response_disarm_simple = "gently push aside"
-	initial_language_holder = /datum/language_holder/spider
 	speed = 1
 	maxHealth = 60
 	health = 60
-	damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, CLONE = 1, STAMINA = 1, OXY = 1)
-	basic_mob_flags = FLAMMABLE_MOB
-	status_flags = NONE
-	unsuitable_cold_damage = 4
-	unsuitable_heat_damage = 4
 	obj_damage = 10
 	melee_damage_lower = 8
 	melee_damage_upper = 12
-	combat_mode = TRUE
-	faction = list(FACTION_SPIDER)
-	pass_flags = PASSTABLE
-	attack_verb_continuous = "bites"
-	attack_verb_simple = "bite"
-	attack_sound = 'sound/weapons/bite.ogg'
-	attack_vis_effect = ATTACK_EFFECT_BITE
-	unique_name = TRUE
-	// VERY red, to fit the eyes
-	lighting_cutoff_red = 22
-	lighting_cutoff_green = 5
-	lighting_cutoff_blue = 5
 	ai_controller = /datum/ai_controller/basic_controller/young_spider
-	/// The mob we will grow into.
-	var/mob/living/basic/giant_spider/grow_as = null
-	/// Speed modifier to apply if controlled by a human player
-	var/player_speed_modifier = -1
-	/// What reagent the mob injects targets with
-	var/poison_type = /datum/reagent/toxin/hunterspider
-	/// How much of a reagent the mob injects on attack
-	var/poison_per_bite = 0
-	/// Multiplier to apply to web laying speed. Fractional numbers make it faster, because it's a multiplier.
-	var/web_speed = 1
-	/// Type of webbing ability to learn.
-	var/web_type = /datum/action/cooldown/lay_web
-	/// The message that the mother spider left for this spider when the egg was layed.
-	var/directive = ""
-	/// Short description of what this mob is capable of, for radial menu uses
-	var/menu_description = "Tanky and strong for the defense of the nest and other spiders."
-	/// If true then you shouldn't be told that you're a spider antagonist as soon as you are placed into this mob
-	var/apply_spider_antag = TRUE
-	/// The time it takes for the spider to grow into the next stage
-	var/spider_growth_time = 1 MINUTES
+	player_speed_modifier = -1
 
-/mob/living/basic/young_spider/Initialize(mapload)
+/mob/living/basic/spider/growing/young/Initialize(mapload)
 	. = ..()
-	ADD_TRAIT(src, TRAIT_WEB_SURFER, INNATE_TRAIT)
 	AddElement(/datum/element/ai_retaliate)
 	AddElement(/datum/element/ai_flee_while_injured)
-	AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
-	AddElement(/datum/element/nerfed_pulling, GLOB.typecache_general_bad_things_to_easily_move)
-	AddElement(/datum/element/prevent_attacking_of_types, GLOB.typecache_general_bad_hostile_attack_targets, "this tastes awful!")
-	AddElement(/datum/element/web_walker, /datum/movespeed_modifier/young_web)
-
-	if(poison_per_bite)
-		AddElement(/datum/element/venomous, poison_type, poison_per_bite)
-
-	var/datum/action/cooldown/lay_web/webbing = new web_type(src)
-	webbing.webbing_time *= web_speed
-	webbing.Grant(src)
-	ai_controller.set_blackboard_key(BB_SPIDER_WEB_ACTION, webbing)
-	AddComponent(\
-		/datum/component/growth_and_differentiation,\
-		growth_time = spider_growth_time,\
-		growth_path = grow_as,\
-		growth_probability = 25,\
-		lower_growth_value = 1,\
-		upper_growth_value = 2,\
-		optional_checks = CALLBACK(src, PROC_REF(ready_to_grow)),\
-		optional_grow_behavior = CALLBACK(src, PROC_REF(grow_into_giant_spider))\
-	)
-
-/mob/living/basic/young_spider/Login()
-	. = ..()
-	if(!. || !client)
-		return FALSE
-	GLOB.spidermobs[src] = TRUE
-	add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/player_spider_modifier, multiplicative_slowdown = player_speed_modifier)
-	if (apply_spider_antag)
-		var/datum/antagonist/spider/spider_antag = new(directive)
-		mind.add_antag_datum(spider_antag)
-
-/mob/living/basic/young_spider/Logout()
-	. = ..()
-	remove_movespeed_modifier(/datum/movespeed_modifier/player_spider_modifier)
-
-/mob/living/basic/young_spider/Destroy()
-	GLOB.spidermobs -= src
-	return ..()
-
-/mob/living/basic/young_spider/mob_negates_gravity()
-	if(locate(/obj/structure/spider/stickyweb) in loc)
-		return TRUE
-	return ..()
-
-/mob/living/basic/young_spider/expose_reagents(list/reagents, datum/reagents/source, methods=TOUCH, volume_modifier=1, show_message=TRUE)
-	. = ..()
-	for(var/datum/reagent/toxin/pestkiller/current_reagent in reagents)
-		apply_damage(50 * volume_modifier, STAMINA, BODY_ZONE_CHEST)
-
-/// Checks to see if we're ready to grow, primarily if we are on solid ground and not in a vent or something.
-/// The component will automagically grow us when we return TRUE and that threshold has been met.
-/mob/living/basic/young_spider/proc/ready_to_grow()
-	if(isturf(loc))
-		return TRUE
-
-	return FALSE
-
-/// Actually grows the young spider into a giant spider. We have to do a bunch of unique behavior that really can't be genericized, so we have to override the component in this manner.
-/mob/living/basic/young_spider/proc/grow_into_giant_spider()
-	if(isnull(grow_as))
-		if(prob(3))
-			grow_as = pick(/mob/living/basic/giant_spider/tarantula, /mob/living/basic/giant_spider/viper, /mob/living/basic/giant_spider/midwife)
-		else
-			grow_as = pick(/mob/living/basic/giant_spider/guard, /mob/living/basic/giant_spider/ambush, /mob/living/basic/giant_spider/hunter, /mob/living/basic/giant_spider/scout, /mob/living/basic/giant_spider/nurse, /mob/living/basic/giant_spider/tangle)
-
-	var/mob/living/basic/giant_spider/grown = change_mob_type(grow_as, get_turf(src), initial(grow_as.name))
-	ADD_TRAIT(grown, TRAIT_WAS_EVOLVED, REF(src))
-	grown.faction = faction.Copy()
-	grown.directive = directive
-	grown.set_name()
-	if(getBruteLoss() - 5 > 0)
-		grown.setBruteLoss(getBruteLoss() - 5)
-	if(getFireLoss() - 5 > 0)
-		grown.setFireLoss(getFireLoss() - 5)
-
-	qdel(src)
 
 /// Used by all young spiders if they ever appear.
 /datum/ai_controller/basic_controller/young_spider
diff --git a/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider_subtypes.dm b/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider_subtypes.dm
index 697ee5d0808..4027575ac01 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider_subtypes.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider_subtypes.dm
@@ -1,8 +1,8 @@
 // This whole file is just a container for the young spider subtypes that actually differentiate into different giant spiders. None of them are particularly special as of now.
 
 /// Will differentiate into the base giant spider (known colloquially as the "guard" spider).
-/mob/living/basic/young_spider/guard
-	grow_as = /mob/living/basic/giant_spider/guard
+/mob/living/basic/spider/growing/young/guard
+	grow_as = /mob/living/basic/spider/giant/guard
 	name = "young guard spider"
 	desc = "Furry and brown, it looks defenseless. This one has sparkling red eyes."
 	maxHealth = 70
@@ -12,8 +12,8 @@
 	speed = 0.7
 
 /// Will differentiate into the "ambush" giant spider.
-/mob/living/basic/young_spider/ambush
-	grow_as = /mob/living/basic/giant_spider/ambush
+/mob/living/basic/spider/growing/young/ambush
+	grow_as = /mob/living/basic/spider/giant/ambush
 	name = "young ambush spider"
 	desc = "Furry and white, it looks defenseless. This one has sparkling pink eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -25,14 +25,14 @@
 	melee_damage_upper = 18
 	speed = 1
 
-/mob/living/basic/young_spider/ambush/Initialize(mapload)
+/mob/living/basic/spider/growing/young/ambush/Initialize(mapload)
 	. = ..()
 	var/datum/action/cooldown/sneak/spider/sneak_web = new(src)
 	sneak_web.Grant(src)
 
 /// Will differentiate into the "scout" giant spider.
-/mob/living/basic/young_spider/scout
-	grow_as = /mob/living/basic/giant_spider/scout
+/mob/living/basic/spider/growing/young/scout
+	grow_as = /mob/living/basic/spider/giant/scout
 	name = "young scout spider"
 	desc = "Furry and black, it looks defenseless. This one has sparkling blue eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -47,13 +47,13 @@
 	poison_type = /datum/reagent/peaceborg/confuse
 	sight = SEE_SELF|SEE_MOBS
 
-/mob/living/basic/young_spider/scout/Initialize(mapload)
+/mob/living/basic/spider/growing/young/scout/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
 
 /// Will differentiate into the "hunter" giant spider.
-/mob/living/basic/young_spider/hunter
-	grow_as = /mob/living/basic/giant_spider/hunter
+/mob/living/basic/spider/growing/young/hunter
+	grow_as = /mob/living/basic/spider/giant/hunter
 	name = "young hunter spider"
 	desc = "Furry and black, it looks defenseless. This one has sparkling purple eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -67,8 +67,8 @@
 	poison_per_bite = 2
 
 /// Will differentiate into the "nurse" giant spider.
-/mob/living/basic/young_spider/nurse
-	grow_as = /mob/living/basic/giant_spider/nurse
+/mob/living/basic/spider/growing/young/nurse
+	grow_as = /mob/living/basic/spider/giant/nurse
 	name = "young nurse spider"
 	desc = "Furry and black, it looks defenseless. This one has sparkling green eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -84,7 +84,7 @@
 	///The health HUD applied to the mob.
 	var/health_hud = DATA_HUD_MEDICAL_ADVANCED
 
-/mob/living/basic/young_spider/nurse/Initialize(mapload)
+/mob/living/basic/spider/growing/young/nurse/Initialize(mapload)
 	. = ..()
 	var/datum/atom_hud/datahud = GLOB.huds[health_hud]
 	datahud.show_to(src)
@@ -93,14 +93,14 @@
 		heal_brute = 15,\
 		heal_burn = 15,\
 		interaction_key = DOAFTER_SOURCE_SPIDER,\
-		valid_targets_typecache = typecacheof(list(/mob/living/basic/giant_spider)),\
+		valid_targets_typecache = typecacheof(list(/mob/living/basic/spider/giant)),\
 		action_text = "%SOURCE% begins wrapping the wounds of %TARGET%.",\
 		complete_text = "%SOURCE% wraps the wounds of %TARGET%.",\
 	)
 
 /// Will differentiate into the "tangle" giant spider.
-/mob/living/basic/young_spider/tangle
-	grow_as = /mob/living/basic/giant_spider/tangle
+/mob/living/basic/spider/growing/young/tangle
+	grow_as = /mob/living/basic/spider/giant/tangle
 	name = "young tangle spider"
 	desc = "Furry and brown, it looks defenseless. This one has dim brown eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -116,7 +116,7 @@
 	poison_per_bite = 2
 	poison_type = /datum/reagent/toxin/acid
 
-/mob/living/basic/young_spider/tangle/Initialize(mapload)
+/mob/living/basic/spider/growing/young/tangle/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/healing_touch,\
 		heal_brute = 10,\
@@ -124,22 +124,22 @@
 		heal_time = 3 SECONDS,\
 		self_targetting = HEALING_TOUCH_SELF_ONLY,\
 		interaction_key = DOAFTER_SOURCE_SPIDER,\
-		valid_targets_typecache = typecacheof(list(/mob/living/basic/giant_spider/tangle)),\
+		valid_targets_typecache = typecacheof(list(/mob/living/basic/spider/growing/young/tangle, /mob/living/basic/spider/giant/tangle)),\
 		extra_checks = CALLBACK(src, PROC_REF(can_mend)),\
 		action_text = "%SOURCE% begins mending themselves...",\
 		complete_text = "%SOURCE%'s wounds mend together.",\
 	)
 
 /// Prevent you from healing other tangle spiders, or healing when on fire
-/mob/living/basic/young_spider/tangle/proc/can_mend(mob/living/source, mob/living/target)
+/mob/living/basic/spider/growing/young/tangle/proc/can_mend(mob/living/source, mob/living/target)
 	if (on_fire)
 		balloon_alert(src, "on fire!")
 		return FALSE
 	return TRUE
 
 /// Will differentiate into the "midwife" giant spider.
-/mob/living/basic/young_spider/midwife
-	grow_as = /mob/living/basic/giant_spider/midwife
+/mob/living/basic/spider/growing/young/midwife
+	grow_as = /mob/living/basic/spider/giant/midwife
 	name = "young broodmother spider"
 	desc = "Furry and black, it looks defenseless. This one has scintillating green eyes. Might also be hiding a real knife somewhere."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -154,8 +154,8 @@
 	web_type = /datum/action/cooldown/lay_web/sealer
 
 /// Will differentiate into the "viper" giant spider.
-/mob/living/basic/young_spider/viper
-	grow_as = /mob/living/basic/giant_spider/viper
+/mob/living/basic/spider/growing/young/viper
+	grow_as = /mob/living/basic/spider/giant/viper
 	name = "young viper spider"
 	desc = "Furry and black, it looks defenseless. This one has sparkling magenta eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -170,8 +170,8 @@
 	poison_per_bite = 2
 
 /// Will differentiate into the "tarantula" giant spider.
-/mob/living/basic/young_spider/tarantula
-	grow_as = /mob/living/basic/giant_spider/tarantula
+/mob/living/basic/spider/growing/young/tarantula
+	grow_as = /mob/living/basic/spider/giant/tarantula
 	name = "young tarantula spider"
 	desc = "Furry and black, it looks defenseless. This one has abyssal red eyes."
 	icon = 'icons/mob/simple/arachnoid.dmi'
@@ -183,40 +183,3 @@
 	melee_damage_upper = 25
 	speed = 1
 	obj_damage = 40
-
-/// Will differentiate into the "flesh" giant spider.
-/mob/living/basic/young_spider/hunter/flesh
-	grow_as = /mob/living/basic/giant_spider/hunter/flesh
-	name = "young flesh spider"
-	desc = "Furry and red, it looks defenseless. This one has sparkling grey eyes."
-	icon = 'icons/mob/simple/arachnoid.dmi'
-	icon_state = "young_flesh"
-	icon_dead = "young_flesh_dead"
-	maxHealth = 55
-	health = 55
-	web_speed = 0.7
-	spider_growth_time = 30 SECONDS
-
-/mob/living/basic/young_spider/hunter/flesh/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/blood_walk, \
-		blood_type = /obj/effect/decal/cleanable/blood/bubblegum, \
-		blood_spawn_chance = 3)
-	// It might be easier and more fitting to just replace this with Regenerator
-	AddComponent(/datum/component/healing_touch,\
-		heal_brute = 25,\
-		heal_burn = 25,\
-		self_targetting = HEALING_TOUCH_SELF_ONLY,\
-		interaction_key = DOAFTER_SOURCE_SPIDER,\
-		valid_targets_typecache = typecacheof(list(/mob/living/basic/giant_spider/hunter/flesh)),\
-		extra_checks = CALLBACK(src, PROC_REF(can_mend)),\
-		action_text = "%SOURCE% begins mending themselves...",\
-		complete_text = "%SOURCE%'s wounds mend together.",\
-	)
-
-/// Prevent you from healing other flesh spiders, or healing when on fire
-/mob/living/basic/young_spider/hunter/flesh/proc/can_mend(mob/living/source, mob/living/target)
-	if (on_fire)
-		balloon_alert(src, "on fire!")
-		return FALSE
-	return TRUE
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index e4bd47dc8c2..06300ad8899 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1492,8 +1492,8 @@
 				/mob/living/basic/chicken,
 				/mob/living/basic/cow,
 				/mob/living/basic/crab,
-				/mob/living/basic/giant_spider,
-				/mob/living/basic/giant_spider/hunter,
+				/mob/living/basic/spider/giant,
+				/mob/living/basic/spider/giant/hunter,
 				/mob/living/basic/mining/goliath,
 				/mob/living/basic/headslug,
 				/mob/living/basic/killer_tomato,
diff --git a/code/modules/mob_spawn/ghost_roles/spider_roles.dm b/code/modules/mob_spawn/ghost_roles/spider_roles.dm
index 24bef0abfa3..e3dbea6b1ba 100644
--- a/code/modules/mob_spawn/ghost_roles/spider_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/spider_roles.dm
@@ -23,7 +23,7 @@
 /obj/structure/spider/eggcluster/examine_more(mob/user)
 	. = ..()
 
-	if(istype(user, /mob/living/basic/giant_spider/midwife))
+	if(istype(user, /mob/living/basic/spider/giant/midwife))
 		switch(spawner.amount_grown)
 			if(0 to 24)
 				. += span_info("These eggs look shrunken and dormant.")
@@ -74,12 +74,12 @@
 	var/obj/structure/spider/eggcluster/egg
 	/// The types of spiders that the spawner can produce
 	var/list/potentialspawns = list(
-		/mob/living/basic/spiderling/nurse,
-		/mob/living/basic/spiderling/hunter,
-		/mob/living/basic/spiderling/ambush,
-		/mob/living/basic/spiderling/tangle,
-		/mob/living/basic/spiderling/guard,
-		/mob/living/basic/spiderling/scout,
+		/mob/living/basic/spider/growing/spiderling/nurse,
+		/mob/living/basic/spider/growing/spiderling/hunter,
+		/mob/living/basic/spider/growing/spiderling/ambush,
+		/mob/living/basic/spider/growing/spiderling/tangle,
+		/mob/living/basic/spider/growing/spiderling/guard,
+		/mob/living/basic/spider/growing/spiderling/scout,
 	)
 	/// Do we flash the byond window when this particular egg type is available?
 	var/flash_window = FALSE
@@ -122,11 +122,13 @@
 			to_chat(user, span_warning("\The [src] is not ready to hatch yet!"))
 		return FALSE
 
-/obj/effect/mob_spawn/ghost_role/spider/special(mob/living/basic/giant_spider/spawned_mob, mob/mob_possessor)
+/obj/effect/mob_spawn/ghost_role/spider/special(mob/living/basic/spider/spawned_mob, mob/mob_possessor)
+	. = ..()
 	spawned_mob.directive = directive
 	egg.spawner = null
 	QDEL_NULL(egg)
-	return ..()
+	var/datum/antagonist/spider/spider_antag = new(directive)
+	spawned_mob.mind.add_antag_datum(spider_antag)
 
 /obj/effect/mob_spawn/ghost_role/spider/enriched
 	name = "enriched egg cluster"
@@ -134,9 +136,9 @@
 	you_are_text = "You are an enriched spider."
 	cluster_type = /obj/structure/spider/eggcluster/enriched
 	potentialspawns = list(
-		/mob/living/basic/spiderling/tarantula,
-		/mob/living/basic/spiderling/viper,
-		/mob/living/basic/spiderling/midwife,
+		/mob/living/basic/spider/growing/spiderling/tarantula,
+		/mob/living/basic/spider/growing/spiderling/viper,
+		/mob/living/basic/spider/growing/spiderling/midwife,
 	)
 	flash_window = TRUE
 
@@ -148,7 +150,7 @@
 	directive = "You are the spawn of a vicious changeling. You have no ambitions except to wreak havoc and ensure your own survival. You are aggressive to all living beings outside of your species, including changelings."
 	cluster_type = /obj/structure/spider/eggcluster/bloody
 	potentialspawns = list(
-		/mob/living/basic/spiderling/hunter/flesh,
+		/mob/living/basic/spider/giant/hunter/flesh,
 	)
 	flash_window = TRUE
 
@@ -159,7 +161,7 @@
 	directive = "Ensure the survival of the spider species and overtake whatever structure you find yourself in."
 	cluster_type = /obj/structure/spider/eggcluster/midwife
 	potentialspawns = list(
-		/mob/living/basic/spiderling/midwife,
+		/mob/living/basic/spider/giant/midwife, // We don't want the event to end instantly because of a 2 hp spiderling dying
 	)
 	flash_window = TRUE
 
@@ -176,9 +178,9 @@
 	var/list/spider_list = list()
 	var/list/display_spiders = list()
 	for(var/choice in potentialspawns)
-		var/mob/living/basic/spiderling/chosen_spiderling = choice
-		var/mob/living/basic/young_spider/young_spider = initial(chosen_spiderling.grow_as)
-		var/mob/living/basic/giant_spider/spider = initial(young_spider.grow_as)
+		var/mob/living/basic/spider/growing/spiderling/chosen_spiderling = choice
+		var/mob/living/basic/spider/growing/young/young_spider = initial(chosen_spiderling.grow_as)
+		var/mob/living/basic/spider/giant/spider = initial(young_spider.grow_as) // God this is so stupid
 		spider_list[initial(spider.name)] = chosen_spiderling
 
 		var/datum/radial_menu_choice/option = new
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 5dc9fed83ce..b39eee137c1 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -125,7 +125,7 @@
 
 /datum/chemical_reaction/slime/slimemobspawn/spider/summon_mobs(datum/reagents/holder, turf/T)
 	T.visible_message(span_danger("The slime extract begins to vibrate crikey-ingly!"))
-	addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Traitor Spider Slime", /mob/living/basic/giant_spider/midwife, FACTION_NEUTRAL, FALSE), 50)
+	addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Traitor Spider Slime", /mob/living/basic/spider/giant/midwife, FACTION_NEUTRAL, FALSE), 50)
 
 
 //Silver
diff --git a/code/modules/spells/spell_types/shapeshift/shapechange.dm b/code/modules/spells/spell_types/shapeshift/shapechange.dm
index 3177191d49a..2e890eed632 100644
--- a/code/modules/spells/spell_types/shapeshift/shapechange.dm
+++ b/code/modules/spells/spell_types/shapeshift/shapechange.dm
@@ -16,6 +16,6 @@
 		/mob/living/basic/pet/dog/corgi,
 		/mob/living/basic/carp/magic/chaos,
 		/mob/living/simple_animal/bot/secbot/ed209,
-		/mob/living/basic/giant_spider/viper/wizard,
+		/mob/living/basic/spider/giant/viper/wizard,
 		/mob/living/simple_animal/hostile/construct/juggernaut/mystic,
 	)
diff --git a/icons/mob/simple/arachnoid.dmi b/icons/mob/simple/arachnoid.dmi
index 976005f6b5e..fca53195d4c 100644
Binary files a/icons/mob/simple/arachnoid.dmi and b/icons/mob/simple/arachnoid.dmi differ
diff --git a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
index 05bd5295555..0900f7a1a74 100644
--- a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
+++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
@@ -49,7 +49,7 @@
 	. = ..()
 	AddComponent(/datum/component/slippery, 20)
 
-/mob/living/basic/giant_spider/badnana_spider
+/mob/living/basic/spider/giant/badnana_spider
 	name = "badnana spider"
 	desc = "WHY WOULD GOD ALLOW THIS?!"
 	icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi'
diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm
index 402f17101ba..3a8dad43888 100644
--- a/modular_skyrat/modules/decay_subsystem/code/nests.dm
+++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm
@@ -140,7 +140,7 @@
 	desc = "A mush of sticky cobwebs and nasty looking eggs..."
 	icon_state = "nest_spider"
 	light_color = LIGHT_COLOR_BLOOD_MAGIC
-	monster_types = list(/mob/living/basic/giant_spider/hunter, /mob/living/basic/giant_spider)
+	monster_types = list(/mob/living/basic/spider/giant/hunter, /mob/living/basic/spider/giant/)
 	loot = list(/obj/item/spider_egg = 4)
 
 /obj/item/spider_egg
@@ -155,7 +155,7 @@
 	if(do_after(user, 3 SECONDS, src))
 		to_chat(user, span_userdanger("You crack [src] open, something monsterous crawls out!"))
 		playsound(src, 'sound/effects/blobattack.ogg', 100)
-		new /mob/living/basic/giant_spider (user.loc)
+		new /mob/living/basic/spider/giant/ (user.loc)
 		qdel(src)
 
 /obj/structure/mob_spawner/bush
diff --git a/modular_skyrat/modules/mapping/code/holocall.dm b/modular_skyrat/modules/mapping/code/holocall.dm
index 3dcfc16f542..9c2da80641f 100644
--- a/modular_skyrat/modules/mapping/code/holocall.dm
+++ b/modular_skyrat/modules/mapping/code/holocall.dm
@@ -1,6 +1,6 @@
 //Custom Holoimages//
 /datum/preset_holoimage/spider
-	nonhuman_mobtype = /mob/living/basic/giant_spider
+	nonhuman_mobtype = /mob/living/basic/spider/giant/
 
 //Custom Holodisks//
 /obj/item/disk/holodisk/woospider //No special markings on this disk, should be a fun maint loot surprise.
diff --git a/modular_skyrat/modules/mold/code/mold.dm b/modular_skyrat/modules/mold/code/mold.dm
index edcccf6e874..dbd1ff139f6 100644
--- a/modular_skyrat/modules/mold/code/mold.dm
+++ b/modular_skyrat/modules/mold/code/mold.dm
@@ -270,7 +270,7 @@
 	mold_color = "#cb37f5"
 	structure_light_color = LIGHT_COLOR_LAVENDER
 	examine_text = "It feels damp and smells of rat poison."
-	mob_types = list(/mob/living/basic/giant_spider)
+	mob_types = list(/mob/living/basic/spider/giant/)
 	preferred_atmos_conditions = "miasma=50;TEMP=296"
 	resistance_flags = UNACIDABLE | ACID_PROOF
 
diff --git a/tgstation.dme b/tgstation.dme
index 0098e2f1c48..b0980048d04 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4267,10 +4267,10 @@
 #include "code\modules\mob\living\basic\space_fauna\netherworld\migo.dm"
 #include "code\modules\mob\living\basic\space_fauna\paper_wizard\paper_abilities.dm"
 #include "code\modules\mob\living\basic\space_fauna\paper_wizard\paper_wizard.dm"
-#include "code\modules\mob\living\basic\space_fauna\spider\giant_spider\giant_spider.dm"
+#include "code\modules\mob\living\basic\space_fauna\spider\spider.dm"
 #include "code\modules\mob\living\basic\space_fauna\spider\giant_spider\giant_spider_ai.dm"
 #include "code\modules\mob\living\basic\space_fauna\spider\giant_spider\giant_spider_subtrees.dm"
-#include "code\modules\mob\living\basic\space_fauna\spider\giant_spider\giant_spider_variants.dm"
+#include "code\modules\mob\living\basic\space_fauna\spider\giant_spider\giant_spiders.dm"
 #include "code\modules\mob\living\basic\space_fauna\spider\spider_abilities\hivemind.dm"
 #include "code\modules\mob\living\basic\space_fauna\spider\spider_abilities\lay_eggs.dm"
 #include "code\modules\mob\living\basic\space_fauna\spider\spider_abilities\web.dm"
diff --git a/tools/UpdatePaths/Scripts/77523_giant_spider_repath.txt b/tools/UpdatePaths/Scripts/77523_giant_spider_repath.txt
new file mode 100644
index 00000000000..1fb03473be8
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/77523_giant_spider_repath.txt
@@ -0,0 +1,4 @@
+/mob/living/basic/spiderling/@SUBTYPES : /mob/living/basic/spider/growing/spiderling/@SUBTYPES{@OLD}
+/mob/living/basic/spider_young/@SUBTYPES : /mob/living/basic/spider/growing/young/@SUBTYPES{@OLD}
+/mob/living/basic/giant_spider/maintenance : /mob/living/basic/spider/maintenance{@OLD}
+/mob/living/basic/giant_spider/@SUBTYPES : /mob/living/basic/spider/giant/@SUBTYPES{@OLD}