diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
index 21f2d38090..b66fbdf3d5 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -28,7 +28,7 @@
 "g" = (
 /obj/structure/reagent_dispensers/water_cooler{
 	name = "punch cooler";
-	reagent_id = "bacchus_blessing"
+	reagent_id = /datum/reagent/consumable/ethanol/bacchus_blessing
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index e5038c0730..1464dd9529 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -3410,7 +3410,7 @@
 "lq" = (
 /obj/structure/table,
 /obj/item/reagent_containers/glass/beaker{
-	list_reagents = list("sacid" = 50)
+	list_reagents = list(/datum/reagent/toxin/acid = 50)
 	},
 /obj/item/paper/crumpled/bloody/ruins/thederelict/unfinished,
 /obj/item/pen,
diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm
new file mode 100644
index 0000000000..05e6e4b63f
--- /dev/null
+++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_1x3.dmm
@@ -0,0 +1,2760 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"ac" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"at" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/item/cartridge/atmos,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"av" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"aw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"aA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"aC" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/tank/internals/emergency_oxygen/engi{
+	pixel_x = 5
+	},
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/glasses/meson/engine,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"aV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber";
+	req_access_txt = "10"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"aX" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/turf/open/space,
+/area/space/nearstation)
+"aY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bl" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bo" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bq" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 9
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"bH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4;
+	name = "Output to Waste"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bI" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"bT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bW" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ck" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"cp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"cN" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"cP" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"cX" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Gas to Cooling Loop"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"cY" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"de" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Port";
+	dir = 4;
+	network = list("ss13","engine")
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"df" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/rad_collector/anchored,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"dl" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"dw" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
+"dD" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
+"ej" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Cooling Loop Bypass"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ey" = (
+/obj/structure/reflector/single/anchored{
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ez" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fa" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fj" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"fq" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"fK" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gf" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"gj" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gx" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"gB" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gQ" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"hy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"hJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"hK" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"ii" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"in" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"iC" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/artistic{
+	icon_state = "yellow";
+	item_state = "toolbox_yellow";
+	name = "Cable Toolbox";
+	pixel_y = 6
+	},
+/obj/item/storage/toolbox/artistic{
+	icon_state = "yellow";
+	item_state = "toolbox_yellow";
+	name = "Cable Toolbox";
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"iD" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"iJ" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Gas to Filter"
+	},
+/obj/machinery/airalarm/engine{
+	dir = 4;
+	pixel_x = -23
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"iU" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"jg" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"jp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"jr" = (
+/obj/structure/sign/warning/electricshock,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"js" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"jB" = (
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"jZ" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"kA" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"kW" = (
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ln" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"lw" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"lE" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"lG" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space,
+/area/space/nearstation)
+"lQ" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"mi" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"mj" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"mk" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"mE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"mH" = (
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"mU" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"mW" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"mX" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nd" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 4;
+	name = "Cooling Loop to Gas"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nH" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"nR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"nV" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nW" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/rad_collector/anchored,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"ou" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"oC" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 1
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"oS" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"pb" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"px" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"pA" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"pL" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"pP" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/emitter/anchored{
+	dir = 4;
+	state = 2
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"qc" = (
+/obj/structure/table,
+/obj/item/pipe_dispenser,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"qe" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qm" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Mix Bypass"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qo" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"qr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qA" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"rt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ry" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"rJ" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"rY" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 10
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"sm" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/turf/open/space,
+/area/space/nearstation)
+"sn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"so" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"sq" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"sA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 4;
+	name = "Gas to Mix"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"td" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"te" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ti" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"tn" = (
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber";
+	req_access_txt = "10"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"tw" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"tE" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"un" = (
+/obj/structure/reflector/single/anchored{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"uz" = (
+/obj/structure/sign/warning/radiation,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"uC" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"uR" = (
+/obj/machinery/power/supermatter_crystal/engine,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"vD" = (
+/obj/structure/girder,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"vN" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"vO" = (
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"vX" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"wt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/closet/radiation,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"wz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"wG" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"wS" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"xo" = (
+/obj/structure/reflector/box/anchored{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"xB" = (
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yd" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yf" = (
+/turf/open/space/basic,
+/area/space/nearstation)
+"yA" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"yD" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yZ" = (
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Fore";
+	dir = 1;
+	network = list("ss13","engine");
+	pixel_x = 23
+	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -26
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zf" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Atmos to Loop"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zh" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/flashlight,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/item/pipe_dispenser,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zF" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"zS" = (
+/turf/open/space/basic,
+/area/space)
+"Ab" = (
+/obj/item/crowbar/large,
+/obj/structure/rack,
+/obj/item/flashlight,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Ah" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"AH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Bc" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Bl" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/glasses/meson,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"BD" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/components/binary/valve/digital/on{
+	dir = 4;
+	name = "Output Release"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Cb" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Cn" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"CH" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"CT" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Gas to Chamber"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"CW" = (
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Dj" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Dz" = (
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"DA" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"DC" = (
+/obj/structure/rack,
+/obj/item/clothing/mask/gas{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Ef" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ei" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external{
+	name = "Engineering External Access";
+	req_access_txt = "10;13"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Es" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ex" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ey" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"EL" = (
+/turf/closed/wall,
+/area/engine/engineering)
+"EM" = (
+/obj/item/wrench,
+/obj/structure/rack,
+/obj/item/weldingtool/hugetank,
+/obj/item/clothing/head/welding{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/clothing/head/welding{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Fr" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"FG" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Gb" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"Gl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Starboard";
+	dir = 8;
+	network = list("ss13","engine")
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Gz" = (
+/obj/machinery/button/door{
+	id = "engsm";
+	name = "Radiation Shutters Control";
+	pixel_y = -24;
+	req_access_txt = "10"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"GB" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"GI" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"GK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"GX" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Hj" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Hn" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"Hw" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Hz" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ik" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"In" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"IE" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"IF" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/emitter/anchored{
+	dir = 8;
+	state = 2
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Jn" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Jp" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"JH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"JK" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"JV" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Laser Room";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ke" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 5
+	},
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Kv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"KX" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"KZ" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/turf/open/space,
+/area/space/nearstation)
+"Le" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"Lg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Lv" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Lw" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"LJ" = (
+/obj/machinery/light,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"LS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"Ml" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8;
+	filter_type = "n2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Mr" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Mu" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ME" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"MI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"MJ" = (
+/turf/open/floor/plating,
+/area/engine/engineering)
+"MK" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"MP" = (
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Ne" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Np" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Nx" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ND" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+	name = "Engineering External Access";
+	req_access_txt = "10;13"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"NK" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"NU" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Aft";
+	network = list("ss13","engine");
+	pixel_x = 23
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"NZ" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Oj" = (
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
+"Ok" = (
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"OK" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Mix to Gas"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"OU" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Pa" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "External Gas to Loop"
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ph" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Py" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Qn" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
+/obj/machinery/meter,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Qu" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"QD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"QJ" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Rh" = (
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"RA" = (
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"RV" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Sn" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
+"SL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"SR" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"SX" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Tk" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/closet/emcloset/anchored,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"TB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"TC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"TO" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ub" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Uq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Ur" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Uu" = (
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"UM" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"UN" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Vg" = (
+/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 6
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Vn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Vz" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"VP" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Wf" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"WB" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
+"WI" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"WT" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Xy" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"XA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"XG" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"XK" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/item/radio/headset/headset_eng,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"XY" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"YB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YD" = (
+/obj/structure/reflector/double/anchored{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"YF" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YX" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Gas to Filter"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YY" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"YZ" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space,
+/area/space/nearstation)
+"Zn" = (
+/obj/structure/sign/warning/vacuum/external{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"ZH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ZO" = (
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ZT" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+yf
+Rh
+yf
+yf
+Rh
+yf
+yf
+Rh
+yf
+yf
+yf
+YZ
+YZ
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(2,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+pL
+aX
+pL
+yA
+Sn
+yA
+yA
+Sn
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(3,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(4,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+uC
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(5,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(6,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+wS
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(7,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+EL
+EL
+MP
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+yf
+yf
+yf
+yf
+zS
+"}
+(8,1,1) = {"
+ZT
+ZT
+cP
+Ke
+EL
+Tk
+MP
+wS
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+yf
+yf
+Rh
+yf
+yf
+"}
+(9,1,1) = {"
+ZT
+ZT
+dl
+Ok
+ND
+Zn
+Ei
+bI
+KZ
+lG
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+YZ
+YZ
+tw
+Rh
+Rh
+Rh
+yf
+"}
+(10,1,1) = {"
+ZT
+nR
+AH
+iD
+MP
+MP
+MP
+sq
+aA
+rJ
+gf
+rJ
+rJ
+td
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+"}
+(11,1,1) = {"
+oC
+GB
+UN
+sn
+sn
+sn
+de
+GK
+wG
+TC
+mj
+fW
+at
+XA
+td
+MP
+MP
+MP
+MP
+MP
+MP
+yf
+WB
+YZ
+WB
+yf
+"}
+(12,1,1) = {"
+cS
+hJ
+qe
+ry
+ry
+ry
+ry
+cX
+ry
+ry
+nd
+ry
+yD
+Ex
+ck
+iC
+Uu
+kW
+Uu
+EM
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(13,1,1) = {"
+ME
+qr
+Hz
+gj
+bl
+te
+ez
+Mr
+DA
+ej
+Dz
+jZ
+gB
+SR
+SX
+Vn
+Vn
+cp
+Uu
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(14,1,1) = {"
+Ne
+yd
+bW
+VP
+Qu
+Vg
+KX
+px
+nW
+Vz
+cN
+xB
+WI
+IE
+JV
+Bc
+JH
+Lv
+XY
+LJ
+MP
+Rh
+YZ
+Oj
+YZ
+Rh
+"}
+(15,1,1) = {"
+MP
+zh
+QD
+Hj
+rt
+lQ
+KX
+RA
+tE
+Vz
+cN
+Xy
+Ml
+Ef
+iD
+MJ
+QJ
+pP
+pP
+MJ
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(16,1,1) = {"
+MP
+aC
+bW
+TO
+fK
+uz
+RA
+ti
+YY
+Vz
+cN
+JK
+WT
+Ef
+MP
+Lw
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(17,1,1) = {"
+oS
+fa
+bW
+ZO
+yZ
+qA
+iJ
+pb
+so
+jr
+js
+CW
+YF
+Py
+iD
+YD
+Uu
+Uu
+ey
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(18,1,1) = {"
+iD
+fa
+bW
+YX
+Qu
+aV
+jp
+tn
+uR
+Jp
+NU
+Hw
+ac
+ac
+iD
+xo
+Uu
+xo
+vD
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(19,1,1) = {"
+oS
+fa
+bW
+vO
+Gz
+lE
+CT
+Gb
+UM
+Wf
+Mu
+jB
+Nx
+aw
+iD
+Uu
+Uu
+Uu
+un
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(20,1,1) = {"
+MP
+Bl
+bW
+iU
+fK
+RA
+Wf
+mW
+bq
+Vz
+cN
+JK
+WT
+Ef
+MP
+Lw
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(21,1,1) = {"
+MP
+nV
+mE
+vO
+Pa
+wz
+fj
+RA
+cY
+Vz
+cN
+vO
+Np
+Ef
+iD
+MJ
+Dj
+IF
+Dj
+MJ
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(22,1,1) = {"
+iD
+fa
+hy
+vO
+Pa
+Ey
+fj
+Cn
+df
+Vz
+cN
+JK
+lw
+bH
+JV
+Bc
+Ph
+Ph
+nH
+LJ
+MP
+Rh
+YZ
+Oj
+YZ
+Rh
+"}
+(23,1,1) = {"
+iD
+vX
+bo
+GX
+mk
+Ik
+SL
+YB
+RV
+qm
+MK
+ii
+rY
+Qn
+ab
+ZH
+ZH
+MI
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(24,1,1) = {"
+mH
+bT
+Lg
+zf
+ry
+ry
+ry
+OK
+ry
+ry
+sA
+ry
+mX
+BD
+Uq
+zF
+Uu
+GI
+Uu
+Ab
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(25,1,1) = {"
+iD
+mU
+in
+Ur
+Es
+Kv
+Gl
+aY
+Kv
+Kv
+Fr
+vN
+nz
+In
+Ub
+MP
+MP
+MP
+MP
+MP
+MP
+yf
+YZ
+YZ
+YZ
+yf
+"}
+(26,1,1) = {"
+wt
+av
+kA
+qo
+EL
+MP
+MP
+Cb
+Uu
+Uu
+pA
+jg
+qc
+fq
+LS
+Hn
+dw
+yf
+Rh
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+"}
+(27,1,1) = {"
+ZT
+ZT
+ZT
+ou
+DC
+iD
+Uu
+mi
+NK
+NK
+Ah
+Uu
+Jn
+MP
+dw
+dw
+dw
+Rh
+Rh
+Rh
+Rh
+tw
+Rh
+Rh
+Rh
+Rh
+"}
+(28,1,1) = {"
+ZT
+ZT
+ZT
+OU
+Ok
+CH
+GI
+gx
+TB
+gQ
+gQ
+ln
+XK
+MP
+yf
+yf
+Rh
+yf
+Rh
+Oj
+YZ
+yf
+yf
+Rh
+yf
+yf
+"}
+(29,1,1) = {"
+ZT
+ZT
+ZT
+FG
+NZ
+MP
+MP
+MP
+MP
+MP
+iD
+iD
+iD
+MP
+Rh
+Rh
+Rh
+Rh
+Rh
+Oj
+YZ
+yf
+yf
+Rh
+yf
+zS
+"}
diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm
new file mode 100644
index 0000000000..3356ebaa77
--- /dev/null
+++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_3x.dmm
@@ -0,0 +1,2777 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"ac" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"at" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/item/cartridge/atmos,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"av" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"aw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"aA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"aC" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/tank/internals/emergency_oxygen/engi{
+	pixel_x = 5
+	},
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/glasses/meson/engine,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"aV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"aX" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/turf/open/space,
+/area/space/nearstation)
+"aY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bo" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 4;
+	name = "Output to Waste"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bI" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"bT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bW" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ck" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"cp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"cP" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"cX" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Gas to Cooling Loop"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"de" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Port";
+	dir = 4;
+	network = list("ss13","engine")
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"df" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"dl" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"dw" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
+"dD" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
+"ej" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Cooling Loop Bypass"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ey" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"ez" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fa" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fj" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"fq" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"fK" = (
+/obj/structure/sign/warning/radiation,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"fW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gf" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"gj" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gx" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"gB" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gQ" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"hy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"hJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"hK" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"ii" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"in" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"iC" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/artistic{
+	icon_state = "yellow";
+	item_state = "toolbox_yellow";
+	name = "Cable Toolbox";
+	pixel_y = 6
+	},
+/obj/item/storage/toolbox/artistic{
+	icon_state = "yellow";
+	item_state = "toolbox_yellow";
+	name = "Cable Toolbox";
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"iD" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"iJ" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"iU" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"jg" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"jp" = (
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber";
+	req_access_txt = "10"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"js" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"jB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"jZ" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"kA" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"kW" = (
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ln" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"lw" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"lE" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Gas to Chamber"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"lG" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space,
+/area/space/nearstation)
+"mi" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"mj" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"mE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"mH" = (
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"mU" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"mX" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"na" = (
+/obj/machinery/camera{
+	c_tag = "Supermatter Chamber";
+	network = list("engine");
+	pixel_x = 23
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"nd" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 4;
+	name = "Cooling Loop to Gas"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ni" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nH" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"nR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"nV" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nW" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/tank/internals/plasma,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"ou" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"oC" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 1
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"oS" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"px" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"pA" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"pL" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"pP" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/emitter/anchored{
+	dir = 4;
+	state = 2
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"qc" = (
+/obj/structure/table,
+/obj/item/pipe_dispenser,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"qe" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qm" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Mix Bypass"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qo" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"qr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qA" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Gas to Filter"
+	},
+/obj/machinery/airalarm/engine{
+	dir = 4;
+	pixel_x = -23
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"re" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"rt" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ry" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"rJ" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"rY" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 10
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"sm" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/turf/open/space,
+/area/space/nearstation)
+"sn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"so" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"sq" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"sA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 4;
+	name = "Gas to Mix"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"td" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"te" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"tw" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"tE" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"un" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"uC" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"uR" = (
+/obj/machinery/power/supermatter_crystal/engine,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"vD" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 9
+	},
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"vN" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"vO" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"vX" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"wt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/closet/radiation,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"wz" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"wG" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"wS" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"xo" = (
+/obj/structure/reflector/box/anchored{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"xB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yd" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yf" = (
+/turf/open/space/basic,
+/area/space/nearstation)
+"yA" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"yD" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yZ" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"zf" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Atmos to Loop"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zh" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/flashlight,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/item/pipe_dispenser,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zF" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"zS" = (
+/turf/open/space/basic,
+/area/space)
+"Ab" = (
+/obj/item/crowbar/large,
+/obj/structure/rack,
+/obj/item/flashlight,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Ah" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"AH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Bc" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Bk" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"Bl" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/glasses/meson,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"BD" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/components/binary/valve/digital/on{
+	dir = 4;
+	name = "Output Release"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Cb" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Cn" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"CH" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"CT" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"CW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Dz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"DA" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"DC" = (
+/obj/structure/rack,
+/obj/item/clothing/mask/gas{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Ef" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ei" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external{
+	name = "Engineering External Access";
+	req_access_txt = "10;13"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Es" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ex" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"EL" = (
+/turf/closed/wall,
+/area/engine/engineering)
+"EM" = (
+/obj/item/wrench,
+/obj/structure/rack,
+/obj/item/weldingtool/hugetank,
+/obj/item/clothing/head/welding{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/clothing/head/welding{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"EX" = (
+/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 6
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Fr" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"FG" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"FL" = (
+/obj/structure/sign/warning/electricshock,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"Gl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Starboard";
+	dir = 8;
+	network = list("ss13","engine")
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Gz" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"GB" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"GI" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"GK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"GX" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Hj" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Hn" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"Hw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Aft";
+	network = list("ss13","engine");
+	pixel_x = 23
+	},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Hz" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ik" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"In" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"IE" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"IF" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/emitter/anchored{
+	dir = 8;
+	state = 2
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Jn" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"JH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"JK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"JL" = (
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"JV" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Laser Room";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ke" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 5
+	},
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Kv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"KX" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"KZ" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/turf/open/space,
+/area/space/nearstation)
+"Le" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"Lg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Lv" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Lw" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"LE" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/button/door{
+	id = "engsm";
+	name = "Radiation Shutters Control";
+	pixel_y = -24;
+	req_access_txt = "10"
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"LJ" = (
+/obj/machinery/light,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"LS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"Ml" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8;
+	filter_type = "n2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Mr" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ME" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"MI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"MJ" = (
+/turf/open/floor/plating,
+/area/engine/engineering)
+"MK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"MP" = (
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Ne" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Np" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Nw" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"Nx" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ND" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+	name = "Engineering External Access";
+	req_access_txt = "10;13"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"NK" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"NU" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"NZ" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Oj" = (
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
+"Ok" = (
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"OK" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Mix to Gas"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"OR" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"OU" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Pa" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "External Gas to Loop"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Ph" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Py" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Qn" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
+/obj/machinery/meter,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Qu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber";
+	req_access_txt = "10"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"QD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Rh" = (
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"RA" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"RV" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Sn" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
+"SL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"SR" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"SX" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Tk" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/closet/emcloset/anchored,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"TB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"TC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"TO" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ub" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Uq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Ur" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Uu" = (
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"UN" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Vg" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Vn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"VN" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "External Gas to Loop"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"VP" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Wf" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"Ws" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"WB" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
+"WI" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"WT" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Xy" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"XA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"XG" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"XK" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/item/radio/headset/headset_eng,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"XY" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"YB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YF" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YX" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Gas to Filter"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YZ" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space,
+/area/space/nearstation)
+"Zn" = (
+/obj/structure/sign/warning/vacuum/external{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"ZH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ZO" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -26
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Fore";
+	dir = 1;
+	network = list("ss13","engine");
+	pixel_x = 23
+	},
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ZT" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+yf
+Rh
+yf
+yf
+Rh
+yf
+yf
+Rh
+yf
+yf
+yf
+YZ
+YZ
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(2,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+pL
+aX
+pL
+yA
+Sn
+yA
+yA
+Sn
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(3,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(4,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+uC
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(5,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(6,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+wS
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(7,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+EL
+EL
+MP
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+yf
+yf
+yf
+yf
+zS
+"}
+(8,1,1) = {"
+ZT
+ZT
+cP
+Ke
+EL
+Tk
+MP
+wS
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+yf
+yf
+Rh
+yf
+yf
+"}
+(9,1,1) = {"
+ZT
+ZT
+dl
+Ok
+ND
+Zn
+Ei
+bI
+KZ
+lG
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+YZ
+YZ
+tw
+Rh
+Rh
+Rh
+yf
+"}
+(10,1,1) = {"
+ZT
+nR
+AH
+iD
+MP
+MP
+MP
+sq
+aA
+rJ
+gf
+rJ
+rJ
+td
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+"}
+(11,1,1) = {"
+oC
+GB
+UN
+sn
+sn
+sn
+de
+GK
+wG
+TC
+mj
+fW
+at
+XA
+td
+MP
+MP
+MP
+MP
+MP
+MP
+yf
+WB
+YZ
+WB
+yf
+"}
+(12,1,1) = {"
+cS
+hJ
+qe
+ry
+ry
+ry
+ry
+cX
+ry
+ry
+nd
+ry
+yD
+Ex
+ck
+iC
+Uu
+kW
+Uu
+EM
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(13,1,1) = {"
+ME
+qr
+Hz
+gj
+te
+te
+ez
+Mr
+DA
+ej
+Dz
+jZ
+gB
+SR
+SX
+Vn
+Vn
+cp
+Uu
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(14,1,1) = {"
+Ne
+yd
+bW
+VP
+EX
+Vg
+KX
+px
+nW
+Cn
+fj
+xB
+WI
+IE
+JV
+Bc
+JH
+Lv
+XY
+LJ
+MP
+Rh
+YZ
+Oj
+YZ
+Rh
+"}
+(15,1,1) = {"
+MP
+zh
+QD
+Hj
+rt
+Vg
+JL
+na
+tE
+tE
+JL
+Xy
+Ml
+Ef
+iD
+MJ
+pP
+pP
+pP
+MJ
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(16,1,1) = {"
+MP
+aC
+bW
+TO
+fK
+JL
+JL
+Bk
+Bk
+Bk
+FL
+JK
+WT
+Ef
+MP
+Lw
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(17,1,1) = {"
+oS
+fa
+bW
+ZO
+yZ
+qA
+iJ
+so
+uR
+ey
+js
+CW
+YF
+Py
+iD
+Uu
+xo
+Uu
+Uu
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(18,1,1) = {"
+iD
+fa
+bW
+YX
+Qu
+aV
+jp
+so
+uR
+ey
+NU
+Hw
+ac
+ac
+iD
+Uu
+Uu
+xo
+Uu
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(19,1,1) = {"
+oS
+fa
+bW
+LE
+Gz
+lE
+CT
+so
+uR
+ey
+un
+jB
+Nx
+aw
+iD
+Uu
+Uu
+Uu
+xo
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(20,1,1) = {"
+MP
+Bl
+bW
+iU
+JL
+OR
+Wf
+RA
+RA
+RA
+vD
+JK
+WT
+Ef
+MP
+Lw
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(21,1,1) = {"
+MP
+nV
+mE
+Ws
+VN
+wz
+JL
+tE
+tE
+tE
+JL
+vO
+Np
+Ef
+iD
+MJ
+IF
+IF
+IF
+MJ
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(22,1,1) = {"
+iD
+fa
+hy
+Ws
+Pa
+wz
+fj
+Nw
+df
+re
+KX
+ni
+lw
+bH
+JV
+Bc
+Ph
+Ph
+nH
+LJ
+MP
+Rh
+YZ
+Oj
+YZ
+Rh
+"}
+(23,1,1) = {"
+iD
+vX
+bo
+GX
+Ik
+Ik
+SL
+YB
+RV
+qm
+MK
+ii
+rY
+Qn
+ab
+ZH
+ZH
+MI
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(24,1,1) = {"
+mH
+bT
+Lg
+zf
+ry
+ry
+ry
+OK
+ry
+ry
+sA
+ry
+mX
+BD
+Uq
+zF
+Uu
+GI
+Uu
+Ab
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(25,1,1) = {"
+iD
+mU
+in
+Ur
+Es
+Kv
+Gl
+aY
+Kv
+Kv
+Fr
+vN
+nz
+In
+Ub
+MP
+MP
+MP
+MP
+MP
+MP
+yf
+YZ
+YZ
+YZ
+yf
+"}
+(26,1,1) = {"
+wt
+av
+kA
+qo
+EL
+MP
+MP
+Cb
+Uu
+Uu
+pA
+jg
+qc
+fq
+LS
+Hn
+dw
+yf
+Rh
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+"}
+(27,1,1) = {"
+ZT
+ZT
+ZT
+ou
+DC
+iD
+Uu
+mi
+NK
+NK
+Ah
+Uu
+Jn
+MP
+dw
+dw
+dw
+Rh
+Rh
+Rh
+Rh
+tw
+Rh
+Rh
+Rh
+Rh
+"}
+(28,1,1) = {"
+ZT
+ZT
+ZT
+OU
+Ok
+CH
+GI
+gx
+TB
+gQ
+gQ
+ln
+XK
+MP
+yf
+yf
+Rh
+yf
+Rh
+Oj
+YZ
+yf
+yf
+Rh
+yf
+yf
+"}
+(29,1,1) = {"
+ZT
+ZT
+ZT
+FG
+NZ
+MP
+MP
+MP
+MP
+MP
+iD
+iD
+iD
+MP
+Rh
+Rh
+Rh
+Rh
+Rh
+Oj
+YZ
+yf
+yf
+Rh
+yf
+zS
+"}
diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm
new file mode 100644
index 0000000000..3b3328a8f0
--- /dev/null
+++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_sm_5x5.dmm
@@ -0,0 +1,2827 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"ac" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"at" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/item/cartridge/atmos,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"av" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"aw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"aA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"aC" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/tank/internals/emergency_oxygen/engi{
+	pixel_x = 5
+	},
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/glasses/meson/engine,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"aV" = (
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber";
+	req_access_txt = "10"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"aX" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/turf/open/space,
+/area/space/nearstation)
+"aY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bo" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bH" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bI" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"bT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"bW" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ck" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"cp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"cP" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"cS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"cX" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Gas to Cooling Loop"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"de" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Port";
+	dir = 4;
+	network = list("ss13","engine")
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"df" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"dl" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"dw" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/space/nearstation)
+"dD" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
+"ej" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Cooling Loop Bypass"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ey" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ez" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fa" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fj" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -26
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Fore";
+	dir = 1;
+	network = list("ss13","engine");
+	pixel_x = 23
+	},
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"fq" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"fW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gf" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"gj" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	name = "Gas to Filter"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gx" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"gB" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"gQ" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"hy" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"hJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"hK" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 5
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"ii" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"in" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"iC" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/artistic{
+	icon_state = "yellow";
+	item_state = "toolbox_yellow";
+	name = "Cable Toolbox";
+	pixel_y = 6
+	},
+/obj/item/storage/toolbox/artistic{
+	icon_state = "yellow";
+	item_state = "toolbox_yellow";
+	name = "Cable Toolbox";
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"iD" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"iJ" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/button/door{
+	id = "engsm";
+	name = "Radiation Shutters Control";
+	pixel_y = -24;
+	req_access_txt = "10"
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"jg" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"jp" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"js" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "External Gas to Loop"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"jB" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"jZ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"kA" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"kW" = (
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ln" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"lw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"lE" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"lG" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 9
+	},
+/turf/open/space,
+/area/space/nearstation)
+"mi" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"mj" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"mG" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"mH" = (
+/obj/structure/sign/poster/official/safety_eye_protection,
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"mU" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"mX" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"na" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"nd" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 4;
+	name = "Cooling Loop to Gas"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nH" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"nR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"nV" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/meson,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"nW" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/tank/internals/plasma,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"ou" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"oC" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 1
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"oS" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"px" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"pA" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"pL" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"pP" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/emitter/anchored{
+	dir = 4;
+	state = 2
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"qc" = (
+/obj/structure/table,
+/obj/item/pipe_dispenser,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"qe" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qm" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Mix Bypass"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qo" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"qr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"qA" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"qP" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"re" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"rt" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ry" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"rJ" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"rY" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"sm" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 6
+	},
+/turf/open/space,
+/area/space/nearstation)
+"sn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"so" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"sq" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+	dir = 8
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"sA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 4;
+	name = "Gas to Mix"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"td" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"te" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"tn" = (
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"tw" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"tE" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 4
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"un" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"uC" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"uR" = (
+/obj/machinery/power/supermatter_crystal/engine,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"vD" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"vN" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"vO" = (
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"vX" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"wt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/closet/radiation,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"wz" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"wG" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"wS" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"xo" = (
+/obj/structure/reflector/box/anchored{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"xB" = (
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"yd" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yf" = (
+/turf/open/space/basic,
+/area/space/nearstation)
+"yA" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"yD" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"yZ" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "Gas to Filter"
+	},
+/obj/machinery/airalarm/engine{
+	dir = 4;
+	pixel_x = -23
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"zf" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Atmos to Loop"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zh" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/flashlight,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/item/pipe_dispenser,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"zF" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"zS" = (
+/turf/open/space/basic,
+/area/space)
+"Ab" = (
+/obj/item/crowbar/large,
+/obj/structure/rack,
+/obj/item/flashlight,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Ah" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"AH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Bc" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Bk" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"Bl" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/glasses/meson,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"BD" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Cb" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Cn" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"CH" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room";
+	req_access_txt = "10"
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"CT" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Supermatter Chamber";
+	network = list("engine");
+	pixel_x = 23
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"CW" = (
+/obj/structure/sign/warning/electricshock,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"Dj" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 4
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Supermatter Chamber";
+	network = list("engine");
+	pixel_x = 23
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"Dz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"DA" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"DC" = (
+/obj/structure/rack,
+/obj/item/clothing/mask/gas{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Ef" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8;
+	filter_type = "n2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ei" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external{
+	name = "Engineering External Access";
+	req_access_txt = "10;13"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Es" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ex" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"EL" = (
+/turf/closed/wall,
+/area/engine/engineering)
+"EM" = (
+/obj/item/wrench,
+/obj/structure/rack,
+/obj/item/weldingtool/hugetank,
+/obj/item/clothing/head/welding{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/clothing/head/welding{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Fr" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"FG" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Gl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Starboard";
+	dir = 8;
+	network = list("ss13","engine")
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Gz" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "Gas to Chamber"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"GB" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"GI" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"GK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"GX" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Hj" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Hn" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"Hw" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"Hz" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ik" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"In" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"IE" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"IF" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/emitter/anchored{
+	dir = 8;
+	state = 2
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Jn" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"JH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"JV" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Laser Room";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Ke" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 5
+	},
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Kv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"KX" = (
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"KZ" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/turf/open/space,
+/area/space/nearstation)
+"Le" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 10
+	},
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"Lg" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Lv" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Lw" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"LE" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"LJ" = (
+/obj/machinery/light,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"LS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"Ml" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 6
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Mr" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/green/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ME" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"MI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"MJ" = (
+/turf/open/floor/plating,
+/area/engine/engineering)
+"MK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"MP" = (
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Ne" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Np" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Nw" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "engsm";
+	name = "Radiation Chamber Shutters"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/engine/supermatter)
+"Nx" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"ND" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external{
+	name = "Engineering External Access";
+	req_access_txt = "10;13"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"NK" = (
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"NU" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 9
+	},
+/obj/machinery/power/rad_collector/anchored,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"NZ" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Oj" = (
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
+"Ok" = (
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"OK" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "Mix to Gas"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"OR" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"OU" = (
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/obj/machinery/meter,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"Pa" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Ph" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Py" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Qn" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Qu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"QD" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"QJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Aft";
+	network = list("ss13","engine");
+	pixel_x = 23
+	},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Rh" = (
+/obj/structure/lattice,
+/turf/open/space,
+/area/space/nearstation)
+"RA" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"RV" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Sn" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/turf/open/space,
+/area/space/nearstation)
+"SL" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/visible,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"SR" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 5
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"SX" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"Tk" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/closet/emcloset/anchored,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"TB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"TC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"TO" = (
+/obj/structure/sign/warning/radiation,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"Ub" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Uq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"Ur" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Uu" = (
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"UM" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"UN" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"Vg" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"Vn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"VP" = (
+/obj/item/wrench,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 6
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"Ws" = (
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 1;
+	name = "External Gas to Loop"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"WB" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
+"WI" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"WT" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 4
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"XA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/turf/closed/wall/r_wall,
+/area/engine/engineering)
+"XG" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+	dir = 4
+	},
+/turf/open/space,
+/area/space/nearstation)
+"XK" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/item/radio/headset/headset_eng,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"XY" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"YB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YD" = (
+/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YF" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
+/turf/open/floor/engine,
+/area/engine/engineering)
+"YX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber";
+	req_access_txt = "10"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/engine,
+/area/engine/supermatter)
+"YZ" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space,
+/area/space/nearstation)
+"Zn" = (
+/obj/structure/sign/warning/vacuum/external{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/engine/engineering)
+"ZH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
+"ZO" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"ZT" = (
+/turf/template_noop,
+/area/template_noop)
+
+(1,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+yf
+Rh
+yf
+yf
+Rh
+yf
+yf
+Rh
+yf
+yf
+yf
+YZ
+YZ
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(2,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+pL
+aX
+pL
+yA
+Sn
+yA
+yA
+Sn
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(3,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(4,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+uC
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(5,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(6,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+ZT
+wS
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+ZT
+ZT
+ZT
+ZT
+ZT
+"}
+(7,1,1) = {"
+ZT
+ZT
+ZT
+ZT
+EL
+EL
+MP
+bI
+XG
+bI
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+Oj
+YZ
+yf
+yf
+yf
+yf
+zS
+"}
+(8,1,1) = {"
+ZT
+ZT
+cP
+Ke
+EL
+Tk
+MP
+wS
+XG
+uC
+Le
+dD
+yA
+yA
+dD
+hK
+yf
+yf
+YZ
+Oj
+YZ
+yf
+yf
+Rh
+yf
+yf
+"}
+(9,1,1) = {"
+ZT
+ZT
+dl
+Ok
+ND
+Zn
+Ei
+bI
+KZ
+lG
+sm
+dD
+Sn
+Sn
+dD
+lG
+Rh
+Rh
+YZ
+YZ
+YZ
+tw
+Rh
+Rh
+Rh
+yf
+"}
+(10,1,1) = {"
+ZT
+nR
+AH
+iD
+MP
+MP
+MP
+sq
+aA
+rJ
+gf
+rJ
+rJ
+td
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+"}
+(11,1,1) = {"
+oC
+GB
+UN
+sn
+sn
+sn
+de
+GK
+wG
+TC
+mj
+fW
+at
+XA
+td
+MP
+MP
+MP
+MP
+MP
+MP
+yf
+WB
+YZ
+WB
+yf
+"}
+(12,1,1) = {"
+cS
+hJ
+qe
+ry
+ry
+ry
+ry
+cX
+ry
+ry
+nd
+ry
+yD
+Ex
+ck
+iC
+Uu
+kW
+Uu
+EM
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(13,1,1) = {"
+ME
+qr
+Hz
+te
+te
+so
+ez
+Mr
+DA
+ej
+Dz
+jZ
+gB
+SR
+SX
+Vn
+Vn
+cp
+Uu
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(14,1,1) = {"
+Ne
+yd
+bW
+VP
+rt
+Vg
+px
+px
+nW
+Cn
+Cn
+xB
+WI
+IE
+JV
+Bc
+JH
+Lv
+XY
+LJ
+MP
+Rh
+YZ
+Oj
+YZ
+Rh
+"}
+(15,1,1) = {"
+MP
+zh
+QD
+Hj
+rt
+un
+CT
+na
+na
+mG
+KX
+vO
+Ml
+Ef
+iD
+MJ
+pP
+pP
+pP
+MJ
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(16,1,1) = {"
+MP
+aC
+ey
+TO
+vO
+OR
+Bk
+Bk
+Bk
+Bk
+Bk
+vO
+WT
+UM
+MP
+Lw
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(17,1,1) = {"
+oS
+fa
+fj
+ZO
+yZ
+qA
+tn
+tn
+tn
+tn
+tn
+CW
+YF
+Py
+iD
+Uu
+Uu
+Uu
+Uu
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(18,1,1) = {"
+iD
+fa
+gj
+YX
+Qu
+aV
+tn
+tn
+uR
+tn
+tn
+Hw
+QJ
+ac
+iD
+Uu
+xo
+xo
+xo
+Uu
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(19,1,1) = {"
+oS
+fa
+iJ
+LE
+Gz
+lE
+tn
+tn
+tn
+tn
+tn
+jB
+Nx
+aw
+iD
+Uu
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(20,1,1) = {"
+MP
+Bl
+jp
+vO
+jB
+OR
+RA
+RA
+RA
+RA
+RA
+vO
+WT
+UM
+MP
+Lw
+Uu
+Uu
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(21,1,1) = {"
+MP
+nV
+hy
+Ws
+Pa
+wz
+Dj
+tE
+tE
+qP
+NU
+vO
+Np
+YD
+iD
+MJ
+IF
+IF
+IF
+MJ
+MP
+yf
+YZ
+Oj
+YZ
+yf
+"}
+(22,1,1) = {"
+iD
+fa
+hy
+js
+Pa
+xB
+Nw
+Nw
+df
+re
+re
+Vg
+lw
+bH
+JV
+Bc
+Ph
+Ph
+nH
+LJ
+MP
+Rh
+YZ
+Oj
+YZ
+Rh
+"}
+(23,1,1) = {"
+iD
+vX
+bo
+GX
+Ik
+vD
+SL
+YB
+RV
+qm
+MK
+ii
+rY
+Qn
+ab
+ZH
+ZH
+MI
+Uu
+Uu
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(24,1,1) = {"
+mH
+bT
+Lg
+zf
+ry
+ry
+ry
+OK
+ry
+ry
+sA
+ry
+mX
+BD
+Uq
+zF
+Uu
+GI
+Uu
+Ab
+MP
+Rh
+YZ
+Oj
+YZ
+yf
+"}
+(25,1,1) = {"
+iD
+mU
+in
+Ur
+Es
+Kv
+Gl
+aY
+Kv
+Kv
+Fr
+vN
+nz
+In
+Ub
+MP
+MP
+MP
+MP
+MP
+MP
+yf
+YZ
+YZ
+YZ
+yf
+"}
+(26,1,1) = {"
+wt
+av
+kA
+qo
+EL
+MP
+MP
+Cb
+Uu
+Uu
+pA
+jg
+qc
+fq
+LS
+Hn
+dw
+yf
+Rh
+yf
+yf
+yf
+yf
+Rh
+yf
+yf
+"}
+(27,1,1) = {"
+ZT
+ZT
+ZT
+ou
+DC
+iD
+Uu
+mi
+NK
+NK
+Ah
+Uu
+Jn
+MP
+dw
+dw
+dw
+Rh
+Rh
+Rh
+Rh
+tw
+Rh
+Rh
+Rh
+Rh
+"}
+(28,1,1) = {"
+ZT
+ZT
+ZT
+OU
+Ok
+CH
+GI
+gx
+TB
+gQ
+gQ
+ln
+XK
+MP
+yf
+yf
+Rh
+yf
+Rh
+Oj
+YZ
+yf
+yf
+Rh
+yf
+yf
+"}
+(29,1,1) = {"
+ZT
+ZT
+ZT
+FG
+NZ
+MP
+MP
+MP
+MP
+MP
+iD
+iD
+iD
+MP
+Rh
+Rh
+Rh
+Rh
+Rh
+Oj
+YZ
+yf
+yf
+Rh
+yf
+zS
+"}
diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm
index f4a18fd87c..4d07c02565 100644
--- a/_maps/RandomZLevels/Cabin.dmm
+++ b/_maps/RandomZLevels/Cabin.dmm
@@ -967,10 +967,6 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/cabin)
-"dw" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock/snow,
-/area/space)
 
 (1,1,1) = {"
 aa
@@ -1227,7 +1223,7 @@ aa
 aa
 aa
 aa
-dw
+aa
 "}
 (2,1,1) = {"
 aa
diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm
index 8f6eda450c..bae0b05e3d 100644
--- a/_maps/RandomZLevels/VR/snowdin_VR.dmm
+++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm
@@ -4,9 +4,15 @@
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
 "ab" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock/snow,
-/area/awaymission/snowdin/cave/mountain)
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/netherworld/migo,
+/turf/open/floor/plasteel,
+/area/awaymission/snowdin/post/mining_dock)
 "ac" = (
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
@@ -10267,16 +10273,6 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
-"xA" = (
-/mob/living/simple_animal/hostile/netherworld/migo,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/mining_dock)
 "xB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16013,7 +16009,7 @@ ac
 ac
 "}
 (2,1,1) = {"
-ab
+ac
 ac
 ac
 ac
@@ -66518,7 +66514,7 @@ wD
 wT
 xe
 xs
-xA
+ab
 xI
 xN
 wL
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index d50480c381..96c1a08b1f 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -2251,10 +2251,6 @@
 	initial_gas_mix = "n2=23;o2=14"
 	},
 /area/awaymission/caves/BMP_asteroid)
-"gW" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock,
-/area/space/nearstation)
 "gX" = (
 /obj/effect/baseturf_helper/lava,
 /turf/closed/mineral/volcanic,
@@ -2536,7 +2532,7 @@ aa
 aa
 aa
 aa
-gW
+aa
 "}
 (2,1,1) = {"
 aa
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index ddc8778ac1..8c33326703 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -7215,10 +7215,6 @@
 	heat_capacity = 1e+006
 	},
 /area/awaymission/moonoutpost19/research)
-"oV" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/open/space,
-/area/space)
 "vV" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -7512,7 +7508,7 @@ aa
 aa
 aa
 aa
-oV
+aa
 "}
 (2,1,1) = {"
 aa
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 525c8fcf7b..57e03061dd 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -4,9 +4,15 @@
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
 "ab" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/indestructible/rock/snow,
-/area/awaymission/snowdin/cave/mountain)
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/netherworld/migo,
+/turf/open/floor/plasteel,
+/area/awaymission/snowdin/post/mining_dock)
 "ac" = (
 /turf/closed/indestructible/rock/snow,
 /area/awaymission/snowdin/cave/mountain)
@@ -10331,16 +10337,6 @@
 /obj/item/shard,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/mining_dock)
-"xA" = (
-/mob/living/simple_animal/hostile/netherworld/migo,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/mining_dock)
 "xB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -16108,7 +16104,7 @@ ac
 ac
 "}
 (2,1,1) = {"
-ab
+ac
 ac
 ac
 ac
@@ -66613,7 +66609,7 @@ wD
 wT
 xe
 xs
-xA
+ab
 xI
 xN
 wL
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 21cd37f78f..66d7f556b4 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -5,6 +5,16 @@
 "ab" = (
 /turf/open/space,
 /area/space)
+"ac" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/syndicate/melee/sword,
+/turf/open/floor/plasteel,
+/area/awaymission/spacebattle/cruiser)
 "ad" = (
 /obj/structure/shuttle/engine/propulsion/right{
 	dir = 1
@@ -2597,16 +2607,6 @@
 /obj/effect/spawner/lootdrop/armory_contraband,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
-"jK" = (
-/mob/living/simple_animal/hostile/syndicate/melee/sword,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/spacebattle/cruiser)
 "jL" = (
 /obj/machinery/door/poddoor{
 	id = "spacebattlearmory";
@@ -2894,10 +2894,6 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
-"kM" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/closed/mineral/random,
-/area/space/nearstation)
 "vw" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/awaymission/spacebattle/syndicate5)
@@ -3175,7 +3171,7 @@ aa
 aa
 aa
 aa
-kM
+aa
 "}
 (2,1,1) = {"
 aa
@@ -35686,10 +35682,10 @@ eC
 cn
 fL
 cp
-jK
+ac
 fs
 fO
-jK
+ac
 eM
 eM
 eM
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index f6d46ef97d..56018b943a 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -25,6 +25,9 @@
 "ag" = (
 /turf/closed/wall/mineral/titanium,
 /area/awaymission/undergroundoutpost45/central)
+"ah" = (
+/turf/open/space,
+/area/space/nearstation)
 "aj" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel{
@@ -13945,10 +13948,6 @@
 	temperature = 363.9
 	},
 /area/awaymission/undergroundoutpost45/caves)
-"zi" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/open/space,
-/area/space/nearstation)
 "KE" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -14211,7 +14210,7 @@ aa
 aa
 aa
 aa
-zi
+ah
 "}
 (2,1,1) = {"
 aa
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 92ceb0ac34..b6463f7147 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -35,6 +35,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/bar)
+"aad" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "aae" = (
 /obj/effect/landmark/carpspawn,
 /turf/open/space,
@@ -139,7 +145,6 @@
 /obj/structure/sign/warning/electricshock{
 	pixel_y = 32
 	},
-/obj/machinery/seed_extractor,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aat" = (
@@ -168,6 +173,10 @@
 "aay" = (
 /turf/open/floor/plating,
 /area/security/prison)
+"aaA" = (
+/obj/machinery/seed_extractor,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "aaB" = (
 /obj/structure/window/reinforced,
 /obj/machinery/hydroponics/soil,
@@ -226,10 +235,6 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaN" = (
-/obj/structure/chair/sofa/left,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"aaO" = (
 /obj/structure/chair/sofa/right,
 /turf/open/floor/plasteel,
 /area/security/prison)
@@ -262,12 +267,15 @@
 /area/space/nearstation)
 "aaV" = (
 /obj/structure/table/wood,
-/obj/item/toy/cards/deck,
+/obj/item/storage/pill_bottle/dice,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaW" = (
-/obj/structure/table/wood,
-/obj/item/storage/pill_bottle/dice,
+/obj/effect/landmark/event_spawn,
+/obj/structure/chair/comfy/brown{
+	color = "#596479";
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaX" = (
@@ -350,7 +358,6 @@
 /obj/structure/table,
 /obj/item/storage/box/firingpins,
 /obj/item/storage/box/firingpins,
-/obj/item/key/security,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -453,6 +460,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
 /area/security/execution/transfer)
+"abz" = (
+/obj/machinery/light/small{
+	dir = 4;
+	light_color = "#d8b1b1"
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "abA" = (
 /obj/machinery/light,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -1551,14 +1565,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/carpet,
 /area/crew_quarters/heads/hos)
-"adO" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/chair/comfy/brown{
-	color = "#596479";
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "adP" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -1881,14 +1887,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/gun/energy/pumpaction/blaster{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/gun/energy/pumpaction/blaster{
-	pixel_x = 3;
-	pixel_y = -3
-	},
+/obj/item/key/security,
 /turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "aet" = (
@@ -4904,6 +4903,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "akt" = (
@@ -4926,13 +4928,16 @@
 /turf/open/floor/plasteel,
 /area/security/brig)
 "aku" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
 	},
+/turf/open/floor/plasteel,
+/area/security/brig)
+"akv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/security/brig)
 "akw" = (
@@ -4960,11 +4965,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/courtroom)
-"akz" = (
-/obj/machinery/vending/snack/random,
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
 "akA" = (
 /obj/structure/chair{
 	dir = 8;
@@ -5174,6 +5174,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "akX" = (
@@ -5197,6 +5200,40 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
+"akY" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/security/brig)
+"ala" = (
+/obj/machinery/door/window/brigdoor/security/cell{
+	desc = "A rare fourth cell, known for faulty wiring...";
+	id = "Cell 4";
+	name = "Cell 4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/security/brig)
 "alb" = (
 /obj/structure/chair{
 	dir = 4;
@@ -5408,11 +5445,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
 /area/security/courtroom)
-"alE" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
 "alF" = (
 /obj/machinery/atmospherics/components/unary/tank/air,
 /turf/open/floor/plating,
@@ -5644,6 +5676,13 @@
 /obj/effect/turf_decal/tile/red,
 /turf/open/floor/plasteel,
 /area/security/brig)
+"amp" = (
+/obj/structure/closet/secure_closet/brig{
+	id = "Cell 4";
+	name = "Cell 4 Locker"
+	},
+/turf/open/floor/plasteel,
+/area/security/brig)
 "amr" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -6482,8 +6521,8 @@
 /area/hallway/primary/fore)
 "aoC" = (
 /obj/effect/turf_decal/tile/red,
-/obj/structure,
 /obj/item/storage/box/drinkingglasses,
+/obj/structure/table,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aoD" = (
@@ -6501,14 +6540,14 @@
 /area/hallway/primary/fore)
 "aoE" = (
 /obj/effect/turf_decal/tile/red,
-/obj/structure,
 /obj/item/storage/box/cups,
+/obj/structure/table,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aoF" = (
 /obj/effect/turf_decal/tile/red,
-/obj/structure,
 /obj/machinery/chem_dispenser/drinks,
+/obj/structure/table,
 /turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aoG" = (
@@ -6666,6 +6705,7 @@
 "ape" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering/abandoned{
+	abandoned = 0;
 	name = "Vacant Office B";
 	req_access_txt = "32"
 	},
@@ -9200,9 +9240,6 @@
 /area/crew_quarters/dorms)
 "aww" = (
 /obj/effect/landmark/event_spawn,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "awx" = (
@@ -9581,15 +9618,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
-"axm" = (
-/obj/structure/sign/warning/electricshock{
-	pixel_y = -32
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore)
 "axn" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12"
@@ -9622,9 +9650,6 @@
 /turf/open/floor/plating,
 /area/maintenance/fore)
 "axr" = (
-/obj/structure/sign/warning/electricshock{
-	pixel_y = -32
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -10032,41 +10057,29 @@
 /turf/closed/wall/r_wall,
 /area/maintenance/port/fore)
 "ayA" = (
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/door/airlock{
+	name = "Theatre Backstage";
+	req_access_txt = "46"
 	},
+/obj/machinery/door/firedoor,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 4
 	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
 /area/maintenance/fore)
 "ayC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
 /area/maintenance/fore)
 "ayD" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/maintenance/fore)
 "ayE" = (
 /turf/closed/wall/r_wall,
 /area/maintenance/fore)
-"ayF" = (
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/maintenance/fore)
 "ayG" = (
 /turf/closed/wall/r_wall,
 /area/gateway)
@@ -11313,18 +11326,21 @@
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/nuke_storage)
 "aBU" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/supply,
 /turf/open/floor/wood,
 /area/crew_quarters/theatre)
 "aBV" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/light{
 	dir = 8;
 	light_color = "#e8eaff"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/theatre)
 "aBW" = (
@@ -13591,6 +13607,15 @@
 /obj/structure/sign/warning/securearea,
 /turf/closed/wall/r_wall,
 /area/ai_monitored/nuke_storage)
+"aHG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
 "aHH" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -14188,6 +14213,12 @@
 /obj/machinery/disposal/bin,
 /turf/open/floor/plasteel,
 /area/storage/primary)
+"aJe" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
 "aJf" = (
 /obj/machinery/camera{
 	c_tag = "EVA South";
@@ -14605,17 +14636,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/storage/primary)
-"aKb" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/theatre)
 "aKc" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
@@ -14706,9 +14726,7 @@
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
-/obj/machinery/camera{
-	c_tag = "Theatre Stage"
-	},
+/obj/machinery/camera,
 /obj/structure/chair/comfy/brown{
 	dir = 4
 	},
@@ -14729,31 +14747,7 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/storage/primary)
-"aKt" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/theatre)
 "aKu" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/theatre)
-"aKv" = (
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/theatre)
@@ -14761,12 +14755,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -14781,13 +14769,9 @@
 /obj/machinery/door/airlock/public/glass{
 	name = "Central Access"
 	},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/theatre)
-"aKx" = (
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "1-2"
 	},
-/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/theatre)
 "aKy" = (
@@ -15088,9 +15072,6 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "aLl" = (
-/obj/structure/sign/warning/electricshock{
-	pixel_y = 32
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
@@ -15246,18 +15227,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
-"aLJ" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/structure/sign/warning/electricshock{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/port)
 "aLK" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
@@ -20011,6 +19980,7 @@
 /area/chapel/main)
 "aXX" = (
 /obj/machinery/door/airlock/engineering/abandoned{
+	abandoned = 0;
 	name = "Vacant Office A";
 	req_access_txt = "32"
 	},
@@ -21831,12 +21801,10 @@
 /turf/open/floor/carpet,
 /area/crew_quarters/heads/captain)
 "bcQ" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bcR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -21906,6 +21874,9 @@
 /area/hallway/primary/starboard)
 "bdd" = (
 /obj/machinery/vending/cola/random,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/bridge/meeting_room)
 "bde" = (
@@ -21949,12 +21920,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/ai_upload)
 "bdi" = (
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Captain's Desk";
-	departmentType = 5;
-	name = "Captain RC";
-	pixel_x = -30
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
@@ -22868,6 +22835,9 @@
 	dir = 8;
 	pixel_x = 27
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/bridge/meeting_room)
 "bfs" = (
@@ -22906,6 +22876,13 @@
 	pixel_y = 7
 	},
 /obj/item/pen,
+/obj/machinery/requests_console{
+	announcementConsole = 1;
+	department = "Captain's Desk";
+	departmentType = 5;
+	name = "Captain RC";
+	pixel_x = -30
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bfz" = (
@@ -22927,6 +22904,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
+"bfC" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
 "bfD" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -23354,9 +23339,6 @@
 /turf/open/floor/wood,
 /area/bridge/meeting_room)
 "bgM" = (
-/obj/machinery/light{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -23386,14 +23368,9 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bgS" = (
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Captain's Desk";
-	departmentType = 5;
-	name = "Captain RC";
-	pixel_x = -30
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/filingcabinet,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bgT" = (
@@ -23401,6 +23378,9 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bgU" = (
@@ -23409,12 +23389,18 @@
 	},
 /obj/effect/landmark/start/captain,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bgV" = (
 /obj/structure/table/wood,
 /obj/item/book/manual/wiki/security_space_law,
 /obj/item/coin/plasma,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bgW" = (
@@ -24011,11 +23997,22 @@
 	pixel_x = -28
 	},
 /obj/machinery/suit_storage_unit/captain,
+/obj/machinery/light{
+	light_color = "#c9d3e8"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
+"bil" = (
+/obj/machinery/computer/card{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bim" = (
 /obj/structure/table/wood,
 /obj/machinery/recharger,
+/obj/item/melee/chainofcommand,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
 "bin" = (
@@ -28239,11 +28236,10 @@
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/central)
 "bsb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
+/obj/structure/table,
+/obj/item/hand_labeler,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
 "bsc" = (
 /turf/open/floor/plasteel,
 /area/engine/gravity_generator)
@@ -28251,6 +28247,16 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/central)
+"bsg" = (
+/obj/structure/table,
+/obj/item/hand_labeler,
+/obj/machinery/camera{
+	c_tag = "Medbay Morgue";
+	dir = 8;
+	network = list("ss13","medbay")
+	},
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
 "bsh" = (
 /turf/closed/wall,
 /area/teleporter)
@@ -34910,20 +34916,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/research)
-"bHg" = (
-/obj/structure/sign/warning/fire{
-	desc = "A sign that states the labeled room's number.";
-	dir = 5;
-	icon_state = "roomnum";
-	name = "Room Number 7";
-	pixel_y = 24
-	},
-/obj/structure/chair/sofa/right,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
 "bHh" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -45354,14 +45346,9 @@
 /area/engine/engineering)
 "cgw" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/closet/radiation,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cgx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
 "cgy" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -45431,32 +45418,8 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "cgI" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 1
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cgJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cgK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cgL" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room";
-	req_access_txt = "10"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
+/turf/template_noop,
+/area/template_noop)
 "cgO" = (
 /obj/structure/rack,
 /obj/item/lighter,
@@ -45865,27 +45828,6 @@
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"chF" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"chG" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "chH" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
@@ -45974,36 +45916,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
-"chV" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/obj/item/tank/internals/emergency_oxygen/engi{
-	pixel_x = 5
-	},
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/glasses/meson/engine,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"chX" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "chY" = (
 /obj/machinery/shieldgen,
 /turf/open/floor/plating,
@@ -46086,24 +45998,6 @@
 "cig" = (
 /turf/closed/wall,
 /area/engine/engineering)
-"cii" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/obj/item/clothing/suit/radiation,
-/obj/item/clothing/head/radiation,
-/obj/item/clothing/glasses/meson,
-/obj/item/geiger_counter,
-/obj/item/geiger_counter,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "cij" = (
 /obj/machinery/modular_computer/console/preset/engineering,
 /obj/structure/cable{
@@ -46169,15 +46063,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/chief)
-"cip" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "ciq" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
@@ -46187,13 +46072,6 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/chief)
-"cir" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
 "cis" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel,
@@ -46338,16 +46216,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"ciO" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "ciP" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -46515,12 +46383,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/chief)
-"cjh" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "cji" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -46806,6 +46668,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/structure/closet/wardrobe/engineering_yellow,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "cjT" = (
@@ -47673,15 +47536,6 @@
 	},
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
-"cmm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
 "cmo" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -48058,18 +47912,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cnx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "cny" = (
 /obj/effect/landmark/start/station_engineer,
 /turf/open/floor/plasteel,
@@ -48328,19 +48170,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"coc" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room";
-	req_access_txt = "10"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"coj" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/crew_quarters/dorms)
 "cop" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
 	dir = 1
@@ -48432,9 +48261,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "coz" = (
@@ -48447,9 +48274,6 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "coA" = (
@@ -48514,16 +48338,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"coK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
 "coL" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -48536,18 +48350,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"coM" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "coS" = (
 /obj/structure/rack,
 /obj/item/gun/energy/laser{
@@ -48664,6 +48466,9 @@
 /area/engine/engine_smes)
 "cpk" = (
 /obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "cpl" = (
@@ -48680,18 +48485,20 @@
 	dir = 1;
 	pixel_y = -22
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "cpn" = (
 /obj/machinery/light,
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
 /turf/open/floor/plasteel,
 /area/engine/engine_smes)
 "cpo" = (
@@ -48731,52 +48538,6 @@
 /obj/machinery/cell_charger,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cpt" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cpu" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room";
-	req_access_txt = "10"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cpv" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cpx" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cpy" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "cpA" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -48791,15 +48552,6 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel,
 /area/bridge)
-"cpD" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "cpE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
@@ -48914,133 +48666,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
-"cpZ" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 5
-	},
-/obj/item/flashlight{
-	pixel_x = 1;
-	pixel_y = 5
-	},
-/obj/item/flashlight{
-	pixel_x = 1;
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cqa" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cqb" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqd" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqe" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 6
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqf" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqg" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 8;
-	name = "Gas to Filter"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqh" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -26
-	},
-/obj/machinery/camera{
-	c_tag = "Engineering Supermatter Fore";
-	dir = 1;
-	network = list("ss13","engine");
-	pixel_x = 23
-	},
-/obj/machinery/atmospherics/pipe/manifold/green/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqi" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light,
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqj" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/button/door{
-	id = "engsm";
-	name = "Radiation Shutters Control";
-	pixel_y = -24;
-	req_access_txt = "10"
-	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cql" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqm" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/obj/machinery/meter,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "cqn" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
@@ -49122,53 +48747,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cqA" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
-	name = "Engineering External Access";
-	req_access_txt = "10;13"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cqB" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = 24
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cqD" = (
-/obj/structure/sign/warning/radiation,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"cqE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/engineering/glass/critical{
-	heat_proof = 1;
-	name = "Supermatter Chamber";
-	req_access_txt = "10"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cqF" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "cqG" = (
 /obj/structure/rack,
 /obj/item/storage/box/rubbershot{
@@ -49265,70 +48843,10 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cqS" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cqT" = (
-/obj/structure/sign/warning/vacuum/external{
-	pixel_x = 32
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cqU" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/effect/turf_decal/bot,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "cqY" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/engine/engineering)
-"cqZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cra" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 1;
-	name = "Gas to Filter"
-	},
-/obj/machinery/airalarm/engine{
-	dir = 4;
-	pixel_x = -23
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"crb" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Gas to Chamber"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"crc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"crd" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room";
-	req_access_txt = "10"
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "crh" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -49393,36 +48911,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/engine/engineering)
-"crs" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 6
-	},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"crt" = (
-/obj/machinery/door/airlock/engineering/glass/critical{
-	heat_proof = 1;
-	name = "Supermatter Chamber";
-	req_access_txt = "10"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cru" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 5
-	},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"crv" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 10
-	},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "crw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
@@ -49513,44 +49001,6 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space,
 /area/solar/starboard/aft)
-"crH" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 4
-	},
-/turf/open/space,
-/area/space/nearstation)
-"crI" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 9
-	},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"crJ" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 4
-	},
-/turf/open/space,
-/area/space/nearstation)
-"crK" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
-	dir = 8
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"crL" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"crM" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "crP" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel,
@@ -49562,26 +49012,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"crT" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 4
-	},
-/turf/open/space,
-/area/space/nearstation)
-"crU" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 10
-	},
-/turf/open/space,
-/area/space/nearstation)
-"crV" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "crW" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -49600,39 +49030,11 @@
 /obj/structure/transit_tube,
 /turf/open/floor/plating,
 /area/engine/engineering)
-"crZ" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 4
-	},
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
-"csa" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"csb" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 9
-	},
-/turf/open/space,
-/area/space/nearstation)
 "csc" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /turf/open/space,
 /area/maintenance/aft)
-"csd" = (
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cse" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "csg" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
@@ -49649,13 +49051,6 @@
 	},
 /turf/open/space,
 /area/space/nearstation)
-"csj" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
 "csk" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/airless,
@@ -49681,10 +49076,6 @@
 /obj/structure/transit_tube/crossing/horizontal,
 /turf/open/space,
 /area/space/nearstation)
-"csp" = (
-/obj/effect/landmark/event_spawn,
-/turf/closed/wall,
-/area/crew_quarters/fitness)
 "csq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 4
@@ -49707,68 +49098,16 @@
 /obj/machinery/meter,
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
-"css" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/space,
-/area/space/nearstation)
-"csu" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"csv" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 5
-	},
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
-"csx" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/turf/open/space,
-/area/space/nearstation)
 "csy" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"csA" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/engine/supermatter)
 "csD" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
-"csH" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"csI" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "csM" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
@@ -49784,30 +49123,6 @@
 /obj/structure/transit_tube/horizontal,
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
-"csP" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/green/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"csR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "csT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/landmark/xmastree,
@@ -51491,6 +50806,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
+"cwP" = (
+/obj/structure/fireplace,
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 23
+	},
+/turf/open/floor/plating,
+/area/maintenance/port)
 "cwT" = (
 /obj/machinery/camera{
 	c_tag = "Arrivals Escape Pod 2";
@@ -51649,13 +50972,6 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/exit)
-"cyi" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
 "cyl" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -51807,6 +51123,14 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
+"czi" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 8;
+	name = "8maintenance loot spawner"
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
 "czk" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -51817,23 +51141,6 @@
 	},
 /turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
-"czD" = (
-/obj/structure/extinguisher_cabinet,
-/turf/closed/wall/r_wall,
-/area/hallway/primary/central)
-"czE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"czF" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
-/obj/machinery/meter,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "czG" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -52033,96 +51340,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
-"cAl" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAm" = (
-/obj/machinery/power/supermatter_crystal/engine,
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cAo" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAp" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 4;
-	name = "Cooling Loop to Gas"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAq" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAr" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 4;
-	name = "Gas to Mix"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAs" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAt" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cAu" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/emitter/anchored{
-	dir = 4;
-	state = 2
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
 "cAy" = (
 /obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
 /turf/open/floor/plating,
@@ -52229,10 +51446,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
-"cAP" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
 "cAQ" = (
 /obj/structure/chair,
 /turf/open/floor/plating,
@@ -52652,15 +51865,6 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/engine/air,
 /area/engine/atmos)
-"cBR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "cBS" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -52897,79 +52101,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cDe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/closet/radiation,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cDg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDh" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/flashlight,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/item/pipe_dispenser,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDi" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/table/reinforced,
-/obj/item/clothing/suit/radiation,
-/obj/item/clothing/head/radiation,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/meson,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDj" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
 "cDl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -52984,92 +52115,6 @@
 /obj/machinery/vending/engivend,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cDo" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cDp" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDr" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDs" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDv" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDw" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDx" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "Atmos to Loop"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDy" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDz" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "cDB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -53077,70 +52122,6 @@
 /obj/effect/landmark/start/station_engineer,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cDC" = (
-/obj/item/wrench,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 6
-	},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cDD" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
-	dir = 4
-	},
-/obj/machinery/meter,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cDE" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 1;
-	name = "External Gas to Loop"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cDF" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 1;
-	name = "External Gas to Loop"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cDG" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cDH" = (
-/obj/structure/rack,
-/obj/item/clothing/mask/gas{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
-"cDI" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 5
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "cDJ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
@@ -53181,831 +52162,6 @@
 /obj/structure/closet/radiation,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cEa" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cEd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/camera{
-	c_tag = "Engineering Supermatter Port";
-	dir = 4;
-	network = list("ss13","engine")
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEe" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEf" = (
-/obj/machinery/status_display/ai,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"cEg" = (
-/obj/machinery/status_display,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"cEh" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/camera{
-	c_tag = "Engineering Supermatter Starboard";
-	dir = 8;
-	network = list("ss13","engine")
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEk" = (
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = 24
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cEl" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 6
-	},
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
-"cEr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEs" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 8;
-	name = "Gas to Cooling Loop"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEt" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/engine/supermatter)
-"cEu" = (
-/obj/machinery/camera{
-	c_tag = "Supermatter Chamber";
-	network = list("engine");
-	pixel_x = 23
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cEv" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
-	dir = 8
-	},
-/obj/machinery/power/rad_collector/anchored,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
-/obj/structure/window/plasma/reinforced{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cEw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cEx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cEy" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
-	dir = 4
-	},
-/obj/machinery/power/rad_collector/anchored,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/structure/window/plasma/reinforced{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cEz" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cEA" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/engine/supermatter)
-"cEB" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEC" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "Mix to Gas"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cED" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEE" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 5
-	},
-/turf/open/space,
-/area/space/nearstation)
-"cEK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"cEL" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/airalarm{
-	dir = 4;
-	pixel_x = -22
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEM" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/item/tank/internals/plasma,
-/turf/open/floor/plating,
-/area/engine/supermatter)
-"cET" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/obj/effect/decal/cleanable/oil,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/engine/supermatter)
-"cEU" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cEW" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cFb" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFc" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	name = "Cooling Loop Bypass"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFe" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 5
-	},
-/obj/machinery/power/rad_collector/anchored,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
-/obj/structure/window/plasma/reinforced{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cFh" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 9
-	},
-/obj/machinery/power/rad_collector/anchored,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/structure/window/plasma/reinforced{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cFj" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/engine/supermatter)
-"cFk" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 1;
-	name = "Mix Bypass"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFm" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
-"cFn" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 6
-	},
-/turf/open/space,
-/area/space/nearstation)
-"cFo" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
-	dir = 10
-	},
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
-"cFu" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
-/obj/machinery/meter,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFw" = (
-/obj/structure/sign/warning/electricshock,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"cFy" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFz" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cFA" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cFF" = (
-/obj/machinery/vr_sleeper{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 1
-	},
-/area/crew_quarters/fitness)
-"cFI" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFJ" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFK" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFL" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 6
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFM" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFN" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFO" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/camera{
-	c_tag = "Engineering Supermatter Aft";
-	network = list("ss13","engine");
-	pixel_x = 23
-	},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cFP" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
-	dir = 1
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFS" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFT" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 9
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cFU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGd" = (
-/obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/item/cartridge/atmos,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGe" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGf" = (
-/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
-	dir = 8;
-	filter_type = "n2"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGg" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGh" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGi" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGj" = (
-/obj/structure/table,
-/obj/item/pipe_dispenser,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGk" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGl" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/item/radio/headset/headset_eng,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"cGs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"cGt" = (
-/obj/structure/closet/wardrobe/engineering_yellow,
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGu" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 6
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGv" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGx" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
-/obj/machinery/meter,
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGC" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/machinery/atmospherics/components/binary/valve/digital/on{
-	dir = 4;
-	name = "Output Release"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"cGE" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 10
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cGH" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cGI" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Laser Room";
-	req_access_txt = "10"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cGK" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cGL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"cGM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plating/airless,
-/area/engine/engineering)
-"cGR" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGS" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cGT" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGU" = (
-/obj/structure/reflector/double/anchored{
-	dir = 6
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGV" = (
-/obj/structure/reflector/box/anchored{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGY" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cGZ" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
-	dir = 1
-	},
-/turf/open/floor/plating/airless,
-/area/engine/engineering)
-"cHa" = (
-/obj/machinery/airalarm{
-	dir = 4;
-	pixel_x = -22
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cHb" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHc" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHd" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHe" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHg" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHj" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/emitter/anchored{
-	dir = 8;
-	state = 2
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHn" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
-"cHo" = (
-/obj/structure/reflector/single/anchored{
-	dir = 9
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cHp" = (
-/obj/structure/reflector/single/anchored{
-	dir = 5
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cHr" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/engine/engineering)
 "cHD" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -54315,33 +52471,27 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
-"cII" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/coin/silver,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"cIW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/vending/kink,
-/obj/machinery/light{
-	dir = 4;
-	light_color = "#e8eaff"
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"cJl" = (
-/obj/structure/toilet{
+"cJn" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"cMm" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/box,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
+"cMk" = (
+/obj/machinery/vr_sleeper{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "cMC" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -54362,16 +52512,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
-"cMD" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"cMH" = (
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"cMN" = (
-/obj/effect/spawner/structure/window/plasma/reinforced,
-/turf/open/floor/plating,
-/area/engine/supermatter)
 "cMQ" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -54559,10 +52699,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"cPO" = (
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
 "cQw" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -54581,6 +52717,47 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"cRz" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	id = "holoprivacy";
+	name = "Holodeck Privacy";
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"cRD" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/dresser,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/crew_quarters/theatre";
+	dir = 8;
+	name = "Theatre APC";
+	pixel_x = -25
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/theatre)
+"cSn" = (
+/obj/machinery/light_switch{
+	pixel_y = 28
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/circuit,
+/area/ai_monitored/nuke_storage)
 "cSA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -54599,42 +52776,6 @@
 	},
 /turf/open/floor/plasteel/dark/telecomms,
 /area/tcommsat/server)
-"cSG" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"cSH" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 5
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cSI" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"cSJ" = (
-/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
-	dir = 8
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"cSK" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 10
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
 "cSL" = (
 /obj/machinery/button/door{
 	id = "atmos";
@@ -55003,10 +53144,60 @@
 "cVb" = (
 /turf/closed/wall,
 /area/hallway/secondary/service)
+"cVp" = (
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 4
+	},
+/obj/structure/curtain,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"cVu" = (
+/obj/machinery/camera{
+	c_tag = "Locker Room South";
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
 "cVK" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"cXx" = (
+/obj/machinery/door/airlock/security{
+	name = "Labor Shuttle";
+	req_access_txt = "2"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/processing)
+"dbn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes)
+"dbM" = (
+/turf/open/floor/plating,
+/area/space/nearstation)
+"dcG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/closet/wardrobe/pjs,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/janimaid,
+/obj/item/clothing/accessory/maidapron,
+/obj/item/clothing/accessory/maidapron,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
 "dfh" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/circuit";
@@ -55021,63 +53212,257 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"dfH" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/security/main";
-	dir = 4;
-	name = "Firing Range APC";
-	pixel_x = 24
+"dfI" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/departments/evac{
+	pixel_y = -32
 	},
 /turf/open/floor/plasteel,
-/area/security/prison)
+/area/hallway/primary/starboard)
 "dfL" = (
 /obj/structure/reagent_dispensers/keg/gargle,
 /turf/open/floor/wood,
 /area/maintenance/bar)
+"dgh" = (
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/camera{
+	c_tag = "VR Sleepers";
+	dir = 1
+	},
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/white/side{
+	dir = 1
+	},
+/area/crew_quarters/fitness)
 "dgz" = (
 /turf/closed/wall,
 /area/crew_quarters/cryopod)
-"djq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"dhx" = (
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = 25
+	},
+/obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/mineral/titanium/blue,
 /area/crew_quarters/dorms)
-"djB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+"dkk" = (
+/obj/machinery/photocopier{
+	pixel_x = -5;
+	pixel_y = -5
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore)
+/turf/open/floor/wood,
+/area/library)
 "dok" = (
-/obj/machinery/portable_atmospherics/pump,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-22"
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"doP" = (
+/obj/structure/chair/stool{
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/carpet{
+	icon_state = "carpetsymbol"
+	},
+/area/crew_quarters/theatre)
 "dqu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
-"dqD" = (
+"dtE" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"dvc" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"dvO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/turf/closed/wall,
+/area/science/circuit)
+"dwc" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/vault,
-/obj/effect/mapping_helpers/airlock/locked,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/nuke_storage)
-"dqG" = (
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"dxB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"dzi" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"dzy" = (
+/obj/machinery/door/airlock{
+	name = "Shower Room"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/toilet)
+"dHb" = (
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"dKP" = (
+/turf/closed/wall,
+/area/maintenance/bar)
+"dKV" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"dMu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"dMX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"dMZ" = (
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"dRC" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"dSv" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/crew_quarters/abandoned_gambling_den";
+	name = "Abandoned Gambling Den APC";
+	pixel_y = -24
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"dTe" = (
+/obj/structure/chair/comfy/beige{
+	dir = 8
+	},
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/grimy,
+/area/hallway/secondary/entry)
+"dTJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/heads/captain)
+"eaI" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom{
+	pixel_x = -30
+	},
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"edH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"ego" = (
+/obj/machinery/atmospherics/components/binary/valve,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"egQ" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "kitchen";
+	name = "kitchen shutters"
+	},
+/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/kitchen)
+"egS" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/snacks/burger/plain,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"elw" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"epV" = (
+/obj/structure/bed,
+/obj/machinery/button/door{
+	id = "Dorm6";
+	name = "Cabin Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_y = -25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
+"eqm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"est" = (
 /obj/machinery/light{
 	dir = 1
 	},
@@ -55091,277 +53476,13 @@
 	dir = 1
 	},
 /area/hallway/secondary/entry)
-"dsV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/structure/closet/secure_closet/personal/cabinet{
-	desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
-	name = "Personal ID-Locked Closet";
-	pixel_y = 15
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
-"duc" = (
-/obj/machinery/shower{
-	dir = 8
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"dvc" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"dvO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/turf/closed/wall,
-/area/science/circuit)
-"dyS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"dzi" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"dBt" = (
-/obj/structure/filingcabinet,
-/obj/machinery/light{
-	dir = 8;
-	light_color = "#e8eaff"
-	},
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"dCk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
-"dEZ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/door/window/westleft{
-	base_state = "right";
-	dir = 4;
-	icon_state = "right";
-	name = "Shooting Range"
-	},
-/turf/open/floor/plating,
-/area/security/prison)
-"dGY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/safety_eye_protection,
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"dHx" = (
-/obj/structure/light_construct{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"dHP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"dIA" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"dIH" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/security/prison)
-"dKe" = (
-/obj/machinery/atmospherics/components/binary/valve,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"dKg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"dKP" = (
-/turf/closed/wall,
-/area/maintenance/bar)
-"dKV" = (
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"dLh" = (
-/obj/structure/table/wood,
-/obj/item/instrument/trumpet,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"dMZ" = (
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"dQy" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/security/prison)
-"dQz" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"dSI" = (
-/obj/machinery/door/airlock{
-	desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue.";
-	id_tag = "MaintDorm1";
-	name = "Furniture Storage"
-	},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/port)
-"dSM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/obj/structure/chair/comfy/brown,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"eaD" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"eaI" = (
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom{
-	pixel_x = -30
-	},
-/obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"eeD" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/engine/gravity_generator";
-	dir = 8;
-	name = "Gravity Generator APC";
-	pixel_x = -25;
-	pixel_y = 1
-	},
-/obj/structure/table,
-/obj/item/paper/guides/jobs/engi/gravity_gen,
-/obj/item/pen/blue,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"efo" = (
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"ekY" = (
-/obj/structure/filingcabinet,
-/obj/machinery/light{
-	dir = 4;
-	light_color = "#e8eaff"
-	},
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"epP" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Gravity Generator";
-	req_access_txt = "11"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/engine/engine_smes)
-"eqs" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/machinery/requests_console{
-	department = "Bar";
-	departmentType = 2;
-	pixel_x = -30;
-	pixel_y = 45;
-	receive_ore_updates = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"ese" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
 "evR" = (
 /turf/open/floor/plating,
 /area/maintenance/bar)
-"eyC" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+"ewZ" = (
+/obj/structure/chair/sofa/right,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
 "eyM" = (
 /obj/machinery/mineral/ore_redemption{
 	input_dir = 2;
@@ -55370,90 +53491,111 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
-"eAE" = (
-/obj/structure/bookcase{
-	name = "Forbidden Knowledge"
-	},
-/turf/open/floor/carpet,
-/area/library)
-"eBm" = (
-/obj/structure/chair/sofa/left,
-/obj/structure/window{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"eDq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/machinery/light/small,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"eDv" = (
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
 "eHI" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/disposal/incinerator)
-"eIe" = (
-/obj/structure/table/wood,
-/obj/machinery/light{
+"eLH" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/item/instrument/trombone,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"eJk" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/brig)
-"eJz" = (
-/obj/machinery/door/airlock{
-	name = "Theatre Backstage";
-	req_access_txt = "46"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore)
+"eMQ" = (
+/obj/item/radio/intercom{
+	pixel_y = 25
+	},
+/obj/machinery/vending/wardrobe/curator_wardrobe,
+/turf/open/floor/carpet,
+/area/library)
+"eND" = (
+/obj/structure/filingcabinet,
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"eNK" = (
+/obj/structure/table/wood,
+/obj/item/instrument/guitar,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"eNW" = (
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/dorms)
+"eOv" = (
+/obj/effect/landmark/event_spawn,
+/turf/closed/wall,
+/area/crew_quarters/fitness)
+"eOy" = (
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"ePO" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4;
+	pixel_y = 5
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/theatre)
-"eMb" = (
-/obj/structure/grille,
-/turf/closed/wall/r_wall,
-/area/space/nearstation)
-"eMV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
+"eRk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"eRn" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/closed/wall,
+/area/quartermaster/warehouse)
 "eRz" = (
 /obj/structure/lattice,
 /obj/structure/grille,
 /turf/open/space/basic,
 /area/space/nearstation)
-"eTc" = (
-/obj/item/flashlight/lamp/green{
-	pixel_x = -3;
-	pixel_y = 22
+"eUd" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/dresser{
-	desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
-	name = "Dresser";
-	pixel_y = 7
+/obj/structure/chair/comfy/brown{
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/maintenance/port)
-"eUR" = (
-/obj/structure/chair/stool{
-	pixel_y = 8
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
 "eVC" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/door/firedoor,
@@ -55469,93 +53611,45 @@
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
-"eWl" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/structure/cable{
-	icon_state = "1-2"
+"eXm" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"fbm" = (
+/obj/structure/chair/comfy/brown{
+	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"eWv" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/security/prison)
-"eWV" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"eYr" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/space/nearstation)
-"fcc" = (
-/obj/machinery/vr_sleeper{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 4
-	},
-/area/crew_quarters/fitness)
-"fcu" = (
-/obj/structure/lattice/catwalk,
+/area/crew_quarters/bar)
+"fby" = (
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "2-4"
 	},
-/turf/open/space,
-/area/solar/port/aft)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
 "fcG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
 	},
 /turf/closed/wall/r_wall,
 /area/science/mixing)
-"fey" = (
-/obj/structure/chair/sofa,
-/obj/structure/window{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"ffm" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/turf/closed/wall,
-/area/quartermaster/warehouse)
-"ffU" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"fkx" = (
-/obj/machinery/door/firedoor,
-/obj/structure/sign/departments/evac{
-	pixel_y = 32
+"fhP" = (
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
 	},
 /turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
+/area/engine/gravity_generator)
+"fjy" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/heads/captain)
 "flc" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/donut_box,
@@ -55574,20 +53668,67 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/service)
-"fpd" = (
+"fnJ" = (
+/obj/structure/sign/mining{
+	pixel_y = 7
+	},
+/turf/closed/wall,
+/area/quartermaster/miningdock)
+"frE" = (
+/obj/machinery/vr_sleeper{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/crew_quarters/fitness)
+"fsk" = (
+/obj/structure/lattice/catwalk,
+/obj/item/stack/marker_beacon{
+	anchored = 1;
+	icon_state = "markerburgundy-on";
+	light_power = 3;
+	light_range = 3;
+	name = "Docking Beacon";
+	picked_color = "Burgundy"
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
+"ftv" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 4;
+	name = "4maintenance loot spawner"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"fuo" = (
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/grass,
+/area/security/prison)
+"fvk" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"fvW" = (
+/obj/structure/chair/comfy/brown{
+	dir = 8
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/closed/wall,
-/area/crew_quarters/dorms)
-"fsQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"ftK" = (
-/obj/structure/bed,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
 "fvY" = (
 /obj/machinery/computer/cryopod{
 	pixel_y = 26
@@ -55597,54 +53738,28 @@
 	},
 /turf/open/floor/carpet,
 /area/crew_quarters/cryopod)
-"fwD" = (
-/obj/structure/sign/poster/official/ion_rifle,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/security/armory)
 "fxa" = (
 /obj/structure/chair/wood/normal,
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
 /area/maintenance/bar)
-"fyr" = (
-/obj/machinery/door/window/southright{
-	name = "Target Storage"
+"fyq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1;
+	pixel_x = 5
 	},
-/obj/item/target/alien,
-/obj/item/target/alien,
-/obj/item/target/syndicate,
-/turf/open/floor/plating,
-/area/security/prison)
-"fBj" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 4;
-	name = "Air In"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"fDV" = (
-/obj/machinery/computer/card{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"fEo" = (
-/obj/machinery/recharge_station,
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"fFp" = (
-/obj/structure/table/wood/fancy/royalblue,
-/obj/item/crowbar/red,
-/turf/open/floor/plating,
-/area/maintenance/port)
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"fyM" = (
+/obj/structure/closet/wardrobe/cargotech,
+/obj/item/radio/headset/headset_cargo,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fzd" = (
+/turf/closed/wall,
+/area/crew_quarters/abandoned_gambling_den)
 "fGf" = (
 /obj/machinery/smartfridge/disks{
 	pixel_y = 2
@@ -55655,30 +53770,42 @@
 	},
 /turf/open/floor/plasteel,
 /area/hydroponics)
-"fIK" = (
-/obj/structure/closet{
-	name = "Costume Closet"
+"fGl" = (
+/obj/effect/landmark/event_spawn,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/clothing/head/russobluecamohat,
-/obj/item/clothing/head/russobluecamohat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/head/russofurhat,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/under/mw2_russian_para,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"fGC" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/vault,
+/obj/effect/mapping_helpers/airlock/locked,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"fHK" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"fIn" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/obj/machinery/meter,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
-"fJA" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
+"fJa" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4;
+	pixel_y = 5
+	},
+/obj/structure/chair/sofa{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
@@ -55687,679 +53814,7 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"fLb" = (
-/obj/structure/table/wood,
-/obj/item/instrument/violin,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"fLn" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table,
-/obj/item/storage/firstaid/regular{
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"fLX" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"fOB" = (
-/obj/structure/chair/sofa{
-	dir = 1
-	},
-/obj/structure/window,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"fPz" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1;
-	pixel_x = 5
-	},
-/obj/machinery/light/small,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"fRa" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/structure/sign/warning/fire{
-	desc = "A sign that states the labeled room's number.";
-	icon_state = "roomnum";
-	name = "Room Number 1";
-	pixel_x = -30;
-	pixel_y = -7
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"fSL" = (
-/obj/machinery/door/window/westleft{
-	base_state = "right";
-	icon_state = "right";
-	name = "Unisex Showers"
-	},
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
-"fTg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/firealarm{
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"fXo" = (
-/obj/structure/sign/poster/contraband/lizard{
-	pixel_x = -32
-	},
-/obj/structure/sign/poster/contraband/lizard{
-	pixel_x = -32
-	},
-/obj/structure/sign/poster/contraband/lizard{
-	pixel_x = -32
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"fXH" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"fZD" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/effect/landmark/start/mime,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 4
-	},
-/area/crew_quarters/theatre)
-"gbb" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
-	pixel_x = 5;
-	pixel_y = 7
-	},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"gbq" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/turf/open/floor/plating,
-/area/construction)
-"gbT" = (
-/obj/structure/table,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
-"gfn" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"gfD" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"gjl" = (
-/turf/closed/wall,
-/area/quartermaster/warehouse)
-"gks" = (
-/turf/open/floor/grass,
-/area/security/prison)
-"gmc" = (
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/camera{
-	c_tag = "VR Sleepers";
-	dir = 1
-	},
-/obj/machinery/light/small,
-/turf/open/floor/plasteel/white/side{
-	dir = 1
-	},
-/area/crew_quarters/fitness)
-"gnM" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"gnW" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable,
-/turf/open/space,
-/area/solar/starboard/aft)
-"gqp" = (
-/obj/structure/frame/computer{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"gqR" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"gro" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Gravity Generator";
-	req_access_txt = "11"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"guh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "kitchen";
-	name = "kitchen shutters"
-	},
-/obj/item/reagent_containers/food/snacks/cheesynachos{
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
-"gvC" = (
-/obj/structure/chair/stool{
-	pixel_y = 8
-	},
-/turf/open/floor/carpet{
-	icon_state = "carpetsymbol"
-	},
-/area/crew_quarters/theatre)
-"gwd" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"gxH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"gzA" = (
-/obj/structure/table/wood/fancy,
-/obj/machinery/light,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -3;
-	pixel_y = 20
-	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	dir = 1;
-	pixel_x = 3;
-	pixel_y = 20
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4;
-	pixel_y = 5
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"gzJ" = (
-/obj/structure/sign/poster/official/cohiba_robusto_ad,
-/turf/closed/wall,
-/area/lawoffice)
-"gBo" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"gBY" = (
-/obj/machinery/power/apc{
-	areastring = "/area/maintenance/starboard/fore";
-	dir = 1;
-	name = "Starboard Bow Maintenance APC";
-	pixel_y = 24
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"gDv" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/boxing/yellow,
-/obj/item/clothing/gloves/boxing/green,
-/obj/item/clothing/gloves/boxing/blue,
-/obj/item/clothing/gloves/boxing/blue,
-/obj/item/clothing/gloves/boxing,
-/obj/item/clothing/gloves/boxing,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"gFY" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/wood,
-/area/bridge/meeting_room)
-"gGD" = (
-/obj/structure/table,
-/obj/item/hand_labeler,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"gGK" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/light_switch{
-	pixel_y = -25
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"gIT" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "kitchen";
-	name = "kitchen shutters"
-	},
-/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/kitchen)
-"gJR" = (
-/obj/structure/table/wood,
-/obj/item/instrument/guitar{
-	pixel_x = -7
-	},
-/obj/item/instrument/eguitar{
-	pixel_x = 5
-	},
-/obj/item/instrument/violin,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"gLH" = (
-/obj/machinery/door/airlock/external{
-	name = "External Access";
-	req_access_txt = "13"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
-"gMl" = (
-/obj/structure/chair/wood/normal{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"gOZ" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"gTx" = (
-/obj/structure/bed,
-/obj/machinery/button/door{
-	id = "Dorm5";
-	name = "Cabin Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_y = -25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/wood,
-/area/crew_quarters/dorms)
-"gUz" = (
-/obj/structure/sign/poster/official/safety_eye_protection,
-/turf/closed/wall/r_wall,
-/area/engine/engineering)
-"gWd" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plating,
-/area/construction)
-"gXs" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
-"gYK" = (
-/obj/machinery/light/small,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"gYR" = (
-/obj/item/radio/intercom{
-	pixel_y = 25
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"gZG" = (
-/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/item/reagent_containers/glass/beaker/synthflesh,
-/turf/open/floor/plasteel/white/side{
-	dir = 8
-	},
-/area/medical/sleeper)
-"hmv" = (
-/obj/structure/chair/comfy/brown{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hot" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/window,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"hvD" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hxw" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/obj/machinery/meter,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"hFk" = (
-/obj/structure/piano{
-	icon_state = "piano"
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hIi" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"hIJ" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"hKI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore)
-"hKX" = (
-/obj/machinery/button/door{
-	desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot.";
-	id = "RIPFUN";
-	name = "Powerful Gamer Toggle";
-	normaldoorcontrol = 1;
-	pixel_x = -24;
-	pixel_y = 7;
-	specialfunctions = 4
-	},
-/obj/structure/table_frame/wood,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"hMk" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "Secure Gate";
-	name = "brig shutters"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/security/brig)
-"hRa" = (
-/obj/structure/table/reinforced,
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/cell_charger{
-	pixel_y = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"hSS" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/coin/silver,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"hUC" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-06"
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 1
-	},
-/area/hallway/secondary/entry)
-"hVk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/quartermaster/warehouse";
-	dir = 4;
-	name = "Cargo Warehouse APC";
-	pixel_x = 26
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/maintenance/port)
-"hYH" = (
-/obj/machinery/door/airlock/security{
-	name = "Labor Shuttle";
-	req_access_txt = "2"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/processing)
-"iaq" = (
-/obj/machinery/power/smes{
-	charge = 5e+006
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"iiH" = (
-/obj/structure/table/wood/fancy,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/item/reagent_containers/food/drinks/britcup{
-	desc = "Kingston's personal cup.";
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"iiW" = (
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"ijc" = (
-/obj/structure/table,
-/obj/item/stack/sheet/metal/fifty,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"ilO" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"imi" = (
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/dorms)
-"imH" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"imK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/light_construct{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"ioS" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Holodeck Door"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
-"ipA" = (
-/turf/open/floor/plating,
-/area/maintenance/department/medical/morgue)
-"ipU" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
-	},
-/obj/structure/mirror{
-	pixel_x = 25
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"itE" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
-/obj/structure/curtain,
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"itG" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"itP" = (
-/obj/structure/chair/comfy/brown{
-	color = "#596479";
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ium" = (
-/mob/living/simple_animal/bot/cleanbot{
-	name = "C.L.E.A.N."
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"ixv" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"izv" = (
-/obj/machinery/vending/clothing,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"izL" = (
-/obj/machinery/door/firedoor,
-/obj/structure/sign/departments/evac{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"iCE" = (
+"fLd" = (
 /obj/structure/table/wood,
 /obj/machinery/requests_console{
 	department = "Theatre";
@@ -56380,740 +53835,96 @@
 	dir = 4
 	},
 /area/crew_quarters/theatre)
-"iEc" = (
-/obj/structure/safe,
-/obj/item/clothing/head/bearpelt,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/item/gun/ballistic/revolver/nagant,
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"iEJ" = (
-/obj/machinery/door/airlock/external{
-	name = "Escape Pod One"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
-"iFt" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"iGV" = (
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"iHq" = (
-/obj/machinery/door/airlock{
-	name = "Recharging Station"
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"iNn" = (
-/obj/machinery/camera{
-	c_tag = "Kitchen Cold Room"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/reagent_dispensers/cooking_oil,
-/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
-"iQA" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/clothing/under/color/grey,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"iRI" = (
-/obj/structure/chair/comfy/beige{
-	dir = 8
-	},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/secondary/entry)
-"iSB" = (
-/obj/machinery/door/window/southleft{
-	name = "Target Storage"
-	},
-/obj/item/target/clown,
-/obj/item/target/clown,
-/obj/item/target,
-/obj/item/target,
-/turf/open/floor/plating,
-/area/security/prison)
-"iTd" = (
-/obj/structure/closet/secure_closet/personal/cabinet{
-	desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
-	name = "Personal ID-Locked Closet";
-	pixel_y = 15
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"iTD" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
-	pixel_x = -3;
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"iVU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/spawner/structure/window,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/crew_quarters/cryopod)
-"iWm" = (
-/obj/machinery/camera{
-	c_tag = "Bar West";
-	dir = 4
-	},
-/obj/machinery/computer/arcade/orion_trail,
-/obj/structure/sign/poster/official/foam_force_ad{
-	pixel_x = -32
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"jav" = (
-/obj/structure/chair/sofa/right,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"jbf" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/hallway/secondary/service";
-	dir = 1;
-	name = "Service Hall APC";
-	pixel_y = 25
-	},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"jcN" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"jde" = (
+"fOc" = (
+/obj/structure/bed,
+/obj/item/bedsheet/random,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4;
-	pixel_y = 5
-	},
-/obj/structure/chair/sofa{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"jgm" = (
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/machinery/camera{
-	c_tag = "Circuitry Lab";
-	dir = 8;
-	network = list("ss13","rd")
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"jil" = (
-/obj/machinery/vr_sleeper{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 8
-	},
-/area/crew_quarters/fitness)
-"jlm" = (
-/obj/machinery/rnd/production/techfab/department/cargo,
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
-"joc" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/dresser,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/theatre";
-	dir = 8;
-	name = "Theatre APC";
-	pixel_x = -25
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/theatre)
-"joq" = (
-/obj/structure/chair/stool{
-	pixel_y = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/carpet{
-	icon_state = "carpetsymbol"
-	},
-/area/crew_quarters/theatre)
-"jqv" = (
-/obj/structure/chair/wood/normal{
-	dir = 1
-	},
-/turf/open/floor/wood{
-	icon_state = "wood-broken7"
-	},
-/area/maintenance/bar)
-"jrE" = (
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
-	},
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"jtp" = (
-/obj/structure/sign/poster/contraband/red_rum{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"jtY" = (
-/obj/machinery/door/airlock{
-	name = "Unisex Restrooms"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/bar)
-"juV" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"jvm" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/space,
-/area/solar/starboard/aft)
-"jxp" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"fPs" = (
 /obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "kitchen";
+	name = "kitchen shutters"
 	},
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"jAD" = (
-/obj/structure/grille,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"jCq" = (
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"jDh" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"jHt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"jJF" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"jKM" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/window{
-	dir = 1
+/obj/item/reagent_containers/food/snacks/cheesynachos{
+	pixel_y = 5
 	},
 /turf/open/floor/plasteel/cafeteria,
-/area/crew_quarters/locker)
-"jMa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"jMY" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/artistic{
-	icon_state = "yellow";
-	item_state = "toolbox_yellow";
-	name = "Cable Toolbox";
-	pixel_y = 6
-	},
-/obj/item/storage/toolbox/artistic{
-	icon_state = "yellow";
-	item_state = "toolbox_yellow";
-	name = "Cable Toolbox";
-	pixel_y = -4
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"jNS" = (
-/obj/structure/filingcabinet,
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"jOF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"jRc" = (
-/obj/structure/table,
-/obj/item/storage/pill_bottle/dice{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/food/snacks/cherrycupcake,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"jRs" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"jSk" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/security/prison)
-"jSO" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"jTp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"jUc" = (
-/obj/structure/closet/radiation,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"jVl" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"jYg" = (
-/obj/structure/table/wood/fancy,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -3;
-	pixel_y = 9
-	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	dir = 1;
-	pixel_x = 3;
-	pixel_y = 9
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"jYD" = (
-/obj/structure/closet{
-	name = "Suit Closet"
-	},
-/obj/item/clothing/under/suit_jacket/white,
-/obj/item/clothing/under/suit_jacket/tan,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/item/clothing/under/suit_jacket/really_black,
-/obj/item/clothing/under/suit_jacket/navy,
-/obj/item/clothing/under/suit_jacket/green,
-/obj/item/clothing/under/suit_jacket/female,
-/obj/item/clothing/under/suit_jacket/checkered,
-/obj/item/clothing/under/suit_jacket/charcoal,
-/obj/item/clothing/under/suit_jacket/burgundy,
-/obj/item/clothing/under/suit_jacket,
-/obj/item/clothing/under/lawyer/black,
-/obj/item/clothing/under/lawyer/blacksuit,
-/obj/item/clothing/under/lawyer/blue,
-/obj/item/clothing/under/lawyer/bluesuit,
-/obj/item/clothing/under/lawyer/female,
-/obj/item/clothing/under/lawyer/purpsuit,
-/obj/item/clothing/under/lawyer/really_black,
-/obj/item/clothing/under/lawyer/red,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"kcg" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/box,
-/turf/open/floor/plasteel,
-/area/engine/atmos)
-"kgf" = (
-/obj/machinery/button/door{
-	id = "maintdiy";
-	name = "Shutters Control Button";
-	pixel_x = -6;
+/area/crew_quarters/kitchen)
+"fQF" = (
+/obj/structure/sign/warning/fire{
+	desc = "A sign that states the labeled room's number.";
+	dir = 5;
+	icon_state = "roomnum";
+	name = "Room Number 7";
 	pixel_y = 24
 	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"khb" = (
+/obj/structure/chair/sofa/right,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/obj/structure/table,
-/obj/item/kitchen/rollingpin,
-/obj/item/shovel/spade,
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"khB" = (
-/obj/machinery/door/airlock/external{
-	req_access_txt = "13"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"kiH" = (
-/obj/machinery/door/airlock{
-	name = "Bar Back Room"
-	},
-/turf/open/space/basic,
-/area/crew_quarters/bar)
-"kmf" = (
-/obj/machinery/vending/autodrobe/all_access,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"kmw" = (
-/obj/machinery/door/airlock{
-	name = "Theatre Backstage";
-	req_access_txt = "46"
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"knx" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Central Access"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "bridge blast";
-	name = "bridge blast door"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"knR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/security/prison)
-"kob" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"ktc" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"kte" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
-	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"kuT" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plating,
-/area/maintenance/department/electrical)
-"kwj" = (
-/obj/machinery/door/airlock{
-	name = "Instrument Storage"
-	},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/fore)
-"kwW" = (
-/obj/structure/table/wood,
-/obj/item/book/codex_gigas,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/structure/destructible/cult/tome,
-/turf/open/floor/carpet,
-/area/library)
-"kyA" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"kyF" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"kzT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/science/mixing)
-"kBF" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/security/prison)
-"kCq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/captain)
-"kCK" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"kDw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"kFf" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
-	id = "bridge blast";
-	name = "bridge blast door"
-	},
-/turf/open/floor/plating,
-/area/hallway/primary/central)
-"kMg" = (
-/turf/open/space/basic,
-/area/space/nearstation)
-"kMO" = (
-/obj/machinery/shower{
 	dir = 4
 	},
-/obj/item/soap,
-/turf/open/floor/mineral/titanium/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"fSr" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/light,
+/turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
-"kMY" = (
-/obj/machinery/door/airlock{
-	desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
-	id_tag = "PrivateStudy";
-	name = "Private Study"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood,
-/area/library)
-"kOA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+"fTg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/button/door{
-	id = "holoprivacy";
-	name = "Holodeck Privacy";
+/obj/machinery/firealarm{
 	pixel_y = 24
 	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"kPd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"kQg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	alpha = 255;
-	dir = 1
-	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
-"kQk" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 2;
-	name = "2maintenance loot spawner"
+"fVU" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Holodeck Door"
 	},
-/obj/item/storage/toolbox/electrical,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"fZD" = (
+/obj/structure/filingcabinet,
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"gbq" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plating,
+/area/construction)
+"gbT" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
-"kQq" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"kSb" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/quartermaster/miningdock)
-"kTe" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 1
-	},
-/turf/closed/wall/mineral/titanium,
-/area/space/nearstation)
-"lev" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"lfx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "maintdiy";
-	name = "Security Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"liD" = (
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-22"
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"ljN" = (
+"gdu" = (
 /obj/structure/toilet{
 	dir = 4
 	},
@@ -57137,1017 +53948,167 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/crew_quarters/toilet/locker)
-"lmT" = (
+"gfD" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"ggg" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/turf/open/space,
+/area/solar/starboard/aft)
+"ghs" = (
 /obj/structure/table/wood/fancy,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/light,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = -3;
+	pixel_y = 20
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	dir = 1;
+	pixel_x = 3;
+	pixel_y = 20
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/food/snacks/burger/plain,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
-"lnu" = (
-/obj/structure/chair/wood/normal{
-	dir = 4
-	},
-/turf/open/floor/wood{
-	icon_state = "wood-broken6"
-	},
-/area/maintenance/bar)
-"lqe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/chair/sofa,
-/obj/item/radio/intercom{
-	pixel_y = 25
-	},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"lre" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-18"
-	},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
-"lrF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"lrH" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"ltC" = (
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"lwn" = (
-/obj/structure/table,
-/obj/item/book/manual/hydroponics_pod_people{
-	pixel_x = -4;
-	pixel_y = 5
-	},
-/obj/item/paper/guides/jobs/hydroponics{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"lyB" = (
-/obj/effect/turf_decal/tile/red{
+"ghJ" = (
+/obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/camera{
-	c_tag = "Firing Range";
-	dir = 1
+/obj/structure/sign/warning/fire{
+	desc = "A sign that states the labeled room's number.";
+	icon_state = "roomnum";
+	name = "Room Number 1";
+	pixel_x = -30;
+	pixel_y = -7
 	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"lzY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/engine_smes)
-"lAB" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall,
-/area/science/circuit)
-"lAY" = (
-/obj/structure/closet/lasertag/red,
-/obj/item/clothing/under/pj/red,
-/obj/item/clothing/under/pj/red,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"lBk" = (
-/obj/structure/chair/sofa/left{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"lCi" = (
-/obj/docking_port/stationary/public_mining_dock{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/construction/mining/aux_base)
-"lDF" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 1
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
-"lHE" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "maint2"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"lJX" = (
-/obj/machinery/light/small{
-	brightness = 3;
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/security/prison)
-"lMg" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"lNn" = (
-/obj/structure/lattice,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/nuke_storage)
-"lNz" = (
-/obj/structure/sign/mining{
-	pixel_y = 7
-	},
-/turf/closed/wall,
-/area/quartermaster/miningdock)
-"lQG" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/science/circuit)
-"lQR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"lUd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"lUR" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"maz" = (
-/obj/machinery/door/airlock/command{
-	name = "Captain's Office";
-	req_access_txt = "20"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/space/basic,
-/area/crew_quarters/heads/captain)
-"maK" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"mbl" = (
-/obj/structure/chair/sofa/left,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"mcQ" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 4
 	},
-/obj/structure/closet/wardrobe/black,
-/obj/item/clothing/under/skirt/black,
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/sundress,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"mdp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"mdQ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"mgT" = (
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"mjr" = (
-/obj/structure/reagent_dispensers/keg/milk,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"mnP" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/sign/poster/official/pda_ad{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"moa" = (
-/obj/structure/chair/comfy/black{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
-"mpA" = (
-/obj/structure/table/wood,
-/obj/item/melee/chainofcommand,
+"ghY" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"mpI" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood{
-	icon_state = "wood-broken5"
-	},
-/area/maintenance/bar)
-"mqZ" = (
-/obj/structure/reagent_dispensers/keg/aphro/strong,
-/obj/item/reagent_containers/glass/beaker,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/bar)
-"mrR" = (
-/obj/effect/spawner/lootdrop/keg,
+/area/maintenance/starboard/fore)
+"gjf" = (
+/obj/machinery/vending/coffee,
 /turf/open/floor/wood,
-/area/maintenance/bar)
-"muq" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
+/area/bridge/meeting_room)
+"gjl" = (
+/turf/closed/wall,
+/area/quartermaster/warehouse)
+"gjC" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"gtL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
 	},
 /turf/closed/wall/r_wall,
 /area/engine/gravity_generator)
-"mvB" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/airalarm{
-	dir = 8;
-	pixel_x = 23
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"mwm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/freezer,
-/area/crew_quarters/toilet)
-"mBv" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/components/binary/valve{
-	dir = 4;
-	name = "Output to Waste"
-	},
-/turf/open/floor/engine,
-/area/engine/engineering)
-"mDU" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"mFJ" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/sign/poster/contraband/free_drone{
-	pixel_y = 32
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"mHC" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"mHW" = (
-/obj/machinery/vr_sleeper{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
+"gwd" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/turf/open/floor/plasteel/white/side{
-	dir = 4
-	},
-/area/crew_quarters/fitness)
-"mJU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"mKU" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 8;
-	name = "8maintenance loot spawner"
-	},
-/obj/item/radio/intercom{
-	pixel_y = 25
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"mMb" = (
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-14"
-	},
 /turf/open/floor/plasteel,
-/area/hallway/primary/port)
-"mNi" = (
-/obj/machinery/light_switch{
-	pixel_x = -20
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
 /area/science/circuit)
-"mOL" = (
-/obj/structure/bed,
-/obj/machinery/button/door{
-	id = "Dorm6";
-	name = "Cabin Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_y = -25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/obj/effect/spawner/lootdrop/bedsheet,
+"gwi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
-/area/crew_quarters/dorms)
-"mPj" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/sign/departments/restroom{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"mPE" = (
-/obj/machinery/chem_dispenser/drinks,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"mRe" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"mRj" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"mTi" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck{
-	pixel_y = 5
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"mTj" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"ncB" = (
-/obj/machinery/camera{
-	c_tag = "Gravity Generator Room";
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"ncI" = (
-/obj/machinery/computer/libraryconsole/bookmanagement,
-/obj/structure/table,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ndo" = (
-/obj/structure/chair/comfy/black{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"neq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"neT" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"nfm" = (
-/obj/machinery/vending/autodrobe,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"nhn" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
+/area/crew_quarters/theatre)
+"gBo" = (
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"gCe" = (
+/obj/effect/spawner/lootdrop/keg,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
-"niE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/maintenance/port)
-"nlN" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"nnb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"noK" = (
-/obj/structure/girder,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"npV" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"nqP" = (
-/obj/machinery/vending/cola/red,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"nuI" = (
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"nvw" = (
-/obj/machinery/photocopier{
-	pixel_x = -5;
-	pixel_y = -5
-	},
-/turf/open/floor/wood,
-/area/library)
-"nxv" = (
-/obj/machinery/power/apc{
-	areastring = "/area/construction";
-	name = "Construction Area APC";
-	pixel_y = -24
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
+"gFD" = (
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/crowbar/red,
 /turf/open/floor/plating,
-/area/construction)
-"nxN" = (
+/area/maintenance/port)
+"gIO" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/plating,
+/area/security/prison)
+"gJg" = (
 /turf/closed/wall/mineral/titanium,
 /area/space/nearstation)
-"nyF" = (
-/obj/machinery/vending/coffee,
-/turf/open/floor/wood,
-/area/bridge/meeting_room)
-"nzc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"nzh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"nDn" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"nGt" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"gKk" = (
+/obj/machinery/vr_sleeper{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"nGN" = (
-/obj/structure/piano,
-/obj/structure/window/reinforced,
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
-"nNY" = (
-/obj/structure/chair/comfy/brown{
+/obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 4
+	},
+/area/crew_quarters/fitness)
+"gLH" = (
+/obj/machinery/door/airlock/external{
+	name = "External Access";
+	req_access_txt = "13"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
+"gMl" = (
+/obj/structure/chair/wood/normal{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar)
-"nOD" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/light_construct{
-	dir = 8
+/area/maintenance/bar)
+"gOZ" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"nRG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"nTu" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"oaB" = (
+/area/crew_quarters/fitness)
+"gQn" = (
+/obj/machinery/light/small,
 /turf/open/floor/mineral/titanium/blue,
 /area/crew_quarters/dorms)
-"oaP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"oaT" = (
-/obj/structure/window,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"oce" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white,
-/area/science/mixing)
-"odx" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"odR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"ogU" = (
-/obj/machinery/door/airlock/security{
-	name = "Firing Range";
-	req_access_txt = "2"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"ohe" = (
-/obj/machinery/hydroponics/constructable,
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_x = 29
-	},
-/turf/open/floor/plasteel/dark,
-/area/hydroponics)
-"olr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"ope" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plating,
-/area/storage/tech)
-"oqa" = (
-/obj/structure/lattice/catwalk,
-/obj/item/stack/marker_beacon{
-	anchored = 1;
-	icon_state = "markerburgundy-on";
-	light_power = 3;
-	light_range = 3;
-	name = "Docking Beacon";
-	picked_color = "Burgundy"
-	},
-/turf/open/space/basic,
+"gSH" = (
+/obj/structure/grille,
+/turf/closed/wall/r_wall,
 /area/space/nearstation)
-"osd" = (
-/obj/structure/sign/poster/contraband/tools,
-/turf/closed/wall,
-/area/storage/primary)
-"ove" = (
-/obj/machinery/door/airlock/command{
-	name = "Conference Room";
-	req_access_txt = "19"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/space/basic,
-/area/bridge/meeting_room)
-"ovG" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/love_ian{
-	pixel_x = 32;
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"oxA" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/chair/comfy/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"oAc" = (
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"oAV" = (
-/obj/structure/table,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/item/clothing/glasses/sunglasses{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/clothing/glasses/sunglasses{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/clothing/ears/earmuffs{
-	pixel_x = -3;
-	pixel_y = -2
-	},
-/obj/item/clothing/ears/earmuffs{
-	pixel_x = -3;
-	pixel_y = -2
-	},
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = 24
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"oBB" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"oDF" = (
-/obj/machinery/light,
-/turf/open/floor/plating,
-/area/engine/engineering)
-"oFY" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"oGS" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 4;
-	light_color = "#d8b1b1"
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"oHU" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"oIt" = (
-/obj/machinery/button/door{
-	desc = "Bolts the doors to the Private Study.";
-	id = "PrivateStudy";
-	name = "Private Study Lock";
-	pixel_x = 25;
-	pixel_y = 25;
-	req_access_txt = "";
-	req_one_access_txt = "28;63"
-	},
-/turf/open/floor/wood,
-/area/library)
-"oIx" = (
-/obj/machinery/button/door{
-	id = "Room Two";
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 7;
-	pixel_y = -24;
-	specialfunctions = 4
-	},
-/obj/structure/chair/comfy/brown{
-	dir = 8
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"oJs" = (
+"gVX" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
 	},
 /turf/closed/wall/r_wall,
 /area/engine/engine_smes)
-"oKh" = (
-/obj/structure/chair/wood/normal{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"oKy" = (
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"oLI" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"oNq" = (
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/obj/structure/sink{
-	dir = 1;
-	pixel_y = 25
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"oNN" = (
-/obj/item/electropack/shockcollar,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/security/prison)
-"oSk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 4
-	},
-/area/crew_quarters/theatre)
-"oSW" = (
-/obj/structure/grille/broken,
-/turf/open/floor/plating,
-/area/space/nearstation)
-"oTI" = (
-/obj/item/radio/intercom{
-	name = "Station Intercom (General)";
-	pixel_y = -29
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"oUh" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/obj/machinery/disposal/bin,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"oVS" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/structure/window,
-/obj/structure/window{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"oWe" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	desc = "Privacy shutters for the Private Study. Stops people spying in on your game.";
-	id = "PrivateStudy1";
-	name = "Private Study Privacy Shutters"
-	},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/wood,
-/area/library)
-"oZl" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/structure/sign/departments/security{
-	pixel_x = -32;
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"pbw" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"pdg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/door/window/eastleft{
-	name = "Blue Corner"
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"pet" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/security/brig)
-"pgY" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/junction/flip,
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"phP" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/space,
-/area/solar/starboard/aft)
-"pmf" = (
+"gVY" = (
 /obj/structure/reagent_dispensers/foamtank,
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
@@ -58162,30 +54123,84 @@
 /obj/effect/turf_decal/stripes/box,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
-"pmj" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"pnl" = (
-/obj/machinery/light{
-	dir = 4;
-	light_color = "#e8eaff"
+"gWd" = (
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"pnx" = (
-/obj/machinery/light_switch{
-	pixel_y = 28
+/area/construction)
+"gXs" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"gZG" = (
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/obj/item/reagent_containers/glass/beaker/synthflesh,
+/turf/open/floor/plasteel/white/side{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light{
+/area/medical/sleeper)
+"haz" = (
+/obj/machinery/autolathe{
+	name = "public autolathe"
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
+"haX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"hcd" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/sleeper)
+"hdb" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"hdp" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 3;
+	name = "3maintenance loot spawner"
+	},
+/obj/structure/light_construct{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"hfe" = (
+/obj/structure/sign/poster/contraband/smoke{
+	desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. ";
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"hgX" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/machinery/light/small,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 5;
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/white/side{
 	dir = 1
 	},
-/turf/open/floor/circuit,
-/area/ai_monitored/nuke_storage)
-"pnS" = (
+/area/crew_quarters/fitness)
+"hho" = (
 /obj/structure/lattice/catwalk,
 /obj/item/stack/marker_beacon{
 	anchored = 1;
@@ -58195,142 +54210,445 @@
 	name = "Docking Beacon";
 	picked_color = "Burgundy"
 	},
-/turf/open/floor/plating,
+/turf/open/space/basic,
 /area/space/nearstation)
-"poc" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
+"hik" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/obj/structure/chair{
+/turf/open/space,
+/area/solar/starboard/aft)
+"hjw" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"hkg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"hlY" = (
+/obj/machinery/door/airlock{
+	name = "Recharging Station"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"hoo" = (
+/obj/effect/landmark/carpspawn,
+/turf/open/space/basic,
+/area/space)
+"htr" = (
+/obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/science/mixing)
-"puG" = (
-/obj/structure/closet{
-	name = "Suit Closet"
+/area/hydroponics)
+"hvS" = (
+/obj/effect/landmark/stationroom/box/engine,
+/turf/open/space/basic,
+/area/space)
+"hwu" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"hzw" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/window{
+	dir = 1
+	},
+/obj/structure/window{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
 	},
-/obj/item/clothing/under/suit_jacket/white,
-/obj/item/clothing/under/suit_jacket/tan,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/item/clothing/under/suit_jacket/really_black,
-/obj/item/clothing/under/suit_jacket/navy,
-/obj/item/clothing/under/suit_jacket/green,
-/obj/item/clothing/under/suit_jacket/female,
-/obj/item/clothing/under/suit_jacket/checkered,
-/obj/item/clothing/under/suit_jacket/charcoal,
-/obj/item/clothing/under/suit_jacket/burgundy,
-/obj/item/clothing/under/suit_jacket,
-/obj/item/clothing/under/lawyer/black,
-/obj/item/clothing/under/lawyer/blacksuit,
-/obj/item/clothing/under/lawyer/blue,
-/obj/item/clothing/under/lawyer/bluesuit,
-/obj/item/clothing/under/lawyer/female,
-/obj/item/clothing/under/lawyer/purpsuit,
-/obj/item/clothing/under/lawyer/really_black,
-/obj/item/clothing/under/lawyer/red,
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
-"pAE" = (
-/obj/machinery/vending/cola/space_up,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"pGr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"pHl" = (
-/obj/structure/table,
-/obj/item/storage/box/beakers{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/storage/box/syringes,
-/obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = 7;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/glass/bottle/morphine{
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/syringe{
-	pixel_x = 6;
-	pixel_y = -3
-	},
-/obj/item/radio/intercom{
-	frequency = 1485;
-	name = "Station Intercom (Medbay)";
-	pixel_x = 30
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/sleeper)
-"pIA" = (
-/obj/structure/chair/comfy/brown{
+"hzR" = (
+/obj/machinery/light{
 	dir = 4
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
-"pKz" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/port)
-"pLn" = (
-/obj/machinery/conveyor/inverted{
-	dir = 5;
-	id = "garbage"
-	},
-/turf/open/floor/plating,
-/area/maintenance/disposal)
-"pMv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-04"
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"pNj" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
-/area/maintenance/starboard/fore)
-"pNO" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
-"pQA" = (
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"pRx" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/computer/slot_machine,
-/obj/item/coin/iron,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"pUo" = (
-/obj/structure/fireplace,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"pVa" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+"hKF" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/storage/tech)
+"hMx" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"hRa" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/cell_charger{
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"hRz" = (
+/obj/structure/chair/comfy/brown{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"hRT" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/department/electrical)
+"hRX" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/wood,
-/area/crew_quarters/heads/captain)
-"pWH" = (
+/area/crew_quarters/theatre)
+"hSU" = (
+/obj/structure/chair/sofa/left,
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"hVw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"hWn" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"hYW" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 2;
+	name = "2maintenance loot spawner"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"hZH" = (
+/obj/machinery/hydroponics/constructable,
+/obj/item/radio/intercom{
+	name = "Station Intercom (General)";
+	pixel_x = 29
+	},
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
+"idX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"iep" = (
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = 25
+	},
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"ier" = (
+/obj/machinery/button/door{
+	id = "Room Two";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 7;
+	pixel_y = -24;
+	specialfunctions = 4
+	},
+/obj/structure/chair/comfy/brown{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"igT" = (
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck{
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"ihm" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/junction/flip,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"ihC" = (
+/obj/item/chair/wood,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"iiW" = (
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"ikx" = (
+/turf/open/floor/plating/foam,
+/area/space/nearstation)
+"ilJ" = (
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/light{
+	light_color = "#c9d3e8"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"imH" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"ioB" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/effect/landmark/start/mime,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 4
+	},
+/area/crew_quarters/theatre)
+"ioG" = (
+/obj/machinery/vending/cola/red,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"ioX" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"ipc" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Gravity Generator";
+	req_access_txt = "11"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/engine/engine_smes)
+"ipA" = (
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+"iqw" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"isy" = (
+/obj/structure/urinal{
+	pixel_y = 32
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"itG" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"itT" = (
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"ium" = (
+/mob/living/simple_animal/bot/cleanbot{
+	name = "C.L.E.A.N."
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"ivF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"iyC" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-06"
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
+"izv" = (
+/obj/machinery/vending/clothing,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"iEx" = (
+/obj/structure/table/wood,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/item/instrument/trombone,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"iEI" = (
+/obj/machinery/vending/autodrobe/all_access,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"iEJ" = (
+/obj/machinery/door/airlock/external{
+	name = "Escape Pod One"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"iES" = (
+/obj/structure/fireplace,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"iFL" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"iMG" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-14"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
+"iNn" = (
+/obj/machinery/camera{
+	c_tag = "Kitchen Cold Room"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/reagent_dispensers/cooking_oil,
+/turf/open/floor/plasteel/showroomfloor,
+/area/crew_quarters/kitchen)
+"iOt" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/sign/poster/contraband/free_drone{
+	pixel_y = 32
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"iOV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/light_construct{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"iRJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/quartermaster/storage";
+	name = "Cargo Bay APC";
+	pixel_x = 1;
+	pixel_y = -24
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/maintenance/port)
+"iVU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/structure/window,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/crew_quarters/cryopod)
+"iWa" = (
 /obj/structure/closet/crate,
 /obj/item/book/manual/wiki/telescience,
 /obj/item/book/manual/wiki/engineering_guide,
@@ -58357,338 +54675,142 @@
 	},
 /turf/open/floor/wood,
 /area/library)
-"pWO" = (
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"qaZ" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 2;
-	name = "2maintenance loot spawner"
-	},
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"qcu" = (
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/green,
-/turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"qdm" = (
-/obj/machinery/autolathe{
-	name = "public autolathe"
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/office)
-"qet" = (
-/obj/structure/flora/ausbushes/fullgrass,
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/ppflowers,
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/structure/flora/ausbushes/brflowers,
-/obj/effect/spawner/structure/window,
-/turf/open/floor/grass,
-/area/crew_quarters/bar)
-"qeQ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"qeZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/closed/wall,
-/area/crew_quarters/bar)
-"qnd" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
-	},
-/obj/structure/light_construct{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"qqY" = (
-/obj/effect/turf_decal/tile/blue{
-	alpha = 255
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	alpha = 255;
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"quT" = (
-/obj/structure/lattice,
-/obj/structure/grille/broken,
-/turf/open/space/basic,
-/area/space/nearstation)
-"qvo" = (
-/obj/structure/chair/comfy/brown{
-	color = "#66b266";
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"qwZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"qxb" = (
-/obj/machinery/vr_sleeper{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"qzE" = (
-/obj/machinery/door/airlock{
-	name = "Shower Room"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/toilet)
-"qGM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"qIw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+"iWk" = (
+/obj/structure/bookcase{
+	name = "Forbidden Knowledge"
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"qIT" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4;
-	pixel_y = 5
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"qIZ" = (
+/area/library)
+"iYz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"qKJ" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/area/crew_quarters/theatre)
+"jaa" = (
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light{
+	dir = 1
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"qKZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/security/execution/transfer)
-"qMf" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "holoprivacy";
-	name = "Holodeck Shutters"
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness)
-"qPl" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/junction,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"qPJ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/machinery/camera{
-	c_tag = "Bar Backroom";
-	dir = 2
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"qRq" = (
-/obj/structure/table,
+/turf/open/floor/plasteel/dark,
+/area/hydroponics)
+"jbf" = (
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
+/obj/machinery/power/apc{
+	areastring = "/area/hallway/secondary/service";
+	dir = 1;
+	name = "Service Hall APC";
+	pixel_y = 25
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/machinery/recharger,
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"jdT" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"jeR" = (
+/obj/structure/chair/sofa/left,
 /turf/open/floor/plasteel,
 /area/security/prison)
-"qVa" = (
-/obj/structure/sign/poster/official/help_others{
-	pixel_y = -32
+"jeT" = (
+/obj/machinery/vending/clothing,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"jgm" = (
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/camera{
+	c_tag = "Circuitry Lab";
+	dir = 8;
+	network = list("ss13","rd")
 	},
 /turf/open/floor/plasteel,
-/area/hallway/primary/starboard)
-"qXl" = (
+/area/science/circuit)
+"jgv" = (
+/obj/structure/chair/comfy/brown{
+	color = "#596479";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"jhF" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#c1caff"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"jiR" = (
 /obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
+/obj/structure/window,
 /obj/structure/window{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
+/obj/effect/landmark/start/assistant,
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
-"qYi" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
+"jlm" = (
+/obj/machinery/rnd/production/techfab/department/cargo,
+/turf/open/floor/plasteel,
+/area/quartermaster/office)
+"jly" = (
+/obj/structure/chair/stool{
+	pixel_y = 8
 	},
-/obj/structure/window/reinforced{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/security/prison)
-"qZv" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/turf/open/floor/carpet{
+	icon_state = "carpetsymbol"
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"rak" = (
-/obj/structure/bed,
-/obj/item/bedsheet/random,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"rcD" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/science/circuit)
-"rfu" = (
-/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/grass,
-/area/security/prison)
-"rfE" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"rfW" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/maintenance/disposal/incinerator)
-"rgv" = (
-/obj/structure/bed,
-/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/plating,
-/area/security/prison)
-"rkR" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/carpet,
 /area/crew_quarters/theatre)
-"rmC" = (
-/obj/structure/fans/tiny/invisible,
+"jmC" = (
+/obj/structure/lattice/catwalk,
 /turf/open/space/basic,
-/area/space)
-"rmX" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"rmY" = (
-/obj/machinery/light/small{
-	dir = 4;
-	light_color = "#d8b1b1"
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"rnY" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
 /area/space/nearstation)
-"rrJ" = (
+"jnm" = (
+/obj/machinery/power/smes{
+	charge = 5e+006
+	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"ruS" = (
-/obj/structure/closet/athletic_mixed,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"rAJ" = (
+/area/engine/gravity_generator)
+"job" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -58707,49 +54829,2030 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
+"jqv" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken7"
+	},
+/area/maintenance/bar)
+"jrE" = (
+/obj/structure/sign/poster/official/random{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"jsy" = (
+/obj/structure/closet{
+	name = "Suit Closet"
+	},
+/obj/item/clothing/under/suit_jacket/white,
+/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit_jacket/green,
+/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit_jacket/checkered,
+/obj/item/clothing/under/suit_jacket/charcoal,
+/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit_jacket,
+/obj/item/clothing/under/lawyer/black,
+/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/lawyer/blue,
+/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/lawyer/female,
+/obj/item/clothing/under/lawyer/purpsuit,
+/obj/item/clothing/under/lawyer/really_black,
+/obj/item/clothing/under/lawyer/red,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"jtk" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"jtU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/security/execution/transfer)
+"jvN" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"jwi" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
+"jzi" = (
+/obj/structure/grille,
+/obj/structure/lattice,
+/turf/open/floor/plating,
+/area/space/nearstation)
+"jzD" = (
+/obj/structure/piano{
+	icon_state = "piano"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"jAD" = (
+/obj/structure/grille,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"jBZ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"jCq" = (
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"jDY" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"jFy" = (
+/obj/machinery/door/airlock{
+	desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
+	id_tag = "PrivateStudy";
+	name = "Private Study"
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/wood,
+/area/library)
+"jHt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"jHM" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/prison)
+"jJF" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"jLM" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore)
+"jMK" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"jNo" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
+"jRy" = (
+/obj/machinery/door/airlock{
+	name = "Instrument Storage"
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
+"jSa" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/security/prison)
+"jSD" = (
+/obj/machinery/door/airlock/security{
+	name = "Firing Range";
+	req_access_txt = "2"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"jSO" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"jVl" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"jXg" = (
+/obj/machinery/power/apc{
+	areastring = "/area/ai_monitored/nuke_storage";
+	dir = 1;
+	name = "Vault APC";
+	pixel_y = 25
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/circuit,
+/area/ai_monitored/nuke_storage)
+"jYI" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"kay" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
+	pixel_y = 5
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"kcj" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"kdm" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"kel" = (
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"kfE" = (
+/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/structure/table,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"khb" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/obj/structure/table,
+/obj/item/kitchen/rollingpin,
+/obj/item/shovel/spade,
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"khA" = (
+/obj/structure/table,
+/obj/item/instrument/guitar{
+	pixel_x = -7
+	},
+/obj/item/instrument/eguitar{
+	pixel_x = 5
+	},
+/obj/item/instrument/violin,
+/obj/item/instrument/trombone,
+/obj/item/instrument/saxophone,
+/obj/item/instrument/piano_synth,
+/obj/item/instrument/recorder,
+/obj/item/instrument/accordion,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"khB" = (
+/obj/machinery/door/airlock/external{
+	req_access_txt = "13"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"klu" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"knx" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Central Access"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "bridge blast";
+	name = "bridge blast door"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"kob" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"ksn" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/window,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"kuY" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "maint2"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"kvb" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 1
+	},
+/turf/closed/wall/mineral/titanium,
+/area/space/nearstation)
+"kvZ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"kwy" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/requests_console{
+	department = "Bar";
+	departmentType = 2;
+	pixel_x = -30;
+	pixel_y = 45;
+	receive_ore_updates = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"kxc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"kyi" = (
+/obj/structure/bed,
+/obj/machinery/button/door{
+	id = "Dorm5";
+	name = "Cabin Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_y = -25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/effect/spawner/lootdrop/bedsheet,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
+"kyF" = (
+/obj/effect/landmark/xeno_spawn,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"kzT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall/r_wall,
+/area/science/mixing)
+"kCk" = (
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = 25
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"kCW" = (
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"kDD" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/nuke_storage)
+"kHJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"kHK" = (
+/obj/machinery/button/door{
+	desc = "Bolts the doors to the Private Study.";
+	id = "PrivateStudy";
+	name = "Private Study Lock";
+	pixel_x = 25;
+	pixel_y = 25;
+	req_access_txt = "";
+	req_one_access_txt = "28;63"
+	},
+/turf/open/floor/wood,
+/area/library)
+"kJr" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"kJY" = (
+/obj/item/flashlight/lamp/green{
+	pixel_x = -3;
+	pixel_y = 22
+	},
+/obj/structure/dresser{
+	desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+	name = "Dresser";
+	pixel_y = 7
+	},
+/turf/open/floor/plating,
+/area/maintenance/port)
+"kKw" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/space,
+/area/solar/port/aft)
+"kLR" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	desc = "Privacy shutters for the Private Study. Stops people spying in on your game.";
+	id = "PrivateStudy1";
+	name = "Private Study Privacy Shutters"
+	},
+/obj/effect/spawner/structure/window,
+/turf/open/floor/wood,
+/area/library)
+"kOf" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4;
+	light_color = "#d8b1b1"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"kPd" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"kQk" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 2;
+	name = "2maintenance loot spawner"
+	},
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+"kQZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"kRk" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#e8eaff"
+	},
+/obj/structure/chair/sofa/right{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"kSb" = (
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
+"kSh" = (
+/obj/item/radio/intercom{
+	name = "Station Intercom (General)";
+	pixel_y = -29
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"kSB" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"kTz" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
+"kWI" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/locker)
+"lhg" = (
+/obj/machinery/vending/clothing,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"lmi" = (
+/obj/structure/door_assembly/door_assembly_mai,
+/obj/item/electronics/airlock,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"lnu" = (
+/obj/structure/chair/wood/normal{
+	dir = 4
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/maintenance/bar)
+"lwj" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+	pixel_x = 5;
+	pixel_y = 7
+	},
+/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"lwp" = (
+/obj/structure/chair/stool{
+	pixel_y = 8
+	},
+/turf/open/floor/carpet{
+	icon_state = "carpetsymbol"
+	},
+/area/crew_quarters/theatre)
+"lwY" = (
+/obj/machinery/door/window/westleft{
+	base_state = "right";
+	icon_state = "right";
+	name = "Unisex Showers"
+	},
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"lxx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/closed/wall,
+/area/crew_quarters/bar)
+"lAB" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall,
+/area/science/circuit)
+"lBE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"lCi" = (
+/obj/docking_port/stationary/public_mining_dock{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
+"lCB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
+"lCL" = (
+/turf/open/space/basic,
+/area/space/nearstation)
+"lFl" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"lLt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
+"lLI" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"lMg" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"lMx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"lMY" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/effect/spawner/structure/window,
+/turf/open/floor/grass,
+/area/crew_quarters/bar)
+"lNB" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
+"lQG" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/science/circuit)
+"lTq" = (
+/obj/structure/table,
+/obj/item/folder/blue,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"lYU" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/sign/departments/security{
+	pixel_x = -32;
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"lYZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/disposalpipe/junction,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"maC" = (
+/obj/structure/table,
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/food/snacks/cherrycupcake,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"mbD" = (
+/obj/structure/closet{
+	name = "Suit Closet"
+	},
+/obj/item/clothing/under/suit_jacket/white,
+/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit_jacket/green,
+/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit_jacket/checkered,
+/obj/item/clothing/under/suit_jacket/charcoal,
+/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit_jacket,
+/obj/item/clothing/under/lawyer/black,
+/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/lawyer/blue,
+/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/lawyer/female,
+/obj/item/clothing/under/lawyer/purpsuit,
+/obj/item/clothing/under/lawyer/really_black,
+/obj/item/clothing/under/lawyer/red,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"mfb" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"mjr" = (
+/obj/structure/reagent_dispensers/keg/milk,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"mlr" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/light_construct{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"moq" = (
+/obj/structure/chair/comfy/brown{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"mpI" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/maintenance/bar)
+"mqa" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"mqZ" = (
+/obj/structure/reagent_dispensers/keg/aphro/strong,
+/obj/item/reagent_containers/glass/beaker,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"mrR" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"mte" = (
+/obj/structure/extinguisher_cabinet,
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"mwb" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/space/nearstation)
+"mwO" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"myt" = (
+/obj/structure/closet/secure_closet/personal/cabinet{
+	desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+	name = "Personal ID-Locked Closet";
+	pixel_y = 15
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"mCq" = (
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"mEN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/toilet)
+"mHC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"mIS" = (
+/obj/structure/table,
+/obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/green,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing/blue,
+/obj/item/clothing/gloves/boxing,
+/obj/item/clothing/gloves/boxing,
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"mNi" = (
+/obj/machinery/light_switch{
+	pixel_x = -20
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"mPE" = (
+/obj/machinery/chem_dispenser/drinks,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"mQR" = (
+/obj/machinery/camera{
+	c_tag = "Gravity Generator Room";
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#c1caff"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"mRe" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"mTp" = (
+/obj/structure/chair/sofa/left,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"mXB" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"ncj" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/sign/poster/contraband/fun_police{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"ndC" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"nea" = (
+/obj/machinery/recharge_station,
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"neb" = (
+/obj/item/radio/intercom{
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"nel" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"new" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/security/prison)
+"neC" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"nfm" = (
+/obj/machinery/vending/autodrobe,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"nie" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Holodeck Door"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"nlt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"nmx" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"nmS" = (
+/obj/structure/closet/athletic_mixed,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"nrR" = (
+/obj/machinery/door/airlock{
+	name = "Unisex Restrooms"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"nsJ" = (
+/obj/machinery/door/airlock{
+	desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
+	id_tag = "PrivateStudy";
+	name = "Private Study"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/library)
+"ntf" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"nuV" = (
+/obj/structure/chair/stool{
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"nxv" = (
+/obj/machinery/power/apc{
+	areastring = "/area/construction";
+	name = "Construction Area APC";
+	pixel_y = -24
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/construction)
+"nyH" = (
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"nGt" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"nGS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	alpha = 255;
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"nIE" = (
+/obj/structure/sign/poster/contraband/tools,
+/turf/closed/wall,
+/area/storage/primary)
+"nLf" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/bridge/meeting_room)
+"nMx" = (
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/vault,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"nOS" = (
+/obj/structure/safe,
+/obj/item/clothing/head/bearpelt,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
+/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/item/gun/ballistic/revolver/nagant,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"nQr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/maintenance/port)
+"nRG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"nTE" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"nWq" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Gravity Generator";
+	req_access_txt = "11"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"nXa" = (
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"oce" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/science/mixing)
+"odx" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"oeJ" = (
+/obj/structure/table/wood,
+/obj/item/instrument/violin,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"oeQ" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"ohX" = (
+/obj/structure/table/wood,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/wood,
+/area/security/vacantoffice)
+"olr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"olv" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"olw" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 4;
+	name = "4maintenance loot spawner"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"oma" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"orw" = (
+/obj/structure/table,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/machinery/recharger,
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"ory" = (
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/green,
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"otF" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 5;
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"ouD" = (
+/obj/structure/reagent_dispensers/keg/semen,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"oBp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"oDy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-04"
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"oFk" = (
+/obj/structure/closet/boxinggloves,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"oHU" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"oKh" = (
+/obj/structure/chair/wood/normal{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"oMY" = (
+/obj/machinery/button/door{
+	desc = "Alright, GAMER! Want to take your PWRGAME addiction to the MAX? Just smash this button with your chubby chetto encrusted hands an- oh, you broke the switch. Good job, idiot.";
+	id = "RIPFUN";
+	name = "Powerful Gamer Toggle";
+	normaldoorcontrol = 1;
+	pixel_x = -24;
+	pixel_y = 7;
+	specialfunctions = 4
+	},
+/obj/structure/table_frame/wood,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"oNb" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"oNQ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#c1caff"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"oOb" = (
+/obj/structure/sign/poster/official/cohiba_robusto_ad,
+/turf/closed/wall,
+/area/lawoffice)
+"oSO" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/chair/sofa,
+/obj/item/radio/intercom{
+	pixel_y = 25
+	},
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"oUh" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal/bin,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"oXL" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"oYc" = (
+/obj/machinery/light/small{
+	dir = 4;
+	light_color = "#d8b1b1"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"phu" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4;
+	pixel_y = 5
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"phH" = (
+/turf/open/floor/grass,
+/area/security/prison)
+"phY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"pjh" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light_switch{
+	pixel_y = -25
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"poa" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"poc" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/science/mixing)
+"ppY" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/love_ian{
+	pixel_x = 32;
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"pqR" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"prP" = (
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
+"prU" = (
+/obj/item/radio/intercom{
+	dir = 4;
+	name = "Station Intercom (General)";
+	pixel_x = 27
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"ptV" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"puG" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/clothing/under/color/grey,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"pxD" = (
+/obj/structure/chair/sofa,
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"pzk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/obj/structure/table,
+/obj/item/coin/gold,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"pAl" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"pFt" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/space,
+/area/solar/starboard/aft)
+"pHl" = (
+/obj/structure/table,
+/obj/item/storage/box/beakers{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/storage/box/syringes,
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+	pixel_x = 7;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/glass/bottle/morphine{
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/syringe{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/item/radio/intercom{
+	frequency = 1485;
+	name = "Station Intercom (Medbay)";
+	pixel_x = 30
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/sleeper)
+"pHo" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"pLn" = (
+/obj/machinery/conveyor/inverted{
+	dir = 5;
+	id = "garbage"
+	},
+/turf/open/floor/plating,
+/area/maintenance/disposal)
+"pLt" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/security/main";
+	dir = 4;
+	name = "Firing Range APC";
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"pNH" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/door/window,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"pNI" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/poster/official/pda_ad{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"pPE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/machinery/door/window/eastleft{
+	name = "Blue Corner"
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"pQr" = (
+/obj/structure/table,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/item/clothing/glasses/sunglasses{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/clothing/glasses/sunglasses{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/clothing/ears/earmuffs{
+	pixel_x = -3;
+	pixel_y = -2
+	},
+/obj/item/clothing/ears/earmuffs{
+	pixel_x = -3;
+	pixel_y = -2
+	},
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"pQD" = (
+/obj/structure/sign/poster/official/ion_rifle,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
+"pSf" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"pTn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/terminal,
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"pTR" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/radio/intercom{
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"pUl" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/command{
+	name = "Command Access To Vault"
+	},
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
+"pZv" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"qbx" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"qeQ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"qje" = (
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"qkC" = (
+/obj/machinery/power/apc{
+	areastring = "/area/maintenance/starboard/fore";
+	dir = 1;
+	name = "Starboard Bow Maintenance APC";
+	pixel_y = 24
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"qlr" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/window{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/locker)
+"qlF" = (
+/obj/structure/lattice,
+/turf/closed/wall,
+/area/security/prison)
+"qmM" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"qoP" = (
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/obj/structure/chair/sofa/left,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"qpA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/cohiba_robusto_ad{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"qux" = (
+/obj/structure/chair/sofa/left{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"quT" = (
+/obj/structure/lattice,
+/obj/structure/grille/broken,
+/turf/open/space/basic,
+/area/space/nearstation)
+"qvM" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/circuit,
+/area/ai_monitored/nuke_storage)
+"qwe" = (
+/turf/open/floor/plasteel/white/side{
+	dir = 4
+	},
+/area/crew_quarters/theatre)
+"qwB" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Gravity Generator";
+	req_access_txt = "11"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/gravity_generator)
+"qxc" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/computer/slot_machine,
+/obj/item/coin/iron,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"qAQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"qBc" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"qBe" = (
+/obj/structure/chair/comfy/black{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/bridge/meeting_room)
+"qEv" = (
+/obj/structure/table/wood/fancy,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/item/reagent_containers/food/drinks/britcup{
+	desc = "Kingston's personal cup.";
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"qHB" = (
+/obj/structure/chair/stool{
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/carpet{
+	icon_state = "carpetsymbol"
+	},
+/area/crew_quarters/theatre)
+"qIf" = (
+/obj/machinery/door/airlock{
+	name = "Unisex Restrooms"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/bar)
+"qIw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"qJZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"qMu" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"qNs" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	on = 0;
+	pixel_x = -7;
+	pixel_y = 12
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"qOf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"qQJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 4
+	},
+/area/crew_quarters/theatre)
+"qUm" = (
+/obj/structure/filingcabinet/employment,
+/turf/open/floor/wood,
+/area/crew_quarters/heads/captain)
+"qXH" = (
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"rcD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/science/circuit)
+"reZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall/r_wall,
+/area/engine/engine_smes)
+"rfW" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/maintenance/disposal/incinerator)
+"rgF" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/silver,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"rhb" = (
+/obj/machinery/vending/cola/space_up,
+/turf/open/floor/plasteel/dark,
+/area/hallway/primary/central)
+"riA" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Firing Range";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"riB" = (
+/obj/machinery/door/firedoor,
+/obj/structure/sign/departments/evac{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"rmX" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"rsv" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/space,
+/area/solar/starboard/fore)
+"rsX" = (
+/obj/effect/turf_decal/tile/red,
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"rtT" = (
+/obj/structure/chair/comfy/brown{
+	color = "#66b266";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"rvZ" = (
+/obj/structure/target_stake,
+/obj/item/target/syndicate,
+/turf/open/floor/plating,
+/area/security/prison)
+"rxH" = (
+/obj/structure/girder,
+/turf/open/floor/plating,
+/area/space/nearstation)
+"rzg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
 "rBq" = (
 /obj/item/clothing/head/kitty,
 /obj/item/clothing/under/maid,
 /obj/item/clothing/mask/muzzle,
 /turf/open/floor/plating,
 /area/maintenance/bar)
-"rEQ" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"rJv" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/sign/poster/official/space_cops{
-	pixel_x = -32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"rKP" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
+"rEV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
 	},
 /turf/open/floor/plating,
-/area/construction)
-"rKZ" = (
-/obj/structure/chair/comfy/brown{
-	dir = 8
+/area/crew_quarters/fitness)
+"rFc" = (
+/obj/machinery/door/airlock{
+	desc = "To keep the station within regulations, space IKEA requires one storage cupboard for their Nanotrasen partnership to continue.";
+	id_tag = "MaintDorm1";
+	name = "Furniture Storage"
 	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"rLg" = (
-/turf/closed/wall/r_wall,
-/area/hallway/primary/central)
-"rMI" = (
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port)
+"rKc" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /turf/open/space,
 /area/solar/port/fore)
+"rKP" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/construction)
+"rLr" = (
+/obj/structure/window,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"rLR" = (
+/obj/structure/sign/poster/contraband/space_up{
+	pixel_x = -32;
+	pixel_y = 32
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"rMc" = (
+/obj/structure/table/wood/fancy/black,
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
 "rMN" = (
 /obj/structure/bed,
 /obj/item/tank/internals/anesthetic,
@@ -58772,29 +56875,38 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
-"rTD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
+"rOm" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 23
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"rTQ" = (
+/obj/machinery/vr_sleeper{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"rXv" = (
-/obj/machinery/hydroponics/constructable,
-/obj/machinery/light{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/hydroponics)
+/turf/open/floor/plasteel/white/side{
+	dir = 8
+	},
+/area/crew_quarters/fitness)
+"rUQ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
 "saK" = (
 /obj/structure/closet/crate,
 /obj/item/target/alien,
@@ -58807,43 +56919,60 @@
 /obj/item/gun/energy/laser/practice,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"sbs" = (
-/turf/open/floor/plating,
-/area/space/nearstation)
-"sfO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/closet/wardrobe/pjs,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/accessory/maidapron,
-/obj/item/clothing/accessory/maidapron,
-/obj/machinery/light{
+"sdL" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
+"sfa" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"sgV" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 4;
+	name = "Air In"
+	},
+/obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
+/area/maintenance/fore/secondary)
+"sjm" = (
+/obj/structure/table/wood,
+/obj/item/instrument/piano_synth,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"sjw" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/obj/structure/closet/wardrobe/black,
+/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/head/beret/black,
+/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/sundress,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
-"sfY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+"sjT" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"shX" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"siG" = (
-/obj/machinery/vending/clothing,
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel,
-/area/crew_quarters/locker)
+/area/security/prison)
 "slk" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12"
@@ -58856,33 +56985,86 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
-"sno" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"slp" = (
+/obj/effect/turf_decal/tile/blue{
+	alpha = 255
+	},
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/structure/sign/poster/official/cohiba_robusto_ad{
-	pixel_y = -32
+/obj/effect/turf_decal/tile/blue{
+	alpha = 255;
+	dir = 1
 	},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"srw" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"svt" = (
-/obj/structure/target_stake,
-/obj/item/target/syndicate,
-/turf/open/floor/plating,
-/area/security/prison)
-"sxe" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"smn" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"snG" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/space,
+/area/solar/port/aft)
+"spX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"sqa" = (
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "applebush"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
+"srq" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/bridge/meeting_room)
+"ssL" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/space,
+/area/solar/starboard/fore)
+"suI" = (
+/obj/machinery/door/window/southleft{
+	name = "Target Storage"
+	},
+/obj/item/target/clown,
+/obj/item/target/clown,
+/obj/item/target,
+/obj/item/target,
+/turf/open/floor/plating,
+/area/security/prison)
+"svw" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
 "sxs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/table,
@@ -58896,61 +57078,52 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/service)
-"szF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 10
+"sxX" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"szH" = (
-/obj/machinery/shower{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
 	},
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
+/area/maintenance/starboard/fore)
+"sAI" = (
+/obj/structure/table/wood/fancy,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = -3;
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	dir = 1;
+	pixel_x = 3;
+	pixel_y = 9
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
 "sAM" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken6"
 	},
 /area/maintenance/bar)
-"sBu" = (
-/obj/machinery/vr_sleeper{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 4
-	},
-/area/crew_quarters/fitness)
-"sCo" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/space,
-/area/solar/starboard/fore)
 "sEt" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
 /area/maintenance/bar)
-"sEJ" = (
-/obj/structure/cable{
-	icon_state = "0-8"
+"sIe" = (
+/obj/structure/sign/poster/official/fruit_bowl{
+	pixel_y = 32
 	},
-/obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/abandoned_gambling_den";
-	name = "Abandoned Gambling Den APC";
-	pixel_y = -24
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
 	},
+/area/hallway/primary/starboard)
+"sLr" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/silver,
 /turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
+/area/maintenance/starboard/fore)
 "sLv" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -58959,6 +57132,17 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"sMa" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/vending/kink,
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
 "sOs" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -58966,29 +57150,6 @@
 /obj/machinery/door/airlock/maintenance/abandoned,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"sOO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"sPj" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"sPA" = (
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
 "sQX" = (
 /turf/open/floor/plating,
 /area/space)
@@ -59000,38 +57161,6 @@
 /obj/structure/chair/office/light,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"sTt" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"sVN" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"sWr" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
 "sWR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -59041,16 +57170,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/office)
-"sXo" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Holodeck Door"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
 "sXy" = (
 /obj/machinery/door/airlock/external{
 	name = "Security External Airlock";
@@ -59065,58 +57184,59 @@
 /obj/machinery/vending/boozeomat/all_access,
 /turf/closed/wall,
 /area/maintenance/bar)
+"sYv" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"sZa" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/machinery/camera{
+	c_tag = "Bar Backroom";
+	dir = 2
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"sZR" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
 "tal" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
 /area/hallway/secondary/service)
-"taU" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/window,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"tcE" = (
-/obj/structure/door_assembly/door_assembly_mai,
-/obj/item/electronics/airlock,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"thl" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/sleeper)
-"thY" = (
+"tdF" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
-/area/maintenance/fore/secondary)
-"tku" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/open/floor/carpet,
-/area/crew_quarters/theatre)
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"thr" = (
+/obj/structure/frame/computer{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
 "tkU" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
 /area/maintenance/bar)
-"tpb" = (
-/turf/open/floor/plating/foam,
-/area/space/nearstation)
 "tqg" = (
 /obj/machinery/cryopod{
 	dir = 4
@@ -59126,808 +57246,20 @@
 	},
 /turf/open/floor/carpet,
 /area/crew_quarters/cryopod)
+"tqt" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/chair/comfy/brown{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/library)
 "trb" = (
 /obj/machinery/light{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/security/courtroom)
-"trk" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"trl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4;
-	pixel_y = 5
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"trM" = (
-/obj/structure/table,
-/obj/item/instrument/guitar{
-	pixel_x = -7
-	},
-/obj/item/instrument/eguitar{
-	pixel_x = 5
-	},
-/obj/item/instrument/violin,
-/obj/item/instrument/trombone,
-/obj/item/instrument/saxophone,
-/obj/item/instrument/piano_synth,
-/obj/item/instrument/recorder,
-/obj/item/instrument/accordion,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"tsY" = (
-/obj/structure/urinal{
-	pixel_y = 32
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/toilet)
-"ttp" = (
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/obj/structure/sink{
-	dir = 1;
-	pixel_y = 25
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"ttF" = (
-/obj/machinery/vr_sleeper{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 1
-	},
-/area/crew_quarters/fitness)
-"tur" = (
-/obj/item/restraints/handcuffs/fake,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"tyg" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"tDE" = (
-/obj/structure/grille,
-/obj/structure/lattice,
-/turf/open/floor/plating,
-/area/space/nearstation)
-"tEy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"tMl" = (
-/obj/effect/turf_decal/loading_area,
-/turf/open/floor/plasteel/showroomfloor,
-/area/crew_quarters/kitchen)
-"tOq" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/science/mixing)
-"tPS" = (
-/obj/structure/chair/stool{
-	pixel_y = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/carpet{
-	icon_state = "carpetsymbol"
-	},
-/area/crew_quarters/theatre)
-"tPT" = (
-/obj/machinery/chem_dispenser/drinks/beer,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"tQu" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/chair/comfy/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"tRe" = (
-/obj/machinery/chem_master,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"tRF" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"tTh" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"tTt" = (
-/obj/structure/sign/departments/restroom,
-/turf/closed/wall,
-/area/crew_quarters/toilet)
-"tVp" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"tVQ" = (
-/obj/structure/table,
-/obj/item/folder/blue,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"tXL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
-"tYn" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/security/prison)
-"uao" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"uaw" = (
-/obj/machinery/power/apc{
-	areastring = "/area/storage/art";
-	dir = 1;
-	name = "Maint bar";
-	pixel_y = 24
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"udn" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
-/obj/machinery/light{
-	dir = 4;
-	light_color = "#e8eaff"
-	},
-/obj/structure/chair/sofa/right{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"udp" = (
-/obj/item/crowbar/large,
-/obj/structure/rack,
-/obj/item/flashlight,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"udS" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/machinery/airalarm{
-	dir = 4;
-	pixel_x = -22
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"ueP" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/airalarm{
-	dir = 8;
-	pixel_x = 24
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"uhG" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"uhH" = (
-/obj/item/wrench,
-/obj/structure/rack,
-/obj/item/weldingtool/hugetank,
-/obj/item/clothing/head/welding{
-	pixel_x = -3;
-	pixel_y = 5
-	},
-/obj/item/clothing/head/welding{
-	pixel_x = -3;
-	pixel_y = 5
-	},
-/obj/item/clothing/glasses/welding,
-/obj/item/clothing/glasses/welding,
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
-"uip" = (
-/obj/machinery/vending/clothing,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"uiR" = (
-/obj/structure/lattice,
-/turf/closed/wall,
-/area/security/prison)
-"uiT" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 4;
-	name = "4maintenance loot spawner"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"ujF" = (
-/obj/machinery/cryopod{
-	dir = 4
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"ukL" = (
-/obj/structure/closet/boxinggloves,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"ulP" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"unN" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/window{
-	dir = 1
-	},
-/obj/structure/window{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"uoB" = (
-/obj/structure/table/reinforced,
-/obj/item/multitool,
-/obj/item/screwdriver,
-/obj/machinery/camera{
-	c_tag = "Circuitry Lab North";
-	network = list("ss13","rd")
-	},
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"uqO" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/sign/poster/contraband/fun_police{
-	pixel_x = 32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"urH" = (
-/obj/machinery/door/airlock{
-	name = "Unisex Restrooms"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"usD" = (
-/turf/open/floor/plasteel/white/side{
-	dir = 4
-	},
-/area/crew_quarters/theatre)
-"usO" = (
-/obj/machinery/vending/snack/random,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"uuG" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"uuT" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"uvZ" = (
-/obj/structure/mineral_door/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"uBW" = (
-/turf/closed/wall,
-/area/crew_quarters/abandoned_gambling_den)
-"uFF" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/space/nearstation)
-"uGq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/engine/engine_smes)
-"uJq" = (
-/obj/machinery/vr_sleeper{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 4
-	},
-/area/crew_quarters/fitness)
-"uJI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"uNs" = (
-/obj/item/flashlight/lamp/green{
-	pixel_x = -3;
-	pixel_y = 22
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4;
-	pixel_y = 5
-	},
-/obj/structure/dresser{
-	desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
-	name = "Dresser";
-	pixel_y = 7
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"uNu" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"uOb" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/item/radio/intercom{
-	pixel_y = 25
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"uOn" = (
-/obj/structure/chair/office/light,
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/engine/gravity_generator)
-"uPT" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
-"uTQ" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 4;
-	name = "4maintenance loot spawner"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"uUC" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/space,
-/area/solar/port/aft)
-"uVo" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
-	on = 0;
-	pixel_x = -7;
-	pixel_y = 12
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"uVS" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"uWs" = (
-/obj/effect/turf_decal/tile/red,
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/fore)
-"uXD" = (
-/obj/structure/grille,
-/turf/open/space/basic,
-/area/space/nearstation)
-"vbc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/turf/closed/wall/r_wall,
-/area/engine/gravity_generator)
-"vbD" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command/glass{
-	name = "EVA Storage";
-	req_access_txt = "18"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ai_monitored/storage/eva)
-"vbP" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/machinery/light/small,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 5;
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 1
-	},
-/area/crew_quarters/fitness)
-"vfe" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/hallway/primary/central)
-"vgX" = (
-/obj/item/radio/intercom{
-	dir = 4;
-	name = "Station Intercom (General)";
-	pixel_x = 27
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"vhc" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/washing_machine,
-/turf/open/floor/plasteel/freezer,
-/area/security/prison)
-"viT" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/space/nearstation)
-"vjm" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/rag,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"vnw" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 8;
-	name = "8maintenance loot spawner"
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"voH" = (
-/obj/structure/closet/wardrobe/cargotech,
-/obj/item/radio/headset/headset_cargo,
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
-"vpY" = (
-/obj/structure/closet/lasertag/blue,
-/obj/item/clothing/under/pj/blue,
-/obj/item/clothing/under/pj/blue,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"vqa" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/sign/departments/custodian{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"vsM" = (
-/obj/machinery/power/apc/auto_name/south,
-/obj/structure/cable,
-/turf/open/floor/carpet,
-/area/crew_quarters/cryopod)
-"vtO" = (
-/obj/structure/sign/poster/official/twelve_gauge,
-/turf/closed/wall/r_wall,
-/area/ai_monitored/security/armory)
-"vxh" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 8;
-	name = "8maintenance loot spawner"
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"vzp" = (
-/obj/structure/table/reinforced,
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/item/stock_parts/cell/high,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"vzO" = (
-/obj/structure/chair/wood/normal{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"vAP" = (
-/obj/structure/table/wood,
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/turf/open/floor/wood,
-/area/security/vacantoffice)
-"vAZ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics)
-"vBb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"vBN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"vCb" = (
-/obj/machinery/rnd/production/techfab/department/service,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"vCt" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"vEA" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -3;
-	pixel_y = 20
-	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	dir = 1;
-	pixel_x = 3;
-	pixel_y = 20
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/reagent_containers/food/drinks/britcup,
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"vGp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
-/obj/machinery/power/apc{
-	areastring = "/area/quartermaster/storage";
-	name = "Cargo Bay APC";
-	pixel_x = 1;
-	pixel_y = -24
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/maintenance/port)
-"vHj" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Cryogenics "
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
-/area/crew_quarters/cryopod)
-"vHY" = (
-/turf/open/floor/plating,
-/area/science/mixing)
-"vKR" = (
-/obj/machinery/computer/arcade/minesweeper{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
-"vMd" = (
-/obj/structure/chair/comfy/black{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/dorms)
-"vOw" = (
-/obj/structure/table/wood,
-/obj/item/instrument/guitar,
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"vPl" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/space/nearstation)
-"vPE" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"vQS" = (
-/obj/structure/sign/poster/contraband/smoke{
-	desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. ";
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"vXW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
-	},
-/obj/structure/table,
-/obj/item/coin/gold,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
-"wab" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/theatre)
-"wbB" = (
+"tru" = (
 /obj/machinery/airalarm{
 	dir = 4;
 	pixel_x = -22
@@ -59949,7 +57281,149 @@
 /obj/item/megaphone/clown,
 /turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
-"wcX" = (
+"trY" = (
+/obj/structure/sign/poster/contraband/lizard{
+	pixel_x = -32
+	},
+/obj/structure/sign/poster/contraband/lizard{
+	pixel_x = -32
+	},
+/obj/structure/sign/poster/contraband/lizard{
+	pixel_x = -32
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"tsr" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"tuj" = (
+/obj/structure/light_construct{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"tur" = (
+/obj/item/restraints/handcuffs/fake,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"tuN" = (
+/obj/structure/chair/sofa,
+/obj/structure/window{
+	dir = 1
+	},
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"tAb" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/command{
+	name = "Captain's Vault Access";
+	req_access_txt = "20"
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
+"tAE" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = -3;
+	pixel_y = 20
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	dir = 1;
+	pixel_x = 3;
+	pixel_y = 20
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/reagent_containers/food/drinks/britcup,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"tAV" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"tCi" = (
+/obj/machinery/vr_sleeper{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 4
+	},
+/area/crew_quarters/fitness)
+"tFt" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"tGG" = (
+/obj/structure/table/wood,
+/obj/item/book/codex_gigas,
+/obj/item/clothing/under/suit_jacket/red,
+/obj/structure/destructible/cult/tome,
+/turf/open/floor/carpet,
+/area/library)
+"tHx" = (
+/obj/machinery/computer/arcade/minesweeper{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"tIk" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "maintdiy";
+	name = "Security Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"tIC" = (
+/obj/structure/table/wood,
+/obj/item/instrument/guitar{
+	pixel_x = -7
+	},
+/obj/item/instrument/eguitar{
+	pixel_x = 5
+	},
+/obj/item/instrument/violin,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"tLl" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"tMl" = (
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/plasteel/showroomfloor,
+/area/crew_quarters/kitchen)
+"tMS" = (
 /obj/structure/table,
 /obj/item/paper_bin{
 	pixel_y = 6
@@ -59957,26 +57431,698 @@
 /obj/item/pen/fountain,
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/central)
-"wdQ" = (
-/obj/structure/fireplace,
+"tNJ" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"tOd" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"tOq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/mixing)
+"tOU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/light/small,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"tPT" = (
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"tQk" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"tRe" = (
+/obj/machinery/chem_master,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"tRF" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"tTW" = (
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"tUm" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"tUw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"tWs" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"tWR" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"tXL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
+"uaw" = (
+/obj/machinery/power/apc{
+	areastring = "/area/storage/art";
+	dir = 1;
+	name = "Maint bar";
+	pixel_y = 24
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"udi" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
 /obj/machinery/airalarm{
-	dir = 8;
-	pixel_x = 23
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"ued" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"uhm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/quartermaster/warehouse";
+	dir = 4;
+	name = "Cargo Warehouse APC";
+	pixel_x = 26
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
 /turf/open/floor/plating,
 /area/maintenance/port)
+"ujF" = (
+/obj/machinery/cryopod{
+	dir = 4
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"uko" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/security/brig)
+"ukP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"ukS" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/item/soap,
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/dorms)
+"unl" = (
+/obj/item/flashlight/lamp/green{
+	pixel_x = -3;
+	pixel_y = 22
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4;
+	pixel_y = 5
+	},
+/obj/structure/dresser{
+	desc = "There's plenty of clothes here to change into! It has a surprising amount of variety, too.";
+	name = "Dresser";
+	pixel_y = 7
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"unu" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/washing_machine,
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"unE" = (
+/obj/structure/fans/tiny/invisible,
+/turf/open/space/basic,
+/area/space)
+"unY" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/sign/departments/custodian{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"uoB" = (
+/obj/structure/table/reinforced,
+/obj/item/multitool,
+/obj/item/screwdriver,
+/obj/machinery/camera{
+	c_tag = "Circuitry Lab North";
+	network = list("ss13","rd")
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"upX" = (
+/obj/structure/chair/stool{
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/carpet{
+	icon_state = "carpetsymbol"
+	},
+/area/crew_quarters/theatre)
+"usO" = (
+/obj/machinery/vending/snack/random,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"uuG" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"uvZ" = (
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"uya" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/departments/restroom{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"uzk" = (
+/obj/structure/sign/departments/restroom,
+/turf/closed/wall,
+/area/crew_quarters/toilet)
+"uDW" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"uNu" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
+/area/science/circuit)
+"uPT" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
+"uTq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"uVq" = (
+/obj/machinery/light{
+	dir = 1;
+	light_color = "#d1dfff"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"uVt" = (
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"uVS" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"uYE" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"uZM" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/space_cops{
+	pixel_x = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/fore)
+"vbD" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command/glass{
+	name = "EVA Storage";
+	req_access_txt = "18"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ai_monitored/storage/eva)
+"vbY" = (
+/obj/machinery/vr_sleeper{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 4
+	},
+/area/crew_quarters/fitness)
+"vdz" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/turf/open/floor/plasteel/freezer,
+/area/security/prison)
+"vdH" = (
+/obj/structure/bed,
+/turf/open/floor/plating,
+/area/maintenance/port)
+"vgp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
+"vjm" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/rag,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"vjq" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
+"vpm" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/fitness)
+"vpz" = (
+/obj/structure/sign/poster/official/twelve_gauge,
+/turf/closed/wall/r_wall,
+/area/ai_monitored/security/armory)
+"vpY" = (
+/obj/structure/closet/lasertag/blue,
+/obj/item/clothing/under/pj/blue,
+/obj/item/clothing/under/pj/blue,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"vrM" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-18"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"vsM" = (
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable,
+/turf/open/floor/carpet,
+/area/crew_quarters/cryopod)
+"vxh" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 8;
+	name = "8maintenance loot spawner"
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"vys" = (
+/obj/machinery/vr_sleeper{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 4
+	},
+/area/crew_quarters/fitness)
+"vzp" = (
+/obj/structure/table/reinforced,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/item/stock_parts/cell/high,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"vzO" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"vzS" = (
+/obj/structure/table,
+/obj/item/book/manual/hydroponics_pod_people{
+	pixel_x = -4;
+	pixel_y = 5
+	},
+/obj/item/paper/guides/jobs/hydroponics{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"vCb" = (
+/obj/machinery/rnd/production/techfab/department/service,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"vCt" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"vDq" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/space/nearstation)
+"vFt" = (
+/obj/machinery/portable_atmospherics/pump,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"vGX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/closet/secure_closet/personal/cabinet{
+	desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
+	name = "Personal ID-Locked Closet";
+	pixel_y = 15
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
+"vHj" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Cryogenics "
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/crew_quarters/cryopod)
+"vHv" = (
+/obj/structure/closet{
+	name = "Costume Closet"
+	},
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/russobluecamohat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/head/russofurhat,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/under/mw2_russian_para,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"vHM" = (
+/obj/machinery/vr_sleeper{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/crew_quarters/fitness)
+"vHY" = (
+/turf/open/floor/plating,
+/area/science/mixing)
+"vLD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light,
+/obj/machinery/camera/motion{
+	c_tag = "Vault";
+	dir = 1;
+	network = list("vault")
+	},
+/turf/open/floor/plasteel/dark,
+/area/ai_monitored/nuke_storage)
+"vNh" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/theatre)
+"vOq" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"vPE" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/science/circuit)
+"vRr" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/door/window/westleft{
+	base_state = "right";
+	dir = 4;
+	icon_state = "right";
+	name = "Shooting Range"
+	},
+/turf/open/floor/plating,
+/area/security/prison)
+"vRX" = (
+/obj/machinery/power/apc{
+	areastring = "/area/security/detectives_office";
+	dir = 4;
+	name = "Detective's Office APC";
+	pixel_x = 24
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/security/detectives_office)
+"vUR" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
+/area/security/prison)
+"vVP" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc{
+	areastring = "/area/engine/gravity_generator";
+	dir = 8;
+	name = "Gravity Generator APC";
+	pixel_x = -25;
+	pixel_y = 1
+	},
+/obj/structure/table,
+/obj/item/paper/guides/jobs/engi/gravity_gen,
+/obj/item/pen/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"vWw" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"vYa" = (
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"wcy" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
 "wfR" = (
 /obj/item/electropack/shockcollar,
 /obj/item/assembly/signaler,
 /turf/open/floor/plating,
 /area/maintenance/bar)
-"wgV" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Holodeck Door"
-	},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness)
+"wgb" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/security/prison)
 "wkN" = (
 /turf/closed/wall,
 /area/science/circuit)
@@ -59986,6 +58132,15 @@
 	},
 /turf/open/floor/carpet,
 /area/crew_quarters/cryopod)
+"woX" = (
+/obj/machinery/door/window/southright{
+	name = "Target Storage"
+	},
+/obj/item/target/alien,
+/obj/item/target/alien,
+/obj/item/target/syndicate,
+/turf/open/floor/plating,
+/area/security/prison)
 "wph" = (
 /obj/docking_port/stationary{
 	area_type = /area/construction/mining/aux_base;
@@ -60000,6 +58155,17 @@
 	},
 /turf/open/floor/plating,
 /area/construction/mining/aux_base)
+"wpo" = (
+/obj/machinery/camera{
+	c_tag = "Bar West";
+	dir = 4
+	},
+/obj/machinery/computer/arcade/orion_trail,
+/obj/structure/sign/poster/official/foam_force_ad{
+	pixel_x = -32
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
 "wrp" = (
 /obj/machinery/light{
 	dir = 8
@@ -60009,90 +58175,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/service)
+"wuB" = (
+/obj/structure/chair/comfy/brown{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/library)
 "wvX" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light,
 /obj/item/stack/sheet/metal/ten,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"wBd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/turf/closed/wall,
-/area/hallway/secondary/service)
-"wCs" = (
-/obj/machinery/door/airlock{
-	name = "Theatre Backstage";
-	req_access_txt = "46"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 4
-	},
-/area/maintenance/fore)
-"wDQ" = (
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "applebush"
-	},
-/turf/open/floor/plasteel,
-/area/hallway/primary/port)
-"wHz" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/closed/wall/r_wall,
-/area/maintenance/disposal/incinerator)
-"wJq" = (
-/obj/effect/landmark/carpspawn,
-/turf/open/space/basic,
-/area/space)
-"wLe" = (
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
-"wNd" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"wSg" = (
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/obj/structure/chair/sofa/left,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"wTu" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/circuit,
-/area/ai_monitored/nuke_storage)
-"wTC" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/chair/comfy/brown{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/library)
-"wUY" = (
-/obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/service)
-"wVp" = (
-/obj/machinery/camera{
-	c_tag = "Locker Room South";
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/plasteel,
-/area/crew_quarters/locker)
-"wWo" = (
+"wwn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -60105,70 +58200,216 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
-"wWF" = (
+"wwB" = (
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"wwC" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	pixel_x = 25
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/crew_quarters/toilet)
+"wyM" = (
+/obj/machinery/door/airlock{
+	name = "Theatre Backstage";
+	req_access_txt = "46"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Gravity Generator";
-	req_access_txt = "11"
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"wAB" = (
+/obj/structure/chair/office/light,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -24
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/gravity_generator)
-"wZk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/turf/closed/wall/r_wall,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
-"wZI" = (
-/obj/effect/spawner/lootdrop/keg,
+"wBd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/closed/wall,
+/area/hallway/secondary/service)
+"wCa" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "holoprivacy";
+	name = "Holodeck Shutters"
+	},
 /turf/open/floor/plating,
-/area/maintenance/starboard/fore)
-"xah" = (
-/obj/structure/chair/comfy/brown{
-	dir = 1
+/area/crew_quarters/fitness)
+"wDR" = (
+/obj/structure/sign/poster/official/help_others{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
+"wEp" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+	id = "bridge blast";
+	name = "bridge blast door"
+	},
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"wFk" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/security/prison)
+"wFX" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Holodeck Door"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness)
+"wGP" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
+"wHz" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/closed/wall/r_wall,
+/area/maintenance/disposal/incinerator)
+"wJz" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"wLT" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/closed/wall,
+/area/maintenance/port)
+"wNM" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"wOT" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
+/area/hydroponics)
+"wUY" = (
+/obj/structure/table,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
+"wVs" = (
+/obj/structure/table/wood,
+/obj/item/instrument/trumpet,
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
+"wXP" = (
+/obj/machinery/button/door{
+	id = "maintdiy";
+	name = "Shutters Control Button";
+	pixel_x = -6;
+	pixel_y = 24
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"wZB" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"xbu" = (
+/obj/structure/chair/comfy/black{
+	dir = 8
 	},
 /turf/open/floor/wood,
-/area/library)
-"xbZ" = (
+/area/crew_quarters/bar)
+"xcg" = (
 /obj/effect/turf_decal/stripes/line{
-	dir = 1
+	dir = 9
 	},
 /turf/open/floor/plating,
-/area/security/prison)
-"xcw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
+/area/space/nearstation)
+"xdb" = (
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 8;
+	name = "8maintenance loot spawner"
+	},
+/obj/item/radio/intercom{
+	pixel_y = 25
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard/aft)
+/area/crew_quarters/abandoned_gambling_den)
+"xdV" = (
+/obj/machinery/door/airlock{
+	name = "Theatre Backstage";
+	req_access_txt = "46"
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
 "xgF" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
 /area/maintenance/bar)
-"xgY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
+"xhx" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"xgZ" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/security/brig)
+/turf/open/floor/wood,
+/area/bridge/meeting_room)
 "xhV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -60189,68 +58430,63 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/service)
-"xlX" = (
-/obj/machinery/door/firedoor,
-/turf/open/space/basic,
-/area/space)
-"xqV" = (
-/obj/structure/table/wood,
-/obj/item/instrument/piano_synth,
+"xkk" = (
+/obj/structure/piano,
+/obj/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
 /area/crew_quarters/theatre)
-"xwI" = (
-/obj/item/radio/intercom{
-	pixel_y = 25
-	},
-/obj/machinery/vending/wardrobe/curator_wardrobe,
-/turf/open/floor/carpet,
-/area/library)
-"xyp" = (
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/vault,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
+"xlN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/nuke_storage)
-"xzw" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 5;
-	pixel_y = -32
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"xpx" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/hallway/primary/central)
-"xzU" = (
-/obj/structure/reagent_dispensers/keg/semen,
+/area/crew_quarters/fitness)
+"xqW" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "Secure Gate";
+	name = "brig shutters"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plating,
-/area/maintenance/bar)
-"xCs" = (
-/obj/structure/chair/sofa,
-/obj/structure/window{
+/area/security/brig)
+"xzh" = (
+/obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"xCE" = (
-/obj/structure/table/wood/fancy/black,
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
+/turf/open/floor/plating,
+/area/space/nearstation)
+"xzy" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hydroponics)
 "xEu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 6
@@ -60262,81 +58498,46 @@
 /obj/effect/spawner/lootdrop/grille_or_trash,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"xIU" = (
-/obj/item/chair/wood,
-/turf/open/floor/plating,
-/area/maintenance/port)
-"xNd" = (
-/obj/machinery/door/airlock{
-	desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals.";
-	id_tag = "PrivateStudy";
-	name = "Private Study"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/wood,
-/area/library)
-"xPX" = (
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
-/turf/open/floor/plating,
-/area/maintenance/starboard/aft)
-"xWW" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/space,
-/area/solar/starboard/fore)
-"xXW" = (
-/obj/structure/mirror{
-	pixel_y = 32
-	},
-/obj/structure/sink{
-	dir = 1;
-	pixel_y = 25
-	},
-/obj/structure/toilet{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/crew_quarters/dorms)
-"xZr" = (
-/obj/structure/sign/poster/official/fruit_bowl{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 1
-	},
-/area/hallway/primary/starboard)
-"xZN" = (
-/obj/machinery/power/apc{
-	areastring = "/area/ai_monitored/nuke_storage";
-	dir = 1;
-	name = "Vault APC";
-	pixel_y = 25
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/circuit,
-/area/ai_monitored/nuke_storage)
-"yar" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+"xIn" = (
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/hallway/primary/central)
+/area/crew_quarters/locker)
+"xLZ" = (
+/obj/structure/closet/radiation,
+/turf/open/floor/plasteel,
+/area/engine/gravity_generator)
+"xMl" = (
+/obj/structure/chair/sofa{
+	dir = 1
+	},
+/obj/structure/window,
+/turf/open/floor/wood,
+/area/crew_quarters/bar)
+"xNY" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 1
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
+"xWM" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/space/nearstation)
+"xXY" = (
+/obj/structure/closet/lasertag/red,
+/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/pj/red,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
+"xYO" = (
+/obj/structure/sign/poster/contraband/red_rum{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/starboard)
 "ycu" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -60348,47 +58549,18 @@
 /obj/machinery/suit_storage_unit/rd,
 /turf/open/floor/plasteel,
 /area/science/mixing)
-"ydZ" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+"yiN" = (
+/obj/effect/turf_decal/tile/green{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
+/obj/effect/turf_decal/tile/green{
+	dir = 4
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
-	pixel_x = -3;
-	pixel_y = 5
+/obj/effect/turf_decal/tile/green{
+	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/crew_quarters/bar)
-"yeR" = (
-/obj/structure/sign/poster/contraband/space_up{
-	pixel_x = -32;
-	pixel_y = 32
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
-"yfs" = (
-/obj/machinery/power/apc{
-	areastring = "/area/security/detectives_office";
-	dir = 4;
-	name = "Detective's Office APC";
-	pixel_x = 24
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plasteel/grimy,
-/area/security/detectives_office)
-"yhO" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/snacks/bluecherrycupcake{
-	pixel_y = 5
-	},
-/turf/open/floor/wood,
-/area/crew_quarters/bar)
+/area/hallway/primary/starboard)
 
 (1,1,1) = {"
 aaa
@@ -66410,11 +64582,11 @@ aaa
 aaa
 aaa
 aaa
-pnS
+fsk
 aaa
 aaa
 aaa
-pnS
+fsk
 aaa
 aaa
 aaa
@@ -66427,7 +64599,7 @@ aaa
 aaa
 aaa
 aaa
-wJq
+hoo
 aaa
 aaa
 aaa
@@ -66661,9 +64833,9 @@ aaa
 aaa
 aaa
 aaa
-pnS
+fsk
 aaa
-pnS
+fsk
 aaa
 aaa
 aaa
@@ -66675,9 +64847,9 @@ gXs
 aaa
 aaa
 aaa
-pnS
+fsk
 aaa
-pnS
+fsk
 aaa
 aaa
 aaa
@@ -66924,11 +65096,11 @@ gXs
 aaa
 aaa
 gXs
-viT
+jmC
 gXs
 gXs
 gXs
-viT
+jmC
 gXs
 aaa
 aaa
@@ -67174,11 +65346,11 @@ aaa
 aaa
 aaa
 aaa
-viT
-viT
+jmC
+jmC
 gXs
 aag
-viT
+jmC
 gXs
 gXs
 aaa
@@ -67188,11 +65360,11 @@ aaa
 aaa
 gXs
 gXs
-viT
-viT
-pNO
+jmC
+jmC
+klu
 aag
-viT
+jmC
 aaa
 aaa
 aaa
@@ -67431,11 +65603,11 @@ aaa
 aaa
 aaa
 aaa
-kyA
-maK
+xcg
+lLt
 aaa
-maK
-hIi
+lLt
+jNo
 gXs
 aoV
 aaa
@@ -67445,11 +65617,11 @@ aaa
 aaa
 aaa
 gXs
-kyA
-maK
+xcg
+lLt
 aaa
-maK
-hIi
+lLt
+jNo
 aaa
 aaa
 aaa
@@ -67688,11 +65860,11 @@ aaa
 aaa
 aaa
 aaa
-uFF
+xzh
 aaa
 cpe
 aaa
-eYr
+vDq
 aaa
 aaa
 aaa
@@ -67702,11 +65874,11 @@ aaa
 aaa
 aaa
 aaa
-uFF
+xzh
 aaa
 cwV
 aaa
-eYr
+vDq
 aaa
 aaa
 aaa
@@ -67944,7 +66116,7 @@ aaa
 aaa
 aaa
 aae
-kMg
+lCL
 gXs
 aaa
 aaa
@@ -68201,7 +66373,7 @@ aaa
 aaa
 aaa
 aaa
-kMg
+lCL
 gXs
 aaa
 aaa
@@ -68458,7 +66630,7 @@ aaa
 aaa
 aaa
 aaa
-kMg
+lCL
 gXs
 aaa
 aaa
@@ -68715,7 +66887,7 @@ aaa
 aaa
 aaa
 aaa
-kMg
+lCL
 gXs
 aaa
 cqq
@@ -68972,7 +67144,7 @@ aaf
 aaf
 aaf
 aaa
-kMg
+lCL
 arB
 asE
 cyb
@@ -69745,7 +67917,7 @@ apN
 apN
 apN
 apJ
-hUC
+iyC
 ayk
 awW
 aAD
@@ -69769,7 +67941,7 @@ aaa
 aaa
 aaa
 arB
-dqG
+est
 ayk
 awW
 aAD
@@ -71045,7 +69217,7 @@ aaa
 awW
 aOh
 ayl
-cPO
+tTW
 aRY
 awW
 aaa
@@ -72341,7 +70513,7 @@ awW
 arB
 awZ
 aym
-lre
+vrM
 awW
 aaf
 aaa
@@ -73622,7 +71794,7 @@ aUO
 aUy
 aWm
 aWf
-vAP
+ohX
 czK
 bhN
 bcl
@@ -74640,7 +72812,7 @@ aHy
 ayl
 aKk
 aLA
-iRI
+dTe
 aNf
 aLA
 aQD
@@ -76666,7 +74838,7 @@ ady
 ady
 ady
 ady
-rMI
+rKc
 ajq
 ajW
 akB
@@ -76710,7 +74882,7 @@ aXQ
 aXQ
 aPz
 aPz
-dSI
+rFc
 aPz
 bhQ
 bjj
@@ -76964,11 +75136,11 @@ aPA
 aXQ
 aZt
 aXQ
-ljN
+gdu
 aPz
-eTc
-xIU
-hKX
+kJY
+ihC
+oMY
 bhQ
 bjj
 bkF
@@ -77224,10 +75396,10 @@ aXQ
 bbL
 aPz
 bdJ
-fFp
+gFD
 bgr
-niE
-mDU
+nQr
+tUm
 bkF
 aaa
 aaa
@@ -77482,7 +75654,7 @@ aZw
 aPz
 bct
 bfa
-ftK
+vdH
 bhQ
 bjk
 bkE
@@ -77737,10 +75909,10 @@ baO
 aZo
 baw
 aPz
-wdQ
+cwP
 cBn
 bgs
-pKz
+wLT
 bjk
 bkF
 aaa
@@ -78041,7 +76213,7 @@ ccb
 ccb
 ccb
 aaa
-fcu
+snG
 aaa
 ccb
 ccb
@@ -78236,7 +76408,7 @@ bxk
 aDo
 aDo
 aIX
-osd
+nIE
 aLE
 aLE
 aOp
@@ -78250,7 +76422,7 @@ aQN
 aQN
 aQN
 aQN
-jKM
+kWI
 bbO
 aPA
 bgt
@@ -78298,7 +76470,7 @@ aaa
 aaf
 aaa
 aaa
-uUC
+kKw
 aaa
 aaa
 aaf
@@ -78313,7 +76485,7 @@ aaa
 aaa
 aaa
 aaa
-wJq
+hoo
 aaa
 aaa
 aaa
@@ -78502,7 +76674,7 @@ aQN
 aQN
 aTz
 aUp
-rAJ
+job
 aXr
 aZx
 aQN
@@ -78555,7 +76727,7 @@ aaf
 aaf
 aaf
 aaf
-uUC
+kKw
 aaf
 aaf
 aaf
@@ -78764,7 +76936,7 @@ aXv
 aYS
 aQN
 aQN
-jKM
+kWI
 bbO
 aPA
 aSg
@@ -79007,18 +77179,18 @@ aDo
 aDo
 aDo
 aIY
-osd
+nIE
 aLE
 aLE
 aOl
 aPA
-siG
+lhg
 aQN
 aTC
 aUs
-qIZ
+phY
 aXt
-taU
+ksn
 aQN
 aQN
 aPA
@@ -79273,9 +77445,9 @@ aQV
 aQN
 aTC
 aUu
-rTD
+eRk
 aXt
-taU
+ksn
 aQN
 aQN
 aZB
@@ -79528,11 +77700,11 @@ aOl
 aPA
 aQU
 aQN
-unN
-qXl
-pdg
+hzw
+qlr
+pPE
 aXw
-oVS
+jiR
 aQN
 aQN
 aZA
@@ -80025,7 +78197,7 @@ alU
 ali
 ali
 atO
-axm
+axo
 ayz
 ayz
 ayz
@@ -80036,14 +78208,14 @@ aBR
 aBR
 aBR
 aBR
-aLJ
+aLm
 aLE
 aOl
 aPA
-jDh
+xIn
 aQN
 aTD
-gDv
+mIS
 aUZ
 aYU
 aYU
@@ -80284,14 +78456,14 @@ aaf
 avY
 axo
 arP
-iCE
-joc
+fLd
+cRD
 aGD
-wbB
+tru
 aCr
-eDv
-rkR
-eDv
+qBc
+iFL
+qBc
 aKu
 aLM
 aLF
@@ -80301,14 +78473,14 @@ aPG
 aPG
 aPG
 aPG
-puG
+jsy
 aQW
 aQW
 aQW
 aQW
-wVp
+cVu
 aPA
-jOF
+oBp
 aYb
 aZE
 bjp
@@ -80541,15 +78713,15 @@ aaa
 avY
 axo
 arP
-usD
-fZD
+qwe
+ioB
 aGr
 aHI
-kmw
-qIT
-trl
-eDv
-aKt
+xdV
+ePO
+phu
+qBc
+aKu
 aLL
 bDe
 aOl
@@ -80799,14 +78971,14 @@ avY
 axo
 arP
 aCh
-oSk
-dCk
+qQJ
+iYz
 aHK
 aCr
-lUd
-wab
-eDv
-aKt
+tUw
+mqa
+qBc
+aKu
 aLN
 aLE
 aOl
@@ -80819,13 +78991,13 @@ aWu
 aYc
 aZD
 aZD
-hVk
+uhm
 aZD
 aZD
 bff
-vGp
+iRJ
 aZE
-voH
+fyM
 bjr
 ama
 bmh
@@ -80884,18 +79056,18 @@ bLv
 bLv
 bLv
 aaa
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
+prP
+prP
+prP
+prP
+prP
+prP
+prP
+prP
+prP
 aaa
 aaa
-wJq
+hoo
 aaa
 aaa
 aaa
@@ -81056,14 +79228,14 @@ avZ
 axp
 ayC
 azH
-eJz
+wyM
 aGv
 aCr
 aCr
-lUd
-wab
-eDv
-aKv
+tUw
+mqa
+qBc
+aKu
 aLN
 aLE
 aOl
@@ -81073,7 +79245,7 @@ aRa
 aTF
 aPG
 aSX
-ffm
+eRn
 aZF
 aZF
 aZF
@@ -81141,7 +79313,7 @@ cqK
 crl
 bLv
 aaa
-uXD
+prP
 ctv
 ctv
 ctv
@@ -81149,7 +79321,7 @@ ctv
 ctv
 ctv
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -81310,16 +79482,16 @@ aGh
 aqR
 aqR
 awb
-djB
-wCs
-eWl
-eyC
+eLH
+ayA
+fHK
+hRX
 aBV
-hot
-nzc
-jRs
-aBU
-aMr
+pNH
+sfa
+ioX
+aHG
+aJe
 aKw
 aLP
 aMR
@@ -81398,15 +79570,15 @@ cAQ
 crm
 bLv
 aaa
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
-uXD
+prP
+prP
+prP
+prP
+prP
+prP
+prP
+prP
+prP
 aaa
 aaa
 aaa
@@ -81570,14 +79742,14 @@ awa
 axq
 ayD
 azI
-dyS
+gwi
 aBU
-nGN
-gvC
-lUd
-tPS
-eDv
-aKb
+xkk
+upX
+qJZ
+doP
+qBc
+aKu
 aLN
 aMQ
 aNT
@@ -81623,7 +79795,7 @@ aoV
 bCq
 bHE
 bHE
-iQA
+puG
 cdb
 bCq
 bVE
@@ -81665,9 +79837,9 @@ gXs
 aaa
 aaa
 aaa
-uXD
-uXD
-uXD
+prP
+prP
+prP
 aaa
 aaa
 aaa
@@ -81824,17 +79996,17 @@ aaa
 aaa
 aag
 avY
-hKI
-ayA
-fLb
+jLM
+ayD
+oeJ
 aMr
-sxe
+qOf
 aDv
-gvC
-lUd
-tPS
-eDv
-aKt
+lwp
+tUw
+jly
+qBc
+aKu
 aLN
 aMS
 aOt
@@ -81922,9 +80094,9 @@ gXs
 aaa
 aaa
 aaa
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -82081,21 +80253,21 @@ aaa
 aaa
 aag
 avY
-hKI
-ayA
-dLh
+jLM
+ayD
+wVs
 aMr
 aMr
 aOH
-gvC
-tku
-joq
-eDv
-aKt
+lwp
+vNh
+qHB
+qBc
+aKu
 aLN
 aMS
 aOi
-wDQ
+sqa
 aPK
 aSl
 aTH
@@ -82150,7 +80322,7 @@ mrR
 dKP
 odx
 rBq
-xzU
+ouD
 bCq
 bUs
 bLv
@@ -82169,19 +80341,19 @@ aaf
 aaa
 aaf
 gXs
-muq
+sYv
 crn
 bij
 bij
 bij
 bij
 bij
-vbc
+hWn
 btG
 aaa
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -82339,16 +80511,16 @@ aaa
 aag
 avY
 axs
-ayF
-xqV
-vOw
-eIe
+ayD
+sjm
+eNK
+iEx
 aOH
-eDv
-eDv
-fXH
-eDv
-aKx
+qBc
+qBc
+tAV
+qBc
+aKu
 aLN
 aMS
 aOi
@@ -82377,7 +80549,7 @@ bbR
 btu
 bbR
 bOL
-lNz
+fnJ
 byF
 bwW
 bGm
@@ -82419,26 +80591,26 @@ cjJ
 cjJ
 cjJ
 cjJ
-oJs
-uGq
-uGq
+gVX
+reZ
+reZ
 bij
 crn
 bij
 bij
-ilO
-udS
+sZR
+ued
 bnT
 bph
 bsc
+fhP
 bsc
-bsc
-mdQ
+eXm
 btG
 gXs
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -82679,12 +80851,12 @@ cov
 cpj
 cpS
 cjJ
-jUc
-mdQ
+xLZ
+ivF
 btG
-uOn
-eeD
-srw
+wAB
+vVP
+mwO
 bnV
 bph
 bih
@@ -82693,9 +80865,9 @@ bii
 bsc
 btG
 aaa
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -82871,8 +81043,8 @@ aPK
 aSn
 aTK
 aPK
-yfs
-lev
+vRX
+hwu
 asW
 baW
 bLE
@@ -82935,14 +81107,14 @@ cnN
 cox
 cpl
 cpU
-epP
-oLI
-oLI
-gro
-oLI
-oLI
-qZv
-wWF
+ipc
+edH
+edH
+nWq
+edH
+wZB
+fby
+qwB
 bph
 big
 bgN
@@ -82950,9 +81122,9 @@ bkZ
 bsc
 btG
 aaa
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -83089,7 +81261,7 @@ aaa
 acd
 acd
 acd
-eMV
+jHM
 acd
 acd
 aaa
@@ -83133,7 +81305,7 @@ aYi
 aqW
 aqW
 bbQ
-sno
+qpA
 apd
 aZH
 aZK
@@ -83193,12 +81365,12 @@ cow
 cpk
 cpT
 cjJ
-jUc
-qwZ
+xLZ
+oNQ
 btG
-qPJ
-nlN
-lQR
+sZa
+jhF
+qmM
 bnV
 bph
 bii
@@ -83207,9 +81379,9 @@ bih
 bsc
 btG
 aaa
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -83344,10 +81516,10 @@ abc
 abc
 afu
 abc
-iSB
-kBF
-knR
-eWv
+suI
+qMu
+kJr
+dxB
 acd
 aaa
 aaa
@@ -83448,25 +81620,25 @@ clG
 cnP
 coz
 cpn
-lzY
-lzY
+dbn
+dbn
 bgO
-sWr
+hjw
 bgO
-trk
-bsb
-iaq
+nTE
+pTn
+jnm
 bnW
 bph
 bsc
-ncB
+mQR
 bsc
-qwZ
+wNM
 btG
 gXs
-uXD
+prP
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -83601,11 +81773,11 @@ aea
 aeH
 aft
 abc
-fyr
-xbZ
-svt
-dQy
-eMV
+woX
+kdm
+rvZ
+vUR
+jHM
 aaa
 aaa
 aiU
@@ -83711,19 +81883,19 @@ aaf
 aaa
 aaa
 gXs
-szF
+gtL
 bgO
 bgO
 bgO
 bgO
 bgO
 bgO
-wZk
+vgp
 btG
 aaa
-eMb
+gSH
 ctv
-uXD
+prP
 aaa
 aaa
 aaa
@@ -83847,7 +82019,7 @@ aaa
 aaa
 gXs
 gXs
-sbs
+dbM
 abc
 abu
 abu
@@ -83859,10 +82031,10 @@ aeJ
 afw
 abc
 abc
-xbZ
+kdm
 aay
-dQy
-uiR
+vUR
+qlF
 aaf
 aaf
 aiU
@@ -83930,7 +82102,7 @@ bCq
 bHD
 bJe
 bCq
-vnw
+czi
 bHE
 bHE
 bHE
@@ -83978,7 +82150,7 @@ aaa
 aaa
 aaa
 aaa
-uXD
+prP
 ctv
 aaT
 aaa
@@ -84116,9 +82288,9 @@ aeI
 afv
 agf
 abc
-xbZ
+kdm
 aay
-dQy
+vUR
 aiT
 aiT
 aiV
@@ -84151,7 +82323,7 @@ aKA
 aLN
 aMS
 aOz
-mMb
+iMG
 aPQ
 aSa
 aSr
@@ -84161,7 +82333,7 @@ aYZ
 bLE
 aqW
 aqW
-vQS
+hfe
 apd
 beA
 bqp
@@ -84169,7 +82341,7 @@ cNG
 cNJ
 bLF
 aZK
-qdm
+haz
 bbR
 bqt
 cBq
@@ -84235,8 +82407,8 @@ aaa
 aaa
 aaa
 aaa
-uXD
-uXD
+prP
+prP
 aaT
 aaa
 aaa
@@ -84360,8 +82532,8 @@ aaa
 aaa
 aaa
 aai
-oNN
-lJX
+jSa
+uVt
 abe
 abw
 acc
@@ -84373,9 +82545,9 @@ aeL
 afy
 agh
 abc
-qYi
-dEZ
-dIH
+tOd
+vRr
+tLl
 aiT
 ajs
 akb
@@ -84617,7 +82789,7 @@ aaa
 aaa
 gXs
 aai
-rgv
+gIO
 aay
 abd
 abv
@@ -84630,9 +82802,9 @@ aeK
 afx
 agg
 abc
-qRq
-npV
-lyB
+orw
+jMK
+riA
 aiU
 ajr
 aka
@@ -84873,11 +83045,11 @@ aaa
 aaa
 aaf
 aaf
-ctv
+aai
 acd
-tYn
+wgb
 abg
-qKZ
+jtU
 aby
 aby
 aby
@@ -84887,10 +83059,10 @@ aeN
 afA
 afA
 abc
-nTu
-fLX
-rfE
-hYH
+vWw
+wFk
+oXL
+cXx
 aju
 akd
 akK
@@ -84957,14 +83129,14 @@ bCn
 bGq
 bGq
 bGq
-tyg
+tdF
 bLw
 bGq
 bGq
 bGq
 bLw
 bGq
-tyg
+tdF
 bTD
 bUx
 bVI
@@ -84979,7 +83151,7 @@ bVI
 bVI
 bVI
 bTA
-sOO
+xlN
 bHE
 bHE
 bHE
@@ -84994,25 +83166,25 @@ cpV
 cqw
 cqO
 crp
-aaa
-aaf
-aaa
-aaa
-aaf
-aaa
-aaa
-aaf
-aaa
-aaa
-aaa
-aaT
-aaT
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
 aaa
+hvS
 aaa
 aaa
 aaa
@@ -85133,7 +83305,7 @@ aai
 aai
 abf
 aat
-vKR
+tHx
 abx
 acd
 acC
@@ -85142,12 +83314,12 @@ adF
 aef
 aeM
 afz
-ogU
+jSD
 aav
-ueP
-dfH
-oAV
-jSk
+sjT
+pLt
+pQr
+new
 ajt
 akc
 akJ
@@ -85251,20 +83423,20 @@ cgR
 cgR
 cqN
 cro
-cEl
-cEE
-cEl
-cFm
-csx
-cFm
-cFm
-csx
-csv
-aaa
-aaa
-aaT
-ctv
-aaT
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -85460,7 +83632,7 @@ bqw
 aJq
 aJq
 aYl
-ovG
+ppY
 aLX
 aJq
 aJq
@@ -85508,20 +83680,20 @@ ciN
 cji
 cDZ
 crr
-crJ
-crT
-crJ
-cFn
-css
-csx
-csx
-css
-csb
-aaf
-aaf
-aaT
-ctv
-aaT
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -85644,7 +83816,7 @@ aai
 aan
 aaw
 aaB
-ncI
+kfE
 aaJ
 aat
 abh
@@ -85765,20 +83937,20 @@ cgR
 cDB
 cqP
 crq
-crZ
-crT
-crZ
-cFo
-css
-cFm
-cFm
-css
-csv
-aaa
-aaa
-aaT
-ctv
-aaT
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -85899,9 +84071,9 @@ aag
 aaa
 aak
 aap
-rfu
+fuo
 aaD
-aat
+aau
 aat
 aat
 aat
@@ -85974,7 +84146,7 @@ bqy
 cBr
 bqy
 buK
-mnP
+pNI
 aJw
 aJq
 aJq
@@ -86006,7 +84178,7 @@ bWB
 bWB
 cec
 bVI
-mFJ
+iOt
 ccw
 chY
 ciX
@@ -86022,20 +84194,20 @@ cgR
 cqx
 cgR
 crp
-crJ
-crT
-crJ
-cFn
-css
-csx
-csx
-css
-csb
-aaf
-aaf
-aaT
-ctv
-aaT
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -86158,9 +84330,9 @@ aaj
 aao
 aax
 aaC
+aaA
 aat
 aat
-adO
 aat
 aei
 acd
@@ -86279,20 +84451,20 @@ cpX
 cqz
 cqR
 ccw
-crH
-crT
-crZ
-cFo
-css
-cFm
-cFm
-css
-csv
-aaa
-aaa
-aaT
-ctv
-aaT
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -86413,12 +84585,12 @@ aag
 aaa
 aal
 aar
-gks
+phH
 aaF
 aat
-aaO
+aat
 aaW
-qvo
+aat
 abB
 acf
 abM
@@ -86492,7 +84664,7 @@ bwi
 bmr
 aMm
 aJq
-xzw
+otF
 bCs
 bCs
 bEY
@@ -86533,28 +84705,28 @@ coa
 coJ
 clJ
 clJ
-cig
-cig
-ccw
-crJ
-crT
-crJ
-cFn
-css
-csx
-csx
-css
-csb
-aaf
-aaf
-aaT
-ctv
-aaT
-aaa
-aaa
-aaa
-aaa
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -86670,12 +84842,12 @@ aag
 aaf
 aaj
 aaq
-iGV
+eOy
 aaE
 aat
 aaN
 aaV
-itP
+rtT
 aat
 acd
 abL
@@ -86754,7 +84926,7 @@ bCs
 bDv
 bEX
 bFb
-ope
+hKF
 bFa
 bKt
 bLx
@@ -86788,30 +84960,30 @@ ccw
 ccw
 cnZ
 coH
-cpt
-cpZ
-cig
-cqS
-ccw
-crH
-crT
-crZ
-cFo
-css
-cFm
-cFm
-css
-csv
-aaa
-aaa
-aaT
-ctv
-aaT
-aaa
-aaa
-aaf
-aaa
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -86926,13 +85098,13 @@ aaa
 aag
 aaa
 aal
-aau
 aat
 aat
 aat
 aat
-rKZ
-aat
+jeR
+neC
+jgv
 abD
 acd
 acd
@@ -86950,9 +85122,9 @@ agj
 auj
 akl
 akO
-pet
-pet
-hMk
+uko
+uko
+xqW
 anw
 anz
 aox
@@ -87045,30 +85217,30 @@ cmG
 cnt
 cob
 coL
-cDo
-cgR
-cqA
-cqT
-csg
-crJ
-crU
-csb
-cFn
-css
-csx
-csx
-css
-csb
-aaf
-aaf
-aaT
-aaT
-aaT
-gXs
-aaf
-aaf
-aaf
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -87188,7 +85360,7 @@ aat
 aat
 aat
 aat
-aat
+hRz
 aat
 abC
 acd
@@ -87210,7 +85382,7 @@ akN
 alw
 amg
 amR
-anw
+anz
 anR
 aow
 apg
@@ -87232,7 +85404,7 @@ aGq
 aHO
 aJl
 ayW
-gYR
+neb
 aJq
 aOE
 aJn
@@ -87245,7 +85417,7 @@ aYq
 aZO
 aZC
 baK
-bbC
+qBe
 bbC
 bdI
 bgK
@@ -87301,31 +85473,31 @@ cTc
 cTe
 cfG
 cgw
-coK
-cpu
-cMm
-ccw
-ccw
-ccw
-crK
-cEK
-csa
-csj
-csa
-csa
-cGr
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -87502,10 +85674,10 @@ aYs
 aZQ
 bbi
 bde
+nLf
 bcd
 bcd
-bcd
-gFY
+xhx
 bcd
 bcd
 bcd
@@ -87558,31 +85730,31 @@ clJ
 cmF
 cgR
 cgI
-chF
-ciO
-cqc
-cqc
-cqc
-cEd
-cEr
-cEL
-cFb
-cFu
-cFI
-cGd
-cGs
-cGr
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-aaa
-eRz
-aaT
-eRz
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -87697,14 +85869,14 @@ aaa
 aag
 aaf
 aai
-qxb
-qxb
+cMk
+cMk
 aaG
-qxb
+cMk
 aaP
 aaX
-vhc
-fSL
+unu
+lwY
 acd
 acD
 acY
@@ -87760,7 +85932,7 @@ aZP
 bbh
 bcc
 bdd
-nyF
+gjf
 bfr
 bgM
 bif
@@ -87814,32 +85986,32 @@ cTa
 ceZ
 clQ
 cgR
-dGY
-coM
-cpv
-cqb
-cqb
-cqb
-cqb
-cEs
-cqb
-cqb
-cAp
-cqb
-cAo
-cGt
-cgx
-jMY
-csd
-cHa
-csd
-uhH
-ccw
-aaa
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -87978,10 +86150,10 @@ aiz
 ajg
 akl
 akR
-pet
-pet
-hMk
-anw
+uko
+uko
+xqW
+anz
 anz
 aov
 aph
@@ -88016,22 +86188,22 @@ aYu
 aYt
 bbk
 bbk
-bbk
+bfu
 bbk
 bfs
-ove
+pUl
 aZM
 aZM
 aaf
 aaf
-kMg
+lCL
 aaf
-kMg
+lCL
 aaf
-kMg
+lCL
 aaf
-kMg
-rLg
+lCL
+wwB
 aXf
 aJq
 bBi
@@ -88071,32 +86243,32 @@ cTb
 cTd
 ckF
 ckF
-cgK
-cDg
-cDp
-cqe
-cqB
-cqB
-cEe
-csP
-cAl
-cFc
-cAq
-cFJ
-cSH
-cGu
-cGH
-fsQ
-fsQ
-cGR
-csd
-csd
-ccw
-aaa
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -88218,7 +86390,7 @@ aaa
 aaf
 aai
 abi
-szH
+vdz
 ach
 acK
 adf
@@ -88276,19 +86448,19 @@ bce
 bdf
 beb
 aYv
-tVp
-lNn
+kTz
+kDD
 aaf
 aaf
-kMg
-kMg
+lCL
+lCL
 aaf
-rLg
-rLg
-rLg
-rLg
-rLg
-rLg
+wwB
+wwB
+wwB
+wwB
+wwB
+wwB
 aXf
 aJq
 byU
@@ -88328,32 +86500,32 @@ cnA
 cev
 cfg
 cgU
-cgJ
-chG
-cpx
-cqd
-cDC
-cqU
-cEf
-cEt
-cEM
-csA
-cEg
-cFK
-cGe
-cGv
-cGI
-cGS
-cHb
-cHg
-cHn
-oDF
-ccw
-aaf
-aaT
-ctv
-aaT
-aaf
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -88533,19 +86705,19 @@ aZR
 bbm
 bec
 bfu
-nnb
+sdL
 aBa
 aBa
 aBa
 aBa
 aBa
 aBa
-rLg
-gGD
-tVQ
-wcX
-dBt
-kFf
+wwB
+bsb
+lTq
+tMS
+eND
+wEp
 aXf
 aJq
 bBi
@@ -88585,32 +86757,32 @@ cig
 cig
 cTf
 cgR
-ccw
-cDh
-cpy
-cDv
-cDD
-cqU
-cMD
-cEu
-cEz
-cEz
-cMD
-cFL
-cGf
-kQq
-cMm
-ciZ
-cHc
-cAu
-cAu
-ciZ
-ccw
-aaa
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -88739,7 +86911,7 @@ cpg
 acv
 adi
 adi
-fwD
+pQD
 aeW
 agQ
 ahv
@@ -88752,11 +86924,11 @@ akP
 aly
 amj
 amR
-anw
+anz
 anz
 aov
 aph
-gzJ
+oOb
 ard
 ard
 ard
@@ -88790,7 +86962,7 @@ aZR
 aZR
 aZR
 bft
-oaP
+srq
 aBa
 aBT
 aDs
@@ -88799,13 +86971,13 @@ aGb
 aBa
 bqD
 bsa
-vfe
+oeQ
 bsa
 bsa
-kFf
+wEp
 byS
 aJq
-yar
+idX
 bCs
 bCs
 bCs
@@ -88842,32 +87014,32 @@ ckI
 clJ
 cmL
 cBO
-ccw
-chV
-cpx
-cqf
-cqD
-cMD
-crs
-cEv
-cEv
-cFe
-cMD
-cFM
-czE
-kQq
-ccw
-cGT
-csd
-csd
-csd
-csd
-ccw
-aaf
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -88996,7 +87168,7 @@ acl
 cxA
 acL
 adi
-vtO
+vpz
 agp
 agT
 ahx
@@ -89006,12 +87178,12 @@ ajc
 ajI
 akl
 akT
-aww
-pet
-hMk
+fGl
+uko
+xqW
 anw
 anz
-oZl
+lYU
 apk
 anw
 anw
@@ -89022,7 +87194,7 @@ avj
 awl
 axC
 ayY
-rJv
+uZM
 azZ
 azZ
 azZ
@@ -89047,16 +87219,16 @@ bbm
 bdh
 bee
 bfv
-nDn
+vLD
 aBb
-pnx
+cSn
 aDr
 aEM
 aGa
 aHF
 bqF
 bsa
-iFt
+nmx
 buQ
 buQ
 bxI
@@ -89099,34 +87271,34 @@ ckK
 clJ
 cmL
 cgR
-cgL
-chX
-cpx
-cqh
-cqF
-cra
-crI
-cEw
-cEw
-cEw
-cFw
-cFN
-csH
-csR
-cMm
-cGU
-csd
-csd
-cHo
-csd
-ccw
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
-aaT
-ctv
-aaT
-aaa
-aaa
-aae
+hoo
 aaa
 aaa
 aaa
@@ -89304,13 +87476,13 @@ bcf
 bdg
 bed
 bfv
-sVN
-dqD
-wTu
+kvZ
+fGC
+qvM
 alu
 aEM
 aGd
-xyp
+nMx
 bqE
 bqE
 bqE
@@ -89356,32 +87528,32 @@ ckI
 clJ
 cmL
 cnv
-cMm
-chX
-cpx
-cqg
-cqE
-cqZ
-crt
-cMH
-cAm
-cMH
-cMN
-cFO
-cSI
-cSI
-cMm
-cGV
-csd
-cGV
-noK
-csd
-ccw
-aaa
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -89536,7 +87708,7 @@ avk
 awk
 axE
 ayZ
-uqO
+ncj
 aBu
 aAa
 aAa
@@ -89561,18 +87733,18 @@ bbm
 bdh
 bef
 bfv
-jTp
+smn
 aBc
-xZN
+jXg
 aDt
 aEO
 aGc
 aHF
 aKG
 bsf
-lrF
-lrF
-lrF
+kxc
+kxc
+kxc
 bxK
 bwh
 bAh
@@ -89613,32 +87785,32 @@ cfb
 ccw
 cmN
 cgR
-cgL
-chX
-cpx
-cqj
-cSG
-crb
-cru
-cEx
-cEx
-cEx
-cAP
-cFP
-csI
-cAt
-cMm
-csd
-csd
-csd
-cHp
-csd
-ccw
-aaf
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -89782,7 +87954,7 @@ aml
 amT
 anw
 anz
-ltC
+ilJ
 apl
 aqc
 aqc
@@ -89818,19 +87990,19 @@ aZR
 aZR
 aZR
 bfw
-uJI
+rzg
 aBa
 aBW
 bjy
 aEP
-iEc
+nOS
 aBa
 bqG
 bsa
-mRj
+jDY
 bsa
 bsa
-kFf
+wEp
 bwb
 aJq
 bBr
@@ -89870,32 +88042,32 @@ cfb
 clM
 cfz
 cgR
-ccw
-cii
-cpx
-cqi
-cMD
-cAP
-crv
-cEy
-cEy
-cFh
-cMD
-cFM
-czE
-kQq
-ccw
-cGT
-csd
-csd
-csd
-csd
-ccw
-aaf
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -90039,7 +88211,7 @@ amn
 amV
 anw
 anz
-uWs
+rsX
 aod
 aqf
 ahT
@@ -90075,19 +88247,19 @@ aZR
 bbm
 beh
 bfx
-kDw
+spX
 aBa
 aBa
 aBa
 aBa
 aBa
 aBa
-czD
-gGD
-tVQ
-wcX
-ekY
-kFf
+mte
+bsg
+lTq
+tMS
+fZD
+wEp
 aJq
 aJq
 bBu
@@ -90127,32 +88299,32 @@ cfb
 cfa
 cje
 cgR
-ccw
-cDi
-cDr
-cDw
-cDE
-cEa
-cMD
-cEz
-cEz
-cEz
-cMD
-cFR
-cSJ
-kQq
-cMm
-ciZ
-cHd
-cHj
-cHd
-ciZ
-ccw
-aaa
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -90332,19 +88504,19 @@ bcg
 aZU
 beg
 aYB
-tVp
-lNn
+ptV
+fjy
 aaf
 aaf
-kMg
-kMg
+lCL
+lCL
 aaf
-rLg
-rLg
-rLg
-rLg
-rLg
-rLg
+wwB
+wwB
+wwB
+wwB
+wwB
+wwB
 aJq
 aJq
 bBt
@@ -90384,32 +88556,32 @@ ckL
 cmF
 cje
 cgR
-cMm
-chX
-cpD
-cDw
-cDF
-cEa
-cEg
-cEA
-cET
-cFj
-cEf
-cFS
-cGg
-mBv
-cGI
-cGS
-cHe
-cHe
-cHr
-oDF
-ccw
-aaf
-aaT
-ctv
-aaT
-aaf
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -90549,9 +88721,9 @@ ajJ
 akr
 akX
 alC
-xgZ
+iqw
 amX
-lUR
+elw
 anz
 aoB
 aod
@@ -90586,22 +88758,22 @@ aYC
 aYA
 bbp
 bbp
-bbp
+bfx
 bbp
 bfz
-maz
+tAb
 aZV
 aZV
 aaf
 aaf
-kMg
+lCL
 aaf
-kMg
+lCL
 aaf
-kMg
+lCL
 aaf
-kMg
-rLg
+lCL
+wwB
 aJq
 aJq
 aXf
@@ -90641,32 +88813,32 @@ ceq
 clQ
 cje
 cgR
-cMm
-cDj
-cDs
-cql
-cDG
-cDG
-cEh
-cEB
-cEU
-cFk
-cAs
-cFT
-cSK
-cGx
-cGK
-nzh
-nzh
-cGY
-csd
-csd
-ccw
-aaf
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -90808,9 +88980,9 @@ akW
 aiG
 amo
 amW
-eWV
+uYE
 anz
-uWs
+rsX
 aod
 aqe
 arf
@@ -90844,9 +89016,9 @@ aZV
 bbo
 bch
 bdi
+bbw
 bfy
 bgS
-ffU
 bik
 aZV
 aZV
@@ -90861,7 +89033,7 @@ bsh
 bqH
 aJq
 aJq
-vqa
+unY
 bCv
 bDJ
 bCt
@@ -90898,32 +89070,32 @@ ckO
 ckH
 cja
 cny
-gUz
-cip
-cnx
-cDx
-cqb
-cqb
-cqb
-cEC
-cqb
-cqb
-cAr
-cqb
-cGh
-cGC
-cey
-ijc
-csd
-cEk
-csd
-udp
-ccw
-aaf
-aaT
-ctv
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -91061,9 +89233,9 @@ adR
 aiQ
 ajI
 akt
-amS
-aiX
-aiX
+akQ
+agj
+agj
 aiX
 anw
 anz
@@ -91100,10 +89272,10 @@ aYD
 aZX
 baf
 bdk
+jwi
 bek
 bfB
 bgU
-pVa
 bdk
 bjF
 blc
@@ -91155,32 +89327,32 @@ cfb
 clR
 cgR
 cgR
-cMm
-cir
-cDt
-cDy
-cqC
-crc
-cEi
-cED
-crc
-crc
-cFy
-cBR
-cGi
-cGD
-cGL
-ccw
-ccw
-ccw
-ccw
-ccw
-ccw
-aaa
-aaT
-aaT
-aaT
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -91318,10 +89490,10 @@ cBV
 ajf
 ajK
 aks
+akY
+aly
+amj
 aiX
-nuI
-anw
-anw
 anw
 anz
 aoC
@@ -91343,7 +89515,7 @@ vHj
 eVC
 dgz
 aJv
-nqP
+ioG
 aMg
 bHt
 aOE
@@ -91358,10 +89530,10 @@ aZW
 aZG
 bej
 bdj
+bej
 bfA
 bgT
-fDV
-bej
+bil
 bej
 blb
 bmy
@@ -91412,32 +89584,32 @@ ces
 clN
 ccm
 ckF
-cDe
-cDk
-coc
-cqa
-cig
-ccw
-ccw
-czF
-csd
-csd
-cFz
-cFU
-cGj
-cGE
-cGM
-cGZ
-aag
-aaa
-aaf
-aaa
-aaa
-aaa
-aaa
-aaf
-aaa
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -91573,13 +89745,13 @@ ahC
 aia
 aiP
 aiR
-eJk
-akl
+olv
+akv
+ala
+aww
+afM
 aiX
-akz
-anz
-anz
-anz
+uVq
 anz
 aoF
 apo
@@ -91590,8 +89762,8 @@ atj
 aul
 auR
 atj
-gnM
-fRa
+kcj
+ghJ
 atj
 aAX
 azc
@@ -91614,10 +89786,10 @@ aPR
 aZV
 baq
 baQ
-kCq
+dTJ
 bcQ
+bfC
 bgV
-mpA
 bim
 bjG
 aZV
@@ -91672,29 +89844,29 @@ cgU
 cgU
 cis
 cjN
-cDz
-cDH
-cMm
-csd
-crM
-crV
-crV
-cFA
-csd
-cGk
-ccw
-aag
-aag
-aag
-aaf
-aaf
-aaf
-aaf
-gXs
-aaf
-aaf
-aaf
-aaf
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -91832,10 +90004,10 @@ adR
 aiG
 ajL
 aku
+akS
+alw
+amp
 aiX
-alE
-anA
-anA
 anA
 anz
 aoE
@@ -91850,8 +90022,8 @@ avt
 axL
 bbl
 azT
-gxH
-tEy
+nlt
+dwc
 aDG
 aFd
 auk
@@ -91874,7 +90046,7 @@ baP
 bbZ
 bcP
 cBo
-ffU
+bgS
 bbw
 bbw
 aZV
@@ -91904,7 +90076,7 @@ bOV
 bQj
 bRw
 bSF
-pmf
+gVY
 bTP
 bRA
 bWQ
@@ -91929,29 +90101,29 @@ cfI
 cgQ
 cjS
 cjN
-cqm
-cgR
-crd
-cEk
-crL
-cEW
-cse
-cse
-csu
-cGl
-ccw
-aaa
-aaa
-aaf
-aaa
-aaf
-ctv
-aaT
-aaa
-aaa
-aaf
-aaa
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -92103,11 +90275,11 @@ arf
 arf
 arf
 arf
-dHP
-djq
+ukP
+oma
 awr
 awr
-wWo
+wwn
 aAh
 aAh
 aAh
@@ -92144,7 +90316,7 @@ btL
 buY
 buY
 bqH
-gYR
+neb
 aJq
 aXf
 bCv
@@ -92161,7 +90333,7 @@ bOV
 bQo
 bRz
 bSH
-kcg
+cJn
 bTP
 bRA
 bWQ
@@ -92186,29 +90358,29 @@ ccw
 ccw
 cDl
 cjN
-cjh
-cDI
-ccw
-ccw
-ccw
-ccw
-ccw
-cMm
-cMm
-cMm
-ccw
-aaf
-aaf
-aaf
-aaf
-aaf
-ctv
-aaT
-aaa
-aaa
-aaf
-aaa
-aaa
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
+cgI
 aaa
 aaa
 aaa
@@ -92364,7 +90536,7 @@ avv
 awu
 awr
 aAd
-qKJ
+uDW
 aAh
 aDL
 aAh
@@ -92418,7 +90590,7 @@ bOV
 bQj
 bRy
 bSG
-pmf
+gVY
 bUK
 bVT
 bWR
@@ -92621,7 +90793,7 @@ awp
 axN
 awr
 awr
-oTI
+kSh
 aAh
 aDQ
 aAh
@@ -92629,7 +90801,7 @@ aGl
 aAh
 aBy
 aAh
-uOb
+pTR
 aJq
 aOE
 aJn
@@ -92642,7 +90814,7 @@ aYF
 aZV
 bbw
 bcn
-jNS
+qUm
 ben
 bfE
 bgX
@@ -92872,13 +91044,13 @@ aqe
 arf
 ari
 asu
-gTx
+kyi
 aun
 avR
-djq
-vMd
+oma
+dHb
 awr
-mPj
+uya
 aAh
 aDM
 aGx
@@ -93131,18 +91303,18 @@ arf
 arf
 arf
 arf
-dHP
+ukP
 axP
 azb
 aAi
-sTt
+wGP
 aCn
-mvB
-ipU
+rOm
+wwC
 aGm
 aHV
 aDM
-urH
+nrR
 aJq
 aJq
 aJq
@@ -93173,9 +91345,9 @@ bva
 bwu
 bwu
 bwu
-pgY
+ihm
 bBB
-pAE
+rhb
 bzs
 bFp
 bGJ
@@ -93391,8 +91563,8 @@ arf
 awq
 axO
 aza
-moa
-uhG
+jtk
+pqR
 aAh
 aAh
 aAh
@@ -93641,7 +91813,7 @@ ajo
 aps
 aqk
 arf
-dsV
+vGX
 blU
 aHw
 avn
@@ -93649,14 +91821,14 @@ awv
 axX
 aze
 awr
-uuT
+hMx
 aAh
 aDU
 aBz
 aBz
 aAh
-tsY
-tTt
+isy
+uzk
 aJq
 aJq
 aJq
@@ -93900,7 +92072,7 @@ aqj
 arf
 ark
 asu
-mOL
+epV
 aun
 awt
 awr
@@ -93909,10 +92081,10 @@ azX
 aAZ
 aCe
 aDT
-mwm
-mwm
-qzE
-fPz
+mEN
+mEN
+dzy
+fyq
 aAh
 aJC
 aJC
@@ -94169,18 +92341,18 @@ aDP
 aBx
 aBx
 aAh
-oNq
-jtY
+kCk
+qIf
 aMq
 adq
 aQb
 aPZ
 aRu
-iWm
+wpo
 aKR
-gJR
+tIC
 aXi
-jRc
+maC
 baa
 aJC
 bcq
@@ -94420,7 +92592,7 @@ awy
 awr
 awr
 avG
-tQu
+udi
 aAh
 aAh
 aAh
@@ -94430,13 +92602,13 @@ aAh
 aAh
 aKR
 aKR
-fey
+pxD
 aPY
-fOB
+xMl
 aRx
 aKR
-hFk
-xCs
+jzD
+tuN
 aPY
 aZZ
 aQg
@@ -94677,24 +92849,24 @@ awA
 axT
 axW
 aAl
-vEA
+tAE
 aJC
 aDR
 aFl
-oaT
+rLr
 aHZ
 aJC
 aKJ
-yeR
+rLR
 aKR
-eBm
-yhO
+hSU
+kay
 aQd
 aQa
 aKR
-ndo
-eBm
-gbb
+xbu
+hSU
+lwj
 bac
 aJC
 aYV
@@ -94918,7 +93090,7 @@ aif
 aif
 aif
 bkV
-thY
+fvk
 alK
 aif
 aif
@@ -94926,19 +93098,19 @@ anc
 anD
 aoI
 arf
-iTd
+myt
 asN
 aur
 avy
-neT
+tWR
 axS
 azk
 aAk
-oxA
+eUd
 aJC
 aDY
 aDY
-oaT
+rLr
 aKR
 aJk
 aKR
@@ -94954,7 +93126,7 @@ aKR
 aKR
 bab
 aJC
-jtp
+xYO
 aYV
 ber
 bfF
@@ -95166,13 +93338,13 @@ abp
 afo
 abp
 abp
-iHq
+hlY
 ahn
 aiA
 aiA
 aiA
 ahn
-qaZ
+hYW
 anF
 aod
 ahn
@@ -95183,15 +93355,15 @@ ahn
 ahn
 ahn
 arf
-pUo
-sPA
+iES
+jdT
 aut
 arf
 aXF
 awr
 awr
 aAn
-dQz
+wcy
 aJC
 aEc
 aFk
@@ -95201,19 +93373,19 @@ aJC
 aKr
 aKR
 aKR
-pIA
-pIA
-jcN
+fbm
+fbm
+hzR
 aKR
 aKR
 aKR
-pIA
+fbm
 aKR
 aKR
 bbx
 aYV
 aYV
-qVa
+wDR
 bfF
 bhd
 bis
@@ -95419,11 +93591,11 @@ aaf
 aaf
 aaf
 abp
-rmC
+unE
 afp
-rmC
+unE
 abp
-fEo
+nea
 ahn
 aaa
 aaf
@@ -95433,39 +93605,39 @@ ahn
 anE
 aod
 aoK
-fBj
+sgV
 aqp
 ahn
-kMO
-oaB
-itE
-sPA
-sPA
-sPA
-xCE
+ukS
+tQk
+cVp
+jdT
+jdT
+jdT
+rMc
 aun
 avz
 awr
 awr
 aAn
-tTh
+fSr
 aJC
 aJC
-kiH
-qeZ
+gjC
+lxx
 aJC
 aJC
 aKq
 aKR
 aNF
-lmT
-gzA
-qet
+egS
+ghs
+lMY
 aSH
 aKR
-dSM
-mTi
-hmv
+dMX
+igT
+moq
 aKR
 aQg
 aYV
@@ -95491,7 +93663,7 @@ bvj
 bvj
 bvd
 bFu
-thl
+hcd
 bvj
 bvd
 bKH
@@ -95693,19 +93865,19 @@ aoL
 apy
 aqq
 ahn
-ttp
-cJl
+dhx
+mfb
 arf
-uNs
+unl
 ast
-sPA
+jdT
 auv
 arf
 avA
 axW
 azo
 aAp
-qPl
+lYZ
 aBC
 aCt
 aEA
@@ -95716,13 +93888,13 @@ aKN
 aKR
 aKR
 aOJ
-nNY
-hIJ
+fvW
+dtE
 aKR
 aKR
 aUg
 bFC
-hmv
+moq
 aKR
 bbx
 aYV
@@ -95730,9 +93902,9 @@ aYV
 bet
 bfH
 bhf
-qqY
+slp
 bhh
-qqY
+slp
 bmJ
 bof
 bpu
@@ -95958,11 +94130,11 @@ arf
 arf
 arf
 arf
-fpd
-imi
+hkg
+eNW
 azf
 aAo
-coj
+lMx
 aBB
 aBB
 aBB
@@ -95972,12 +94144,12 @@ cNE
 aKM
 aMu
 aMu
-ese
-sfY
+poa
+hdb
 aMu
 aMu
 aMu
-mdp
+uTq
 aSq
 aKR
 bad
@@ -95989,7 +94161,7 @@ bfG
 bhe
 bit
 bjS
-kQg
+nGS
 bli
 boe
 bli
@@ -96204,24 +94376,24 @@ aag
 aag
 aag
 arf
-xXW
-gYK
+iep
+gQn
 arf
-iTd
-uVo
-coj
-mcQ
+myt
+qNs
+lMx
+sjw
 clO
 asZ
 aua
-sfO
+dcG
 awB
 att
 azh
-mgT
-mgT
-uJq
-fcc
+vYa
+vYa
+gKk
+vbY
 alP
 aGI
 aId
@@ -96235,7 +94407,7 @@ aMx
 aMx
 aMx
 aMx
-hvD
+eqm
 aKR
 aZb
 aJC
@@ -96446,11 +94618,11 @@ aaa
 aaa
 aaa
 aaa
-uFF
+xzh
 aaa
 aqG
 aaa
-eYr
+vDq
 aaa
 aaa
 aaa
@@ -96461,24 +94633,24 @@ aaa
 aaa
 aaa
 arf
-duc
-oaB
-itE
-sPA
-oIx
+pZv
+tQk
+cVp
+jdT
+ier
 arf
 arm
-mgT
+vYa
 aya
-mgT
-mgT
+vYa
+vYa
 auB
 atZ
 azg
 azp
-mgT
+vYa
 aCu
-gmc
+dgh
 alP
 aGH
 aIc
@@ -96703,11 +94875,11 @@ aaa
 aaa
 aaa
 aaa
-oBB
-ixv
+lCB
+lNB
 aaa
-ixv
-rrJ
+lNB
+rUQ
 aaa
 aaa
 aaa
@@ -96721,21 +94893,21 @@ arf
 arf
 arf
 arf
-pUo
-xgY
+iES
+jYI
 aqs
-gfn
-mgT
-mgT
-mgT
-mgT
-vBb
-mgT
+hVw
+vYa
+vYa
+vYa
+vYa
+pSf
+vYa
 ayb
-fJA
-mgT
+ndC
+vYa
 aCv
-cFF
+frE
 alP
 aGJ
 aIe
@@ -96749,7 +94921,7 @@ aXj
 aVy
 aSY
 aVy
-ydZ
+oNb
 acN
 bah
 aJC
@@ -96960,11 +95132,11 @@ aaa
 aaa
 aaa
 aaa
-viT
-viT
+jmC
+jmC
 gXs
-viT
-viT
+jmC
+jmC
 aaa
 aaa
 aaa
@@ -96977,22 +95149,22 @@ aaa
 aaa
 aaa
 arf
-jav
-sPA
-eDq
+ewZ
+jdT
+tOU
 arf
-bHg
-iTD
-lBk
-mgT
-mgT
-vBb
-mgT
+fQF
+qbx
+qux
+vYa
+vYa
+pSf
+vYa
 ayb
-fJA
-mgT
-mHW
-sBu
+ndC
+vYa
+vys
+tCi
 alP
 aGJ
 aIe
@@ -97002,11 +95174,11 @@ aKQ
 aNu
 aJC
 aPw
-eqs
+kwy
 aQc
 aSZ
 aQc
-jxp
+vjq
 acN
 bag
 aJC
@@ -97234,22 +95406,22 @@ aaa
 aaa
 aaa
 arf
-wSg
-vgX
-rak
+qoP
+prU
+fOc
 arf
-lqe
-jYg
-jde
-mgT
-pbw
-neq
-mTj
-qGM
-ulP
-mgT
+oSO
+sAI
+fJa
+vYa
+svw
+ntf
+jvN
+lBE
+xpx
+vYa
 aCu
-vbP
+hgX
 alP
 aGA
 aHS
@@ -97271,7 +95443,7 @@ aYV
 aYV
 bet
 bfH
-liD
+dok
 bhh
 bhg
 bln
@@ -97475,9 +95647,9 @@ aaa
 aaa
 aaa
 aaa
-oqa
+hho
 aaa
-oqa
+hho
 aaa
 aaa
 aaa
@@ -97495,18 +95667,18 @@ arf
 arf
 arf
 arf
-mbl
-iiH
-udn
-vBN
-fLn
-vXW
-mgT
-cIW
-kmf
-uip
-jil
-ttF
+mTp
+qEv
+kRk
+mXB
+qAQ
+pzk
+vYa
+sMa
+iEI
+jeT
+rTQ
+vHM
 alP
 aGL
 aHM
@@ -97751,18 +95923,18 @@ aaa
 aaa
 aaa
 gXs
-jMa
-qMf
-qMf
-kte
-wgV
-odR
-odR
-wgV
-kCK
-cmm
-cmm
-dKg
+kHJ
+rEV
+rEV
+kQZ
+fVU
+vpm
+vpm
+fVU
+nel
+wCa
+wCa
+lFl
 arj
 alP
 aGL
@@ -97986,7 +96158,7 @@ aaa
 aaa
 aaa
 aaa
-xlX
+aaa
 aaa
 aaa
 aaa
@@ -98037,7 +96209,7 @@ aVz
 aVz
 aYJ
 aJI
-xZr
+sIe
 aYV
 aYV
 aYV
@@ -98554,7 +96726,7 @@ baj
 bbz
 aYV
 bdp
-pWO
+itT
 bfK
 bfK
 bfK
@@ -98807,7 +96979,7 @@ aVD
 aVE
 aXm
 aVz
-gIT
+egQ
 bbz
 aYV
 bdp
@@ -99293,17 +97465,17 @@ aaa
 aaa
 aaa
 aaa
-mHC
-qMf
-qMf
-qMf
-sXo
-odR
-odR
-ioS
-cmm
-cmm
-cmm
+haX
+rEV
+rEV
+rEV
+nie
+vpm
+vpm
+wFX
+wCa
+wCa
+wCa
 aCy
 arj
 alP
@@ -99321,7 +97493,7 @@ aTO
 cCq
 aVz
 aVz
-guh
+fPs
 bbz
 aYV
 bdp
@@ -99554,14 +97726,14 @@ aaa
 aaa
 aaa
 arj
-kOA
+cRz
 avD
 awC
 ayb
-jYD
-ruS
-ukL
-lAY
+mbD
+nmS
+oFk
+xXY
 vpY
 alP
 aGJ
@@ -99607,7 +97779,7 @@ bCR
 bqQ
 bGX
 bCR
-pMv
+oDy
 bRN
 bIK
 bPq
@@ -99813,13 +97985,13 @@ aaf
 arj
 auz
 avC
-oGS
+kOf
 aya
-mgT
-mgT
-rmY
-mgT
-mgT
+vYa
+vYa
+oYc
+vYa
+vYa
 gOZ
 aGJ
 avI
@@ -100070,7 +98242,7 @@ alO
 arj
 arj
 arj
-csp
+eOv
 gOZ
 cVb
 cVb
@@ -100582,10 +98754,10 @@ cxW
 anf
 aqv
 ayf
-hxw
-dKe
+fIn
+ego
 awE
-pGr
+dMu
 cVb
 vCb
 wUY
@@ -100838,8 +99010,8 @@ aag
 alO
 anf
 alO
-gqR
-pQA
+kSB
+pAl
 alP
 anf
 aCG
@@ -100855,11 +99027,11 @@ aIq
 aKK
 aMy
 aIp
-rXv
+jaa
 aQm
-eaD
-vAZ
-vAZ
+wOT
+htr
+htr
 aVK
 aRJ
 aRJ
@@ -101101,10 +99273,10 @@ alP
 awF
 aCG
 alP
-uTQ
+olw
 aBE
 aCz
-fXo
+trY
 aCJ
 aGT
 aIn
@@ -101114,10 +99286,10 @@ aMt
 aIp
 aOW
 aQm
-ktc
+dRC
 aSS
 aUj
-uao
+pHo
 aRJ
 aYQ
 cBg
@@ -101351,7 +99523,7 @@ aoN
 apA
 aof
 arq
-qnd
+hdp
 atv
 auD
 alP
@@ -101371,14 +99543,14 @@ aMA
 aIp
 aOX
 aQm
-ktc
+dRC
 aST
 aUk
-uao
+pHo
 aRJ
 aYQ
 bam
-oAc
+yiN
 aYV
 aYV
 aYV
@@ -101595,10 +99767,10 @@ adU
 adU
 adU
 adU
-xWW
-sCo
-sCo
-sCo
+ssL
+rsv
+rsv
+rsv
 acx
 amv
 ane
@@ -101628,14 +99800,14 @@ aMz
 aNQ
 aOX
 aQm
-pmj
-lrH
-lrH
-rEQ
+tFt
+tsr
+tsr
+xzy
 aRJ
 aYR
 ban
-efo
+qje
 aYV
 aYV
 bez
@@ -101879,7 +100051,7 @@ aaa
 aFq
 aGX
 aIp
-lwn
+vzS
 aKU
 aME
 aNN
@@ -101892,7 +100064,7 @@ aXo
 aXo
 aYO
 bap
-efo
+qje
 aYV
 bci
 beB
@@ -102121,7 +100293,7 @@ aof
 aof
 aof
 aof
-gBY
+qkC
 aoP
 atw
 auF
@@ -102129,7 +100301,7 @@ alP
 aoP
 auF
 azr
-juV
+kel
 atw
 alP
 alP
@@ -102143,13 +100315,13 @@ aNQ
 aOZ
 aOX
 aOX
-ohe
+hZH
 aUz
 aVM
 aOX
 aYT
 bam
-qcu
+ory
 baR
 bcb
 bdl
@@ -102206,7 +100378,7 @@ bAw
 bAw
 clp
 aag
-viT
+jmC
 aaa
 aaa
 aaa
@@ -102384,7 +100556,7 @@ aty
 auF
 alP
 aAt
-lHE
+kuY
 alP
 alP
 alP
@@ -102635,7 +100807,7 @@ aaa
 aaa
 apC
 anf
-juV
+kel
 alP
 atx
 auF
@@ -102644,7 +100816,7 @@ auD
 auF
 apE
 aAs
-trM
+khA
 alP
 aCG
 aFr
@@ -102697,15 +100869,15 @@ bOx
 bPx
 bJN
 bRT
-bEm
+aad
 bEm
 bJN
 bRT
-bEm
+aad
 bEm
 bJN
 bRT
-bEm
+aad
 bEm
 bDb
 cfr
@@ -102897,12 +101069,12 @@ alP
 apE
 auG
 alP
-hSS
+rgF
 auF
 apE
 anf
 anf
-kwj
+jRy
 aCG
 aDZ
 aFu
@@ -103166,8 +101338,8 @@ bbE
 aIr
 bav
 aLf
-nvw
-oWe
+dkk
+kLR
 aRO
 aQp
 aRN
@@ -103231,11 +101403,11 @@ cQB
 czY
 cOT
 aaa
-viT
-viT
-viT
-viT
-viT
+jmC
+jmC
+jmC
+jmC
+jmC
 aaa
 aaa
 aaa
@@ -103408,12 +101580,12 @@ apC
 alP
 alP
 alP
-dHx
+tuj
 auH
 avF
 awI
 ayc
-nOD
+mlr
 asw
 asw
 aCD
@@ -103424,7 +101596,7 @@ aIu
 aJQ
 aIt
 aIt
-oWe
+kLR
 aRO
 aIt
 aRN
@@ -103679,9 +101851,9 @@ anf
 aFu
 aIs
 aJP
-xah
+wuB
 aIt
-xNd
+nsJ
 aYW
 aYW
 aYW
@@ -103748,10 +101920,10 @@ aaa
 aaa
 aaa
 aaa
-tpb
-rnY
-oSW
-vPl
+ikx
+mwb
+xWM
+rxH
 aaa
 aaa
 aaa
@@ -103936,9 +102108,9 @@ aFu
 aFu
 aIw
 aJS
-wTC
+tqt
 aNP
-kMY
+jFy
 aOS
 aOS
 aOS
@@ -104002,14 +102174,14 @@ cQB
 cAa
 cOT
 gXs
-lDF
-kTe
+xNY
+kvb
 aaa
 aaa
-tpb
-tpb
-tpb
-vPl
+ikx
+ikx
+ikx
+rxH
 aaa
 aaa
 aaa
@@ -104186,7 +102358,7 @@ awJ
 anf
 alP
 aAv
-wZI
+gCe
 aCE
 aDZ
 aFu
@@ -104195,7 +102367,7 @@ aIv
 aJR
 aIt
 aIt
-oWe
+kLR
 aRO
 aIt
 aPd
@@ -104259,14 +102431,14 @@ czU
 czZ
 cOT
 aaa
-viT
-sbs
-sbs
-tpb
-tpb
-tpb
-gqp
-rnY
+jmC
+dbM
+dbM
+ikx
+ikx
+ikx
+thr
+mwb
 aaa
 aaa
 aaa
@@ -104452,7 +102624,7 @@ aIx
 aJF
 aQq
 aNS
-oWe
+kLR
 aRO
 aIt
 aPd
@@ -104516,14 +102688,14 @@ cgm
 czY
 cOT
 gXs
-lDF
-kTe
-nxN
-sbs
-sbs
+xNY
+kvb
+gJg
+dbM
+dbM
 aaa
 aaa
-nxN
+gJg
 aaa
 aaa
 aaa
@@ -104713,12 +102885,12 @@ aFu
 aPf
 aQq
 aRP
-oIt
+kHK
 aIt
 aIt
 aWd
 aXV
-pWH
+iWa
 bbD
 aYV
 aXq
@@ -104775,10 +102947,10 @@ cNW
 aaa
 aaa
 aaa
-nxN
-nxN
-rnY
-tpb
+gJg
+gJg
+mwb
+ikx
 gXs
 aaa
 aaa
@@ -104949,8 +103121,8 @@ alO
 anf
 anf
 arw
-uiT
-cII
+ftv
+sLr
 anf
 alP
 awL
@@ -105223,7 +103395,7 @@ aIy
 aJG
 cAz
 aFw
-eAE
+iWk
 aPg
 aQr
 aFu
@@ -105290,10 +103462,10 @@ aaa
 aaa
 aaa
 aaa
-viT
-viT
-viT
-viT
+jmC
+jmC
+jmC
+jmC
 aaa
 aaa
 aaa
@@ -105460,10 +103632,10 @@ aaa
 aaa
 gXs
 alP
-pRx
+qxc
 ayf
-eUR
-imK
+nuV
+iOV
 aFn
 aFn
 aBB
@@ -105480,7 +103652,7 @@ aFw
 aLo
 aLb
 aFw
-xwI
+eMQ
 aYW
 aYW
 aRQ
@@ -105714,13 +103886,13 @@ aaa
 aaa
 aaa
 aaa
-uBW
-uBW
-uBW
-uBW
-oFY
-uBW
-uBW
+fzd
+fzd
+fzd
+fzd
+tNJ
+fzd
+fzd
 atB
 alP
 alP
@@ -105737,7 +103909,7 @@ aIz
 aJM
 aLa
 aFw
-kwW
+tGG
 aYW
 aQs
 aFu
@@ -105781,15 +103953,15 @@ bOx
 bPI
 bJN
 bEm
-bEm
+abz
 bUi
 bJN
 bEm
-bEm
+abz
 bUi
 bJN
 bEm
-bEm
+abz
 bUi
 bDb
 aaf
@@ -105971,21 +104143,21 @@ aaa
 aaa
 aaa
 aaa
-uBW
-mKU
-wLe
-shX
-mJU
-cyi
-tcE
-dIA
-pNj
-dIA
-nhn
+fzd
+xdb
+mCq
+wJz
+mHC
+tWs
+lmi
+ghY
+sxX
+ghY
+jBZ
 avI
 asA
 apE
-fIK
+vHv
 aCG
 aEf
 aFw
@@ -106228,12 +104400,12 @@ aaa
 aaa
 aaa
 aaa
-lfx
-wLe
-wLe
-wLe
-wLe
-gGK
+tIk
+mCq
+mCq
+mCq
+mCq
+pjh
 asB
 asB
 asB
@@ -106324,7 +104496,7 @@ cOe
 cBT
 aag
 gXs
-viT
+jmC
 aaa
 aaa
 aaa
@@ -106485,12 +104657,12 @@ aaa
 aaa
 aaa
 aaa
-lfx
-wLe
-wLe
-wLe
-wLe
-sEJ
+tIk
+mCq
+mCq
+mCq
+mCq
+dSv
 asB
 atD
 auJ
@@ -106742,12 +104914,12 @@ aaa
 aaa
 aaa
 aaa
-uBW
-wLe
-wLe
-wLe
-wLe
-wLe
+fzd
+mCq
+mCq
+mCq
+mCq
+mCq
 asB
 atC
 auI
@@ -106831,7 +105003,7 @@ cNW
 cNW
 cNW
 cOe
-xPX
+qXH
 csy
 cko
 cAf
@@ -106999,12 +105171,12 @@ aaa
 aaa
 aaa
 aaa
-lfx
-wLe
-wLe
-wLe
-wLe
-wLe
+tIk
+mCq
+mCq
+mCq
+mCq
+mCq
 asB
 atE
 auI
@@ -107256,18 +105428,18 @@ aaa
 aaa
 aaa
 aaa
-lfx
-wLe
-wLe
-wLe
-wLe
-wLe
+tIk
+mCq
+mCq
+mCq
+mCq
+mCq
 asB
 asB
 asB
 avL
 awR
-kuT
+hRT
 azu
 aAz
 asB
@@ -107341,7 +105513,7 @@ cgp
 chv
 ciJ
 cbf
-xcw
+lLI
 clr
 bnt
 cOe
@@ -107513,12 +105685,12 @@ aaa
 aaa
 aaa
 aaa
-uBW
-kgf
-wLe
-pnl
-wLe
-oKy
+fzd
+wXP
+mCq
+nXa
+mCq
+nyH
 asB
 atG
 auL
@@ -107770,12 +105942,12 @@ aaa
 aaa
 aaa
 aaa
-uBW
-uBW
-uBW
-uBW
-uBW
-uBW
+fzd
+fzd
+fzd
+fzd
+fzd
+fzd
 asB
 atF
 auK
@@ -108061,9 +106233,9 @@ aXB
 aZh
 baB
 aCR
-fkx
+riB
 bdx
-izL
+dfI
 bgc
 bgc
 biX
@@ -108377,13 +106549,13 @@ cOe
 cOe
 cOe
 sQX
-tDE
-tDE
-tDE
-tDE
-tDE
-tDE
-tDE
+jzi
+jzi
+jzi
+jzi
+jzi
+jzi
+jzi
 aaS
 aaS
 aba
@@ -109135,7 +107307,7 @@ cbZ
 bSl
 cmo
 cNW
-sPj
+vOq
 cNW
 chC
 ciL
@@ -110435,17 +108607,17 @@ cpi
 cpi
 cpi
 cqJ
-gnW
+ggg
 crk
 crk
 crk
 crk
 crk
-phP
+pFt
 cqJ
-gnW
+ggg
 crk
-phP
+pFt
 cpi
 cpi
 ctB
@@ -110701,7 +108873,7 @@ crF
 aaa
 aaa
 aaa
-jvm
+hik
 aaa
 aaa
 aaa
@@ -111440,7 +109612,7 @@ cNW
 cNW
 cNW
 cNW
-dok
+vFt
 clt
 cac
 cbh
@@ -111706,7 +109878,7 @@ cbf
 cbf
 ceT
 cNW
-wNd
+kCW
 chH
 cNW
 aaf
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b47944146f..c59e0698f9 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1449,26 +1449,6 @@
 	},
 /turf/open/floor/plating,
 /area/construction/mining/aux_base)
-"agv" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/machinery/airalarm{
-	dir = 2;
-	pixel_y = 22
-	},
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
 "agB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -56088,8 +56068,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/gun/energy/pumpaction/blaster,
-/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "bRx" = (
@@ -120804,17 +120782,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
-"dWi" = (
-/obj/structure/table,
-/obj/machinery/computer/libraryconsole/bookmanagement,
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/white{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plating,
-/area/security/prison)
 "dWm" = (
 /obj/structure/reagent_dispensers/virusfood{
 	pixel_x = -32
@@ -126401,18 +126368,22 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/library)
-"euu" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/light/small,
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
 "exE" = (
 /obj/machinery/air_sensor/atmos/toxins_mixing_tank,
 /turf/open/floor/engine/vacuum,
 /area/science/mixing)
+"eCJ" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/maintenance/port/fore)
 "eCM" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -126423,27 +126394,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
-"eHb" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
-"eIC" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
 "eJc" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
 /turf/closed/wall/r_wall,
@@ -126485,6 +126435,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
+"ePi" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/maintenance/port/fore)
 "eTv" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -126537,24 +126494,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/medical/medbay/central)
-"flG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/computer/arcade{
-	icon_state = "arcade";
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/fore)
 "fno" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -126580,6 +126519,16 @@
 /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
 /turf/open/floor/engine,
 /area/science/mixing)
+"fCs" = (
+/obj/machinery/door/window/northright{
+	name = "Coffin Storage"
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/closet/crate/coffin,
+/turf/open/floor/plating,
+/area/chapel/office)
 "fFK" = (
 /obj/machinery/ore_silo,
 /obj/effect/turf_decal/tile/neutral{
@@ -126598,6 +126547,22 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
 /area/science/circuit)
+"fLh" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 3;
+	name = "3maintenance loot spawner"
+	},
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
 "fLR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -126614,6 +126579,31 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port)
+"fXF" = (
+/obj/machinery/button/crematorium{
+	id = "cremawheat";
+	pixel_x = -26;
+	req_access_txt = "27"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/clothing/under/burial,
+/obj/item/clothing/under/burial,
+/obj/item/clothing/under/burial,
+/obj/item/clothing/under/burial,
+/obj/item/clothing/under/burial,
+/obj/item/clothing/under/burial,
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
 "gbV" = (
 /obj/machinery/atmospherics/components/binary/pump/on{
 	dir = 1
@@ -126626,49 +126616,56 @@
 	},
 /turf/open/floor/engine,
 /area/science/mixing)
-"gkl" = (
-/obj/effect/turf_decal/tile/neutral{
+"giN" = (
+/obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/closet/crate/coffin,
+/turf/open/floor/plating,
 /area/chapel/office)
 "gmj" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
 /area/science/circuit)
-"gug" = (
-/obj/machinery/light/small,
-/turf/open/floor/plasteel,
-/area/security/prison)
-"gER" = (
-/obj/structure/cable/white{
-	icon_state = "4-8"
+"gut" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
 	},
-/obj/structure/cable/white{
-	icon_state = "2-4"
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
+"gBd" = (
 /turf/open/floor/plasteel,
-/area/maintenance/port/aft)
+/area/security/prison)
+"gKo" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/maintenance/port/fore)
 "gKr" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1
 	},
 /turf/open/floor/circuit/green,
 /area/science/research/abandoned)
+"gLe" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/hydroponics/soil,
+/obj/item/seeds/grape,
+/turf/open/floor/plasteel,
+/area/hydroponics/garden/abandoned{
+	name = "Maintenance Garden"
+	})
 "gNw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/table/glass,
@@ -126726,6 +126723,13 @@
 /obj/item/clothing/mask/muzzle,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
+"gVZ" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/maintenance/port/fore)
 "gXn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -126736,10 +126740,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/department/electrical)
-"hds" = (
-/obj/structure/grille,
-/turf/open/space,
-/area/space/nearstation)
 "hdH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/conveyor{
@@ -126757,21 +126757,10 @@
 	dir = 10
 	},
 /area/science/circuit)
-"hig" = (
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
+"hix" = (
+/obj/structure/sign/warning/vacuum,
+/turf/closed/wall/r_wall,
+/area/chapel/office)
 "hrP" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -126793,19 +126782,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/port/aft)
-"hsc" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
+"hsy" = (
+/obj/machinery/vr_sleeper,
+/obj/structure/cable/white{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
+/turf/open/floor/plasteel,
+/area/security/prison)
 "hFo" = (
 /obj/structure/lattice,
 /obj/structure/disposalpipe/segment{
@@ -126837,9 +126820,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/prison)
-"hJk" = (
-/turf/open/space,
-/area/space)
 "hNZ" = (
 /obj/structure/chair/office/light{
 	dir = 8
@@ -126859,11 +126839,36 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/medical/medbay/central)
-"hUt" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 2;
-	name = "2maintenance loot spawner"
+"hTX" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
+"iaF" = (
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/science/research)
+"iho" = (
+/obj/structure/sign/warning/nosmoking,
+/turf/closed/wall,
+/area/medical/surgery)
+"ijB" = (
+/obj/structure/reagent_dispensers/keg/aphro/strong,
+/obj/item/reagent_containers/glass/beaker,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"ioW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -126872,17 +126877,12 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
-"iaF" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/science/research)
-"ijB" = (
-/obj/structure/reagent_dispensers/keg/aphro/strong,
-/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
 "iwL" = (
 /obj/machinery/status_display{
 	pixel_x = 32
@@ -126941,37 +126941,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
-"iUn" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/structure/closet/crate/coffin,
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
-"iZm" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/computer/arcade{
-	icon_state = "arcade";
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/starboard/fore)
 "jdO" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -126996,13 +126965,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/research/abandoned)
-"jie" = (
-/obj/machinery/vr_sleeper,
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "jjN" = (
 /obj/structure/table/reinforced,
 /obj/machinery/camera{
@@ -127100,10 +127062,6 @@
 /obj/machinery/chem_master,
 /turf/open/floor/plasteel/dark,
 /area/medical/medbay/central)
-"jPL" = (
-/obj/structure/sign/warning/vacuum,
-/turf/closed/wall/r_wall,
-/area/chapel/office)
 "jRy" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -127124,16 +127082,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/science/mixing)
-"jTP" = (
-/obj/machinery/door/window/northleft{
-	name = "Mass Driver"
-	},
-/obj/machinery/mass_driver{
-	id = "chapelgun";
-	name = "Holy Driver"
-	},
-/turf/open/floor/plating,
-/area/chapel/office)
 "kam" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/conveyor{
@@ -127142,11 +127090,48 @@
 	},
 /turf/open/floor/plating,
 /area/quartermaster/storage)
-"ktV" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
+"kiJ" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
+"kqa" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/storage/crayons,
+/obj/item/storage/crayons,
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"krb" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "kvf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -127173,6 +127158,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/port)
+"kKn" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/door/window{
+	req_one_access_txt = "48,50"
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/quartermaster/sorting)
 "kLu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -127188,27 +127186,11 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
-"kTU" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/r_wall,
-/area/chapel/office)
-"lag" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
 "lak" = (
 /turf/open/floor/plasteel/white/side{
 	dir = 10
 	},
 /area/science/circuit)
-"lem" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/grape,
-/turf/open/floor/plasteel,
-/area/hydroponics/garden/abandoned{
-	name = "Maintenance Garden"
-	})
 "loI" = (
 /obj/machinery/autolathe,
 /obj/machinery/door/window/southleft{
@@ -127240,13 +127222,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
-"lva" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
 "lyU" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
 	dir = 8
@@ -127302,6 +127277,20 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"lLY" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/structure/closet/crate/coffin,
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
 "lOY" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -127360,38 +127349,16 @@
 	dir = 1
 	},
 /area/science/circuit)
-"lYm" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
+"mbd" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/delivery,
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
-	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
-"mhH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
 "mkm" = (
 /obj/machinery/atmospherics/components/binary/valve,
 /obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
@@ -127410,9 +127377,21 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/mixing)
-"mqT" = (
+"mpP" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
-/area/security/prison)
+/area/maintenance/port/fore)
 "mvm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -127439,31 +127418,23 @@
 /obj/item/assembly/signaler,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
-"mIQ" = (
-/obj/machinery/button/crematorium{
-	id = "cremawheat";
-	pixel_x = -26;
-	req_access_txt = "27"
+"mPj" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/structure/table,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating,
 /area/chapel/office)
+"mPH" = (
+/obj/structure/table,
+/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/white{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/security/prison)
 "mQE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -127487,38 +127458,35 @@
 	},
 /turf/open/floor/engine,
 /area/science/mixing)
+"nbW" = (
+/obj/structure/grille,
+/turf/open/space,
+/area/space/nearstation)
 "nyN" = (
 /obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
+"nFW" = (
+/obj/machinery/door/poddoor{
+	id = "chapelgun";
+	name = "Chapel Launcher Door"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/chapel/office)
+"nNX" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel,
+/area/maintenance/port/fore)
 "nSh" = (
 /obj/machinery/atmospherics/pipe/simple/general/hidden,
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
-"nUj" = (
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/aft)
-"nZa" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/machinery/door/window{
-	req_one_access_txt = "48,50"
-	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/quartermaster/sorting)
-"oDr" = (
+"oHk" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -127531,7 +127499,7 @@
 	},
 /obj/machinery/computer/arcade{
 	icon_state = "arcade";
-	dir = 4
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/fore)
@@ -127633,6 +127601,39 @@
 	},
 /turf/open/floor/wood,
 /area/bridge/showroom/corporate)
+"oZY" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 2;
+	name = "2maintenance loot spawner"
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
+"pfC" = (
+/obj/machinery/seed_extractor,
+/obj/item/reagent_containers/glass/bucket,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hydroponics/garden/abandoned{
+	name = "Maintenance Garden"
+	})
+"pgU" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/hydroponics/soil,
+/obj/item/seeds/lime{
+	pixel_x = 6
+	},
+/turf/open/floor/plasteel,
+/area/hydroponics/garden/abandoned{
+	name = "Maintenance Garden"
+	})
 "pmQ" = (
 /obj/structure/table/reinforced,
 /obj/machinery/newscaster{
@@ -127643,6 +127644,22 @@
 	dir = 1
 	},
 /area/science/circuit)
+"pnK" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/keycard_auth{
+	pixel_x = -25
+	},
+/turf/open/floor/plasteel,
+/area/quartermaster/qm)
 "poI" = (
 /obj/structure/bed,
 /obj/item/tank/internals/anesthetic,
@@ -127674,36 +127691,6 @@
 	},
 /turf/open/floor/plating,
 /area/science/research/abandoned)
-"pDQ" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
-"pLz" = (
-/obj/structure/sign/warning/nosmoking,
-/turf/closed/wall,
-/area/medical/surgery)
-"pPt" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/bodycontainer/morgue,
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
 "pQm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -127721,7 +127708,47 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/research/abandoned)
-"qbg" = (
+"qhc" = (
+/obj/structure/table/reinforced,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/wirer,
+/turf/open/floor/plasteel/white/side{
+	dir = 9
+	},
+/area/science/circuit)
+"qnx" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input,
+/turf/open/floor/engine/vacuum,
+/area/science/mixing)
+"qoc" = (
+/obj/machinery/door/window/northleft{
+	name = "Mass Driver"
+	},
+/obj/machinery/mass_driver{
+	id = "chapelgun";
+	name = "Holy Driver"
+	},
+/turf/open/floor/plating,
+/area/chapel/office)
+"qpq" = (
+/turf/open/floor/plasteel/white/side{
+	dir = 5
+	},
+/area/science/circuit)
+"qAV" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/light/small,
+/turf/open/floor/plasteel,
+/area/maintenance/port/fore)
+"qBG" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"ray" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -127742,42 +127769,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
-"qhc" = (
-/obj/structure/table/reinforced,
-/obj/item/integrated_electronics/analyzer,
-/obj/item/integrated_electronics/debugger,
-/obj/item/integrated_electronics/wirer,
-/turf/open/floor/plasteel/white/side{
-	dir = 9
-	},
-/area/science/circuit)
-"qkw" = (
-/obj/effect/landmark/barthpot,
-/turf/open/floor/wood,
-/area/library)
-"qnx" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input,
-/turf/open/floor/engine/vacuum,
-/area/science/mixing)
-"qpq" = (
-/turf/open/floor/plasteel/white/side{
-	dir = 5
-	},
-/area/science/circuit)
-"qzY" = (
-/obj/machinery/door/window/northright{
-	name = "Coffin Storage"
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/closet/crate/coffin,
-/turf/open/floor/plating,
-/area/chapel/office)
-"qBG" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
 "rhO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1
@@ -127786,23 +127777,42 @@
 	dir = 9
 	},
 /area/science/circuit)
+"rqh" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "rCv" = (
 /turf/open/floor/plasteel/white/side{
 	dir = 6
 	},
 /area/science/circuit)
-"rTc" = (
-/obj/structure/sign/warning/electricshock{
-	pixel_y = 32
+"rIi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
 	},
-/obj/machinery/vr_sleeper,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
+"rKU" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating{
-	icon_state = "platingdmg2"
+/obj/structure/cable/white{
+	icon_state = "2-4"
 	},
-/area/security/prison)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/maintenance/port/aft)
 "rUD" = (
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -127844,54 +127854,32 @@
 /obj/effect/decal/remains/xeno,
 /turf/open/floor/engine/vacuum,
 /area/science/mixing)
-"siB" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/closet/crate/coffin,
-/turf/open/floor/plating,
-/area/chapel/office)
+"sfL" = (
+/turf/open/space,
+/area/space)
 "svv" = (
 /obj/machinery/door/poddoor/incinerator_toxmix,
 /turf/open/floor/engine/vacuum,
 /area/science/mixing)
-"sBk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+"sww" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/wall/r_wall,
+/area/chapel/office)
+"sCQ" = (
+/obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel{
-	heat_capacity = 1e+006
-	},
-/area/maintenance/port/aft)
-"tma" = (
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
-/obj/machinery/keycard_auth{
-	pixel_x = -25
-	},
-/turf/open/floor/plasteel,
-/area/quartermaster/qm)
-"tmi" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/science/circuit)
-"tra" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/bodycontainer/morgue,
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
+"sVX" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -127902,8 +127890,21 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/airalarm{
+	dir = 2;
+	pixel_y = 22
+	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
+"tmi" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/science/circuit)
 "twt" = (
 /obj/machinery/vr_sleeper,
 /obj/effect/turf_decal/tile/neutral{
@@ -127911,7 +127912,7 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
-"tzT" = (
+"tBE" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
@@ -127944,16 +127945,22 @@
 /obj/machinery/chem_heater,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
-"umo" = (
-/obj/structure/table,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/storage/crayons,
-/obj/item/storage/crayons,
-/obj/structure/cable/white{
-	icon_state = "4-8"
+"tVN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/security/prison)
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
 "upk" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Holodeck Access"
@@ -127986,10 +127993,31 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
-"uNx" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/turf/open/floor/plasteel,
+"usi" = (
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 32
+	},
+/obj/machinery/vr_sleeper,
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg2"
+	},
 /area/security/prison)
+"uuP" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/plasteel/dark,
+/area/chapel/office)
 "uNP" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
 /obj/effect/turf_decal/stripes/line{
@@ -128022,15 +128050,6 @@
 /obj/item/clothing/under/color/grey,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
-"vph" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
 "vAb" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -128040,27 +128059,14 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
+"vAW" = (
+/obj/machinery/light/small,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "wei" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"wjb" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/hydroponics/soil,
-/obj/item/seeds/lime{
-	pixel_x = 6
-	},
-/turf/open/floor/plasteel,
-/area/hydroponics/garden/abandoned{
-	name = "Maintenance Garden"
-	})
-"wsI" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/maintenance/port/fore)
 "wAA" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/r_wall,
@@ -128076,28 +128082,10 @@
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
-"wJf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/chapel/office)
-"wQz" = (
-/obj/machinery/seed_extractor,
-/obj/item/reagent_containers/glass/bucket,
-/obj/effect/turf_decal/delivery,
+"wIf" = (
+/obj/item/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel,
-/area/hydroponics/garden/abandoned{
-	name = "Maintenance Garden"
-	})
+/area/security/prison)
 "xaf" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Holodeck Access"
@@ -128116,14 +128104,20 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
-"xdG" = (
-/obj/machinery/door/poddoor{
-	id = "chapelgun";
-	name = "Chapel Launcher Door"
+"xdZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/chapel/office)
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/turf/open/floor/plasteel{
+	heat_capacity = 1e+006
+	},
+/area/maintenance/port/aft)
 "xmt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
@@ -128133,6 +128127,10 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
+"xuu" = (
+/obj/effect/landmark/barthpot,
+/turf/open/floor/wood,
+/area/library)
 "xwK" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -157117,7 +157115,7 @@ arB
 aug
 alg
 alg
-pDQ
+eCJ
 aKg
 alf
 aMO
@@ -157374,7 +157372,7 @@ aAb
 aAb
 aAb
 aAb
-vph
+gKo
 aKh
 alf
 aMN
@@ -157632,7 +157630,7 @@ aCv
 aFJ
 aAb
 aIH
-eIC
+nNX
 alf
 aMP
 aDw
@@ -158146,7 +158144,7 @@ aEB
 aFL
 aAb
 aIH
-lva
+ePi
 avm
 arB
 arB
@@ -158398,7 +158396,7 @@ alf
 aAb
 aBj
 aCv
-wQz
+pfC
 aEC
 aFM
 aAb
@@ -158529,7 +158527,7 @@ edL
 eep
 eff
 aad
-lag
+rqh
 aaa
 ajr
 aaa
@@ -158655,7 +158653,7 @@ alg
 aAb
 aBk
 aCv
-lem
+gLe
 aEC
 aFN
 aAb
@@ -158786,7 +158784,7 @@ edM
 eeq
 dLY
 aad
-hds
+nbW
 aaa
 aad
 aaa
@@ -158917,7 +158915,7 @@ aED
 aFO
 aHm
 aII
-euu
+qAV
 aLz
 aMR
 aOq
@@ -159174,7 +159172,7 @@ aEE
 aFP
 aHn
 aIJ
-wsI
+gVZ
 aLz
 aMS
 aOr
@@ -159426,12 +159424,12 @@ ayX
 aAb
 aBn
 aCx
-wjb
+pgU
 aCv
 aFQ
 aAb
-hig
-wsI
+mpP
+gVZ
 aLz
 aMT
 aOs
@@ -159804,7 +159802,7 @@ dXz
 dYt
 dON
 dOl
-gER
+rKU
 eaX
 dYu
 ect
@@ -160060,8 +160058,8 @@ dON
 dON
 dON
 dON
-sBk
-nUj
+xdZ
+mbd
 ebc
 ebQ
 ecu
@@ -160202,7 +160200,7 @@ aAb
 aAb
 aAb
 aIL
-lva
+ePi
 aLz
 aLz
 aLz
@@ -160323,12 +160321,12 @@ dZN
 dZN
 dZN
 dZN
-jPL
+hix
 dZN
 dZN
 dLY
 aad
-lag
+rqh
 aad
 aad
 aaa
@@ -160459,7 +160457,7 @@ aEG
 aFS
 aHp
 aIM
-tzT
+tBE
 aLB
 aFS
 aEG
@@ -160574,20 +160572,20 @@ dWJ
 dLW
 dYu
 dZg
-lYm
-hUt
+fLh
+oZY
 dZN
-hsc
-gkl
-qbg
-jTP
-ktV
-xdG
+gut
+krb
+ray
+qoc
+mPj
+nFW
 aaa
-hJk
+sfL
 aaa
 aaa
-hJk
+sfL
 aaa
 aaa
 aaa
@@ -160763,7 +160761,7 @@ caG
 chU
 cjt
 ckR
-qkw
+xuu
 cnR
 cpv
 cqQ
@@ -160833,12 +160831,12 @@ dTw
 dTw
 dZN
 dZN
-kTU
-agv
-eHb
-eHb
-qzY
-siB
+sww
+sVX
+hTX
+hTX
+fCs
+giN
 dTw
 aad
 aad
@@ -161082,17 +161080,17 @@ dRB
 dSz
 dTx
 dUi
-iUn
+lLY
 dVN
-iUn
+lLY
 dXB
 dYv
 dTw
 dZO
-mIQ
-pPt
-mhH
-tra
+fXF
+sCQ
+tVN
+uuP
 dTw
 dTw
 dTw
@@ -161345,7 +161343,7 @@ dUj
 dXC
 dYw
 dZh
-wJf
+rIi
 eau
 edr
 ebS
@@ -168167,7 +168165,7 @@ aCP
 avQ
 aFe
 aGp
-nZa
+kKn
 aJg
 aKF
 aLP
@@ -170724,7 +170722,7 @@ aox
 apu
 aqy
 arb
-flG
+ioW
 aig
 auA
 avU
@@ -171491,7 +171489,7 @@ akU
 alI
 amE
 anz
-oDr
+kiJ
 apw
 aqA
 apy
@@ -172009,7 +172007,7 @@ aiC
 apy
 apy
 apu
-iZm
+oHk
 atw
 auD
 avW
@@ -174934,7 +174932,7 @@ dkv
 dma
 dma
 dma
-pLz
+iho
 dsI
 dro
 dvz
@@ -175370,7 +175368,7 @@ aaa
 aaa
 aad
 aQR
-tma
+pnK
 aUq
 aVR
 aXF
@@ -179473,7 +179471,7 @@ aaa
 aaa
 aaa
 aaa
-lag
+rqh
 aFm
 aIc
 aFm
@@ -179730,9 +179728,9 @@ aaa
 aaa
 aaa
 aaa
-lag
+rqh
 aFm
-umo
+kqa
 bbt
 aFm
 aMc
@@ -179987,10 +179985,10 @@ aaa
 aaa
 aaa
 aaa
-lag
+rqh
 aFm
-jie
-gug
+hsy
+vAW
 aFm
 aKV
 aNy
@@ -180246,10 +180244,10 @@ ajr
 ajr
 aad
 aFm
-rTc
-mqT
-uNx
-mqT
+usi
+gBd
+wIf
+gBd
 aNz
 aPh
 aQZ
@@ -180503,7 +180501,7 @@ ajr
 aad
 aad
 aFn
-dWi
+mPH
 aJA
 aJA
 aMe
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f2eab05785..3516d61080 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3528,7 +3528,6 @@
 	pixel_x = -22
 	},
 /obj/structure/rack,
-/obj/item/storage/fancy/donut_box,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/effect/turf_decal/tile/neutral{
@@ -4004,8 +4003,7 @@
 	dir = 8
 	},
 /obj/structure/rack,
-/obj/item/gun/energy/pumpaction/blaster,
-/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/storage/fancy/donut_box,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "ahJ" = (
@@ -27117,6 +27115,10 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 2
 	},
+/obj/structure/sign/departments/custodian{
+	pixel_x = 32;
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "baI" = (
@@ -83444,6 +83446,10 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
+"iCn" = (
+/obj/machinery/vr_sleeper,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "iLj" = (
 /obj/structure/table,
 /turf/open/floor/plating,
@@ -83462,6 +83468,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
+"jhu" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/public/glass{
+	id_tag = "permahydro";
+	name = "Recreation Module"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "jwW" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/crew_quarters/fitness/recreation)
@@ -83519,16 +83535,6 @@
 "krD" = (
 /turf/closed/wall,
 /area/science/circuit)
-"kwg" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/public/glass{
-	id_tag = "permahydro";
-	name = "Recreation Module"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "kwI" = (
 /obj/item/wrench,
 /obj/item/clothing/suit/apron,
@@ -83589,10 +83595,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"kRT" = (
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/security/prison)
 "kVo" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -83612,13 +83614,6 @@
 /obj/item/integrated_circuit_printer,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"lmg" = (
-/obj/machinery/computer/arcade{
-	icon_state = "arcade";
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "lsv" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/circuit";
@@ -83667,6 +83662,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
+"lWL" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/surgery)
 "lWY" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms Server Room"
@@ -83788,13 +83787,6 @@
 /obj/item/storage/fancy/candle_box,
 /turf/open/floor/engine/cult,
 /area/library)
-"oba" = (
-/obj/structure/chair/stool,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "obb" = (
 /obj/structure/target_stake,
 /obj/effect/turf_decal/stripes/line{
@@ -84063,6 +84055,20 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/cryopod)
+"ram" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
+"roa" = (
+/obj/structure/chair/stool,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "rzX" = (
 /obj/structure/chair/office/light{
 	dir = 1;
@@ -84076,6 +84082,17 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
+"rLV" = (
+/obj/structure/table,
+/obj/item/folder,
+/obj/item/paper/guides/jobs/hydroponics,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/pen,
+/obj/item/storage/crayons,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "rMS" = (
 /obj/machinery/status_display/supply,
 /turf/closed/wall,
@@ -84271,15 +84288,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard)
-"uHA" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/security/prison)
 "uJU" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -84364,10 +84372,6 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space)
-"vPN" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/surgery)
 "wdu" = (
 /obj/structure/grille,
 /obj/structure/lattice,
@@ -84440,17 +84444,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/science/misc_lab)
-"xcb" = (
-/obj/structure/table,
-/obj/item/folder,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/item/pen,
-/obj/item/storage/crayons,
-/turf/open/floor/plasteel,
-/area/security/prison)
 "xeC" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel/dark,
@@ -84507,6 +84500,15 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"xIi" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/security/prison)
 "xVl" = (
 /turf/closed/wall,
 /area/hallway/secondary/service)
@@ -104237,7 +104239,7 @@ cia
 cia
 cpX
 cia
-vPN
+lWL
 cia
 ceu
 dyg
@@ -106710,11 +106712,11 @@ aaa
 aaf
 aaf
 aay
-xcb
-uHA
+rLV
+xIi
 abC
-kwg
-uHA
+jhu
+xIi
 abC
 abC
 acr
@@ -106968,10 +106970,10 @@ aaf
 aaa
 aax
 abl
-oba
-lmg
+roa
+ram
 aax
-kRT
+iCn
 aaR
 aaR
 aaI
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index de42e1ac63..99c536bd3c 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -3571,14 +3571,6 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"Wt" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/laborcamp/security)
-"Wz" = (
-/obj/effect/mapping_helpers/planet_z,
-/turf/open/lava/smooth/lava_land_surface,
-/area/lavaland/surface/outdoors)
 "WA" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
@@ -3630,26 +3622,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
-"WF" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/laborcamp)
-"WH" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/eva)
-"WI" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/production)
-"WJ" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall/r_wall,
-/area/mine/maintenance)
-"WK" = (
-/obj/effect/baseturf_helper/lava_land/surface,
-/turf/closed/wall,
-/area/mine/living_quarters)
 
 (1,1,1) = {"
 aa
@@ -3906,7 +3878,7 @@ aj
 aj
 aj
 aj
-Wz
+aj
 "}
 (2,1,1) = {"
 aa
@@ -8751,7 +8723,7 @@ aq
 WB
 aq
 bi
-WF
+aq
 WC
 aq
 bZ
@@ -9012,7 +8984,7 @@ az
 az
 aq
 ca
-Wt
+ca
 ca
 aj
 aj
@@ -12102,7 +12074,7 @@ ai
 cQ
 dk
 dA
-WJ
+cQ
 ed
 er
 eM
@@ -13134,7 +13106,7 @@ dR
 ef
 es
 dZ
-WK
+cM
 fg
 cM
 cM
@@ -20320,9 +20292,9 @@ bt
 bH
 bV
 cq
-WH
+bf
+bq
 bq
-WI
 db
 bP
 bP
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index be4128208a..b9462f214d 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2812,7 +2812,6 @@
 /obj/structure/table,
 /obj/item/storage/box/firingpins,
 /obj/item/storage/box/firingpins,
-/obj/item/key/security,
 /obj/machinery/power/apc/highcap/five_k{
 	dir = 4;
 	name = "Armory APC";
@@ -3848,8 +3847,7 @@
 "akN" = (
 /obj/effect/landmark/event_spawn,
 /obj/structure/rack,
-/obj/item/gun/energy/pumpaction/blaster,
-/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/key/security,
 /turf/open/floor/plasteel/dark,
 /area/security/armory)
 "akO" = (
@@ -24561,12 +24559,6 @@
 /obj/machinery/shieldwallgen,
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
-"bfQ" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
 "bfY" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/hidden,
 /obj/effect/turf_decal/tile/neutral,
@@ -40142,6 +40134,14 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space,
 /area/space/nearstation)
+"bNE" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/chapel/monastery)
 "bNF" = (
 /obj/item/stack/medical/bruise_pack,
 /turf/open/floor/plasteel/dark,
@@ -46926,16 +46926,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
-"ceG" = (
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 2;
-	name = "2maintenance loot spawner"
-	},
-/obj/structure/rack,
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
-/area/maintenance/department/chapel/monastery)
 "ceH" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -51972,12 +51962,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/library/lounge)
-"cxW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "cxX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -53159,6 +53143,9 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
+"dpc" = (
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "dps" = (
 /obj/machinery/status_display/ai,
 /turf/closed/wall,
@@ -53391,18 +53378,6 @@
 /obj/machinery/shieldwallgen/xenobiologyaccess,
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
-"dQj" = (
-/mob/living/simple_animal/bot/secbot{
-	arrest_type = 1;
-	health = 45;
-	icon_state = "secbot1";
-	idcheck = 1;
-	name = "Sergeant-at-Armsky";
-	on = 1;
-	weaponscheck = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/armory)
 "dSp" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
 	dir = 1
@@ -53413,35 +53388,12 @@
 /obj/item/chair,
 /turf/open/floor/wood,
 /area/maintenance/department/engine)
-"dTz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/item/twohanded/required/kirbyplants{
-	icon_state = "plant-10"
-	},
-/turf/open/floor/plasteel/dark,
-/area/chapel/main/monastery)
 "dTV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
-"dUI" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "dVI" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 4;
@@ -53472,6 +53424,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"dYe" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
 "dZj" = (
 /obj/machinery/atmospherics/pipe/manifold/green/visible,
 /obj/machinery/airalarm/engine{
@@ -53495,10 +53453,6 @@
 	},
 /turf/open/floor/plating,
 /area/lawoffice)
-"ebT" = (
-/mob/living/simple_animal/hostile/retaliate/goose,
-/turf/open/floor/wood,
-/area/maintenance/department/crew_quarters/dorms)
 "edl" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -53551,6 +53505,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"eit" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "eiV" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 4
@@ -53558,26 +53519,20 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
-"ejJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "ekU" = (
 /obj/effect/decal/cleanable/cobweb{
 	icon_state = "cobweb2"
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
-"ekV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "elk" = (
 /obj/structure/chair/office/dark,
 /turf/open/floor/wood,
 /area/lawoffice)
+"epg" = (
+/obj/structure/lattice,
+/turf/open/space,
+/area/space)
 "epj" = (
 /obj/machinery/cryopod{
 	dir = 8
@@ -53766,6 +53721,16 @@
 	icon_state = "platingdmg3"
 	},
 /area/maintenance/department/science)
+"eNc" = (
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 3;
+	name = "3maintenance loot spawner"
+	},
+/obj/structure/rack,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/chapel/monastery)
 "eNq" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -53790,12 +53755,6 @@
 	},
 /turf/closed/wall,
 /area/maintenance/department/security/brig)
-"eQa" = (
-/obj/effect/landmark/xeno_spawn,
-/turf/open/floor/plating{
-	icon_state = "platingdmg1"
-	},
-/area/maintenance/department/chapel/monastery)
 "eQN" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -53850,6 +53809,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"eVT" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "eWi" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -53937,9 +53902,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/construction/mining/aux_base)
-"ffK" = (
-/turf/open/space/basic,
-/area/hallway/secondary/entry)
 "fhM" = (
 /obj/item/storage/secure/safe{
 	pixel_x = -22
@@ -53966,16 +53928,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/explab)
-"fjC" = (
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
-	},
-/obj/structure/rack,
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
-/area/maintenance/department/chapel/monastery)
 "fjD" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
@@ -54201,17 +54153,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/supermatter)
-"fCC" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Monastery Transit"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/hallway/secondary/entry)
 "fFv" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/firealarm{
@@ -54671,14 +54612,6 @@
 /obj/item/clothing/glasses/welding,
 /turf/open/floor/plasteel/dark,
 /area/science/lab)
-"gFw" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
-/area/maintenance/department/chapel/monastery)
 "gGy" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -54792,17 +54725,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
-"gOI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/public/glass{
-	name = "Monastery Transit"
-	},
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/chapel/dock)
 "gPV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 10
@@ -54826,6 +54748,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
+"gTy" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/lattice,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "gUb" = (
 /obj/structure/chair/office/dark{
 	dir = 4
@@ -54857,14 +54787,6 @@
 /obj/structure/grille,
 /turf/open/space/basic,
 /area/space/nearstation)
-"haq" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Monastery Transit"
-	},
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/chapel/dock)
 "haA" = (
 /obj/structure/table,
 /obj/item/stack/sheet/metal/fifty,
@@ -55074,12 +54996,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/solars/port)
-"hCR" = (
-/obj/machinery/light/small,
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
+"hCb" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Monastery Transit"
 	},
-/area/maintenance/department/chapel/monastery)
+/turf/open/floor/plasteel/white{
+	heat_capacity = 1e+006
+	},
+/area/hallway/secondary/entry)
 "hDG" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Auxillary Base Construction";
@@ -55463,9 +55387,6 @@
 "iqc" = (
 /turf/open/floor/plasteel/stairs/right,
 /area/maintenance/department/crew_quarters/dorms)
-"irD" = (
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "irM" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/stripes/line{
@@ -55505,6 +55426,18 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"ivO" = (
+/mob/living/simple_animal/bot/secbot{
+	arrest_type = 1;
+	health = 45;
+	icon_state = "secbot1";
+	idcheck = 1;
+	name = "Sergeant-at-Armsky";
+	on = 1;
+	weaponscheck = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/armory)
 "iwe" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/effect/turf_decal/tile/blue{
@@ -55642,6 +55575,21 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
+"iLR" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison)
 "iPj" = (
 /obj/machinery/igniter{
 	id = "xenoigniter";
@@ -55672,6 +55620,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"iPH" = (
+/obj/machinery/vr_sleeper{
+	icon_state = "sleeper";
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison)
 "iPO" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "aux_base_shutters";
@@ -55724,6 +55685,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
+"iXx" = (
+/obj/machinery/light/small,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/chapel/monastery)
 "jcT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 10
@@ -55744,13 +55711,6 @@
 	dir = 1
 	},
 /area/hallway/secondary/exit/departure_lounge)
-"jfr" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
 "jgr" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Library"
@@ -56013,6 +55973,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/science)
+"jSa" = (
+/obj/machinery/door/airlock/maintenance,
+/turf/open/floor/plating,
+/area/chapel/main/monastery)
 "jTh" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -56034,14 +55998,6 @@
 	},
 /turf/open/floor/carpet,
 /area/lawoffice)
-"jTN" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/lattice,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
 "jTU" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/structure/cable/yellow{
@@ -56211,16 +56167,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
+"koE" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
 "kpK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
-"kqV" = (
-/obj/structure/lattice,
-/turf/open/space,
-/area/space)
 "krU" = (
 /obj/structure/chair{
 	dir = 4
@@ -56234,10 +56190,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
-"kuT" = (
-/obj/machinery/door/airlock/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/department/engine)
 "kvj" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -56295,15 +56247,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"kzK" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
 "kAa" = (
 /obj/structure/chair{
 	dir = 8
@@ -56407,9 +56350,23 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
-"kGc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/white,
+"kGe" = (
+/obj/structure/transit_tube/horizontal,
+/obj/structure/sign/departments/holy{
+	pixel_x = -32
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"kIc" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Monastery Transit"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white{
+	heat_capacity = 1e+006
+	},
 /area/hallway/secondary/entry)
 "kIo" = (
 /obj/structure/table,
@@ -56445,16 +56402,6 @@
 /obj/structure/closet,
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
-"kLT" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/rack,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
-/area/maintenance/department/chapel/monastery)
 "kNf" = (
 /obj/machinery/door/window/northleft{
 	base_state = "right";
@@ -56522,6 +56469,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"kSb" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space)
 "kSF" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -56559,6 +56511,12 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"kVy" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "kWQ" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible,
 /obj/structure/cable/yellow{
@@ -56572,6 +56530,23 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
+"kXx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/item/twohanded/required/kirbyplants{
+	icon_state = "plant-10"
+	},
+/turf/open/floor/plasteel/dark,
+/area/chapel/main/monastery)
 "kYM" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 27
@@ -56708,20 +56683,12 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"ltB" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+"lxI" = (
+/obj/effect/landmark/xeno_spawn,
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
 	},
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
-"lxm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/chapel/dock)
+/area/maintenance/department/chapel/monastery)
 "lzJ" = (
 /obj/structure/closet/crate/bin,
 /turf/open/floor/carpet,
@@ -57027,6 +56994,11 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
+"mgU" = (
+/obj/effect/landmark/carpspawn,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
 "mhl" = (
 /obj/machinery/power/emitter,
 /obj/machinery/light{
@@ -57060,12 +57032,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"mjk" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "mjn" = (
 /obj/machinery/jukebox,
 /turf/open/floor/plasteel/dark,
@@ -57189,15 +57155,6 @@
 /obj/item/gun/ballistic/shotgun/toy,
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
-"mwl" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
 "mwG" = (
 /obj/effect/turf_decal/tile/yellow,
 /obj/effect/turf_decal/tile/yellow{
@@ -57206,12 +57163,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"mxu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "mxy" = (
 /obj/machinery/power/terminal{
 	dir = 4
@@ -57345,6 +57296,14 @@
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
 /area/maintenance/department/science)
+"mSY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white{
+	heat_capacity = 1e+006
+	},
+/area/chapel/dock)
 "mTS" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -57354,6 +57313,12 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"mVD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "mVM" = (
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
@@ -57431,6 +57396,12 @@
 /obj/item/chair/stool,
 /turf/open/floor/carpet,
 /area/maintenance/department/crew_quarters/dorms)
+"nho" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "nih" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/costume,
@@ -57470,11 +57441,6 @@
 /obj/item/stack/spacecash/c10,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/department/crew_quarters/dorms)
-"nog" = (
-/turf/open/floor/plating{
-	icon_state = "panelscorched"
-	},
-/area/maintenance/department/chapel/monastery)
 "noC" = (
 /obj/machinery/vending/kink,
 /turf/open/floor/wood,
@@ -57706,6 +57672,11 @@
 	},
 /turf/open/floor/engine,
 /area/science/explab)
+"nKo" = (
+/obj/structure/lattice,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "nLl" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -57832,20 +57803,12 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/hallway/secondary/exit/departure_lounge)
-"nYM" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "nZw" = (
 /obj/machinery/door/airlock/abandoned{
 	name = "Backup Laboratory"
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
-"obh" = (
-/obj/machinery/light/small,
-/turf/open/floor/plating,
-/area/maintenance/department/chapel/monastery)
 "obj" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -57870,6 +57833,10 @@
 	initial_gas_mix = "o2=0.01;n2=0.01"
 	},
 /area/maintenance/department/science)
+"odM" = (
+/obj/effect/landmark/barthpot,
+/turf/open/floor/carpet,
+/area/library/lounge)
 "oep" = (
 /obj/structure/table/glass,
 /obj/item/paper_bin,
@@ -57902,14 +57869,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
-"ogn" = (
-/obj/structure/lattice,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/turf/open/space,
-/area/space/nearstation)
 "ohR" = (
 /obj/item/chair,
 /turf/open/floor/plating,
@@ -58003,13 +57962,15 @@
 	},
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
-"ovg" = (
-/obj/structure/transit_tube/horizontal,
-/obj/structure/sign/departments/holy{
-	pixel_x = -32
+"ovB" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison)
 "ovM" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/hidden{
 	dir = 4
@@ -58046,6 +58007,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
 /area/storage/primary)
+"ozO" = (
+/obj/machinery/door/airlock/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/department/engine)
 "oAw" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -58415,6 +58380,12 @@
 	},
 /turf/open/floor/plating,
 /area/science/explab)
+"peE" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
 "pfz" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
@@ -58447,6 +58418,23 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
+"phS" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "garbage"
+	},
+/turf/open/floor/plating,
+/area/maintenance/disposal)
+"pia" = (
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/rack,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/chapel/monastery)
 "pjH" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -58498,6 +58486,17 @@
 	},
 /turf/open/floor/plasteel/white/corner,
 /area/hallway/secondary/exit/departure_lounge)
+"ppY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/public/glass{
+	name = "Monastery Transit"
+	},
+/turf/open/floor/plasteel/white{
+	heat_capacity = 1e+006
+	},
+/area/chapel/dock)
 "prQ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
@@ -58512,21 +58511,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
 /area/engine/supermatter)
-"pua" = (
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
 "puw" = (
 /obj/structure/sign/warning/fire,
 /turf/closed/wall/r_wall,
@@ -58576,6 +58560,9 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/medical/chemistry)
+"pyw" = (
+/turf/open/space/basic,
+/area/hallway/secondary/entry)
 "pBD" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -58602,12 +58589,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"pDd" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/maintenance/department/chapel/monastery)
 "pDP" = (
 /obj/machinery/vending/assist,
 /obj/effect/turf_decal/tile/neutral{
@@ -58672,14 +58653,6 @@
 /obj/structure/closet/crate,
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
-"pKg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/hallway/secondary/entry)
 "pMG" = (
 /obj/structure/sink{
 	dir = 8;
@@ -58928,6 +58901,10 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
+"qni" = (
+/obj/machinery/smartfridge/organ/preloaded,
+/turf/closed/wall,
+/area/medical/surgery)
 "qnT" = (
 /obj/machinery/iv_drip,
 /turf/open/floor/plating,
@@ -59199,6 +59176,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"qWo" = (
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/maintenance/department/chapel/monastery)
 "qWG" = (
 /obj/structure/closet/emcloset/anchored,
 /turf/open/floor/plating,
@@ -59985,6 +59967,22 @@
 	},
 /turf/open/space,
 /area/space/nearstation)
+"tbF" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/lattice,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
+"tbY" = (
+/obj/structure/closet/emcloset,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "tcY" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -60116,6 +60114,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"tnP" = (
+/obj/machinery/seed_extractor,
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
 "tnY" = (
 /obj/machinery/button/door{
 	id = "aux_base_shutters";
@@ -60294,11 +60305,6 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/department/engine)
-"tSk" = (
-/obj/structure/lattice,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
 "tSL" = (
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
@@ -60325,25 +60331,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
-"tZk" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Monastery Transit"
-	},
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/hallway/secondary/entry)
-"tZu" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
-"uau" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "uaC" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
@@ -60376,11 +60363,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
 /area/science/mixing)
-"ucT" = (
-/obj/effect/landmark/carpspawn,
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
 "udl" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -60555,6 +60537,15 @@
 /obj/machinery/light,
 /turf/open/floor/plasteel,
 /area/science/explab)
+"utg" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/cafeteria,
+/area/security/prison)
 "uug" = (
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
@@ -60615,6 +60606,10 @@
 /obj/machinery/field/generator,
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"uxI" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "uxP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -60709,16 +60704,6 @@
 	},
 /turf/closed/wall/r_wall,
 /area/engine/engineering)
-"uJI" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/space/basic,
-/area/space)
-"uKS" = (
-/obj/machinery/smartfridge/organ/preloaded,
-/turf/closed/wall,
-/area/medical/surgery)
 "uLF" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -60755,10 +60740,6 @@
 /obj/effect/turf_decal/plaque,
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
-"uNP" = (
-/obj/effect/landmark/barthpot,
-/turf/open/floor/carpet,
-/area/library/lounge)
 "uQR" = (
 /obj/item/ammo_casing/shotgun/beanbag,
 /turf/open/floor/plating,
@@ -60772,11 +60753,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"uTY" = (
-/turf/open/floor/plating{
-	icon_state = "platingdmg3"
-	},
-/area/maintenance/department/chapel/monastery)
 "uUQ" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Engineering Maintenance";
@@ -60803,19 +60779,6 @@
 /obj/item/stamp/law,
 /turf/open/floor/carpet,
 /area/lawoffice)
-"uWP" = (
-/obj/machinery/seed_extractor,
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
 "uXG" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -60838,14 +60801,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard)
-"uYk" = (
-/obj/structure/window/reinforced,
+"uZb" = (
+/obj/structure/lattice,
 /obj/structure/window/reinforced{
-	dir = 4
+	dir = 8
 	},
-/obj/structure/lattice,
-/obj/structure/lattice,
-/turf/open/space/basic,
+/obj/structure/window/reinforced,
+/turf/open/space,
 /area/space/nearstation)
 "vay" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -60853,6 +60815,22 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"vaB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
+"vco" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/department/chapel/monastery)
+"veF" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/space/basic,
+/area/space)
 "veM" = (
 /obj/machinery/suit_storage_unit/rd,
 /obj/machinery/light{
@@ -60980,11 +60958,6 @@
 	initial_gas_mix = "o2=0.01;n2=0.01"
 	},
 /area/maintenance/department/science)
-"vsc" = (
-/obj/structure/lattice,
-/obj/structure/grille,
-/turf/open/space/basic,
-/area/space)
 "vsk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -61077,6 +61050,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
+"vxZ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "vzz" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -61149,13 +61128,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
-"vFZ" = (
-/obj/structure/closet/emcloset,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/turf/open/floor/plasteel/white,
-/area/hallway/secondary/entry)
 "vGg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 9
@@ -61479,19 +61451,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
-"wxa" = (
-/obj/machinery/vr_sleeper{
-	icon_state = "sleeper";
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/cafeteria,
-/area/security/prison)
 "wxb" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -61539,6 +61498,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/crew_quarters/bar)
+"wDe" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Monastery Transit"
+	},
+/turf/open/floor/plasteel/white{
+	heat_capacity = 1e+006
+	},
+/area/chapel/dock)
 "wDl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/stripes/corner,
@@ -61741,6 +61708,10 @@
 	icon_state = "platingdmg3"
 	},
 /area/maintenance/department/science)
+"wUc" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "wUf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
@@ -61751,10 +61722,6 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/department/security/brig)
-"wUW" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/maintenance/department/chapel/monastery)
 "wVC" = (
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=Sci";
@@ -61779,10 +61746,25 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
+"wYJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
 "wYK" = (
 /obj/machinery/power/supermatter_crystal/engine,
 /turf/open/floor/engine,
 /area/engine/supermatter)
+"wZs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white{
+	heat_capacity = 1e+006
+	},
+/area/hallway/secondary/entry)
 "xah" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -61841,6 +61823,14 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/wood,
 /area/lawoffice)
+"xeN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/white,
+/area/hallway/secondary/entry)
+"xgh" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/maintenance/department/chapel/monastery)
 "xgG" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -61871,10 +61861,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"xhW" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
 "xja" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -61898,6 +61884,10 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
+"xjg" = (
+/mob/living/simple_animal/hostile/retaliate/goose,
+/turf/open/floor/wood,
+/area/maintenance/department/crew_quarters/dorms)
 "xjK" = (
 /obj/item/radio/intercom{
 	name = "Station Intercom (General)";
@@ -62130,10 +62120,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/lawoffice)
-"xNw" = (
-/obj/machinery/door/airlock/maintenance,
-/turf/open/floor/plating,
-/area/chapel/main/monastery)
 "xNx" = (
 /obj/structure/lattice,
 /obj/structure/disposalpipe/junction/flip,
@@ -62176,13 +62162,10 @@
 /obj/effect/mapping_helpers/airlock/unres,
 /turf/open/floor/plasteel/freezer,
 /area/storage/emergency/port)
-"xRE" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "garbage"
-	},
+"xSd" = (
+/obj/machinery/light/small,
 /turf/open/floor/plating,
-/area/maintenance/disposal)
+/area/maintenance/department/chapel/monastery)
 "xSX" = (
 /obj/machinery/airalarm/unlocked{
 	pixel_y = 23
@@ -62196,6 +62179,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
+"xVt" = (
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 2;
+	name = "2maintenance loot spawner"
+	},
+/obj/structure/rack,
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/chapel/monastery)
 "xWl" = (
 /obj/item/pen,
 /obj/item/paper_bin{
@@ -62207,6 +62200,11 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
+"xYV" = (
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/maintenance/department/chapel/monastery)
 "ybX" = (
 /obj/structure/table,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -79927,7 +79925,7 @@ ckT
 xhj
 xhj
 cwK
-uNP
+odM
 xhj
 cxn
 xhj
@@ -80378,7 +80376,7 @@ aaa
 aaa
 aaa
 aaa
-ffK
+pyw
 bsl
 btL
 aZx
@@ -80394,11 +80392,11 @@ aaa
 aaa
 aaa
 aaa
-xhW
+koE
 aqG
 bGE
 bKf
-lxm
+mSY
 bMw
 bNy
 bNw
@@ -80635,7 +80633,7 @@ aaa
 aaa
 aaa
 aaa
-ffK
+pyw
 aZx
 bcX
 aZx
@@ -80650,12 +80648,12 @@ aaa
 aaa
 aaa
 aaa
-xhW
-xhW
+koE
+koE
 aqG
 bGE
 bKf
-lxm
+mSY
 bMx
 bNz
 bHM
@@ -80906,13 +80904,13 @@ aaa
 aaa
 aaa
 aaa
-xhW
-xhW
-xhW
+koE
+koE
+koE
 aqG
 bGE
-haq
-gOI
+wDe
+ppY
 bHM
 bNA
 bHM
@@ -80949,7 +80947,7 @@ cvc
 cho
 cvk
 cdx
-dTz
+kXx
 csS
 cfm
 cwe
@@ -81162,11 +81160,11 @@ bVp
 bVp
 bVp
 bVp
-jfr
-jTN
-jfr
-jfr
-uYk
+eit
+gTy
+eit
+eit
+tbF
 aZx
 bIY
 bLs
@@ -81207,7 +81205,7 @@ ciF
 cuQ
 cfm
 cfm
-xNw
+jSa
 cfm
 cwe
 ckp
@@ -81426,7 +81424,7 @@ aZx
 aZx
 aZx
 bIY
-pKg
+wZs
 aZx
 amC
 aaa
@@ -81435,7 +81433,7 @@ aby
 aby
 abI
 bSn
-ogn
+uZb
 cqS
 bNs
 bQe
@@ -81672,18 +81670,18 @@ aaa
 aaa
 bGI
 aZx
-vFZ
-tZu
-uau
-uau
-uau
-tZu
-uau
-dUI
-irD
-mjk
+tbY
+wYJ
+xeN
+xeN
+xeN
+wYJ
+xeN
+eVT
+dpc
+vxZ
 bIY
-mxu
+nho
 aZx
 amB
 aht
@@ -81693,7 +81691,7 @@ aaa
 abI
 abI
 abI
-ogn
+uZb
 bNs
 bNs
 bNs
@@ -81721,7 +81719,7 @@ chr
 chL
 cfm
 cfN
-obh
+xSd
 cfN
 cfN
 cfN
@@ -81929,18 +81927,18 @@ aaa
 aaa
 bGI
 aZx
-cxW
-irD
-irD
-irD
-ejJ
-kGc
-kGc
-kGc
-kGc
-kGc
-kGc
-ekV
+mVD
+dpc
+dpc
+dpc
+wUc
+vaB
+vaB
+vaB
+vaB
+vaB
+vaB
+kVy
 aZx
 amC
 aaa
@@ -81951,7 +81949,7 @@ aaa
 aaa
 abI
 aaa
-uJI
+veF
 bQR
 bNs
 bNs
@@ -82186,8 +82184,8 @@ aaa
 aaa
 bGI
 aZx
-cxW
-irD
+mVD
+dpc
 aZx
 aZx
 aZx
@@ -82443,19 +82441,19 @@ aaa
 aaa
 aqG
 aZx
-cxW
-irD
+mVD
+dpc
 aZx
-xhW
-xhW
-xhW
-xhW
-xhW
-xhW
-xhW
-xhW
-xhW
-xhW
+koE
+koE
+koE
+koE
+koE
+koE
+koE
+koE
+koE
+koE
 amD
 aaa
 aht
@@ -82697,11 +82695,11 @@ bon
 aZx
 aaa
 aaa
-xhW
+koE
 aqG
 aZx
-cxW
-irD
+mVD
+dpc
 aZx
 bBV
 bDf
@@ -82957,12 +82955,12 @@ aZx
 aZx
 aZx
 aZx
-cxW
-nYM
+mVD
+uxI
 bAI
-kqV
+epg
 abI
-xhW
+koE
 abI
 aaa
 bva
@@ -83006,7 +83004,7 @@ cfN
 cfN
 cfN
 cfN
-hCR
+iXx
 cjm
 cfN
 cfN
@@ -83136,7 +83134,7 @@ abI
 aen
 aet
 aeH
-bfQ
+peE
 afo
 afG
 aeU
@@ -83214,8 +83212,8 @@ bbR
 bbR
 bbR
 aZx
-fCC
-tZk
+kIc
+hCb
 bAJ
 bBX
 bBX
@@ -83263,9 +83261,9 @@ cfN
 cfN
 cfN
 cfN
-nog
+xYV
 cjm
-xhW
+koE
 aaa
 aaa
 aaa
@@ -83392,8 +83390,8 @@ adR
 aaa
 aem
 aeu
-uWP
-ltB
+tnP
+dYe
 aeH
 afH
 aeH
@@ -83473,7 +83471,7 @@ baK
 aZx
 bxY
 bzz
-ovg
+kGe
 bBX
 bDg
 bEj
@@ -83520,10 +83518,10 @@ cfN
 cfN
 cfN
 cfN
-uTY
+qWo
 cjm
 cjm
-xhW
+koE
 aaa
 aaa
 aaa
@@ -83763,22 +83761,22 @@ bIZ
 cba
 cbT
 bDi
-kuT
+ozO
 cwA
 cwA
 cwA
 cwA
-pDd
+vco
 cwA
 cwA
 cwA
 cwA
-nog
-gFw
-nog
-uTY
-eQa
-ceG
+xYV
+bNE
+xYV
+qWo
+lxI
+xVt
 cjm
 aht
 aaa
@@ -83906,8 +83904,8 @@ adR
 aaa
 aem
 aeW
-mwl
-kzK
+ovB
+utg
 afr
 agy
 agc
@@ -84023,19 +84021,19 @@ ccO
 bIZ
 cjm
 cjm
-wUW
-wUW
+xgh
+xgh
 cjm
 cjm
 cjm
-wUW
-wUW
+xgh
+xgh
 cjm
 cjm
 cjm
 cjm
-fjC
-kLT
+eNc
+pia
 cjm
 aht
 aaa
@@ -84163,9 +84161,9 @@ adR
 aaa
 aem
 aeX
-pua
-wxa
-wxa
+iLR
+iPH
+iPH
 agy
 agd
 agp
@@ -84278,10 +84276,10 @@ bva
 bNK
 bva
 bva
-xhW
-ucT
-vsc
-vsc
+koE
+mgU
+kSb
+kSb
 aht
 aht
 mau
@@ -84547,11 +84545,11 @@ aaa
 aaa
 aaa
 aaa
-vsc
-vsc
-xhW
-xhW
-tSk
+kSb
+kSb
+koE
+koE
+nKo
 aaa
 aaa
 aaa
@@ -85207,7 +85205,7 @@ aiM
 ajh
 ajR
 akN
-dQj
+ivO
 amj
 amX
 anH
@@ -92219,7 +92217,7 @@ bFU
 bFU
 bIn
 bJt
-uKS
+qni
 bFU
 bFU
 bFU
@@ -99337,7 +99335,7 @@ cBk
 jhD
 cBo
 alQ
-ebT
+xjg
 cBw
 noC
 aiS
@@ -108109,7 +108107,7 @@ aaa
 aLm
 aLm
 aNU
-xRE
+phS
 dqY
 aRv
 sZh
@@ -108366,7 +108364,7 @@ aaa
 aLm
 aME
 eFG
-xRE
+phS
 dqY
 aRw
 sqQ
@@ -108623,7 +108621,7 @@ aaa
 aLo
 aMF
 aNV
-xRE
+phS
 cvf
 aQn
 sqQ
@@ -108880,7 +108878,7 @@ aaa
 aLo
 aMG
 aNX
-xRE
+phS
 xer
 aRy
 aSn
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 7e095329af..6129d263fd 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -2108,10 +2108,6 @@
 	},
 /turf/closed/indestructible/riveted,
 /area/space)
-"fy" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/tdome/arena_source)
 "fz" = (
 /turf/open/floor/plasteel,
 /area/tdome/arena_source)
@@ -4830,7 +4826,7 @@
 	pixel_x = 25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "mb" = (
 /obj/structure/table/reinforced,
@@ -6429,7 +6425,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "oX" = (
 /obj/structure/bookcase/random,
@@ -6800,7 +6796,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "pH" = (
 /obj/structure/table/wood,
@@ -7316,7 +7312,7 @@
 	color = "#596479";
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "qQ" = (
 /obj/machinery/door/airlock/centcom{
@@ -8702,7 +8698,7 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "tX" = (
 /obj/machinery/door/airlock{
@@ -8717,7 +8713,7 @@
 /area/centcom/supplypod)
 "tZ" = (
 /obj/structure/chair/wood/normal,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "uc" = (
 /obj/effect/turf_decal/tile/green{
@@ -9330,7 +9326,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "vt" = (
 /obj/structure/rack,
@@ -9338,7 +9334,7 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "vu" = (
 /obj/structure/chair/stool,
@@ -10363,7 +10359,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "yg" = (
 /obj/structure/chair,
@@ -10611,7 +10607,7 @@
 /obj/structure/table/wood/bar,
 /obj/structure/safe/floor,
 /obj/item/seeds/cherry/bomb,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "yN" = (
 /obj/structure/table/reinforced,
@@ -11058,6 +11054,9 @@
 	},
 /turf/open/floor/plating,
 /area/syndicate_mothership)
+"zT" = (
+/turf/open/indestructible/boss/air,
+/area/centcom/holding)
 "zU" = (
 /obj/structure/closet/crate/freezer,
 /turf/open/floor/plasteel/cafeteria,
@@ -11342,7 +11341,7 @@
 	pixel_y = 25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "AD" = (
 /obj/machinery/door/airlock/centcom{
@@ -11583,12 +11582,12 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Bs" = (
 /obj/structure/table/wood,
 /obj/machinery/computer/libraryconsole/bookmanagement,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Bu" = (
 /obj/structure/table/wood,
@@ -12465,11 +12464,11 @@
 /obj/machinery/vr_sleeper{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "CV" = (
 /obj/structure/chair/stool,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "CX" = (
 /obj/structure/closet/secure_closet/security,
@@ -12663,12 +12662,16 @@
 /obj/machinery/vr_sleeper{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Dk" = (
 /obj/structure/table,
 /turf/open/floor/plasteel/cafeteria,
 /area/syndicate_mothership)
+"Dl" = (
+/obj/structure/mineral_door/paperframe,
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
 "Do" = (
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
@@ -13475,21 +13478,21 @@
 /obj/structure/table/wood,
 /obj/item/instrument/piano_synth,
 /obj/item/instrument/guitar,
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Fb" = (
 /obj/structure/piano,
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Fc" = (
 /obj/structure/sign/barsign{
 	pixel_y = 32
 	},
 /obj/structure/chair/stool,
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Fg" = (
 /obj/structure/flora/grass/brown,
@@ -13506,11 +13509,11 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Fj" = (
 /obj/machinery/vending/cigarette,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Fm" = (
 /obj/machinery/shower{
@@ -13798,7 +13801,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "FX" = (
 /turf/open/floor/plasteel/stairs,
@@ -13972,7 +13975,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Gu" = (
 /obj/machinery/door/airlock/silver{
@@ -14345,7 +14348,7 @@
 /obj/structure/chair/wood/wings{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Ha" = (
 /obj/effect/turf_decal/tile/brown{
@@ -14431,7 +14434,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Hn" = (
 /obj/structure/sink{
@@ -14653,7 +14656,7 @@
 /area/space)
 "HH" = (
 /obj/machinery/light,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "HI" = (
 /obj/structure/sink{
@@ -14777,7 +14780,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "HR" = (
 /obj/structure/sink{
@@ -15117,10 +15120,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/tdome/tdomeobserve)
-"Is" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/tdome/arena)
 "It" = (
 /turf/open/floor/plasteel,
 /area/tdome/arena)
@@ -16220,7 +16219,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "KU" = (
 /obj/structure/closet/emcloset,
@@ -16577,7 +16576,7 @@
 /obj/effect/mob_spawn/human/ghostcafe{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Mt" = (
 /obj/structure/window/reinforced{
@@ -16586,7 +16585,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "Mu" = (
 /obj/machinery/light{
@@ -16602,7 +16601,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Mv" = (
 /obj/structure/table/reinforced,
@@ -16618,7 +16617,7 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "My" = (
 /obj/docking_port/stationary{
@@ -16687,11 +16686,11 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "MM" = (
 /obj/structure/window/reinforced,
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "MP" = (
 /obj/machinery/light{
@@ -16703,7 +16702,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "MS" = (
 /obj/structure/table,
@@ -16750,7 +16749,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "Nk" = (
 /obj/machinery/door/airlock/centcom{
@@ -16772,7 +16771,7 @@
 /obj/item/storage/fancy/candle_box,
 /obj/item/storage/fancy/candle_box,
 /obj/item/storage/box/lights/mixed,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Nn" = (
 /obj/structure/closet/secure_closet/hydroponics{
@@ -16788,7 +16787,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Nu" = (
 /turf/open/floor/wood,
@@ -16806,7 +16805,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Nz" = (
 /obj/effect/turf_decal/tile/brown{
@@ -16826,7 +16825,7 @@
 /obj/item/reagent_containers/medspray/synthflesh,
 /obj/item/reagent_containers/medspray/synthflesh,
 /obj/item/reagent_containers/medspray/synthflesh,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "NF" = (
 /obj/structure/ladder/unbreakable/binary,
@@ -16858,13 +16857,13 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "NT" = (
 /obj/structure/window/paperframe{
 	CanAtmosPass = 0
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "NU" = (
 /obj/machinery/door/airlock/centcom{
@@ -16934,7 +16933,7 @@
 /area/centcom/control)
 "Ol" = (
 /obj/structure/table/wood/fancy,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Om" = (
 /obj/effect/turf_decal/tile/brown,
@@ -17003,7 +17002,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "OH" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -17013,7 +17012,7 @@
 /obj/structure/mineral_door/paperframe{
 	name = "Dojo"
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "OM" = (
 /obj/machinery/light{
@@ -17036,7 +17035,7 @@
 /obj/item/clothing/under/kilt,
 /obj/structure/closet,
 /obj/item/clothing/under/roman,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "OV" = (
 /obj/machinery/light{
@@ -17060,14 +17059,14 @@
 /area/centcom/supplypod)
 "Ph" = (
 /obj/structure/closet/crate/bin,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Pl" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "Pn" = (
 /turf/closed/indestructible/fakedoor{
@@ -17078,7 +17077,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "Pq" = (
 /obj/structure/urinal{
@@ -17119,7 +17118,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "PD" = (
 /turf/open/floor/plasteel/cafeteria,
@@ -17131,7 +17130,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "PG" = (
 /obj/structure/table/reinforced,
@@ -17150,7 +17149,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "PJ" = (
 /obj/effect/turf_decal/stripes/line{
@@ -17160,7 +17159,7 @@
 /area/syndicate_mothership)
 "PL" = (
 /obj/machinery/autolathe,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "PM" = (
 /obj/machinery/vending/clothing{
@@ -17180,7 +17179,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "PP" = (
 /obj/machinery/door/airlock/external{
@@ -17214,7 +17213,7 @@
 /area/holodeck/rec_center/firingrange)
 "PX" = (
 /obj/machinery/computer/arcade/battle,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "PY" = (
 /obj/effect/turf_decal/tile/green{
@@ -17227,7 +17226,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "PZ" = (
 /obj/effect/turf_decal/delivery,
@@ -17256,7 +17255,7 @@
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/palebush,
 /obj/structure/window/reinforced/fulltile,
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Qm" = (
 /obj/singularity/wizard/mapped,
@@ -17311,7 +17310,7 @@
 	pixel_y = -25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "QH" = (
 /obj/machinery/chem_master/condimaster{
@@ -17329,7 +17328,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "QI" = (
 /obj/structure/toilet{
@@ -17346,7 +17345,7 @@
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/palebush,
 /obj/structure/window/reinforced/fulltile,
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "QN" = (
 /obj/machinery/light{
@@ -17401,7 +17400,7 @@
 /area/holodeck/rec_center/basketball)
 "Ra" = (
 /obj/machinery/door/window/eastright,
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "Rb" = (
 /obj/effect/turf_decal/stripes/corner{
@@ -17421,7 +17420,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Re" = (
 /obj/structure/mineral_door/paperframe,
@@ -17441,7 +17440,7 @@
 /obj/structure/chair/wood/normal{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Rj" = (
 /obj/machinery/vending/hydroseeds,
@@ -17455,7 +17454,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Rl" = (
 /obj/structure/mirror{
@@ -17469,7 +17468,7 @@
 /obj/structure/chair/wood/wings{
 	dir = 3
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Ro" = (
 /obj/structure/closet{
@@ -17488,14 +17487,14 @@
 /obj/item/tank/internals/plasmaman/belt/full,
 /obj/item/tank/internals/plasmaman/belt/full,
 /obj/item/tank/internals/plasmaman/belt/full,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Rq" = (
 /obj/machinery/light{
 	dir = 1;
 	light_color = "#cee5d2"
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Ru" = (
 /obj/structure/fireplace,
@@ -17542,7 +17541,7 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "RR" = (
 /turf/open/floor/plasteel,
@@ -17556,13 +17555,13 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "RX" = (
 /obj/structure/chair/comfy/brown{
 	color = "#596479"
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "RZ" = (
 /obj/effect/turf_decal/tile/bar,
@@ -17582,7 +17581,7 @@
 /turf/open/floor/plasteel/dark,
 /area/syndicate_mothership)
 "Sd" = (
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Sf" = (
 /obj/structure/chair{
@@ -17616,7 +17615,7 @@
 /obj/machinery/defibrillator_mount/loaded{
 	pixel_y = 28
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Sw" = (
 /obj/machinery/hydroponics/constructable,
@@ -17633,7 +17632,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Sy" = (
 /obj/effect/turf_decal/tile/brown{
@@ -17715,7 +17714,7 @@
 /obj/item/wallframe/newscaster,
 /obj/item/paper_bin,
 /obj/item/pen/fountain,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "SV" = (
 /obj/effect/turf_decal/tile/bar,
@@ -17737,11 +17736,11 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "SY" = (
 /obj/structure/table/wood,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "SZ" = (
 /obj/machinery/door/airlock/wood{
@@ -17752,7 +17751,7 @@
 /area/centcom/holding)
 "Tb" = (
 /obj/structure/closet/crate/freezer/blood,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Tc" = (
 /obj/machinery/button/door{
@@ -17762,7 +17761,7 @@
 	pixel_y = -25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Tj" = (
 /obj/effect/turf_decal/tile/bar,
@@ -17777,7 +17776,7 @@
 /obj/item/candle/infinite{
 	pixel_y = 6
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "To" = (
 /turf/open/indestructible/airblock,
@@ -17788,7 +17787,7 @@
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/storage/toolbox/mechanical,
 /obj/item/multitool,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Tr" = (
 /obj/structure/closet/chefcloset,
@@ -17800,7 +17799,7 @@
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/palebush,
 /obj/structure/window/reinforced/fulltile,
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Tw" = (
 /obj/structure/closet{
@@ -17817,7 +17816,7 @@
 /obj/item/clothing/head/helmet/space/plasmaman,
 /obj/item/clothing/head/helmet/space/plasmaman,
 /obj/item/clothing/head/helmet/space/plasmaman,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Tz" = (
 /obj/effect/light_emitter,
@@ -17847,7 +17846,7 @@
 /obj/structure/mirror{
 	pixel_y = 28
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "TM" = (
 /mob/living/simple_animal/bot/medbot{
@@ -17856,7 +17855,7 @@
 	radio_key = null;
 	stationary_mode = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "TO" = (
 /obj/effect/turf_decal/tile/bar,
@@ -17876,11 +17875,11 @@
 /area/syndicate_mothership)
 "Ud" = (
 /obj/effect/landmark/holding_facility,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Uf" = (
 /obj/structure/closet/secure_closet,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Ug" = (
 /obj/machinery/door/poddoor/shuttledock{
@@ -17899,7 +17898,7 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Uj" = (
 /obj/machinery/door/airlock/centcom{
@@ -17934,7 +17933,7 @@
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Un" = (
 /obj/machinery/door/airlock/centcom{
@@ -17978,11 +17977,11 @@
 	desc = "Swipe your ID on the closet to claim it. First come first serve, this one is wooden and fancy. Store your stuff here.";
 	name = "Personal ID-Locked Closet"
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "UE" = (
 /obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "UG" = (
 /obj/structure/flora/tree/pine,
@@ -18027,11 +18026,11 @@
 /obj/structure/chair/wood/wings{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "UV" = (
 /obj/machinery/computer/arcade,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "UW" = (
 /obj/effect/turf_decal/tile/brown{
@@ -18115,7 +18114,7 @@
 /obj/structure/flora/ausbushes/palebush,
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/light,
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Vv" = (
 /obj/structure/table,
@@ -18165,7 +18164,7 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "VO" = (
 /turf/closed/indestructible/riveted,
@@ -18201,7 +18200,7 @@
 /area/space)
 "Wb" = (
 /obj/machinery/door/window/westleft,
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "Wc" = (
 /obj/machinery/door/airlock/centcom{
@@ -18233,6 +18232,10 @@
 	},
 /turf/open/floor/plating,
 /area/syndicate_mothership)
+"Wl" = (
+/obj/machinery/door/airlock/wood,
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
 "Wr" = (
 /turf/open/floor/plasteel/dark,
 /area/centcom/supplypod)
@@ -18243,6 +18246,12 @@
 	},
 /turf/open/floor/wood,
 /area/centcom/holding)
+"Ww" = (
+/obj/structure/bodycontainer/crematorium{
+	dir = 4
+	},
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
 "WC" = (
 /obj/structure/table/reinforced,
 /obj/item/pen,
@@ -18283,7 +18292,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "WN" = (
 /obj/machinery/button/door{
@@ -18293,7 +18302,7 @@
 	pixel_y = 25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "WO" = (
 /obj/effect/turf_decal/tile/brown,
@@ -18337,11 +18346,11 @@
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/structure/flora/ausbushes/palebush,
 /obj/structure/window/reinforced/fulltile,
-/turf/open/floor/grass,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Xe" = (
 /obj/machinery/vending/autodrobe,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Xg" = (
 /obj/effect/turf_decal/tile/red{
@@ -18355,9 +18364,6 @@
 	},
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/basketball)
-"Xk" = (
-/turf/open/floor/wood,
-/area/centcom/holding)
 "Xl" = (
 /obj/structure/closet/syndicate/personal,
 /obj/effect/turf_decal/stripes/line{
@@ -18368,7 +18374,7 @@
 "Xn" = (
 /obj/structure/bed,
 /obj/item/bedsheet/random,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Xo" = (
 /obj/machinery/vending/dinnerware,
@@ -18393,7 +18399,7 @@
 /area/centcom/supplypod/loading/four)
 "Xs" = (
 /obj/structure/chair/comfy/brown,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Xt" = (
 /obj/machinery/door/airlock/centcom{
@@ -18416,13 +18422,7 @@
 /area/holodeck/rec_center/firingrange)
 "Xw" = (
 /obj/structure/table/wood/fancy/royalblue,
-/turf/open/floor/wood,
-/area/centcom/holding)
-"Xx" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Xy" = (
 /obj/machinery/door/airlock/external{
@@ -18444,7 +18444,7 @@
 	pixel_y = 25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "XE" = (
 /obj/machinery/door/airlock/centcom{
@@ -18461,12 +18461,12 @@
 /obj/structure/chair/wood/wings{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "XT" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/sashimi,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "XU" = (
 /obj/machinery/computer/secure_data{
@@ -18477,7 +18477,7 @@
 "XX" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/bottle/sake,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "XY" = (
 /obj/machinery/door/poddoor/shutters{
@@ -18494,7 +18494,7 @@
 	pixel_y = -25;
 	specialfunctions = 4
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Yc" = (
 /obj/effect/turf_decal/stripes/line,
@@ -18512,12 +18512,12 @@
 /obj/machinery/defibrillator_mount/loaded{
 	pixel_y = 28
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Yf" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/chawanmushi,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Yg" = (
 /obj/effect/turf_decal/stripes/corner{
@@ -18529,7 +18529,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -27
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Yi" = (
 /obj/structure/dresser,
@@ -18537,13 +18537,13 @@
 /area/syndicate_mothership)
 "Ym" = (
 /obj/machinery/computer/arcade/orion_trail,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Yo" = (
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Ys" = (
 /obj/structure/table/reinforced,
@@ -18585,7 +18585,7 @@
 /area/centcom/holding)
 "YL" = (
 /obj/machinery/vending/clothing,
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "YN" = (
 /obj/structure/window/reinforced{
@@ -18598,7 +18598,7 @@
 /obj/structure/chair/comfy/brown{
 	dir = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "YQ" = (
 /obj/structure/table,
@@ -18609,7 +18609,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "YV" = (
 /obj/machinery/light{
@@ -18620,10 +18620,7 @@
 	damtype = "stamina";
 	force = 30
 	},
-/turf/open/floor/wood,
-/area/centcom/holding)
-"YW" = (
-/turf/open/floor/plating,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Za" = (
 /obj/machinery/door/airlock/wood{
@@ -18638,7 +18635,7 @@
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-10"
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Zi" = (
 /turf/open/floor/plasteel,
@@ -18677,7 +18674,7 @@
 	radio_key = null;
 	stationary_mode = 1
 	},
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "Zz" = (
 /obj/effect/landmark/start/nukeop_leader,
@@ -18749,7 +18746,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/open/floor/carpet/black,
+/turf/open/indestructible/boss/air,
 /area/centcom/holding)
 "ZV" = (
 /obj/effect/turf_decal/tile/brown,
@@ -43132,13 +43129,13 @@ Rm
 Tn
 UT
 yd
-Xk
-Xk
+Sd
+Sd
 XM
 NT
 UV
 CV
-Xk
+Sd
 NT
 CT
 oV
@@ -43148,15 +43145,15 @@ CT
 oV
 CT
 Nd
-Xk
-Xk
-Xk
+Sd
+Ww
+Sd
 Nd
 aa
 Nd
 Uf
-Xk
-Xk
+Sd
+Sd
 Nd
 aa
 aa
@@ -43385,35 +43382,35 @@ Pq
 ZW
 ZW
 Za
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Tu
-Xk
-Xk
+Sd
+Sd
 Tn
 NT
 RQ
-Xk
-Xk
+Sd
+Sd
 NT
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 Nd
 Gs
-Xk
+Sd
 HH
 Nd
 aa
 Nd
 MJ
-Xk
-YW
+Sd
+Sd
 Nd
 aa
 aa
@@ -43642,35 +43639,35 @@ Pa
 ZW
 ZW
 Nd
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 GY
 NT
 UV
 CV
-Xk
+Sd
 NT
 Dj
 PF
 Dj
-Xk
+Sd
 Dj
 PF
 Dj
 Nd
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 aa
 Nd
 ma
-YW
-Xk
+Sd
+Sd
 Nd
 aa
 aa
@@ -43899,17 +43896,17 @@ SB
 ZW
 Nw
 Nd
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Ph
-Xk
+Sd
 Tu
 Vu
 Nd
 Gs
-Xk
-Xk
+Sd
+Sd
 Nd
 Nd
 Nd
@@ -44156,34 +44153,34 @@ Nd
 Nd
 Nd
 Nd
-Xk
-Xk
+Sd
+Sd
 XM
 QL
-Xk
-Xk
+Sd
+Sd
 XM
 NT
 PX
 CV
-Xk
+Sd
 NT
-Xk
+Sd
 Yo
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Yo
-Xk
+Sd
 Nd
-Xk
-Xk
+Sd
+Sd
 Yo
-Xk
-Xk
+Sd
+Sd
 Yo
-Xk
-Xk
+Sd
+Sd
 WE
 Nd
 aa
@@ -44409,38 +44406,38 @@ Nd
 Nd
 py
 Nd
-Xk
+Sd
 Yo
-Xk
-XL
-Xk
-Xk
+Sd
+Wl
+Sd
+Sd
 Tn
 Tu
-Xk
-Xk
+Sd
+Sd
 Tn
 NT
 Zh
-Xk
-Xk
-Re
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Dl
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 Qu
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 Zu
 Nd
 aa
@@ -44659,45 +44656,45 @@ aa
 aa
 Nd
 PL
-Xk
+Sd
 Yo
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
 Yh
-Xk
+Sd
 Nd
 Nd
 Nd
 Gs
-Xk
+Sd
 GY
 Tu
-Xk
-Xk
+Sd
+Sd
 GY
 NT
 Ym
 CV
-Xk
+Sd
 NT
-Xk
-Xx
-Xk
-Xk
-Xk
-Xx
-Xk
+Sd
+MR
+Sd
+Sd
+Sd
+MR
+Sd
 Nd
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 PM
 Nd
 aa
@@ -44916,7 +44913,7 @@ aa
 aa
 Nd
 Tq
-Xk
+Sd
 MG
 YN
 Nd
@@ -44927,17 +44924,17 @@ Nd
 Nd
 Fa
 KT
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 HH
 Nd
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 Nd
 Nd
@@ -45172,8 +45169,8 @@ aa
 aa
 aa
 Nd
-Xk
-Xk
+Sd
+Sd
 Rh
 Mm
 Nd
@@ -45184,17 +45181,17 @@ Nd
 Fb
 Sd
 KT
-Xk
-Xk
+Sd
+Sd
 Sd
 Sd
 Sd
 Sd
 Sd
 Re
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 NT
 vt
 YV
@@ -45207,8 +45204,8 @@ UD
 tZ
 SY
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 SY
 Ri
@@ -45429,8 +45426,8 @@ aa
 aa
 aa
 Nd
-Xk
-Xk
+Sd
+Sd
 Rh
 ZT
 Nd
@@ -45441,8 +45438,8 @@ Nd
 Fc
 Sd
 KT
-Xk
-Xk
+Sd
+Sd
 Sd
 Sd
 Sd
@@ -45451,24 +45448,24 @@ Sd
 Nd
 Gs
 Zx
-Xk
+Sd
 OL
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 Nd
 Gs
-Xk
-Xk
+Sd
+Sd
 lS
-Xk
-Xk
+Sd
+Sd
 RP
-Xk
-Xk
+Sd
+Sd
 HH
 Nd
 aa
@@ -45698,34 +45695,34 @@ Nd
 MR
 Sd
 FW
-Xk
-Xk
+Sd
+Sd
 Sd
 Sd
 Sd
 Sd
 Sd
 Re
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 NT
 So
 XM
-Xk
+Sd
 XM
 XM
-Xk
+Sd
 Nd
 Xn
-Xk
+Sd
 Ya
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 XD
-Xk
+Sd
 Xn
 Nd
 aa
@@ -45944,9 +45941,9 @@ aa
 aa
 Nd
 yM
-Xk
+Sd
 Yo
-Xk
+Sd
 Nd
 SG
 Fh
@@ -45955,12 +45952,12 @@ Nd
 Nd
 Sd
 FX
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 HH
 Nd
 WM
@@ -45972,14 +45969,14 @@ Po
 Wb
 Po
 ZU
-Xk
+Sd
 Nd
 Nd
 Nd
 Nd
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 Nd
 Nd
@@ -46201,9 +46198,9 @@ aa
 aa
 Nd
 OG
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 zX
 Fh
@@ -46213,30 +46210,30 @@ Nd
 Nd
 Nd
 Gs
-Xk
+Sd
 XM
 Tu
-Xk
-Xk
+Sd
+Sd
 XM
 NT
-Xk
+Sd
 Ud
 Ud
 NT
 YU
-Sd
-Sd
-Sd
+zT
+zT
+zT
 MM
-Xk
+Sd
 Nd
 UD
 tZ
 SY
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 SY
 Ri
@@ -46458,9 +46455,9 @@ aa
 aa
 Nd
 TK
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 QA
 Fh
@@ -46469,12 +46466,12 @@ ED
 Yo
 Yf
 UE
-Xk
-Xk
+Sd
+Sd
 Tn
 Xd
-Xk
-Xk
+Sd
+Sd
 Tn
 NT
 Ro
@@ -46482,21 +46479,21 @@ Ud
 Ud
 NT
 YU
-Sd
-Sd
-Sd
+zT
+zT
+zT
 MM
 TM
 Nd
 Gs
-Xk
-Xk
+Sd
+Sd
 uh
-Xk
-Xk
+Sd
+Sd
 zW
-Xk
-Xk
+Sd
+Sd
 HH
 Nd
 aa
@@ -46715,23 +46712,23 @@ aa
 aa
 Nd
 YL
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 Xo
 Fh
 Fh
 py
-Xk
+Sd
 SY
 UE
-Xk
-Xk
+Sd
+Sd
 GY
 Tu
-Xk
-Xk
+Sd
+Sd
 GY
 NT
 Tw
@@ -46739,21 +46736,21 @@ Ud
 Ud
 NT
 YU
-Sd
-Sd
-Sd
+zT
+zT
+zT
 MM
-Xk
+Sd
 Nd
 Xn
-Xk
+Sd
 Tc
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 AC
-Xk
+Sd
 Xn
 Nd
 aa
@@ -46972,22 +46969,22 @@ aa
 aa
 Nd
 Xe
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 TB
 Fh
 Fh
 BV
-Xk
+Sd
 XT
 UE
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Ph
-Xk
+Sd
 Qk
 Vu
 Nd
@@ -47000,7 +46997,7 @@ PA
 Ra
 PA
 Pl
-Xk
+Sd
 Nd
 Nd
 Nd
@@ -47229,42 +47226,42 @@ aa
 aa
 Nd
 Ny
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Nd
 Vz
 Fh
 YJ
 QT
-Xk
+Sd
 SY
 UE
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 XM
 NT
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 NT
 Ye
 GY
-Xk
+Sd
 GY
 GY
-Xk
+Sd
 Nd
 Xs
 Ol
 YO
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 RX
 Xw
@@ -47487,44 +47484,44 @@ aa
 Nd
 Bs
 Ri
-Xk
-Xk
+Sd
+Sd
 XL
 Fh
 Fh
 Fh
 XL
-Xk
+Sd
 XX
 UE
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 Tu
-Xk
-Xk
+Sd
+Sd
 Tn
 NT
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
 OL
-Xk
-Xk
-Xk
-Xk
-Xk
-Xk
+Sd
+Sd
+Sd
+Sd
+Sd
+Sd
 Nd
 Gs
-Xk
-Xk
+Sd
+Sd
 SZ
-Xk
-Xk
+Sd
+Sd
 Ws
-Xk
-Xk
+Sd
+Sd
 HH
 Nd
 aa
@@ -47743,8 +47740,8 @@ aa
 aa
 Nd
 SU
-Xk
-Xx
+Sd
+MR
 Nm
 Nd
 SN
@@ -47758,13 +47755,13 @@ Fi
 Tn
 UT
 Hm
-Xk
-Xk
+Sd
+Sd
 GY
 NT
-Xk
+Sd
 Ms
-Xk
+Sd
 NT
 vt
 Mx
@@ -47777,8 +47774,8 @@ Ru
 Of
 QF
 Nd
-Xk
-Xk
+Sd
+Sd
 Nd
 WN
 Ur
@@ -48032,12 +48029,12 @@ Nd
 Nd
 Kf
 WV
-Xk
+Sd
 Nd
 Nd
 Nd
 Nd
-Xk
+Sd
 zY
 Rv
 Nd
@@ -60356,14 +60353,14 @@ GM
 HW
 HW
 Il
-Is
+IF
 IE
 IX
 Jh
 Jh
 Js
 IE
-Is
+IF
 JI
 JP
 JZ
@@ -63954,14 +63951,14 @@ GM
 HW
 HW
 Il
-Is
+IF
 IJ
 IY
 Jk
 Jk
 Jt
 IJ
-Is
+IF
 JI
 JP
 Kc
@@ -78178,14 +78175,14 @@ fa
 fn
 fr
 fx
-fy
+fF
 fE
 fL
 fN
 fN
 fS
 fE
-fy
+fF
 ab
 aa
 aa
@@ -81776,14 +81773,14 @@ dA
 dA
 dA
 fx
-fy
+fF
 fJ
 fM
 fQ
 fQ
 fT
 fJ
-fy
+fF
 ab
 aa
 aa
diff --git a/_maps/templates/shelter_1.dmm b/_maps/templates/shelter_1.dmm
index f5b2e141f4..7f95fba10f 100644
--- a/_maps/templates/shelter_1.dmm
+++ b/_maps/templates/shelter_1.dmm
@@ -50,9 +50,7 @@
 /area/survivalpod)
 "l" = (
 /obj/structure/tubes,
-/obj/structure/chair/comfy/black{
-	dir = 8
-	},
+/obj/machinery/recharge_station,
 /turf/open/floor/pod,
 /area/survivalpod)
 "m" = (
diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm
index 80de4438da..825cb26e3a 100644
--- a/_maps/templates/shelter_2.dmm
+++ b/_maps/templates/shelter_2.dmm
@@ -67,8 +67,7 @@
 	layer = 3
 	},
 /obj/machinery/door/window/survival_pod{
-	dir = 1;
-	icon_state = "windoor"
+	dir = 1
 	},
 /turf/open/floor/carpet/black,
 /area/survivalpod)
@@ -133,7 +132,6 @@
 /area/survivalpod)
 "u" = (
 /obj/machinery/door/window/survival_pod{
-	icon_state = "windoor";
 	dir = 1
 	},
 /turf/open/floor/carpet/black,
@@ -169,10 +167,10 @@
 /area/survivalpod)
 "y" = (
 /obj/structure/sink/kitchen{
-	icon_state = "sink_alt";
 	dir = 4;
 	pixel_x = -13
 	},
+/obj/machinery/recharge_station/upgraded,
 /turf/open/floor/carpet/black,
 /area/survivalpod)
 "z" = (
diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm
index b71da1fba0..bb400f29ac 100644
--- a/_maps/templates/shelter_3.dmm
+++ b/_maps/templates/shelter_3.dmm
@@ -268,6 +268,10 @@
 /obj/structure/fans/tiny,
 /turf/open/floor/carpet/black,
 /area/survivalpod)
+"T" = (
+/obj/machinery/recharge_station/fullupgrade,
+/turf/open/floor/carpet/black,
+/area/survivalpod)
 
 (1,1,1) = {"
 a
@@ -287,7 +291,7 @@ b
 f
 q
 s
-x
+T
 y
 D
 F
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 7b2dd8663c..b0cc9030cb 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -177,6 +177,7 @@
 #define COMSIG_MOB_PRE_PLAYER_CHANGE "mob_pre_player_change"	//sent to the target mob from base of /mob/transfer_ckey() and /mind/transfer_to(): (our_character, their_character)
 //	#define COMPONENT_STOP_MIND_TRANSFER 1
 #define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight"				//from base of /mob/update_sight(): ()
+#define COMSIG_MOB_ON_NEW_MIND "mob_on_new_mind"			//called when a new mind is assigned to a mob: ()
 #define COMSIG_MOB_SAY "mob_say" // from /mob/living/say(): (proc args list)
 	#define COMPONENT_UPPERCASE_SPEECH 1
 	// used to access COMSIG_MOB_SAY argslist
diff --git a/code/__DEFINES/dynamic.dm b/code/__DEFINES/dynamic.dm
new file mode 100644
index 0000000000..45c1ba9cb2
--- /dev/null
+++ b/code/__DEFINES/dynamic.dm
@@ -0,0 +1,14 @@
+#define CURRENT_LIVING_PLAYERS	1
+#define CURRENT_LIVING_ANTAGS	2
+#define CURRENT_DEAD_PLAYERS	3
+#define CURRENT_OBSERVERS	    4
+
+#define NO_ASSASSIN				(1<<0)
+#define WAROPS_ALWAYS_ALLOWED	(1<<1)
+
+#define ONLY_RULESET       (1<<0)
+#define HIGHLANDER_RULESET (1<<1)
+#define TRAITOR_RULESET    (1<<2)
+#define MINOR_RULESET      (1<<3)
+
+#define RULESET_STOP_PROCESSING 1
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index f5ea8d835f..2756be76fb 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -130,33 +130,24 @@
 #define NECK		(1<<11)
 #define FULL_BODY	(~0)
 
+//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
+#define NORMAL_STYLE		0
+#define ALT_STYLE			1
+
 //flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
 #define NO_FEMALE_UNIFORM			0
 #define FEMALE_UNIFORM_FULL			1
 #define FEMALE_UNIFORM_TOP			2
 
-//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
-#define NORMAL_STYLE		0
-#define ALT_STYLE			1
-
-#define NORMAL_SUIT_STYLE		0
-#define DIGITIGRADE_SUIT_STYLE 	1
-
-//Tauric Specific suits
-#define NOT_TAURIC			0
-#define SNEK_TAURIC			1
-#define PAW_TAURIC			2
-#define HOOF_TAURIC			3
-
-//Helmets/masks for muzzles or beaks
-#define NORMAL_FACED		0
-#define	MUZZLE_FACED		1
-#define	BEAKED_FACED		2
-
-//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
-#define NO_MUTANTRACE_VARIATION		0
-#define MUTANTRACE_VARIATION		1
+//flags for outfits that have mutantrace variants: These are hard sprited too.
+#define STYLE_DIGITIGRADE		(1<<0) //jumpsuits, suits and shoes
+#define STYLE_MUZZLE			(1<<1) //hats or masks
+#define STYLE_SNEK_TAURIC		(1<<2) //taur-friendly suits
+#define STYLE_PAW_TAURIC		(1<<3)
+#define STYLE_HOOF_TAURIC		(1<<4)
+#define STYLE_ALL_TAURIC		(STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC)
 
+//digitigrade legs settings.
 #define NOT_DIGITIGRADE				0
 #define FULL_DIGITIGRADE			1
 #define SQUISHED_DIGITIGRADE		2
diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm
index 1b42217fe1..73e900226e 100644
--- a/code/__DEFINES/maps.dm
+++ b/code/__DEFINES/maps.dm
@@ -38,8 +38,6 @@ require only minor tweaks.
 #define ZTRAIT_SPACE_RUINS "Space Ruins"
 #define ZTRAIT_LAVA_RUINS "Lava Ruins"
 #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement.
-// prevents certain turfs from being stripped by a singularity
-#define ZTRAIT_PLANET "Planet"
 
 // number - bombcap is multiplied by this before being applied to bombs
 #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
@@ -60,11 +58,18 @@ require only minor tweaks.
 	// CROSSLINKED - mixed in with the cross-linked space pool
 	#define CROSSLINKED "Cross"
 
+// string - type path of the z-level's baseturf (defaults to space)
+#define ZTRAIT_BASETURF "Baseturf"
+
 // default trait definitions, used by SSmapping
 #define ZTRAITS_CENTCOM list(ZTRAIT_CENTCOM = TRUE)
 #define ZTRAITS_STATION list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_STATION = TRUE)
 #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE)
-#define ZTRAITS_LAVALAND list(ZTRAIT_MINING = TRUE, ZTRAIT_LAVA_RUINS = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 5)
+#define ZTRAITS_LAVALAND list(\
+    ZTRAIT_MINING = TRUE, \
+    ZTRAIT_LAVA_RUINS = TRUE, \
+    ZTRAIT_BOMBCAP_MULTIPLIER = 5, \
+    ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface)
 #define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)
 
 #define DL_NAME "name"
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index d89743d2d2..d595abd3ec 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -427,6 +427,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 
 //Dummy mob reserve slots
 #define DUMMY_HUMAN_SLOT_PREFERENCES "dummy_preference_preview"
+#define DUMMY_HUMAN_SLOT_HOLOFORM			"dummy_holoform_generation"
 #define DUMMY_HUMAN_SLOT_ADMIN "admintools"
 #define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"
 
@@ -529,4 +530,10 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 
 #define CRYOMOBS 'icons/obj/cryo_mobs.dmi'
 
+#define CUSTOM_HOLOFORM_DELAY		10 SECONDS			//prevents spamming to make lag. it's pretty expensive to do this.
+
+#define HOLOFORM_FILTER_AI		"FILTER_AI"
+#define HOLOFORM_FILTER_PAI		"FILTER_PAI"
+#define HOLOFORM_FILTER_STATIC	"FILTER_STATIC"
+
 #define CANT_REENTER_ROUND -1
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index c194e578c9..5c54843df2 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -47,6 +47,7 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.
 
+#define INIT_ORDER_FAIL2TOPIC		22
 #define INIT_ORDER_TITLE			20
 #define INIT_ORDER_GARBAGE			19
 #define INIT_ORDER_DBCORE			18
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 0412e7b62b..e9e6119b0b 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -169,11 +169,12 @@
 #define TRAIT_EMPATH			"empath"
 #define TRAIT_FRIENDLY			"friendly"
 #define TRAIT_CULT_EYES 		"cult_eyes"
+#define TRAIT_AUTO_CATCH_ITEM	"auto_catch_item"
 #define TRAIT_CLOWN_MENTALITY	"clown_mentality" // The future is now, clownman.
 #define TRAIT_FREESPRINT		"free_sprinting"
 #define TRAIT_XRAY_VISION       "xray_vision"
 #define TRAIT_THERMAL_VISION    "thermal_vision"
-
+#define TRAIT_NO_ALCOHOL		"alcohol_intolerance"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"
diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm
new file mode 100644
index 0000000000..8fb2e6deab
--- /dev/null
+++ b/code/__DEFINES/vote.dm
@@ -0,0 +1,6 @@
+#define PLURALITY_VOTING 0
+#define APPROVAL_VOTING 1
+#define RANKED_CHOICE_VOTING 2
+#define SCORE_VOTING 3
+
+GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great"))
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index c259831f94..4dd590d9a1 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -78,7 +78,6 @@
 	if (CONFIG_GET(flag/log_manifest))
 		WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]")
 
-
 /proc/log_say(text)
 	if (CONFIG_GET(flag/log_say))
 		WRITE_LOG(GLOB.world_game_log, "SAY: [text]")
@@ -121,7 +120,6 @@
 	if (CONFIG_GET(flag/log_vote))
 		WRITE_LOG(GLOB.world_game_log, "VOTE: [text]")
 
-
 /proc/log_topic(text)
 	WRITE_LOG(GLOB.world_game_log, "TOPIC: [text]")
 
@@ -141,6 +139,9 @@
 	if (CONFIG_GET(flag/log_job_debug))
 		WRITE_LOG(GLOB.world_job_debug_log, "JOB: [text]")
 
+/proc/log_subsystem(subsystem, text)
+	WRITE_LOG(GLOB.subsystem_log, "[subsystem]: [text]")
+
 /* Log to both DD and the logfile. */
 /proc/log_world(text)
 #ifdef USE_CUSTOM_ERROR_HANDLER
@@ -157,6 +158,8 @@
 	WRITE_LOG(GLOB.config_error_log, text)
 	SEND_TEXT(world.log, text)
 
+/proc/log_mapping(text)
+	WRITE_LOG(GLOB.world_map_error_log, text)
 
 /* For logging round startup. */
 /proc/start_log(log)
diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index 1f5b82f7bf..4b52187e13 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -43,6 +43,13 @@
 	var/static/blacklisted_areas = typecacheof(list(
 		/area/space,
 		))
+
+	if(creator)
+		if(creator.create_area_cooldown >= world.time)
+			to_chat(creator, "<span class='warning'>You're trying to create a new area a little too fast.</span>")
+			return
+		creator.create_area_cooldown = world.time + 10
+
 	var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types)
 	if(!turfs)
 		to_chat(creator, "<span class='warning'>The new area must be completely airtight and not a part of a shuttle.</span>")
diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index 4a86f57fcd..c95896d853 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -97,6 +97,9 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 /proc/cmp_numbered_displays_name_dsc(datum/numbered_display/A, datum/numbered_display/B)
 	return sorttext(B.sample_object.name, A.sample_object.name)
 
+/proc/cmp_reagents_asc(datum/reagent/a, datum/reagent/b)
+	return sorttext(initial(b.name),initial(a.name))
+
 /proc/cmp_quirk_asc(datum/quirk/A, datum/quirk/B)
 	var/a_sign = num2sign(initial(A.value) * -1)
 	var/b_sign = num2sign(initial(B.value) * -1)
diff --git a/code/__HELPERS/custom_holoforms.dm b/code/__HELPERS/custom_holoforms.dm
new file mode 100644
index 0000000000..0e97314f1f
--- /dev/null
+++ b/code/__HELPERS/custom_holoforms.dm
@@ -0,0 +1,62 @@
+// Generates a holoform appearance
+// Equipment list is slot = path.
+/proc/generate_custom_holoform_from_prefs(datum/preferences/prefs, list/equipment_by_slot, list/inhand_equipment, copy_job = FALSE, apply_loadout = FALSE)
+	ASSERT(prefs)
+	var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_HOLOFORM)
+	prefs.copy_to(mannequin)
+	if(apply_loadout && prefs.parent)
+		SSjob.equip_loadout(prefs.parent.mob, mannequin, bypass_prereqs = TRUE)
+	if(copy_job)
+		var/datum/job/highest = prefs.get_highest_job()
+		if(highest && !istype(highest, /datum/job/ai) && !istype(highest, /datum/job/cyborg))
+			highest.equip(mannequin, TRUE, preference_source = prefs.parent)
+
+	if(length(equipment_by_slot))
+		for(var/slot in equipment_by_slot)
+			var/obj/item/I = new equipment_by_slot[slot]
+			mannequin.equip_to_slot_if_possible(I, slot, TRUE, TRUE, TRUE, TRUE)
+	if(length(inhand_equipment))
+		for(var/path in inhand_equipment)
+			var/obj/item/I = new path
+			mannequin.equip_to_slot_if_possible(I, SLOT_HANDS, TRUE, TRUE, TRUE, TRUE)
+
+
+	var/icon/combined = new
+	for(var/d in GLOB.cardinals)
+		mannequin.setDir(d)
+		COMPILE_OVERLAYS(mannequin)
+		CHECK_TICK
+		var/icon/capture = getFlatIcon(mannequin)
+		CHECK_TICK
+		combined.Insert(capture, dir = d)
+		CHECK_TICK
+
+	unset_busy_human_dummy(DUMMY_HUMAN_SLOT_HOLOFORM)
+	return combined
+
+/proc/process_holoform_icon_filter(icon/I, filter_type, clone = TRUE)
+	if(clone)
+		I = icon(I)		//Clone
+	switch(filter_type)
+		if(HOLOFORM_FILTER_AI)
+			I = getHologramIcon(I)
+		if(HOLOFORM_FILTER_STATIC)
+			I = getStaticIcon(I)
+		if(HOLOFORM_FILTER_PAI)
+			I = getPAIHologramIcon(I)
+	return I
+
+//Errors go to user.
+/proc/generate_custom_holoform_from_prefs_safe(datum/preferences/prefs, mob/user)
+	if(user)
+		if(user.client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+			to_chat(user, "<span class='boldwarning'>You are attempting to set your custom holoform too fast!</span>")
+			return
+	return generate_custom_holoform_from_prefs(prefs, null, null, TRUE, TRUE)
+
+//Prompts this client for custom holoform parameters.
+/proc/user_interface_custom_holoform(client/C)
+	var/datum/preferences/target_prefs = C.prefs
+	ASSERT(target_prefs)
+	//In the future, maybe add custom path allowances a la admin create outfit but for now..
+	return generate_custom_holoform_from_prefs_safe(target_prefs, C.mob)
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 222002f512..65c7145d8f 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -444,12 +444,8 @@
 			candidates -= M
 
 /proc/pollGhostCandidates(Question, jobbanType, datum/game_mode/gametypeCheck, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE)
-	var/list/candidates = list()
-
-	for(var/mob/dead/observer/G in GLOB.player_list)
-		if(G.can_reenter_round(TRUE))
-			candidates += G
-
+	var/datum/element/ghost_role_eligibility/eligibility = SSdcs.GetElement(/datum/element/ghost_role_eligibility)
+	var/list/candidates = eligibility.get_all_ghost_role_eligible()
 	return pollCandidates(Question, jobbanType, gametypeCheck, be_special_flag, poll_time, ignore_category, flashwindow, candidates)
 
 /proc/pollCandidates(Question, jobbanType, datum/game_mode/gametypeCheck, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE, list/group = null)
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 5fb64004c0..1af3143d9d 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -939,7 +939,7 @@ world
 				I.pixel_y++
 		add_overlay(I)//And finally add the overlay.
 
-/proc/getHologramIcon(icon/A, safety=1)//If safety is on, a new icon is not created.
+/proc/getHologramIcon(icon/A, safety = TRUE)//If safety is on, a new icon is not created.
 	var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon.
 	flat_icon.ColorTone(rgb(125,180,225))//Let's make it bluish.
 	flat_icon.ChangeOpacity(0.5)//Make it half transparent.
@@ -947,6 +947,14 @@ world
 	flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.
 	return flat_icon
 
+/proc/getPAIHologramIcon(icon/A, safety = TRUE)
+	var/icon/flat_icon = safety? A : new(A)
+	flat_icon.SetIntensity(0.75, 1, 0.75)
+	flat_icon.ChangeOpacity(0.7)
+	var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanlineslow")//Scanline effect.
+	flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.
+	return flat_icon
+
 //What the mob looks like as animated static
 //By vg's ComicIronic
 /proc/getStaticIcon(icon/A, safety = TRUE)
diff --git a/code/__HELPERS/level_traits.dm b/code/__HELPERS/level_traits.dm
index 55ee069321..3e6e88c8fa 100644
--- a/code/__HELPERS/level_traits.dm
+++ b/code/__HELPERS/level_traits.dm
@@ -12,6 +12,3 @@
 #define is_reserved_level(z) SSmapping.level_trait(z, ZTRAIT_RESERVED)
 
 #define is_away_level(z) SSmapping.level_trait(z, ZTRAIT_AWAY)
-
-// If true, the singularity cannot strip away asteroid turf on this Z
-#define is_planet_level(z) SSmapping.level_trait(z, ZTRAIT_PLANET)
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 29f5331fd3..74c32dd52f 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -758,16 +758,6 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(
 	/obj/item/stack/rods,
 	/obj/item/pipe)))
 
-/proc/can_embed(obj/item/W)
-	if(W.get_sharpness())
-		return 1
-	if(is_pointed(W))
-		return 1
-
-	if(is_type_in_typecache(W, GLOB.can_embed_types))
-		return 1
-
-
 /*
 Checks if that loc and dir has an item on the wall
 */
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 1707c3a536..3577402b36 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -61,26 +61,6 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito
 		var/mob/M = i
 		M.update_config_movespeed()
 
-GLOBAL_LIST_INIT(noodle_taurs, list(
-		"Naga",
-		"Tentacle"
-		))
-
-GLOBAL_LIST_INIT(paw_taurs, list(
-		"Fox",
-		"Wolf",
-		"Otie",
-		"Drake",
-		"Lab",
-		"Shepherd",
-		"Husky",
-		"Eevee",
-		"Panther",
-		"Horse",
-		"Cow",
-		"Tiger"
-		))
-
 	//blood types
 GLOBAL_LIST_INIT(regular_bloods,list(
 		"O-",
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index 8e5da083e3..01d5051dba 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -28,6 +28,10 @@ GLOBAL_VAR(world_job_debug_log)
 GLOBAL_PROTECT(world_job_debug_log)
 GLOBAL_VAR(world_virus_log)
 GLOBAL_PROTECT(world_virus_log)
+GLOBAL_VAR(world_map_error_log)
+GLOBAL_PROTECT(world_map_error_log)
+GLOBAL_VAR(subsystem_log)
+GLOBAL_PROTECT(subsystem_log)
 
 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index af31e2b5a5..ec3593ee9d 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -23,6 +23,8 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)	//BSA unlocked by head ID swipes
 
 GLOBAL_LIST_EMPTY(player_details)	// ckey -> /datum/player_details
 
+GLOBAL_LIST_EMPTY(clientless_round_timeouts)	// ckey -> time that ckey can rejoin round
+
 // All religion stuff
 GLOBAL_VAR(religion)
 GLOBAL_VAR(deity)
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index f082f2ad16..e6b2a63673 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -98,17 +98,19 @@
 	take_damage(I.force, I.damtype, "melee", 1)
 
 /mob/living/attacked_by(obj/item/I, mob/living/user)
+	//CIT CHANGES START HERE - combatmode and resting checks
+	var/totitemdamage = I.force
+	if(iscarbon(user))
+		var/mob/living/carbon/tempcarb = user
+		if(!tempcarb.combatmode)
+			totitemdamage *= 0.5
+	if(user.resting)
+		totitemdamage *= 0.5
+	//CIT CHANGES END HERE
+	if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration))
+		return FALSE
 	send_item_attack_message(I, user)
 	if(I.force)
-	//CIT CHANGES START HERE - combatmode and resting checks
-		var/totitemdamage = I.force
-		if(iscarbon(user))
-			var/mob/living/carbon/tempcarb = user
-			if(!tempcarb.combatmode)
-				totitemdamage *= 0.5
-		if(user.resting)
-			totitemdamage *= 0.5
-	//CIT CHANGES END HERE
 		apply_damage(totitemdamage, I.damtype) //CIT CHANGE - replaces I.force with totitemdamage
 		if(I.damtype == BRUTE && !HAS_TRAIT(src, TRAIT_NOMARROW)) 
 			if(prob(33))
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 30e6883d24..6ee7d51091 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -91,6 +91,8 @@
 		var/obj/item/clothing/gloves/G = gloves
 		if(istype(G) && G.Touch(A,0)) // for magic gloves
 			return
+	if (istype(glasses) && glasses.ranged_attack(src,A,mouseparams))
+		return
 
 	for(var/datum/mutation/human/HM in dna.mutations)
 		HM.on_ranged_attack(src, A, mouseparams)
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index a5d27819b8..730a3f17f4 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -14,6 +14,7 @@
 	var/list/modes			// allowed modes
 	var/list/gamemode_cache
 	var/list/votable_modes		// votable modes
+	var/list/storyteller_cache
 	var/list/mode_names
 	var/list/mode_reports
 	var/list/mode_false_report_weight
@@ -37,6 +38,7 @@
 		CRASH("/datum/controller/configuration/Load() called more than once!")
 	InitEntries()
 	LoadModes()
+	storyteller_cache = typecacheof(/datum/dynamic_storyteller, TRUE)
 	if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1)
 		var/list/legacy_configs = list("game_options.txt", "dbconfig.txt", "comms.txt")
 		for(var/I in legacy_configs)
@@ -227,13 +229,13 @@
 	for(var/T in gamemode_cache)
 		// I wish I didn't have to instance the game modes in order to look up
 		// their information, but it is the only way (at least that I know of).
+		// for future reference: just use initial() lol
 		var/datum/game_mode/M = new T()
 
 		if(M.config_tag)
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
 				modes += M.config_tag
 				mode_names[M.config_tag] = M.name
-				probabilities[M.config_tag] = M.probability
 				mode_reports[M.config_tag] = M.generate_report()
 				if(probabilities[M.config_tag]>0)
 					mode_false_report_weight[M.config_tag] = M.false_report_weight
@@ -317,6 +319,14 @@
 			return new T
 	return new /datum/game_mode/extended()
 
+/datum/controller/configuration/proc/pick_storyteller(storyteller_name)
+	for(var/T in storyteller_cache)
+		var/datum/dynamic_storyteller/S = T
+		var/name = initial(S.name)
+		if(name && name == storyteller_name)
+			return T
+	return /datum/dynamic_storyteller/classic
+
 /datum/controller/configuration/proc/get_runnable_modes()
 	var/list/datum/game_mode/runnable_modes = new
 	var/list/probabilities = Get(/datum/config_entry/keyed_list/probability)
@@ -331,6 +341,9 @@
 		if(probabilities[M.config_tag]<=0)
 			qdel(M)
 			continue
+		if(M.config_tag in SSvote.stored_modetier_results && SSvote.stored_modetier_results[M.config_tag] < Get(/datum/config_entry/number/dropped_modes))
+			qdel(M)
+			continue
 		if(min_pop[M.config_tag])
 			M.required_players = min_pop[M.config_tag]
 		if(max_pop[M.config_tag])
diff --git a/code/controllers/configuration/entries/fail2topic.dm b/code/controllers/configuration/entries/fail2topic.dm
new file mode 100644
index 0000000000..7ed09b378a
--- /dev/null
+++ b/code/controllers/configuration/entries/fail2topic.dm
@@ -0,0 +1,19 @@
+/datum/config_entry/number/fail2topic_rate_limit
+	config_entry_value = 10		//deciseconds
+
+/datum/config_entry/number/fail2topic_max_fails
+	config_entry_value = 5
+
+/datum/config_entry/string/fail2topic_rule_name
+	config_entry_value = "_dd_fail2topic"
+	protection = CONFIG_ENTRY_LOCKED		//affects physical server configuration, no touchies!!
+
+/datum/config_entry/flag/fail2topic_enabled
+	config_entry_value = TRUE
+
+/datum/config_entry/number/topic_max_size
+	config_entry_value = 8192
+
+/datum/config_entry/keyed_list/topic_rate_limit_whitelist
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_FLAG
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 61b5788ef8..8b6bbe83b4 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -378,17 +378,25 @@
 
 /datum/config_entry/keyed_list/box_random_engine
 	key_mode = KEY_MODE_TEXT
-	value_mode = VALUE_MODE_FLAG
+	value_mode = VALUE_MODE_NUM
 	lowercase = FALSE
-	splitter = "-"
+	splitter = ","
 
 /datum/config_entry/number/auto_transfer_delay
 	config_entry_value = 72000
 	min_val = 0
 
+/datum/config_entry/flag/pai_custom_holoforms
+
 /datum/config_entry/number/marauder_delay_non_reebe
 	config_entry_value = 1800
 	min_val = 0
 
 /datum/config_entry/flag/allow_clockwork_marauder_on_station
 	config_entry_value = TRUE
+
+/datum/config_entry/flag/modetier_voting
+	config_entry_value = TRUE
+
+/datum/config_entry/number/dropped_modes
+	config_entry_value = 3
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 125da84a30..7244212630 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -54,7 +54,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
-	
+
 	var/static/random_seed
 
 	//current tick limit, assigned before running a subsystem.
@@ -69,7 +69,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	if(!random_seed)
 		random_seed = (TEST_RUN_PARAMETER in world.params) ? 29051994 : rand(1, 1e9)
 		rand_seed(random_seed)
-	
+
 	var/list/_subsystems = list()
 	subsystems = _subsystems
 	if (Master != src)
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index 4fe0812c56..3be4f36270 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -155,6 +155,8 @@
 		if(SS_SLEEPING)
 			state = SS_PAUSING
 
+/datum/controller/subsystem/proc/subsystem_log(msg)
+	return log_subsystem(name, msg)
 
 //used to initialize the subsystem AFTER the map has loaded
 /datum/controller/subsystem/Initialize(start_timeofday)
@@ -162,7 +164,7 @@
 	var/time = (REALTIMEOFDAY - start_timeofday) / 10
 	var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!"
 	to_chat(world, "<span class='boldannounce'>[msg]</span>")
-	log_world(msg)
+	log_subsystem("INIT", msg)
 	return time
 
 //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 1bfdc79d27..2a59558bcd 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -315,7 +315,7 @@ SUBSYSTEM_DEF(air)
 		var/starting_ats = active_turfs.len
 		sleep(world.tick_lag)
 		var/timer = world.timeofday
-		warning("There are [starting_ats] active turfs at roundstart, this is a mapping error caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required)")
+		log_mapping("There are [starting_ats] active turfs at roundstart caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required).")
 		for(var/turf/T in active_turfs)
 			GLOB.active_turfs_startlist += T
 
diff --git a/code/controllers/subsystem/fail2topic.dm b/code/controllers/subsystem/fail2topic.dm
new file mode 100644
index 0000000000..a589ae2462
--- /dev/null
+++ b/code/controllers/subsystem/fail2topic.dm
@@ -0,0 +1,113 @@
+SUBSYSTEM_DEF(fail2topic)
+	name = "Fail2Topic"
+	init_order = INIT_ORDER_FAIL2TOPIC
+	flags = SS_BACKGROUND
+	runlevels = ALL
+
+	var/list/rate_limiting = list()
+	var/list/fail_counts = list()
+	var/list/active_bans = list()
+
+	var/rate_limit
+	var/max_fails
+	var/rule_name
+	var/enabled = FALSE
+
+/datum/controller/subsystem/fail2topic/Initialize(timeofday)
+	rate_limit = CONFIG_GET(number/fail2topic_rate_limit)
+	max_fails = CONFIG_GET(number/fail2topic_max_fails)
+	rule_name = CONFIG_GET(string/fail2topic_rule_name)
+	enabled = CONFIG_GET(flag/fail2topic_enabled)
+
+	DropFirewallRule() // Clear the old bans if any still remain
+
+	if (world.system_type == UNIX && enabled)
+		enabled = FALSE
+		subsystem_log("DISABLED - UNIX systems are not supported.")
+	if(!enabled)
+		flags |= SS_NO_FIRE
+		can_fire = FALSE
+
+	return ..()
+
+/datum/controller/subsystem/fail2topic/fire()
+	while (rate_limiting.len)
+		var/ip = rate_limiting[1]
+		var/last_attempt = rate_limiting[ip]
+
+		if (world.time - last_attempt > rate_limit)
+			rate_limiting -= ip
+			fail_counts -= ip
+
+		if (MC_TICK_CHECK)
+			return
+
+/datum/controller/subsystem/fail2topic/Shutdown()
+	DropFirewallRule()
+
+/datum/controller/subsystem/fail2topic/proc/IsRateLimited(ip)
+	var/last_attempt = rate_limiting[ip]
+
+	var/static/datum/config_entry/keyed_list/topic_rate_limit_whitelist/cached_whitelist_entry
+	if(!istype(cached_whitelist_entry))
+		cached_whitelist_entry = CONFIG_GET(keyed_list/topic_rate_limit_whitelist)
+
+	if(istype(cached_whitelist_entry))
+		if(cached_whitelist_entry.config_entry_value[ip])
+			return FALSE
+
+	if (active_bans[ip])
+		return TRUE
+
+	rate_limiting[ip] = world.time
+
+	if (isnull(last_attempt))
+		return FALSE
+
+	if (world.time - last_attempt > rate_limit)
+		fail_counts -= ip
+		return FALSE
+	else
+		var/failures = fail_counts[ip]
+
+		if (isnull(failures))
+			fail_counts[ip] = 1
+			return TRUE
+		else if (failures > max_fails)
+			BanFromFirewall(ip)
+			return TRUE
+		else
+			fail_counts[ip] = failures + 1
+			return TRUE
+
+/datum/controller/subsystem/fail2topic/proc/BanFromFirewall(ip)
+	if (!enabled)
+		return
+
+	active_bans[ip] = world.time
+	fail_counts -= ip
+	rate_limiting -= ip
+
+	. = shell("netsh advfirewall firewall add rule name=\"[rule_name]\" dir=in interface=any action=block remoteip=[ip]")
+
+	if (.)
+		subsystem_log("Failed to ban [ip]. Exit code: [.].")
+	else if (isnull(.))
+		subsystem_log("Failed to invoke shell to ban [ip].")
+	else
+		subsystem_log("Banned [ip].")
+
+/datum/controller/subsystem/fail2topic/proc/DropFirewallRule()
+	if (!enabled)
+		return
+
+	active_bans = list()
+
+	. = shell("netsh advfirewall firewall delete rule name=\"[rule_name]\"")
+
+	if (.)
+		subsystem_log("Failed to drop firewall rule. Exit code: [.].")
+	else if (isnull(.))
+		subsystem_log("Failed to invoke shell for firewall rule drop.")
+	else
+		subsystem_log("Firewall rule dropped.")
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index af7ae825f4..7597a9229a 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -658,7 +658,7 @@ SUBSYSTEM_DEF(job)
 		message_admins(msg)
 		CRASH(msg)
 
-/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff)
+/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff, bypass_prereqs = FALSE)
 	var/mob/the_mob = N
 	if(!the_mob)
 		the_mob = M // cause this doesn't get assigned if player is a latejoiner
@@ -671,7 +671,7 @@ SUBSYSTEM_DEF(job)
 			if(!G)
 				continue
 			var/permitted = TRUE
-			if(G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles))
+			if(!bypass_prereqs && G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles))
 				permitted = FALSE
 			if(G.donoritem && !G.donator_ckey_check(the_mob.client.ckey))
 				permitted = FALSE
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 8329493818..e43c8f21a2 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -13,13 +13,14 @@ SUBSYSTEM_DEF(persistence)
 	var/list/saved_messages = list()
 	var/list/saved_modes = list(1,2,3)
 	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_threat_levels = list(1,1,1)
+	var/list/saved_storytellers = list("foo","bar","baz","foo again","bar again")
 	var/list/saved_maps
 	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
 	var/list/antag_rep = list()
 	var/list/antag_rep_change = list()
 	var/list/picture_logging_information = list()
+	var/list/saved_votes = list()
 	var/list/obj/structure/sign/picture_frame/photo_frames
 	var/list/obj/item/storage/photo_album/photo_albums
 
@@ -29,9 +30,12 @@ SUBSYSTEM_DEF(persistence)
 	LoadChiselMessages()
 	LoadTrophies()
 	LoadRecentModes()
-	LoadRecentThreats()
+	LoadRecentStorytellers()
+	LoadRecentRulesets()
 	LoadRecentMaps()
 	LoadPhotoPersistence()
+	for(var/client/C in GLOB.clients)
+		LoadSavedVote(C.ckey)
 	if(CONFIG_GET(flag/use_antag_rep))
 		LoadAntagReputation()
 	LoadRandomizedRecipes()
@@ -169,14 +173,23 @@ SUBSYSTEM_DEF(persistence)
 		return
 	saved_modes = json["data"]
 
-/datum/controller/subsystem/persistence/proc/LoadRecentThreats()
-	var/json_file = file("data/RecentThreatLevels.json")
+/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
+	var/json_file = file("data/RecentRulesets.json")
 	if(!fexists(json_file))
 		return
 	var/list/json = json_decode(file2text(json_file))
 	if(!json)
 		return
-	saved_threat_levels = json["data"]
+	saved_dynamic_rules = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
+	var/json_file = file("data/RecentStorytellers.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_storytellers = json["data"]
 
 /datum/controller/subsystem/persistence/proc/LoadRecentMaps()
 	var/json_file = file("data/RecentMaps.json")
@@ -197,6 +210,15 @@ SUBSYSTEM_DEF(persistence)
 		return
 	antag_rep = json_decode(json)
 
+/datum/controller/subsystem/persistence/proc/LoadSavedVote(var/ckey)
+	var/json_file = file("data/player_saves/[copytext(ckey,1,2)]/[ckey]/SavedVotes.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_votes[ckey] = json["data"]
+
 /datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
 	for(var/A in GLOB.trophy_cases)
 		var/obj/structure/displaycase/trophy/T = A
@@ -230,7 +252,7 @@ SUBSYSTEM_DEF(persistence)
 	CollectRoundtype()
 	if(istype(SSticker.mode, /datum/game_mode/dynamic))
 		var/datum/game_mode/dynamic/mode = SSticker.mode
-		CollectThreatLevel(mode)
+		CollectStoryteller(mode)
 		CollectRulesets(mode)
 	RecordMaps()
 	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
@@ -388,13 +410,16 @@ SUBSYSTEM_DEF(persistence)
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))
 
-/datum/controller/subsystem/persistence/proc/CollectThreatLevel(var/datum/game_mode/dynamic/mode)
-	saved_threat_levels[3] = saved_threat_levels[2]
-	saved_threat_levels[2] = saved_threat_levels [1]
-	saved_threat_levels[1] = mode.threat_level
-	var/json_file = file("data/RecentThreatLevels.json")
+/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
+	saved_storytellers.len = 5
+	saved_storytellers[5] = saved_storytellers[4]
+	saved_storytellers[4] = saved_storytellers[3]
+	saved_storytellers[3] = saved_storytellers[2]
+	saved_storytellers[2] = saved_storytellers[1]
+	saved_storytellers[1] = mode.storyteller.name
+	var/json_file = file("data/RecentStorytellers.json")
 	var/list/file_data = list()
-	file_data["data"] = saved_threat_levels
+	file_data["data"] = saved_storytellers
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))
 
@@ -402,8 +427,9 @@ SUBSYSTEM_DEF(persistence)
 	saved_dynamic_rules[3] = saved_dynamic_rules[2]
 	saved_dynamic_rules[2] = saved_dynamic_rules[1]
 	saved_dynamic_rules[1] = list()
-	for(var/datum/dynamic_ruleset/ruleset in mode.executed_rules)
-		saved_dynamic_rules[1] += ruleset.config_tag
+	for(var/r in mode.executed_rules)
+		var/datum/dynamic_ruleset/rule = r
+		saved_dynamic_rules[1] += rule.config_tag
 	var/json_file = file("data/RecentRulesets.json")
 	var/list/file_data = list()
 	file_data["data"] = saved_dynamic_rules
@@ -473,3 +499,11 @@ SUBSYSTEM_DEF(persistence)
 
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/SaveSavedVotes()
+	for(var/ckey in saved_votes)
+		var/json_file = file("data/player_saves/[copytext(ckey,1,2)]/[ckey]/SavedVotes.json")
+		var/list/file_data = list()
+		file_data["data"] = saved_votes[ckey]
+		fdel(json_file)
+		WRITE_FILE(json_file, json_encode(file_data))
diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm
index 69bd5781de..5b53f9f884 100644
--- a/code/controllers/subsystem/processing/nanites.dm
+++ b/code/controllers/subsystem/processing/nanites.dm
@@ -6,6 +6,7 @@ PROCESSING_SUBSYSTEM_DEF(nanites)
 	var/list/datum/nanite_cloud_backup/cloud_backups = list()
 	var/list/mob/living/nanite_monitored_mobs = list()
 	var/list/datum/nanite_program/relay/nanite_relays = list()
+	var/neural_network_count = 0
 
 /datum/controller/subsystem/processing/nanites/proc/check_hardware(datum/nanite_cloud_backup/backup)
 	if(QDELETED(backup.storage) || (backup.storage.stat & (NOPOWER|BROKEN)))
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 0b9284a144..a52bcf4607 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)
 	if(!quirks.len)
 		SetupQuirks()
-		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"))
+		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"))
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()
@@ -46,8 +46,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 			badquirk = TRUE
 	if(badquirk)
 		cli.prefs.save_character()
-	if(!silent && LAZYLEN(cut))
-		to_chat(to_chat_target || user, "<span class='boldwarning'>All of your non-neutral character quirks have been cut due to these quirks conflicting with your job assignment: [english_list(cut)].</span>")
+	if (!silent && LAZYLEN(cut))
+		to_chat(to_chat_target || user, "<span class='boldwarning'>Some quirks have been cut from your character because of these quirks conflicting with your job assignment: [english_list(cut)].</span>")
 
 /datum/controller/subsystem/processing/quirks/proc/quirk_path_by_name(name)
 	return quirks[name]
@@ -66,6 +66,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/proc/filter_quirks(list/our_quirks, datum/job/job)
 	var/list/cut = list()
 	var/list/banned_names = list()
+	var/pointscut = 0
 	for(var/i in job.blacklisted_quirks)
 		var/name = quirk_name_by_path(i)
 		if(name)
@@ -75,7 +76,17 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		for(var/i in blacklisted)
 			our_quirks -= i
 			cut += i
-
+			pointscut += quirk_points_by_name(i)
+	if (pointscut != 0)
+		for (var/i in shuffle(our_quirks))
+			if (quirk_points_by_name(i) < pointscut || (pointscut < 0) ? quirk_points_by_name(i) <= 0 : quirk_points_by_name(i) >= 0)
+				continue
+			else
+				our_quirks -= i
+				cut += i
+				pointscut += quirk_points_by_name(i)
+			if (pointscut >= 0) //with how it works, it needs to be above zero, not below, as points for positive is positive, and negative is negative, we only want it to break if it's above zero, ie. we cut more positive than negative
+				break
 	/*	//Code to automatically reduce positive quirks until balance is even.
 	var/points_used = total_points(our_quirks)
 	if(points_used > 0)
@@ -91,10 +102,11 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	*/
 
 	//Nah, let's null all non-neutrals out.
-	if(cut.len)
-		for(var/i in our_quirks)
-			if(quirk_points_by_name(i) != 0)
-				//cut += i		-- Commented out: Only show the ones that triggered the quirk purge.
-				our_quirks -= i
+	if (pointscut != 0)// only if the pointscutting didn't work.
+		if(cut.len)
+			for(var/i in our_quirks)
+				if(quirk_points_by_name(i) != 0)
+					//cut += i		-- Commented out: Only show the ones that triggered the quirk purge.
+					our_quirks -= i
 
 	return cut
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index fe40b3f01f..b406a8ccad 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -37,7 +37,7 @@ SUBSYSTEM_DEF(shuttle)
 	var/points = 5000					//number of trade-points we have
 	var/centcom_message = ""			//Remarks from CentCom on how well you checked the last order.
 	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentCom, associated with their potencies
-	var/passive_supply_points_per_minute = 750
+	var/passive_supply_points_per_minute = 500
 
 	var/list/supply_packs = list()
 	var/list/shoppinglist = list()
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 974d870a8a..0948e428ff 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -221,6 +221,12 @@ SUBSYSTEM_DEF(ticker)
 	var/init_start = world.timeofday
 		//Create and announce mode
 	var/list/datum/game_mode/runnable_modes
+	if(SSvote.mode && (SSvote.mode == "roundtype" || SSvote.mode == "dynamic" || SSvote.mode == "mode tiers"))
+		SSvote.result()
+		SSpersistence.SaveSavedVotes()
+		for(var/client/C in SSvote.voting)
+			C << browse(null, "window=vote;can_close=0")
+		SSvote.reset()
 	if(GLOB.master_mode == "random" || GLOB.master_mode == "secret")
 		runnable_modes = config.get_runnable_modes()
 
@@ -483,7 +489,11 @@ SUBSYSTEM_DEF(ticker)
 			SSticker.timeLeft = 900
 		SSticker.modevoted = TRUE
 		var/dynamic = CONFIG_GET(flag/dynamic_voting)
-		SSvote.initiate_vote(dynamic ? "dynamic" : "roundtype","server",TRUE)
+		if(dynamic)
+			SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=SCORE_VOTING,forced=TRUE,vote_time = 20 MINUTES)
+		else
+			SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE, \
+			vote_time = (CONFIG_GET(flag/modetier_voting) ? 1 MINUTES : 20 MINUTES))
 
 /datum/controller/subsystem/ticker/Recover()
 	current_state = SSticker.current_state
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index dee10e4998..f82954276e 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -1,3 +1,5 @@
+#define VOTE_COOLDOWN 10
+
 SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10
@@ -8,44 +10,55 @@ SUBSYSTEM_DEF(vote)
 
 	var/initiator = null
 	var/started_time = null
-	var/time_remaining = 0
+	var/end_time = 0
 	var/mode = null
+	var/vote_system = PLURALITY_VOTING
 	var/question = null
 	var/list/choices = list()
+	var/list/scores = list()
+	var/list/choice_descs = list() // optional descriptions
 	var/list/voted = list()
 	var/list/voting = list()
+	var/list/saved = list()
 	var/list/generated_actions = list()
+	var/next_pop = 0
 
 	var/obfuscated = FALSE//CIT CHANGE - adds obfuscated/admin-only votes
 
 	var/list/stored_gamemode_votes = list() //Basically the last voted gamemode is stored here for end-of-round use.
 
+	var/list/stored_modetier_results = list() // The aggregated tier list of the modes available in secret.
+
 /datum/controller/subsystem/vote/fire()	//called by master_controller
 	if(mode)
-		time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10)
-
-		if(time_remaining < 0)
+		if(end_time < world.time)
 			result()
+			SSpersistence.SaveSavedVotes()
 			for(var/client/C in voting)
 				C << browse(null, "window=vote;can_close=0")
-			reset()
-		else
+			if(end_time < world.time) // result() can change this
+				reset()
+		else if(next_pop < world.time)
 			var/datum/browser/client_popup
 			for(var/client/C in voting)
-				client_popup = new(C, "vote", "Voting Panel")
+				client_popup = new(C, "vote", "Voting Panel", nwidth=600,nheight=700)
 				client_popup.set_window_options("can_close=0")
 				client_popup.set_content(interface(C))
 				client_popup.open(0)
+			next_pop = world.time+VOTE_COOLDOWN
+
 
 
 /datum/controller/subsystem/vote/proc/reset()
 	initiator = null
-	time_remaining = 0
+	end_time = 0
 	mode = null
 	question = null
 	choices.Cut()
+	choice_descs.Cut()
 	voted.Cut()
 	voting.Cut()
+	scores.Cut()
 	obfuscated = FALSE //CIT CHANGE - obfuscated votes
 	remove_action_buttons()
 
@@ -84,17 +97,128 @@ SUBSYSTEM_DEF(vote)
 				. += option
 	return .
 
+/datum/controller/subsystem/vote/proc/calculate_condorcet_votes(var/blackbox_text)
+	// https://en.wikipedia.org/wiki/Schulze_method#Implementation
+	var/list/d[][] = new/list(choices.len,choices.len) // the basic vote matrix, how many times a beats b
+	for(var/ckey in voted)
+		var/list/this_vote = voted[ckey]
+		for(var/a in 1 to choices.len)
+			for(var/b in a+1 to choices.len)
+				var/a_rank = this_vote.Find(a)
+				var/b_rank = this_vote.Find(b)
+				a_rank = a_rank ? a_rank : choices.len+1
+				b_rank = b_rank ? b_rank : choices.len+1
+				if(a_rank<b_rank)
+					d[a][b]++
+				else if(b_rank<a_rank)
+					d[b][a]++
+				//if equal, do nothing
+	var/list/p[][] = new/list(choices.len,choices.len) //matrix of shortest path from a to b
+	for(var/i in 1 to choices.len)
+		for(var/j in 1 to choices.len)
+			if(i != j)
+				var/pref_number = d[i][j]
+				var/opposite_pref = d[j][i]
+				if(pref_number>opposite_pref)
+					p[i][j] = d[i][j]
+				else
+					p[i][j] = 0
+	for(var/i in 1 to choices.len)
+		for(var/j in 1 to choices.len)
+			if(i != j)
+				for(var/k in 1 to choices.len) // YEAH O(n^3) !!
+					if(i != k && j != k)
+						p[j][k] = max(p[j][k],min(p[j][i], p[i][k]))
+	//one last pass, now that we've done the math
+	for(var/i in 1 to choices.len)
+		for(var/j in 1 to choices.len)
+			if(i != j)
+				SSblackbox.record_feedback("nested tally","voting",p[i][j],list(blackbox_text,"Shortest Paths",choices[i],choices[j]))
+				if(p[i][j] >= p[j][i])
+					choices[choices[i]]++ // higher shortest path = better candidate, so we add to choices here
+					// choices[choices[i]] is the schulze ranking, here, rather than raw vote numbers
+
+/datum/controller/subsystem/vote/proc/calculate_majority_judgement_vote(var/blackbox_text)
+	// https://en.wikipedia.org/wiki/Majority_judgment
+	var/list/scores_by_choice = list()
+	for(var/choice in choices)
+		scores_by_choice[choice] = list()
+	for(var/ckey in voted)
+		var/list/this_vote = voted[ckey]
+		var/list/pretty_vote = list()
+		for(var/choice in this_vote)
+			sorted_insert(scores_by_choice[choice],this_vote[choice],/proc/cmp_numeric_asc)
+			// START BALLOT GATHERING
+			pretty_vote += choice
+			pretty_vote[choice] = GLOB.vote_score_options[this_vote[choice]]
+		SSblackbox.record_feedback("associative","voting_ballots",1,pretty_vote)
+		// END BALLOT GATHERING
+	for(var/score_name in scores_by_choice)
+		var/list/score = scores_by_choice[score_name]
+		for(var/indiv_score in score)
+			SSblackbox.record_feedback("nested tally","voting",1,list(blackbox_text,"Scores",score_name,GLOB.vote_score_options[indiv_score])) 
+		if(score.len == 0)
+			scores_by_choice -= score_name
+	while(scores_by_choice.len > 1)
+		var/highest_median = 0
+		for(var/score_name in scores_by_choice) // first get highest median
+			var/list/score = scores_by_choice[score_name]
+			if(!score.len)
+				scores_by_choice -= score_name
+				continue
+			var/median = score[max(1,round(score.len/2))]
+			if(median >= highest_median)
+				highest_median = median
+		for(var/score_name in scores_by_choice) // then, remove
+			var/list/score = scores_by_choice[score_name]
+			var/median = score[max(1,round(score.len/2))]
+			if(median < highest_median)
+				scores_by_choice -= score_name
+		for(var/score_name in scores_by_choice) // after removals
+			var/list/score = scores_by_choice[score_name]
+			if(score.len == 0)
+				choices[score_name] += 100 // we're in a tie situation--just go with the first one
+				return
+			var/median_pos = max(1,round(score.len/2))
+			score.Cut(median_pos,median_pos+1)
+			choices[score_name]++
+
+/datum/controller/subsystem/vote/proc/calculate_scores(var/blackbox_text)
+	var/list/scores_by_choice = list()
+	for(var/choice in choices)
+		scores_by_choice[choice] = list()
+	for(var/ckey in voted)
+		var/list/this_vote = voted[ckey]
+		for(var/choice in this_vote)
+			sorted_insert(scores_by_choice[choice],this_vote[choice],/proc/cmp_numeric_asc)
+	var/middle_score = round(GLOB.vote_score_options.len/2,1)
+	for(var/score_name in scores_by_choice)
+		var/list/score = scores_by_choice[score_name]
+		for(var/S in score)
+			scores[score_name] += S-middle_score
+		SSblackbox.record_feedback("nested tally","voting",scores[score_name],list(blackbox_text,"Total scores",score_name))
+
+
 /datum/controller/subsystem/vote/proc/announce_result()
-	var/list/winners = get_result()
+	var/vote_title_text
 	var/text
+	if(question)
+		text += "<b>[question]</b>"
+		vote_title_text = "[question]"
+	else
+		text += "<b>[capitalize(mode)] Vote</b>"
+		vote_title_text = "[capitalize(mode)] Vote"
+	if(vote_system == RANKED_CHOICE_VOTING)
+		calculate_condorcet_votes(vote_title_text)
+	if(vote_system == SCORE_VOTING)
+		calculate_majority_judgement_vote(vote_title_text)
+	var/list/winners = get_result()
 	var/was_roundtype_vote = mode == "roundtype" || mode == "dynamic"
 	if(winners.len > 0)
-		if(question)
-			text += "<b>[question]</b>"
-		else
-			text += "<b>[capitalize(mode)] Vote</b>"
 		if(was_roundtype_vote)
 			stored_gamemode_votes = list()
+		if(!obfuscated && vote_system == RANKED_CHOICE_VOTING)
+			text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			if(!votes)
@@ -116,17 +240,27 @@ SUBSYSTEM_DEF(vote)
 	log_vote(text)
 	remove_action_buttons()
 	to_chat(world, "\n<font color='purple'>[text]</font>")
+	switch(vote_system)
+		if(APPROVAL_VOTING,PLURALITY_VOTING)
+			for(var/i=1,i<=choices.len,i++)
+				SSblackbox.record_feedback("nested tally","voting",choices[choices[i]],list(vote_title_text,choices[i]))
+		if(RANKED_CHOICE_VOTING)
+			for(var/i=1,i<=voted.len,i++)
+				var/list/myvote = voted[voted[i]]
+				for(var/j=1,j<=myvote.len,j++)
+					SSblackbox.record_feedback("nested tally","voting",1,list(vote_title_text,"[j]\th",choices[myvote[j]]))
 	if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results
 		var/admintext = "Obfuscated results"
+		if(vote_system == RANKED_CHOICE_VOTING)
+			admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
+		else if(vote_system == SCORE_VOTING)
+			admintext += "\nIt should be noted that this is not a raw tally of votes but the number of runoffs done by majority judgement!"
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			admintext += "\n<b>[choices[i]]:</b> [votes]"
 		message_admins(admintext)
 	return .
 
-#define PEACE "calm"
-#define CHAOS "chaotic"
-
 /datum/controller/subsystem/vote/proc/result()
 	. = announce_result()
 	var/restart = 0
@@ -139,6 +273,12 @@ SUBSYSTEM_DEF(vote)
 				SSticker.save_mode(.)
 				message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
 				log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
+				if(CONFIG_GET(flag/modetier_voting))
+					reset()
+					started_time = 0
+					initiate_vote("mode tiers","server",hideresults=FALSE,votesystem=RANKED_CHOICE_VOTING,forced=TRUE, vote_time = 30 MINUTES)
+					to_chat(world,"<b>The vote will end right as the round starts.</b>")
+					return .
 			if("restart")
 				if(. == "Restart Round")
 					restart = 1
@@ -149,36 +289,20 @@ SUBSYSTEM_DEF(vote)
 						restart = 1
 					else
 						GLOB.master_mode = .
+			if("mode tiers")
+				stored_modetier_results = choices.Copy()
 			if("dynamic")
 				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
 					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
-				GLOB.master_mode = "dynamic"
-				if("extended" in choices)
-					if(. == "extended")
-						GLOB.dynamic_forced_extended = TRUE // we still do the rest of the stuff
-					choices[PEACE] += choices["extended"]
-				var/mean = 0
-				var/voters = 0
-				for(var/client/c in GLOB.clients)
-					var/vote = c.prefs.preferred_chaos
-					if(vote)
-						voters += 1
-						switch(vote)
-							if(CHAOS_NONE)
-								mean -= 0.1
-							if(CHAOS_LOW)
-								mean -= 0.05
-							if(CHAOS_HIGH)
-								mean += 0.05
-							if(CHAOS_MAX)
-								mean += 0.1
-				mean/=voters
-				if(voted.len != 0)
-					mean += (choices[PEACE]*-1+choices[CHAOS])/voted.len
-				GLOB.dynamic_curve_centre = mean*20
-				GLOB.dynamic_curve_width = CLAMP(2-abs(mean*5),0.5,4)
-				to_chat(world,"<span class='boldannounce'>Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width].</span>")
-				log_admin("Dynamic curve centre set to [GLOB.dynamic_curve_centre] and width set to [GLOB.dynamic_curve_width]")
+				if(. == "Secret")
+					GLOB.master_mode = "secret"
+					SSticker.save_mode(.)
+					message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
+					log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
+				else
+					GLOB.master_mode = "dynamic"
+					var/datum/dynamic_storyteller/S = config.pick_storyteller(.)
+					GLOB.dynamic_storyteller_type = S
 			if("map")
 				var/datum/map_config/VM = config.maplist[.]
 				message_admins("The map has been voted for and will change to: [VM.map_name]")
@@ -196,27 +320,58 @@ SUBSYSTEM_DEF(vote)
 		else
 			to_chat(world, "<span style='boldannounce'>Notice:Restart vote will not restart the server automatically because there are active admins on.</span>")
 			message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.")
-
+	
 	return .
 
-/datum/controller/subsystem/vote/proc/submit_vote(vote)
+/datum/controller/subsystem/vote/proc/submit_vote(vote, score = 0)
 	if(mode)
 		if(CONFIG_GET(flag/no_dead_vote) && usr.stat == DEAD && !usr.client.holder)
 			return 0
-		if(!(usr.ckey in voted))
-			if(vote && 1<=vote && vote<=choices.len)
-				voted += usr.ckey
-				voted[usr.ckey] = vote
-				choices[choices[vote]]++	//check this
-				return vote
-		else if(vote && 1<=vote && vote<=choices.len)
-			choices[choices[voted[usr.ckey]]]--
-			voted[usr.ckey] = vote
-			choices[choices[vote]]++
-			return vote
+		if(vote && ISINRANGE(vote, 1, choices.len))
+			switch(vote_system)
+				if(PLURALITY_VOTING)
+					if(usr.ckey in voted)
+						choices[choices[voted[usr.ckey]]]--
+						voted[usr.ckey] = vote
+						choices[choices[vote]]++
+						return vote
+					else
+						voted += usr.ckey
+						voted[usr.ckey] = vote
+						choices[choices[vote]]++	//check this
+						return vote
+				if(APPROVAL_VOTING)
+					if(usr.ckey in voted)
+						if(vote in voted[usr.ckey])
+							voted[usr.ckey] -= vote
+							choices[choices[vote]]--
+						else
+							voted[usr.ckey] += vote
+							choices[choices[vote]]++
+					else
+						voted += usr.ckey
+						voted[usr.ckey] = list(vote)
+						choices[choices[vote]]++
+						return vote
+				if(RANKED_CHOICE_VOTING)
+					if(usr.ckey in voted)
+						if(vote in voted[usr.ckey])
+							voted[usr.ckey] -= vote
+					else
+						voted += usr.ckey
+						voted[usr.ckey] = list()
+					voted[usr.ckey] += vote
+					saved -= usr.ckey
+				if(SCORE_VOTING)
+					if(!(usr.ckey in voted))
+						voted += usr.ckey
+						voted[usr.ckey] = list()
+					voted[usr.ckey][choices[vote]] = score
+					saved -= usr.ckey
 	return 0
 
-/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes
+/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, hideresults, votesystem = PLURALITY_VOTING, forced = FALSE,vote_time = -1)//CIT CHANGE - adds hideresults argument to votes to allow for obfuscated votes
+	vote_system = votesystem
 	if(!mode)
 		if(started_time)
 			var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay))
@@ -256,12 +411,25 @@ SUBSYSTEM_DEF(vote)
 					choices |= M
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
+			if("mode tiers")
+				var/list/modes_to_add = config.votable_modes
+				var/list/probabilities = CONFIG_GET(keyed_list/probability)
+				for(var/tag in modes_to_add)
+					if(probabilities[tag] <= 0)
+						modes_to_add -= tag
+				choices.Add(modes_to_add)
 			if("dynamic")
-				var/saved_threats = SSpersistence.saved_threat_levels
-				if((saved_threats[1]+saved_threats[2]+saved_threats[3])>150)
-					choices.Add("extended",PEACE,CHAOS)
-				else
-					choices.Add(PEACE,CHAOS)
+				for(var/T in config.storyteller_cache)
+					var/datum/dynamic_storyteller/S = T
+					var/recent_rounds = 0
+					for(var/i in 1 to SSpersistence.saved_storytellers.len)
+						if(SSpersistence.saved_storytellers[i] == initial(S.name))
+							recent_rounds++
+					if(recent_rounds < initial(S.weight))
+						choices.Add(initial(S.name))
+						choice_descs.Add(initial(S.desc))
+				choices.Add("Secret")
+				choice_descs.Add("Standard secret. Switches mode if it wins.")
 			if("custom")
 				question = stripped_input(usr,"What is the vote for?")
 				if(!question)
@@ -280,9 +448,11 @@ SUBSYSTEM_DEF(vote)
 		if(mode == "custom")
 			text += "\n[question]"
 		log_vote(text)
-		var/vp = CONFIG_GET(number/vote_period)
+		var/vp = vote_time
+		if(vp == -1)
+			vp = CONFIG_GET(number/vote_period)
 		to_chat(world, "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=[REF(src)]'>here</a> to place your votes.\nYou have [DisplayTimeText(vp)] to vote.</font>")
-		time_remaining = round(vp/10)
+		end_time = started_time+vp
 		for(var/c in GLOB.clients)
 			SEND_SOUND(c, sound('sound/misc/server-ready.ogg'))
 			var/client/C = c
@@ -292,6 +462,11 @@ SUBSYSTEM_DEF(vote)
 			C.player_details.player_actions += V
 			V.Grant(C.mob)
 			generated_actions += V
+			if(forced)
+				var/datum/browser/popup = new(C, "vote", "Voting Panel",nwidth=600,nheight=700)
+				popup.set_window_options("can_close=0")
+				popup.set_content(SSvote.interface(C))
+				popup.open(0)
 		return 1
 	return 0
 
@@ -311,14 +486,71 @@ SUBSYSTEM_DEF(vote)
 			. += "<h2>Vote: '[question]'</h2>"
 		else
 			. += "<h2>Vote: [capitalize(mode)]</h2>"
-		. += "Time Left: [time_remaining] s<hr><ul>"
-		for(var/i=1,i<=choices.len,i++)
-			var/votes = choices[choices[i]]
-			var/ivotedforthis = ((C.ckey in voted) && (voted[C.ckey] == i) ? TRUE : FALSE)
-			if(!votes)
-				votes = 0
-			. += "<li>[ivotedforthis ? "<b>" : ""]<a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a> ([obfuscated ? (admin ? "??? ([votes])" : "???") : votes] votes)[ivotedforthis ? "</b>" : ""]</li>" // CIT CHANGE - adds obfuscated votes
-		. += "</ul><hr>"
+		switch(vote_system)
+			if(PLURALITY_VOTING)
+				. += "<h3>Vote one.</h3>"
+			if(APPROVAL_VOTING)
+				. += "<h3>Vote any number of choices.</h3>"
+			if(RANKED_CHOICE_VOTING)
+				. += "<h3>Vote by order of preference. Revoting will demote to the bottom. 1 is your favorite, and higher numbers are worse.</h3>"
+			if(SCORE_VOTING)
+				. += "<h3>Grade the candidates by how much you like them.</h3>"
+				. += "<h3>No-votes have no power--your opinion is only heard if you vote!</h3>"
+		. += "Time Left: [DisplayTimeText(end_time-world.time)]<hr><ul>"
+		switch(vote_system)
+			if(PLURALITY_VOTING, APPROVAL_VOTING)
+				for(var/i=1,i<=choices.len,i++)
+					var/votes = choices[choices[i]]
+					var/ivotedforthis = FALSE
+					switch(vote_system)
+						if(PLURALITY_VOTING)
+							ivotedforthis = ((C.ckey in voted) && (voted[C.ckey] == i))
+						if(APPROVAL_VOTING)
+							ivotedforthis = ((C.ckey in voted) && (i in voted[C.ckey]))
+					if(!votes)
+						votes = 0
+					. += "<li>[ivotedforthis ? "<b>" : ""]<a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a> ([obfuscated ? (admin ? "??? ([votes])" : "???") : votes] votes)[ivotedforthis ? "</b>" : ""]</li>" // CIT CHANGE - adds obfuscated votes
+					if(choice_descs.len >= i)
+						. += "<li>[choice_descs[i]]</li>"
+				. += "</ul><hr>"
+			if(RANKED_CHOICE_VOTING)
+				var/list/myvote = voted[C.ckey]
+				for(var/i=1,i<=choices.len,i++)
+					var/vote = (myvote ? (myvote.Find(i)) : 0)
+					if(vote)
+						. += "<li><b><a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a> ([vote])</b></li>"
+					else
+						. += "<li><a href='?src=[REF(src)];vote=[i]'>[choices[i]]</a></li>"
+					if(choice_descs.len >= i)
+						. += "<li>[choice_descs[i]]</li>"
+				. += "</ul><hr>"
+				if(!(C.ckey in saved))
+					. += "(<a href='?src=[REF(src)];vote=save'>Save vote</a>)"
+				else
+					. += "(Saved!)"
+				. += "(<a href='?src=[REF(src)];vote=load'>Load vote from save</a>)"
+				. += "(<a href='?src=[REF(src)];vote=reset'>Reset votes</a>)"
+			if(SCORE_VOTING)
+				var/list/myvote = voted[C.ckey]
+				for(var/i=1,i<=choices.len,i++)
+					. += "<li><b>[choices[i]]</b>"
+					for(var/r in 1 to GLOB.vote_score_options.len)
+						. += " <a href='?src=[REF(src)];vote=[i];score=[r]'>"
+						if((choices[i] in myvote) && myvote[choices[i]] == r)
+							. +="<b>([GLOB.vote_score_options[r]])</b>"
+						else
+							. +="[GLOB.vote_score_options[r]]"
+						. += "</a>"
+					. += "</li>"
+					if(choice_descs.len >= i)
+						. += "<li>[choice_descs[i]]</li>"
+				. += "</ul><hr>"
+				if(!(C.ckey in saved))
+					. += "(<a href='?src=[REF(src)];vote=save'>Save vote</a>)"
+				else
+					. += "(Saved!)"
+				. += "(<a href='?src=[REF(src)];vote=load'>Load vote from save</a>)"
+				. += "(<a href='?src=[REF(src)];vote=reset'>Reset votes</a>)"
 		if(admin)
 			. += "(<a href='?src=[REF(src)];vote=cancel'>Cancel Vote</a>) "
 	else
@@ -376,8 +608,31 @@ SUBSYSTEM_DEF(vote)
 		if("custom")
 			if(usr.client.holder)
 				initiate_vote("custom",usr.key)
+		if("reset")
+			if(usr.ckey in voted)
+				voted -= usr.ckey
+		if("save")
+			if(usr.ckey in voted)
+				if(!(usr.ckey in SSpersistence.saved_votes))
+					SSpersistence.saved_votes[usr.ckey] = list()
+				SSpersistence.saved_votes[usr.ckey][mode] = voted[usr.ckey]
+				saved += usr.ckey
+		if("load")
+			if(!(usr.ckey in SSpersistence.saved_votes))
+				SSpersistence.LoadSavedVote(usr.ckey)
+				if(!(usr.ckey in SSpersistence.saved_votes))
+					SSpersistence.saved_votes[usr.ckey] = list()
+					if(usr.ckey in voted)
+						SSpersistence.saved_votes[usr.ckey][mode] = voted[usr.ckey]
+					else
+						SSpersistence.saved_votes[usr.ckey][mode] = list()
+			voted[usr.ckey] = SSpersistence.saved_votes[usr.ckey][mode]
+			saved += usr.ckey
 		else
-			submit_vote(round(text2num(href_list["vote"])))
+			if(vote_system == SCORE_VOTING)
+				submit_vote(round(text2num(href_list["vote"])),round(text2num(href_list["score"])))
+			else
+				submit_vote(round(text2num(href_list["vote"])))
 	usr.vote()
 
 /datum/controller/subsystem/vote/proc/remove_action_buttons()
@@ -392,7 +647,7 @@ SUBSYSTEM_DEF(vote)
 	set category = "OOC"
 	set name = "Vote"
 
-	var/datum/browser/popup = new(src, "vote", "Voting Panel")
+	var/datum/browser/popup = new(src, "vote", "Voting Panel",nwidth=600,nheight=700)
 	popup.set_window_options("can_close=0")
 	popup.set_content(SSvote.interface(client))
 	popup.open(0)
@@ -419,6 +674,3 @@ SUBSYSTEM_DEF(vote)
 		var/datum/player_details/P = GLOB.player_details[owner.ckey]
 		if(P)
 			P.player_actions -= src
-
-#undef PEACE
-#undef CHAOS
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 77aa729eb1..cb56c26b91 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -141,6 +141,17 @@
 		current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state))
 		current_button.button_icon_state = button_icon_state
 
+/datum/action/ghost
+	icon_icon = 'icons/mob/mob.dmi'
+	button_icon_state = "ghost"
+	name = "Ghostize"
+	desc = "Turn into a ghost and freely come back to your body."
+
+/datum/action/ghost/Trigger()
+	if(!..())
+		return 0
+	var/mob/M = target
+	M.ghostize(1)
 
 //Presets for item actions
 /datum/action/item_action
diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm
index 0ef13b514b..89c4deb2e9 100644
--- a/code/datums/components/nanites.dm
+++ b/code/datums/components/nanites.dm
@@ -11,8 +11,9 @@
 	var/list/datum/nanite_program/programs = list()
 	var/max_programs = NANITE_PROGRAM_LIMIT
 
-	var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans, and does not display the program list on nanite scans
-
+	var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans
+	var/diagnostics = TRUE //if TRUE, displays program list when scanned by nanite scanners
+	
 /datum/component/nanites/Initialize(amount = 100, cloud = 0)
 	if(!isliving(parent) && !istype(parent, /datum/nanite_cloud_backup))
 		return COMPONENT_INCOMPATIBLE
@@ -252,8 +253,8 @@
 		to_chat(user, "<span class='info'>Cloud ID: [cloud_id ? cloud_id : "Disabled"]</span>")
 		to_chat(user, "<span class='info'>================</span>")
 		to_chat(user, "<span class='info'>Program List:</span>")
-		if(stealth)
-			to_chat(user, "<span class='alert'>%#$ENCRYPTED&^@</span>")
+		if(!diagnostics)
+			to_chat(user, "<span class='alert'>Diagnostics Disabled</span>")
 		else
 			for(var/X in programs)
 				var/datum/nanite_program/NP = X
diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm
index f7ca711421..accc8cadaf 100644
--- a/code/datums/components/storage/concrete/_concrete.dm
+++ b/code/datums/components/storage/concrete/_concrete.dm
@@ -66,7 +66,7 @@
 /datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
 	. = TRUE
 	var/atom/real_location = real_location()
-	if(I.loc != real_location)
+	if(I.loc != real_location && real_location)
 		I.forceMove(real_location)
 	refresh_mob_views()
 
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 7e4a561422..9c8622d16e 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -87,3 +87,12 @@
 /datum/component/storage/concrete/pockets/pocketprotector/real_location()
 	// if the component is reparented to a jumpsuit, the items still go in the protector
 	return original_parent
+
+/datum/component/storage/concrete/pockets/small/rushelmet
+	max_items = 1
+	quickdraw = TRUE
+
+/datum/component/storage/concrete/pockets/small/rushelmet/Initialize()
+	. = ..()
+	can_hold = typecacheof(list(/obj/item/reagent_containers/glass/bottle,
+								/obj/item/ammo_box/a762))
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index feac1de972..dfaa6f061d 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -947,21 +947,25 @@
 
 			if(A.reagents)
 				var/chosen_id
-				var/list/reagent_options = sortList(GLOB.chemical_reagents_list)
-				switch(alert(usr, "Choose a method.", "Add Reagents", "Enter ID", "Choose ID"))
-					if("Enter ID")
+				switch(alert(usr, "Choose a method.", "Add Reagents", "Search", "Choose from a list", "I'm feeling lucky"))
+					if("Search")
 						var/valid_id
 						while(!valid_id)
-							chosen_id = stripped_input(usr, "Enter the ID of the reagent you want to add.")
-							if(!chosen_id) //Get me out of here!
+							chosen_id = input(usr, "Enter the ID of the reagent you want to add.", "Search reagents") as null|text
+							if(isnull(chosen_id)) //Get me out of here!
 								break
-							for(var/ID in reagent_options)
-								if(ID == chosen_id)
-									valid_id = 1
+							if(!ispath(text2path(chosen_id)))
+								chosen_id = pick_closest_path(chosen_id, make_types_fancy(subtypesof(/datum/reagent)))
+								if(ispath(chosen_id))
+									valid_id = TRUE
+							else
+								valid_id = TRUE
 							if(!valid_id)
 								to_chat(usr, "<span class='warning'>A reagent with that ID doesn't exist!</span>")
-					if("Choose ID")
-						chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in reagent_options
+					if("Choose from a list")
+						chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent)
+					if("I'm feeling lucky")
+						chosen_id = pick(subtypesof(/datum/reagent))
 				if(chosen_id)
 					var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num
 					if(amount)
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index 8a6966666e..056f99c7a4 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -103,7 +103,7 @@
 	if(!(spread_flags & DISEASE_SPREAD_AIRBORNE) && !force_spread)
 		return
 
-	if(affected_mob.reagents.has_reagent("spaceacillin") || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
+	if(affected_mob.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) || (affected_mob.satiety > 0 && prob(affected_mob.satiety/10)))
 		return
 
 	var/spread_range = 2
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 8d5e915b31..a844254ef9 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -36,37 +36,41 @@
 	// The order goes from easy to cure to hard to cure. Keep in mind that sentient diseases pick two cures from tier 6 and up, ensure they wont react away in bodies.
 	var/static/list/advance_cures = 	list(
 									list(	// level 1
-										"copper", "silver", "iodine", "iron", "carbon"
+										/datum/reagent/copper, /datum/reagent/silver, /datum/reagent/iodine, /datum/reagent/iron, /datum/reagent/carbon
 									),
 									list(	// level 2
-										"potassium", "ethanol", "lithium", "silicon", "bromine"
+										/datum/reagent/potassium, /datum/reagent/consumable/ethanol, /datum/reagent/lithium,
+										/datum/reagent/silicon, /datum/reagent/bromine
 									),
 									list(	// level 3
-										"sodiumchloride", "sugar", "orangejuice", "tomatojuice", "milk"
+										/datum/reagent/consumable/sodiumchloride, /datum/reagent/consumable/sugar, /datum/reagent/consumable/orangejuice,
+										/datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/milk
 									),
 									list(	//level 4
-										"spaceacillin", "salglu_solution", "epinephrine", "charcoal"
+										/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution,
+										/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/charcoal
 									),
 									list(	//level 5
-										"oil", "synaptizine", "mannitol", "space_drugs", "cryptobiolin"
+										/datum/reagent/oil, /datum/reagent/medicine/synaptizine, /datum/reagent/medicine/mannitol,
+										/datum/reagent/drug/space_drugs, /datum/reagent/cryptobiolin
 									),
 									list(	// level 6
-										"phenol", "inacusiate", "oculine", "antihol"
+										/datum/reagent/phenol, /datum/reagent/medicine/inacusiate, /datum/reagent/medicine/oculine, /datum/reagent/medicine/antihol
 									),
 									list(	// level 7
-										"leporazine", "mindbreaker", "corazone"
+										/datum/reagent/medicine/leporazine, /datum/reagent/toxin/mindbreaker, /datum/reagent/medicine/corazone
 									),
 									list(	// level 8
-										"pax", "happiness", "ephedrine"
+										/datum/reagent/pax, /datum/reagent/drug/happiness, /datum/reagent/medicine/ephedrine
 									),
 									list(	// level 9
-										"lipolicide", "sal_acid"
+										/datum/reagent/toxin/lipolicide, /datum/reagent/medicine/sal_acid
 									),
 									list(	// level 10
-										"haloperidol", "aranesp", "diphenhydramine"
+										/datum/reagent/medicine/haloperidol, /datum/reagent/drug/aranesp, /datum/reagent/medicine/diphenhydramine
 									),
 									list(	//level 11
-										"modafinil", "anacea"
+										/datum/reagent/medicine/modafinil, /datum/reagent/toxin/anacea
 									)
 								)
 
diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index a54b132de1..069c62cf3f 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -138,7 +138,7 @@ Bonus
 	var/get_damage = rand(15,21) * power
 	M.adjustOxyLoss(get_damage)
 	if(paralysis)
-		M.reagents.add_reagent_list(list("pancuronium" = 3, "sodium_thiopental" = 3))
+		M.reagents.add_reagent_list(list(/datum/reagent/toxin/pancuronium = 3, /datum/reagent/toxin/sodium_thiopental = 3))
 	return 1
 
 /datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm
index f85024a7a9..6429db9439 100644
--- a/code/datums/diseases/advance/symptoms/fire.dm
+++ b/code/datums/diseases/advance/symptoms/fire.dm
@@ -156,7 +156,7 @@ Bonus
 	M.adjust_fire_stacks(get_stacks)
 	M.adjustFireLoss(get_stacks/2)
 	if(chems)
-		M.reagents.add_reagent("clf3", 2 * power)
+		M.reagents.add_reagent(/datum/reagent/clf3, 2 * power)
 	return 1
 
 /datum/symptom/alkali/proc/Alkali_fire_stage_5(mob/living/M, datum/disease/advance/A)
@@ -164,5 +164,5 @@ Bonus
 	M.adjust_fire_stacks(get_stacks)
 	M.adjustFireLoss(get_stacks)
 	if(chems)
-		M.reagents.add_reagent_list(list("napalm" = 4 * power, "clf3" = 4 * power))
+		M.reagents.add_reagent_list(list(/datum/reagent/napalm = 4 * power, /datum/reagent/clf3 = 4 * power))
 	return 1
diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm
index c38acc8e9e..d1e9d3fdca 100644
--- a/code/datums/diseases/advance/symptoms/flesh_eating.dm
+++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm
@@ -124,7 +124,7 @@ Bonus
 	var/get_damage = rand(6,10)
 	M.adjustBruteLoss(get_damage)
 	if(chems)
-		M.reagents.add_reagent_list(list("heparin" = 2, "lipolicide" = 2))
+		M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2))
 	if(zombie)
-		M.reagents.add_reagent("romerol", 1)
+		M.reagents.add_reagent(/datum/reagent/romerol, 1)
 	return 1
\ No newline at end of file
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index 8b205db756..d41e0bf225 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -117,8 +117,9 @@
 		power = 2
 
 /datum/symptom/heal/chem/Heal(mob/living/M, datum/disease/advance/A, actual_power)
-	for(var/datum/reagent/R in M.reagents.reagent_list) //Not just toxins!
-		M.reagents.remove_reagent(R.id, actual_power)
+	for(var/E in M.reagents.reagent_list) //Not just toxins!
+		var/datum/reagent/R = E
+		M.reagents.remove_reagent(R.type, actual_power)
 		if(food_conversion)
 			M.nutrition += 0.3
 		if(prob(2))
@@ -329,11 +330,11 @@
 	if(M.fire_stacks < 0)
 		M.fire_stacks = min(M.fire_stacks + 1 * absorption_coeff, 0)
 		. += power
-	if(M.reagents.has_reagent("holywater"))
-		M.reagents.remove_reagent("holywater", 0.5 * absorption_coeff)
+	if(M.reagents.has_reagent(/datum/reagent/water/holywater))
+		M.reagents.remove_reagent(/datum/reagent/water/holywater, 0.5 * absorption_coeff)
 		. += power * 0.75
-	else if(M.reagents.has_reagent("water"))
-		M.reagents.remove_reagent("water", 0.5 * absorption_coeff)
+	else if(M.reagents.has_reagent(/datum/reagent/water))
+		M.reagents.remove_reagent(/datum/reagent/water, 0.5 * absorption_coeff)
 		. += power * 0.5
 
 /datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
@@ -392,7 +393,7 @@
 		plasmamount = environment.gases[/datum/gas/plasma]
 		if(plasmamount && plasmamount > GLOB.meta_gas_visibility[/datum/gas/plasma]) //if there's enough plasma in the air to see
 			. += power * 0.5
-	if(M.reagents.has_reagent("plasma"))
+	if(M.reagents.has_reagent(/datum/reagent/toxin/plasma))
 		. +=  power * 0.75
 
 /datum/symptom/heal/plasma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 2705e0b168..1f8cc8d7af 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -44,10 +44,10 @@
 
 	if(A.stage >= 4)
 		M.drowsyness = max(0, M.drowsyness - 2)
-		if(M.reagents.has_reagent("mindbreaker"))
-			M.reagents.remove_reagent("mindbreaker", 5)
-		if(M.reagents.has_reagent("histamine"))
-			M.reagents.remove_reagent("histamine", 5)
+		if(M.reagents.has_reagent(/datum/reagent/toxin/mindbreaker))
+			M.reagents.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
+		if(M.reagents.has_reagent(/datum/reagent/toxin/histamine))
+			M.reagents.remove_reagent(/datum/reagent/toxin/histamine, 5)
 		M.hallucination = max(0, M.hallucination - 10)
 
 	if(A.stage >= 5)
diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm
index 2d96157bb0..20ecceb224 100644
--- a/code/datums/diseases/anxiety.dm
+++ b/code/datums/diseases/anxiety.dm
@@ -5,7 +5,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Ethanol"
-	cures = list("ethanol")
+	cures = list(/datum/reagent/consumable/ethanol)
 	agent = "Excess Lepidopticides"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated subject will regurgitate butterflies."
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index ab64fd515c..edd6f151c9 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -5,7 +5,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Sugar"
-	cures = list("sugar")
+	cures = list(/datum/reagent/consumable/sugar)
 	agent = "Apidae Infection"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated subject will regurgitate bees."
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 98ae74270b..1028d1fff4 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Mannitol"
-	cures = list("mannitol")
+	cures = list(/datum/reagent/medicine/mannitol)
 	agent = "Cryptococcus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 15//higher chance to cure, since two reagents are required
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index 22d45ffb29..8bbb05e17c 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -2,7 +2,7 @@
 	name = "The Cold"
 	max_stages = 3
 	cure_text = "Rest & Spaceacillin"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	agent = "XY-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	permeability_mod = 0.5
diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm
index da5e67a4fb..eea3147107 100644
--- a/code/datums/diseases/cold9.dm
+++ b/code/datums/diseases/cold9.dm
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Common Cold Anti-bodies & Spaceacillin"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	agent = "ICE9-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "If left untreated the subject will slow, as if partly frozen."
diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm
index 267dd711a3..972a7f4e18 100644
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Mutadone"
-	cures = list("mutadone")
+	cures = list(/datum/reagent/medicine/mutadone)
 	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
 	agent = "S4E1 retrovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm
index add60c73f1..70bcc67d21 100644
--- a/code/datums/diseases/fake_gbs.dm
+++ b/code/datums/diseases/fake_gbs.dm
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
+	cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
 	agent = "Gravitokinetic Bipotential SADS-"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
 	desc = "If left untreated death will occur."
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index e1943937ba..4fc646a590 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -3,7 +3,7 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	cure_chance = 10
 	agent = "H13N1 flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm
index 9577ca43d0..1557ddfbd8 100644
--- a/code/datums/diseases/fluspanish.dm
+++ b/code/datums/diseases/fluspanish.dm
@@ -3,7 +3,7 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & Anti-bodies to the common flu"
-	cures = list("spaceacillin")
+	cures = list(/datum/reagent/medicine/spaceacillin)
 	cure_chance = 10
 	agent = "1nqu1s1t10n flu virion"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index 0487b1c815..8a6eab6048 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
+	cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
 	cure_chance = 15//higher chance to cure, since two reagents are required
 	agent = "Gravitokinetic Bipotential SADS+"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm
index 2389052a54..196cd95f69 100644
--- a/code/datums/diseases/heart_failure.dm
+++ b/code/datums/diseases/heart_failure.dm
@@ -58,7 +58,7 @@
 					H.visible_message("<span class='userdanger'>[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!</span>")
 				H.adjustStaminaLoss(60)
 				H.set_heartattack(TRUE)
-				H.reagents.add_reagent("corazone", 3) // To give the victim a final chance to shock their heart before losing consciousness
+				H.reagents.add_reagent(/datum/reagent/medicine/corazone, 3) // To give the victim a final chance to shock their heart before losing consciousness
 				cure()
 
 	else
diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm
index 7c5f05c440..cb00f571aa 100644
--- a/code/datums/diseases/magnitis.dm
+++ b/code/datums/diseases/magnitis.dm
@@ -3,7 +3,7 @@
 	max_stages = 4
 	spread_text = "Airborne"
 	cure_text = "Iron"
-	cures = list("iron")
+	cures = list(/datum/reagent/iron)
 	agent = "Fukkos Miracos"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm
index d9c4b324f6..68e962055a 100644
--- a/code/datums/diseases/parrotpossession.dm
+++ b/code/datums/diseases/parrotpossession.dm
@@ -5,7 +5,7 @@
 	spread_flags = DISEASE_SPREAD_SPECIAL
 	disease_flags = CURABLE
 	cure_text = "Holy Water."
-	cures = list("holywater")
+	cures = list(/datum/reagent/water/holywater)
 	cure_chance = 20
 	agent = "Avian Vengence"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
index b2241d59ba..392e1bc85f 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -3,7 +3,7 @@
 	max_stages = 4
 	spread_text = "Airborne"
 	cure_text = "Banana products, especially banana bread."
-	cures = list("banana")
+	cures = list(/datum/reagent/consumable/banana)
 	cure_chance = 75
 	agent = "H0NI<42 Virus"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm
index fe099e495b..5854249e54 100644
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -17,7 +17,7 @@
 	..()
 	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
 	if(prob(40))
-		cures = list("mutadone")
+		cures = list(/datum/reagent/medicine/mutadone)
 	else
 		restcure = 1
 
diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm
index 52e9c2e19f..da6e7da8df 100644
--- a/code/datums/diseases/rhumba_beat.dm
+++ b/code/datums/diseases/rhumba_beat.dm
@@ -4,7 +4,7 @@
 	spread_text = "On contact"
 	spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
 	cure_text = "Chick Chicky Boom!"
-	cures = list("plasma")
+	cures = list(/datum/reagent/toxin/plasma)
 	agent = "Unknown"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	permeability_mod = 1
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 083a1f9c6c..1c214c8516 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -93,7 +93,7 @@
 /datum/disease/transformation/jungle_fever
 	name = "Jungle Fever"
 	cure_text = "Death."
-	cures = list("adminordrazine")
+	cures = list(/datum/reagent/medicine/adminordrazine)
 	spread_text = "Monkey Bites"
 	spread_flags = DISEASE_SPREAD_SPECIAL
 	viable_mobtypes = list(/mob/living/carbon/monkey, /mob/living/carbon/human)
@@ -156,7 +156,7 @@
 
 	name = "Robotic Transformation"
 	cure_text = "An injection of copper."
-	cures = list("copper")
+	cures = list(/datum/reagent/copper)
 	cure_chance = 5
 	agent = "R2D2 Nanomachines"
 	desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg."
@@ -189,7 +189,7 @@
 
 	name = "Xenomorph Transformation"
 	cure_text = "Spaceacillin & Glycerol"
-	cures = list("spaceacillin", "glycerol")
+	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/glycerol)
 	cure_chance = 5
 	agent = "Rip-LEY Alien Microbes"
 	desc = "This disease changes the victim into a xenomorph."
@@ -218,7 +218,7 @@
 /datum/disease/transformation/slime
 	name = "Advanced Mutation Transformation"
 	cure_text = "frost oil"
-	cures = list("frostoil")
+	cures = list(/datum/reagent/consumable/frostoil)
 	cure_chance = 80
 	agent = "Advanced Mutation Toxin"
 	desc = "This highly concentrated extract converts anything into more of itself."
@@ -247,7 +247,7 @@
 /datum/disease/transformation/corgi
 	name = "The Barkening"
 	cure_text = "Death"
-	cures = list("adminordrazine")
+	cures = list(/datum/reagent/medicine/adminordrazine)
 	agent = "Fell Doge Majicks"
 	desc = "This disease transforms the victim into a corgi."
 	severity = DISEASE_SEVERITY_BIOHAZARD
@@ -272,7 +272,7 @@
 /datum/disease/transformation/morph
 	name = "Gluttony's Blessing"
 	cure_text = "nothing"
-	cures = list("adminordrazine")
+	cures = list(/datum/reagent/medicine/adminordrazine)
 	agent = "Gluttony's Blessing"
 	desc = "A 'gift' from somewhere terrible."
 	stage_prob = 20
@@ -289,7 +289,7 @@
 /datum/disease/transformation/gondola
 	name = "Gondola Transformation"
 	cure_text = "Condensed Capsaicin, ingested or injected." //getting pepper sprayed doesn't help
-	cures = list("condensedcapsaicin") //beats the hippie crap right out of your system
+	cures = list(/datum/reagent/consumable/condensedcapsaicin) //beats the hippie crap right out of your system
 	cure_chance = 80
 	stage_prob = 5
 	agent = "Tranquility"
@@ -310,17 +310,17 @@
 			if (prob(5))
 				affected_mob.emote("smile")
 			if (prob(20))
-				affected_mob.reagents.add_reagent_list(list("pax" = 5))
+				affected_mob.reagents.add_reagent(/datum/reagent/pax, 5)
 		if(3)
 			if (prob(5))
 				affected_mob.emote("smile")
 			if (prob(20))
-				affected_mob.reagents.add_reagent_list(list("pax" = 5))
+				affected_mob.reagents.add_reagent(/datum/reagent/pax, 5)
 		if(4)
 			if (prob(5))
 				affected_mob.emote("smile")
 			if (prob(20))
-				affected_mob.reagents.add_reagent_list(list("pax" = 5))
+				affected_mob.reagents.add_reagent(/datum/reagent/pax, 5)
 			if (prob(2))
 				to_chat(affected_mob, "<span class='danger'>You let go of what you were holding.</span>")
 				var/obj/item/I = affected_mob.get_active_held_item()
diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm
index 788107c4b6..23902603ce 100644
--- a/code/datums/diseases/tuberculosis.dm
+++ b/code/datums/diseases/tuberculosis.dm
@@ -4,7 +4,7 @@
 	max_stages = 5
 	spread_text = "Airborne"
 	cure_text = "Spaceacillin & salbutamol"
-	cures = list("spaceacillin", "salbutamol")
+	cures = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salbutamol)
 	agent = "Fungal Tubercle bacillus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 5//like hell are you getting out of hell
diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm
index b288046380..244cc819d8 100644
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -3,7 +3,7 @@
 	max_stages = 4
 	spread_text = "Airborne"
 	cure_text = "The Manly Dorf"
-	cures = list("manlydorf")
+	cures = list(/datum/reagent/consumable/ethanol/manly_dorf)
 	cure_chance = 100
 	agent = "Rincewindus Vulgaris"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
index 8f9b97db22..17e2b12232 100644
--- a/code/datums/elements/_element.dm
+++ b/code/datums/elements/_element.dm
@@ -11,7 +11,7 @@
 	if(type == /datum/element)
 		return ELEMENT_INCOMPATIBLE
 	if(element_flags & ELEMENT_DETACH)
-		RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach)
+		RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach, override = TRUE)
 
 /datum/element/proc/Detach(datum/source, force)
 	UnregisterSignal(source, COMSIG_PARENT_QDELETING)
@@ -36,4 +36,4 @@
   */
 /datum/proc/RemoveElement(eletype, ...)
 	var/datum/element/ele = SSdcs.GetElement(arglist(args))
-	ele.Detach(src)
\ No newline at end of file
+	ele.Detach(src)
diff --git a/code/datums/elements/ghost_role_eligibility.dm b/code/datums/elements/ghost_role_eligibility.dm
new file mode 100644
index 0000000000..8ecb579bc8
--- /dev/null
+++ b/code/datums/elements/ghost_role_eligibility.dm
@@ -0,0 +1,54 @@
+/datum/element/ghost_role_eligibility
+	element_flags = ELEMENT_DETACH
+	var/list/timeouts = list()
+	var/list/mob/eligible_mobs = list()
+
+/datum/element/ghost_role_eligibility/Attach(datum/target,penalize = FALSE)
+	. = ..()
+	if(!ismob(target))
+		return ELEMENT_INCOMPATIBLE
+	var/mob/M = target
+	if(!(M in eligible_mobs))
+		eligible_mobs += M
+	if(penalize) //penalizing them from making a ghost role / midround antag comeback right away.
+		var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES
+		var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
+		if(world.time < roundstart_quit_limit) //add up the time difference to their antag rolling penalty if they quit before half a (ingame) hour even passed.
+			penalty += roundstart_quit_limit - world.time
+		if(penalty)
+			penalty += world.realtime
+			if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+				penalty = CANT_REENTER_ROUND
+			if(!(M.ckey in timeouts))
+				timeouts += M.ckey
+				timeouts[M.ckey] = 0
+			timeouts[M.ckey] = max(timeouts[M.ckey],penalty)
+
+/datum/element/ghost_role_eligibility/Detach(mob/M)
+	. = ..()
+	if(M in eligible_mobs)
+		eligible_mobs -= M
+
+/datum/element/ghost_role_eligibility/proc/get_all_ghost_role_eligible(silent = FALSE)
+	var/list/candidates = list()
+	for(var/m in eligible_mobs)
+		var/mob/M = m
+		if(M.can_reenter_round(TRUE))
+			candidates += M
+	return candidates
+
+/mob/proc/can_reenter_round(silent = FALSE)
+	var/datum/element/ghost_role_eligibility/eli = SSdcs.GetElement(/datum/element/ghost_role_eligibility)
+	return eli.can_reenter_round(src,silent)
+
+/datum/element/ghost_role_eligibility/proc/can_reenter_round(var/mob/M,silent = FALSE)
+	if(!(M in eligible_mobs))
+		return FALSE
+	if(!(M.ckey in timeouts))
+		return TRUE
+	var/timeout = timeouts[M.ckey]
+	if(timeout != CANT_REENTER_ROUND && timeout <= world.realtime)
+		return TRUE
+	if(!silent && M.client)
+		to_chat(M, "<span class='warning'>You are unable to reenter the round[timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(timeout - world.realtime)]" : ""].</span>")
+	return FALSE
diff --git a/code/datums/elements/wuv.dm b/code/datums/elements/wuv.dm
new file mode 100644
index 0000000000..84f327500f
--- /dev/null
+++ b/code/datums/elements/wuv.dm
@@ -0,0 +1,60 @@
+
+/datum/element/wuv //D'awwwww
+	element_flags = ELEMENT_BESPOKE
+	id_arg_index = 2
+	//the for the me emote proc call when petted.
+	var/pet_emote
+	//whether the emote is visible or audible
+	var/pet_type
+	//same as above, except when harmed. "You are going into orbit, you stupid mutt!"
+	var/punt_emote
+	//same as pet_type
+	var/punt_type
+	//mood typepath for the moodlet signal when petted.
+	var/pet_moodlet
+	//same as above but for harm
+	var/punt_moodlet
+
+/datum/element/wuv/Attach(datum/target, pet, pet_t, pet_mood, punt, punt_t, punt_mood)
+	. = ..()
+
+	if(!isliving(target))
+		return ELEMENT_INCOMPATIBLE
+
+	pet_emote = pet
+	pet_type = pet_t
+	punt_emote = punt
+	punt_type = punt_t
+	pet_moodlet = pet_mood
+	punt_moodlet = punt_mood
+
+	RegisterSignal(target, COMSIG_MOB_ATTACK_HAND, .proc/on_attack_hand)
+
+/datum/element/wuv/proc/on_attack_hand(datum/source, mob/user)
+	var/mob/living/L = source
+
+	if(L.stat == DEAD)
+		return
+	//we want to delay the effect to be displayed after the mob is petted, not before.
+	switch(user.a_intent)
+		if(INTENT_HARM, INTENT_DISARM)
+			addtimer(CALLBACK(src, .proc/kick_the_dog, source, user), 1)
+		if(INTENT_HELP)
+			addtimer(CALLBACK(src, .proc/pet_the_dog, source, user), 1)
+
+/datum/element/wuv/proc/pet_the_dog(mob/target, mob/user)
+	if(!QDELETED(target) || !QDELETED(user) || target.stat != CONSCIOUS)
+		return
+	new /obj/effect/temp_visual/heart(target.loc)
+	if(pet_emote)
+		target.emote("me", pet_type, pet_emote)
+	if(pet_moodlet && !CHECK_BITFIELD(target.flags_1, HOLOGRAM_1)) //prevents unlimited happiness petting park exploit.
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, target, pet_moodlet, target)
+
+/datum/element/wuv/proc/kick_the_dog(mob/target, mob/user)
+	if(!QDELETED(target) || !QDELETED(user) || target.stat != CONSCIOUS)
+		return
+	if(punt_emote)
+		target.emote("me", punt_type, punt_emote)
+	if(punt_moodlet && !CHECK_BITFIELD(target.flags_1, HOLOGRAM_1))
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, target, punt_moodlet, target)
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index f0fca5db5a..599c492d4c 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -136,9 +136,10 @@
 /datum/emote/sound
 	var/sound //Sound to play when emote is called
 	var/vary = FALSE	//used for the honk borg emote
+	var/volume = 50
 	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)
 
 /datum/emote/sound/run_emote(mob/user, params)
 	. = ..()
 	if(.)
-		playsound(user.loc, sound, 50, vary)
+		playsound(user.loc, sound, volume, vary)
diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm
index a3b71c6784..9e00c90a92 100644
--- a/code/datums/martial/rising_bass.dm
+++ b/code/datums/martial/rising_bass.dm
@@ -150,7 +150,9 @@
 	if(!.)
 		return
 	ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	ADD_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
 
 /datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H)
 	. = ..()
-	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
\ No newline at end of file
+	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
\ No newline at end of file
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index a0aa729a8d..8ae45ff720 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -140,6 +140,7 @@
 					L.client.prefs.chat_toggles ^= CHAT_OOC
 
 	SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
+	SEND_SIGNAL(new_character, COMSIG_MOB_ON_NEW_MIND)
 
 /datum/mind/proc/store_memory(new_text)
 	if((length(memory) + length(new_text)) <= MAX_MESSAGE_LEN)
@@ -524,7 +525,7 @@
 		if(!objective)
 			to_chat(usr,"Invalid objective.")
 			return
-		//qdel(objective) Needs cleaning objective destroys
+		qdel(objective) //TODO: Needs cleaning objective destroys (whatever that means)
 		message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]")
 		log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")
 
@@ -747,6 +748,7 @@
 	else
 		mind = new /datum/mind(key)
 		SSticker.minds += mind
+		SEND_SIGNAL(src, COMSIG_MOB_ON_NEW_MIND)
 	if(!mind.name)
 		mind.name = real_name
 	mind.current = src
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index 94fd08535f..98a8eade59 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -23,10 +23,13 @@
 	mood_change = 3
 	timeout = 3000
 
-/datum/mood_event/pet_corgi
-	description = "<span class='nicegreen'>Corgis are adorable! I can't stop petting them!</span>\n"
-	mood_change = 3
-	timeout = 3000
+/datum/mood_event/pet_animal
+	description = "<span class='nicegreen'>Animals are adorable! I can't stop petting them!</span>\n"
+	mood_change = 2
+	timeout = 5 MINUTES
+
+/datum/mood_event/pet_animal/add_effects(mob/animal)
+	description = "<span class='nicegreen'>\The [animal.name] is adorable! I can't stop petting [animal.p_them()]!</span>\n"
 
 /datum/mood_event/honk
 	description = "<span class='nicegreen'>Maybe clowns aren't so bad after all. Honk!</span>\n"
diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index 0ceb4443de..c4d0d6f9c6 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -88,7 +88,7 @@
 	var/obj/result_obj = new result(container)
 	for (var/obj/O in (container.contents-result_obj))
 		if (O.reagents)
-			O.reagents.del_reagent("nutriment")
+			O.reagents.del_reagent(/datum/reagent/consumable/nutriment)
 			O.reagents.update_total()
 			O.reagents.trans_to(result_obj, O.reagents.total_volume)
 		qdel(O)
diff --git a/code/datums/ruins/station.dm b/code/datums/ruins/station.dm
index 156356788f..e637b6178f 100644
--- a/code/datums/ruins/station.dm
+++ b/code/datums/ruins/station.dm
@@ -8,14 +8,29 @@
 /datum/map_template/ruin/station/box/engine
 	id = "engine_sm"
 	suffix = "Box/Engine/engine_sm.dmm"
-	name = "Engine SM"
+	name = "Box SM"
+
+/datum/map_template/ruin/station/box/engine/onebythree
+	id = "engine_sm_1x3"
+	suffix = "Box/Engine/engine_sm_1x3.dmm"
+	name = "Box SM 1x3"
+
+/datum/map_template/ruin/station/box/engine/fivebyfive
+	id = "engine_sm_5x5"
+	suffix = "Box/Engine/engine_sm_5x5.dmm"
+	name = "Box SM 5x5"
+
+/datum/map_template/ruin/station/box/engine/threesm
+	id = "engine_sm_3x"
+	suffix = "Box/Engine/engine_sm_3x.dmm"
+	name = "Box SM 3x"
 
 /datum/map_template/ruin/station/box/engine/singulo
 	id = "engine_singulo"
 	suffix = "Box/Engine/engine_singulo.dmm"
-	name = "Engine Singulo"
+	name = "Box Singulo"
 
 /datum/map_template/ruin/station/box/engine/tesla
 	id = "engine_tesla"
 	suffix = "Box/Engine/engine_tesla.dmm"
-	name = "Engine Tesla"
\ No newline at end of file
+	name = "Box Tesla"
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 5c4fc61827..5dab98d5ca 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -292,6 +292,7 @@
 			var/mob/living/carbon/C = owner
 			for(var/X in C.bodyparts)
 				var/obj/item/bodypart/BP = X
+				BP.max_damage *= 10
 				BP.brute_dam *= 10
 				BP.burn_dam *= 10
 		owner.toxloss *= 10
@@ -377,6 +378,7 @@
 			var/obj/item/bodypart/BP = X
 			BP.brute_dam *= 0.1
 			BP.burn_dam *= 0.1
+			BP.max_damage /= 10
 	owner.toxloss *= 0.1
 	owner.oxyloss *= 0.1
 	owner.cloneloss *= 0.1
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 156d527763..3706f7a7c2 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -99,6 +99,12 @@
 	id = "Mesmerize"
 	alert_type = /obj/screen/alert/status_effect/mesmerized
 
+/datum/status_effect/no_combat_mode/mesmerize/on_apply()
+	ADD_TRAIT(owner, TRAIT_MUTE, "mesmerize")
+
+/datum/status_effect/no_combat_mode/mesmerize/on_remove()
+	REMOVE_TRAIT(owner, TRAIT_MUTE, "mesmerize")
+
 /obj/screen/alert/status_effect/mesmerized
 	name = "Mesmerized"
 	desc = "You cant tear your sight from who is in front of you...Their gaze is simply too enthralling.."
@@ -302,7 +308,7 @@
 
 /datum/status_effect/cultghost/tick()
 	if(owner.reagents)
-		owner.reagents.del_reagent("holywater") //can't be deconverted
+		owner.reagents.del_reagent(/datum/reagent/water/holywater) //can't be deconverted
 
 /datum/status_effect/crusher_mark
 	id = "crusher_mark"
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 3319259381..c5217d8e4b 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -289,7 +289,7 @@
 	medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations."
 
 /datum/quirk/insanity/on_process()
-	if(quirk_holder.reagents.has_reagent("mindbreaker"))
+	if(quirk_holder.reagents.has_reagent(/datum/reagent/toxin/mindbreaker))
 		quirk_holder.hallucination = 0
 		return
 	if(prob(2)) //we'll all be mad soon enough
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 911929896b..8be3174f50 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -121,3 +121,30 @@
 	mob_trait = TRAIT_EXHIBITIONIST
 	gain_text = "<span class='notice'>You feel like exposing yourself to the world.</span>"
 	lose_text = "<span class='notice'>Indecent exposure doesn't sound as charming to you anymore.</span>"
+
+/datum/quirk/coldblooded
+	name = "Cold-blooded"
+	desc = "Your body doesn't create its own internal heat, requiring external heat regulation."
+	value = 0
+	medical_record_text = "Patient is ectothermic."
+	mob_trait = TRAIT_COLDBLOODED
+	gain_text = "<span class='notice'>You feel cold-blooded.</span>"
+	lose_text = "<span class='notice'>You feel more warm-blooded.</span>"
+
+/datum/quirk/alcohol_intolerance
+	name = "Alcohol Intolerance"
+	desc = "You take toxin damage from alcohol rather than getting drunk."
+	value = 0
+	mob_trait = TRAIT_NO_ALCOHOL
+	medical_record_text = "Patient's body does not react properly to ethyl alcohol."
+
+/datum/quirk/alcohol_intolerance/add()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/datum/species/species = H.dna.species
+	species.disliked_food |= ALCOHOL
+
+/datum/quirk/alcohol_intolerance/remove()
+	var/mob/living/carbon/human/H = quirk_holder
+	if(H)
+		var/datum/species/species = H.dna.species
+		species.disliked_food &= ~ALCOHOL
diff --git a/modular_citadel/code/datums/wires/autoylathe.dm b/code/datums/wires/autoylathe.dm
similarity index 100%
rename from modular_citadel/code/datums/wires/autoylathe.dm
rename to code/datums/wires/autoylathe.dm
diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index 0c43d33a4b..9e2efd1d4e 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -1,183 +1,189 @@
-// SETUP
-
-/proc/TopicHandlers()
-	. = list()
-	var/list/all_handlers = subtypesof(/datum/world_topic)
-	for(var/I in all_handlers)
-		var/datum/world_topic/WT = I
-		var/keyword = initial(WT.keyword)
-		if(!keyword)
-			warning("[WT] has no keyword! Ignoring...")
-			continue
-		var/existing_path = .[keyword]
-		if(existing_path)
-			warning("[existing_path] and [WT] have the same keyword! Ignoring [WT]...")
-		else if(keyword == "key")
-			warning("[WT] has keyword 'key'! Ignoring...")
-		else
-			.[keyword] = WT
-
-// DATUM
-
-/datum/world_topic
-	var/keyword
-	var/log = TRUE
-	var/key_valid
-	var/require_comms_key = FALSE
-
-/datum/world_topic/proc/TryRun(list/input)
-	key_valid = config && (CONFIG_GET(string/comms_key) == input["key"])
-	if(require_comms_key && !key_valid)
-		return "Bad Key"
-	input -= "key"
-	. = Run(input)
-	if(islist(.))
-		. = list2params(.)
-
-/datum/world_topic/proc/Run(list/input)
-	CRASH("Run() not implemented for [type]!")
-
-// TOPICS
-
-/datum/world_topic/ping
-	keyword = "ping"
-	log = FALSE
-
-/datum/world_topic/ping/Run(list/input)
-	. = 0
-	for (var/client/C in GLOB.clients)
-		++.
-
-/datum/world_topic/playing
-	keyword = "playing"
-	log = FALSE
-
-/datum/world_topic/playing/Run(list/input)
-	return GLOB.player_list.len
-
-/datum/world_topic/pr_announce
-	keyword = "announce"
-	require_comms_key = TRUE
-	var/static/list/PRcounts = list()	//PR id -> number of times announced this round
-
-/datum/world_topic/pr_announce/Run(list/input)
-	var/list/payload = json_decode(input["payload"])
-	var/id = "[payload["pull_request"]["id"]]"
-	if(!PRcounts[id])
-		PRcounts[id] = 1
-	else
-		++PRcounts[id]
-		if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
-			return
-
-	var/final_composed = "<span class='announce'>PR: [input[keyword]]</span>"
-	for(var/client/C in GLOB.clients)
-		C.AnnouncePR(final_composed)
-
-/datum/world_topic/ahelp_relay
-	keyword = "Ahelp"
-	require_comms_key = TRUE
-
-/datum/world_topic/ahelp_relay/Run(list/input)
-	relay_msg_admins("<span class='adminnotice'><b><font color=red>HELP: </font> [input["source"]] [input["message_sender"]]: [input["message"]]</b></span>")
-
-/datum/world_topic/comms_console
-	keyword = "Comms_Console"
-	require_comms_key = TRUE
-
-/datum/world_topic/comms_console/Run(list/input)
-	minor_announce(input["message"], "Incoming message from [input["message_sender"]]")
-	for(var/obj/machinery/computer/communications/CM in GLOB.machines)
-		CM.overrideCooldown()
-
-/datum/world_topic/news_report
-	keyword = "News_Report"
-	require_comms_key = TRUE
-
-/datum/world_topic/news_report/Run(list/input)
-	minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
-
-/datum/world_topic/server_hop
-	keyword = "server_hop"
-
-/datum/world_topic/server_hop/Run(list/input)
-	var/expected_key = input[keyword]
-	for(var/mob/dead/observer/O in GLOB.player_list)
-		if(O.key == expected_key)
-			if(O.client)
-				new /obj/screen/splash(O.client, TRUE)
-			break
-
-/datum/world_topic/adminmsg
-	keyword = "adminmsg"
-	require_comms_key = TRUE
-
-/datum/world_topic/adminmsg/Run(list/input)
-	return IrcPm(input[keyword], input["msg"], input["sender"])
-
-/datum/world_topic/namecheck
-	keyword = "namecheck"
-	require_comms_key = TRUE
-
-/datum/world_topic/namecheck/Run(list/input)
-	//Oh this is a hack, someone refactor the functionality out of the chat command PLS
-	var/datum/tgs_chat_command/namecheck/NC = new
-	var/datum/tgs_chat_user/user = new
-	user.friendly_name = input["sender"]
-	user.mention = user.friendly_name
-	return NC.Run(user, input["namecheck"])
-
-/datum/world_topic/adminwho
-	keyword = "adminwho"
-	require_comms_key = TRUE
-
-/datum/world_topic/adminwho/Run(list/input)
-	return ircadminwho()
-
-/datum/world_topic/status
-	keyword = "status"
-
-/datum/world_topic/status/Run(list/input)
-	. = list()
-	.["version"] = GLOB.game_version
-	.["mode"] = "hidden"	//CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode
-	.["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
-	.["enter"] = GLOB.enter_allowed
-	.["vote"] = CONFIG_GET(flag/allow_vote_mode)
-	.["ai"] = CONFIG_GET(flag/allow_ai)
-	.["host"] = world.host ? world.host : null
-	.["round_id"] = GLOB.round_id
-	.["players"] = GLOB.clients.len
-	.["revision"] = GLOB.revdata.commit
-	.["revision_date"] = GLOB.revdata.date
-
-	var/list/adm = get_admin_counts()
-	var/list/presentmins = adm["present"]
-	var/list/afkmins = adm["afk"]
-	.["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
-	.["gamestate"] = SSticker.current_state
-
-	.["map_name"] = SSmapping.config?.map_name || "Loading..."
-
-	if(key_valid)
-		.["active_players"] = get_active_player_count()
-		if(SSticker.HasRoundStarted())
-			.["real_mode"] = SSticker.mode.name
-			// Key-authed callers may know the truth behind the "secret"
-
-	.["security_level"] = get_security_level()
-	.["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
-	// Amount of world's ticks in seconds, useful for calculating round duration
-	
-	//Time dilation stats.
-	.["time_dilation_current"] = SStime_track.time_dilation_current
-	.["time_dilation_avg"] = SStime_track.time_dilation_avg
-	.["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow
-	.["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast
-
-	if(SSshuttle && SSshuttle.emergency)
-		.["shuttle_mode"] = SSshuttle.emergency.mode
-		// Shuttle status, see /__DEFINES/stat.dm
-		.["shuttle_timer"] = SSshuttle.emergency.timeLeft()
-		// Shuttle timer, in seconds
-	
+// SETUP
+
+/proc/TopicHandlers()
+	. = list()
+	var/list/all_handlers = subtypesof(/datum/world_topic)
+	for(var/I in all_handlers)
+		var/datum/world_topic/WT = I
+		var/keyword = initial(WT.keyword)
+		if(!keyword)
+			warning("[WT] has no keyword! Ignoring...")
+			continue
+		var/existing_path = .[keyword]
+		if(existing_path)
+			warning("[existing_path] and [WT] have the same keyword! Ignoring [WT]...")
+		else if(keyword == "key")
+			warning("[WT] has keyword 'key'! Ignoring...")
+		else
+			.[keyword] = WT
+
+// DATUM
+
+/datum/world_topic
+	var/keyword
+	var/log = TRUE
+	var/key_valid
+	var/require_comms_key = FALSE
+
+/datum/world_topic/proc/TryRun(list/input, addr)
+	key_valid = config && (CONFIG_GET(string/comms_key) == input["key"])
+	if(require_comms_key && !key_valid)
+		return "Bad Key"
+	input -= "key"
+	. = Run(input, addr)
+	if(islist(.))
+		. = list2params(.)
+
+/datum/world_topic/proc/Run(list/input, addr)
+	CRASH("Run() not implemented for [type]!")
+
+// TOPICS
+
+/datum/world_topic/ping
+	keyword = "ping"
+	log = FALSE
+
+/datum/world_topic/ping/Run(list/input, addr)
+	. = 0
+	for (var/client/C in GLOB.clients)
+		++.
+
+/datum/world_topic/playing
+	keyword = "playing"
+	log = FALSE
+
+/datum/world_topic/playing/Run(list/input, addr)
+	return GLOB.player_list.len
+
+/datum/world_topic/pr_announce
+	keyword = "announce"
+	require_comms_key = TRUE
+	var/static/list/PRcounts = list()	//PR id -> number of times announced this round
+
+/datum/world_topic/pr_announce/Run(list/input, addr)
+	var/list/payload = json_decode(input["payload"])
+	var/id = "[payload["pull_request"]["id"]]"
+	if(!PRcounts[id])
+		PRcounts[id] = 1
+	else
+		++PRcounts[id]
+		if(PRcounts[id] > PR_ANNOUNCEMENTS_PER_ROUND)
+			return
+
+	var/final_composed = "<span class='announce'>PR: [input[keyword]]</span>"
+	for(var/client/C in GLOB.clients)
+		C.AnnouncePR(final_composed)
+
+/datum/world_topic/ahelp_relay
+	keyword = "Ahelp"
+	require_comms_key = TRUE
+
+/datum/world_topic/ahelp_relay/Run(list/input, addr)
+	relay_msg_admins("<span class='adminnotice'><b><font color=red>HELP: </font> [input["source"]] [input["message_sender"]]: [input["message"]]</b></span>")
+
+/datum/world_topic/comms_console
+	keyword = "Comms_Console"
+	require_comms_key = TRUE
+
+/datum/world_topic/comms_console/Run(list/input, addr)
+	minor_announce(input["message"], "Incoming message from [input["message_sender"]]")
+	for(var/obj/machinery/computer/communications/CM in GLOB.machines)
+		CM.overrideCooldown()
+
+/datum/world_topic/news_report
+	keyword = "News_Report"
+	require_comms_key = TRUE
+
+/datum/world_topic/news_report/Run(list/input, addr)
+	minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
+
+/datum/world_topic/server_hop
+	keyword = "server_hop"
+
+/datum/world_topic/server_hop/Run(list/input, addr)
+	var/expected_key = input[keyword]
+	for(var/mob/dead/observer/O in GLOB.player_list)
+		if(O.key == expected_key)
+			if(O.client?.address == addr)
+				new /obj/screen/splash(O.client, TRUE)
+			break
+
+/datum/world_topic/adminmsg
+	keyword = "adminmsg"
+	require_comms_key = TRUE
+
+/datum/world_topic/adminmsg/Run(list/input, addr)
+	return IrcPm(input[keyword], input["msg"], input["sender"])
+
+/datum/world_topic/namecheck
+	keyword = "namecheck"
+	require_comms_key = TRUE
+
+/datum/world_topic/namecheck/Run(list/input, addr)
+	//Oh this is a hack, someone refactor the functionality out of the chat command PLS
+	var/datum/tgs_chat_command/namecheck/NC = new
+	var/datum/tgs_chat_user/user = new
+	user.friendly_name = input["sender"]
+	user.mention = user.friendly_name
+	return NC.Run(user, input["namecheck"])
+
+/datum/world_topic/adminwho
+	keyword = "adminwho"
+	require_comms_key = TRUE
+
+/datum/world_topic/adminwho/Run(list/input, addr)
+	return ircadminwho()
+
+/datum/world_topic/status
+	keyword = "status"
+
+/datum/world_topic/status/Run(list/input, addr)
+	if(!key_valid) //If we have a key, then it's safe to trust that this isn't a malicious packet. Also prevents the extra info from leaking
+		if(GLOB.topic_status_lastcache <= world.time + 5)
+			return GLOB.topic_status_cache
+		GLOB.topic_status_lastcache = world.time
+	. = list()
+	.["version"] = GLOB.game_version
+	.["mode"] = "hidden"	//CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode
+	.["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
+	.["enter"] = GLOB.enter_allowed
+	.["vote"] = CONFIG_GET(flag/allow_vote_mode)
+	.["ai"] = CONFIG_GET(flag/allow_ai)
+	.["host"] = world.host ? world.host : null
+	.["round_id"] = GLOB.round_id
+	.["players"] = GLOB.clients.len
+	.["revision"] = GLOB.revdata.commit
+	.["revision_date"] = GLOB.revdata.date
+
+	var/list/adm = get_admin_counts()
+	var/list/presentmins = adm["present"]
+	var/list/afkmins = adm["afk"]
+	.["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
+	.["gamestate"] = SSticker.current_state
+
+	.["map_name"] = SSmapping.config?.map_name || "Loading..."
+
+	if(key_valid)
+		.["active_players"] = get_active_player_count()
+		if(SSticker.HasRoundStarted())
+			.["real_mode"] = SSticker.mode.name
+			// Key-authed callers may know the truth behind the "secret"
+
+	.["security_level"] = get_security_level()
+	.["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
+	// Amount of world's ticks in seconds, useful for calculating round duration
+	
+	//Time dilation stats.
+	.["time_dilation_current"] = SStime_track.time_dilation_current
+	.["time_dilation_avg"] = SStime_track.time_dilation_avg
+	.["time_dilation_avg_slow"] = SStime_track.time_dilation_avg_slow
+	.["time_dilation_avg_fast"] = SStime_track.time_dilation_avg_fast
+
+	if(SSshuttle && SSshuttle.emergency)
+		.["shuttle_mode"] = SSshuttle.emergency.mode
+		// Shuttle status, see /__DEFINES/stat.dm
+		.["shuttle_timer"] = SSshuttle.emergency.timeLeft()
+		// Shuttle timer, in seconds
+
+	if(!key_valid)
+		GLOB.topic_status_cache = .
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 66570205e3..36b701aae1 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -47,7 +47,7 @@
 /atom/New(loc, ...)
 	//atom creation method that preloads variables at creation
 	if(GLOB.use_preloader && (src.type == GLOB._preloader.target_path))//in case the instanciated atom is creating other atoms in New()
-		GLOB._preloader.load(src)
+		world.preloader_load(src)
 
 	if(datum_flags & DF_USE_TAG)
 		GenerateTag()
@@ -166,7 +166,7 @@
 
 	return FALSE
 
-/atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
 	SEND_SIGNAL(src, COMSIG_ATOM_HULK_ATTACK, user)
 	if(does_attack_animation)
 		user.changeNext_move(CLICK_CD_MELEE)
diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm
index e784fd836d..ca2ebfe00d 100644
--- a/code/game/gamemodes/bloodsucker/bloodsucker.dm
+++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm
@@ -9,6 +9,8 @@
 	var/list/vassal_allowed_antags = list(/datum/antagonist/brother, /datum/antagonist/traitor, /datum/antagonist/traitor/internal_affairs, /datum/antagonist/survivalist, \
 										  /datum/antagonist/rev, /datum/antagonist/nukeop, /datum/antagonist/pirate, /datum/antagonist/cult, /datum/antagonist/abductee)
 	// The antags you're allowed to be if turning Vassal.
+/proc/isvamp(mob/living/M)
+	return istype(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/bloodsucker)
 
 /datum/game_mode/bloodsucker
 	name = "bloodsucker"
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index 9b52ddda1e..0945875ac9 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -8,7 +8,7 @@
 	spray_range = 1
 	stream_range = 1
 	volume = 30
-	list_reagents = list("lube" = 30)
+	list_reagents = list(/datum/reagent/lube = 30)
 
 //COMBAT CLOWN SHOES
 //Clown shoes with combat stats and noslip. Of course they still squeak.
@@ -165,7 +165,7 @@
 	customfoodfilling = FALSE
 	seed = null
 	tastes = list("explosives" = 10)
-	list_reagents = list("vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
 
 /obj/item/grown/bananapeel/bombanana
 	desc = "A peel from a banana. Why is it beeping?"
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 0890d81dfb..821c819664 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -1,14 +1,3 @@
-#define CURRENT_LIVING_PLAYERS	1
-#define CURRENT_LIVING_ANTAGS	2
-#define CURRENT_DEAD_PLAYERS	3
-#define CURRENT_OBSERVERS	    4
-
-#define ONLY_RULESET       1
-#define HIGHLANDER_RULESET 2
-#define TRAITOR_RULESET    4
-#define MINOR_RULESET      8
-
-#define RULESET_STOP_PROCESSING 1
 
 // -- Injection delays
 GLOBAL_VAR_INIT(dynamic_latejoin_delay_min, (10 MINUTES))
@@ -52,6 +41,8 @@ GLOBAL_LIST_EMPTY(dynamic_forced_roundstart_ruleset)
 // Forced threat level, setting this to zero or higher forces the roundstart threat to the value.
 GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 
+GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
+
 /datum/game_mode/dynamic
 	name = "dynamic mode"
 	config_tag = "dynamic"
@@ -60,7 +51,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	announce_text = "Dynamic mode!" // This needs to be changed maybe
 
 	reroll_friendly = FALSE;
-
+	// Current storyteller
+	var/datum/dynamic_storyteller/storyteller = null
 	// Threat logging vars
 	/// The "threat cap", threat shouldn't normally go above this and is used in ruleset calculations
 	var/threat_level = 0
@@ -164,6 +156,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 
 	dat += "Threat to Spend: <b>[threat]</b> <a href='?src=\ref[src];[HrefToken()];adjustthreat=1'>\[Adjust\]</A> <a href='?src=\ref[src];[HrefToken()];threatlog=1'>\[View Log\]</a><br/>"
 	dat += "<br/>"
+	dat += "Storyteller: <b>[storyteller.name]</b><br/>"
 	dat += "Parameters: centre = [GLOB.dynamic_curve_centre] ; width = [GLOB.dynamic_curve_width].<br/>"
 	dat += "<i>On average, <b>[peaceful_percentage]</b>% of the rounds are more peaceful.</i><br/>"
 	dat += "Forced extended: <a href='?src=\ref[src];[HrefToken()];forced_extended=1'><b>[GLOB.dynamic_forced_extended ? "On" : "Off"]</b></a><br/>"
@@ -178,7 +171,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 			dat += "[DR.ruletype] - <b>[DR.name]</b><br>"
 	else
 		dat += "none.<br>"
-	dat += "<br>Injection Timers: (<b>[get_injection_chance(TRUE)]%</b> chance)<BR>"
+	dat += "<br>Injection Timers: (<b>[storyteller.get_injection_chance(TRUE)]%</b> chance)<BR>"
 	dat += "Latejoin: [(latejoin_injection_cooldown-world.time)>60*10 ? "[round((latejoin_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(latejoin_injection_cooldown-world.time)] seconds"] <a href='?src=\ref[src];[HrefToken()];injectlate=1'>\[Now!\]</a><BR>"
 	dat += "Midround: [(midround_injection_cooldown-world.time)>60*10 ? "[round((midround_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(midround_injection_cooldown-world.time)] seconds"] <a href='?src=\ref[src];[HrefToken()];injectmid=1'>\[Now!\]</a><BR>"
 	dat += "Event: [(event_injection_cooldown-world.time)>60*10 ? "[round((event_injection_cooldown-world.time)/60/10,0.1)] minutes" : "[(event_injection_cooldown-world.time)] seconds"] <a href='?src=\ref[src];[HrefToken()];forceevent=1'>\[Now!\]</a><BR>"
@@ -336,6 +329,9 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	SSblackbox.record_feedback("tally","dynamic_threat",peaceful_percentage,"Percent of same-vote rounds that are more peaceful")
 
 /datum/game_mode/dynamic/can_start()
+	storyteller = new GLOB.dynamic_storyteller_type // this is where all the initialization happens
+	storyteller.on_start()
+	SSblackbox.record_feedback("text","dynamic_storyteller",1,storyteller.name)
 	message_admins("Dynamic mode parameters for the round:")
 	message_admins("Centre is [GLOB.dynamic_curve_centre], Width is [GLOB.dynamic_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
 	message_admins("Stacking limit is [GLOB.dynamic_stacking_limit], Classic secret is [GLOB.dynamic_classic_secret ? "Enabled" : "Disabled"], High population limit is [GLOB.dynamic_high_pop_limit].")
@@ -345,19 +341,12 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	if(GLOB.dynamic_forced_threat_level >= 0)
 		threat_level = round(GLOB.dynamic_forced_threat_level, 0.1)
 		threat = threat_level
-		SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Threat level (forced by admins)")
+		SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Threat level (forced)")
 	else
 		generate_threat()
 
-	var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_latejoin_delay_max + GLOB.dynamic_first_latejoin_delay_min)
-	latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_first_latejoin_delay_min, GLOB.dynamic_first_latejoin_delay_max)) + world.time
+	storyteller.start_injection_cooldowns()
 
-	var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_midround_delay_min + GLOB.dynamic_first_midround_delay_max)
-	midround_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_first_midround_delay_min, GLOB.dynamic_first_midround_delay_max)) + world.time
-	
-	var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min)
-	event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time)
-	
 	log_game("DYNAMIC: Dynamic Mode initialized with a Threat Level of... [threat_level]!")
 	initial_threat_level = threat_level
 	return TRUE
@@ -391,7 +380,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 		log_game("DYNAMIC: [roundstart_rules.len] rules.")
 		return TRUE
 	SSblackbox.record_feedback("tally","dynamic",roundstart_rules.len,"Roundstart rules considered")
-	SSblackbox.record_feedback("tally","dynamic",roundstart_rules.len,"Players readied up")
+	SSblackbox.record_feedback("tally","dynamic",roundstart_pop_ready,"Players readied up")
 	if(GLOB.dynamic_forced_roundstart_ruleset.len > 0)
 		rigged_roundstart()
 	else
@@ -429,13 +418,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	if (GLOB.dynamic_forced_extended)
 		log_game("DYNAMIC: Starting a round of forced extended.")
 		return TRUE
-	var/list/drafted_rules = list()
-	for (var/datum/dynamic_ruleset/roundstart/rule in roundstart_rules)
-		if (rule.acceptable(roundstart_pop_ready, threat_level) && threat >= rule.cost)	// If we got the population and threat required
-			rule.candidates = candidates.Copy()
-			rule.trim_candidates()
-			if (rule.ready() && rule.candidates.len > 0)
-				drafted_rules[rule] = rule.weight
+	var/list/drafted_rules = storyteller.roundstart_draft()
 	if(!drafted_rules.len)
 		message_admins("Not enough threat level for roundstart antags!")
 		log_game("DYNAMIC: Not enough threat level for roundstart antags!")
@@ -653,7 +636,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 		if (rule.persistent)
 			current_rules += rule
 		return TRUE
-	rule.clean_up()
 	stack_trace("The [rule.ruletype] rule \"[rule.name]\" failed to execute.")
 	return FALSE
 
@@ -667,62 +649,41 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 			current_rules -= rule
 			SSblackbox.record_feedback("tally","dynamic",1,"Rulesets finished")
 			SSblackbox.record_feedback("associative","dynamic_rulesets_finished",1,rule.get_blackbox_info())
-
+	
+	storyteller.do_process()
+	
 	if (midround_injection_cooldown < world.time)
 		if (GLOB.dynamic_forced_extended)
 			return
 
 		// Somehow it managed to trigger midround multiple times so this was moved here.
 		// There is no way this should be able to trigger an injection twice now.
-		var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min)
-		midround_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_midround_delay_min, GLOB.dynamic_midround_delay_max)) + world.time)
+		midround_injection_cooldown = storyteller.get_midround_cooldown() + world.time
 
 		// Time to inject some threat into the round
 		if(EMERGENCY_ESCAPED_OR_ENDGAMED) // Unless the shuttle is gone
 			return
+		if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called
+			return
 		message_admins("DYNAMIC: Checking for midround injection.")
 		log_game("DYNAMIC: Checking for midround injection.")
 
 		update_playercounts()
-		if (get_injection_chance())
+		if (prob(storyteller.get_injection_chance()))
 			SSblackbox.record_feedback("tally","dynamic",1,"Attempted midround injections")
-			var/cur_threat_frac = threat/threat_level
-			var/list/drafted_rules = list()
-			var/antag_num = current_players[CURRENT_LIVING_ANTAGS].len
-			for (var/datum/dynamic_ruleset/midround/rule in midround_rules)
-				// if there are antags OR the rule is an antag rule, antag_acceptable will be true.
-				if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
-					// Classic secret : only autotraitor/minor roles
-					if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
-						continue
-					rule.trim_candidates()
-					if (rule.ready())
-						if(!antag_num)
-							drafted_rules[rule] = round(rule.get_weight() + (rule.cost * cur_threat_frac))
-						else
-							drafted_rules[rule] = rule.get_weight()
-				else if(threat < rule.cost)
-					SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend")
+			var/list/drafted_rules = storyteller.midround_draft()
 			if (drafted_rules.len > 0)
 				SSblackbox.record_feedback("tally","dynamic",1,"Successful midround injections")
 				picking_midround_latejoin_rule(drafted_rules)
-		else
-			midround_injection_cooldown = (midround_injection_cooldown + world.time)/2
+		// get_injection_chance can do things on fail
 
 	if(event_injection_cooldown < world.time)
 		SSblackbox.record_feedback("tally","dynamic",1,"Attempted event injections")
-		var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min)
-		event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time)
+		event_injection_cooldown = storyteller.get_event_cooldown() + world.time
 		message_admins("DYNAMIC: Doing event injection.")
 		log_game("DYNAMIC: Doing event injection.")
 		update_playercounts()
-		var/list/drafted_rules = list()
-		for(var/datum/dynamic_ruleset/event/rule in events)
-			if(rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
-				if(rule.ready())
-					drafted_rules[rule] = rule.get_weight()
-			else if(threat < rule.cost)
-				SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend")
+		var/list/drafted_rules = storyteller.event_draft()
 		if(drafted_rules.len > 0)
 			SSblackbox.record_feedback("tally","dynamic",1,"Successful event injections")
 			picking_midround_latejoin_rule(drafted_rules)
@@ -748,31 +709,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 					continue
 			current_players[CURRENT_DEAD_PLAYERS].Add(M) // Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow)
 
-/// Gets the chance for latejoin and midround injection, the dry_run argument is only used for forced injection.
-/datum/game_mode/dynamic/proc/get_injection_chance(dry_run = FALSE)
-	if(forced_injection)
-		forced_injection = !dry_run
-		return 100
-	var/chance = 0
-	// If the high pop override is in effect, we reduce the impact of population on the antag injection chance
-	var/high_pop_factor = (current_players[CURRENT_LIVING_PLAYERS].len >= GLOB.dynamic_high_pop_limit)
-	var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(current_players[CURRENT_LIVING_PLAYERS].len/(high_pop_factor ? 10 : 5)))
-	if (!current_players[CURRENT_LIVING_ANTAGS].len)
-		chance += 80 // No antags at all? let's boost those odds!
-	else
-		var/current_pop_per_antag = current_players[CURRENT_LIVING_PLAYERS].len / current_players[CURRENT_LIVING_ANTAGS].len
-		if (current_pop_per_antag > max_pop_per_antag)
-			chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag))
-		else
-			chance += 25-10*(max_pop_per_antag-current_pop_per_antag)
-	if (current_players[CURRENT_DEAD_PLAYERS].len > current_players[CURRENT_LIVING_PLAYERS].len)
-		chance -= 30 // More than half the crew died? ew, let's calm down on antags
-	if (threat > 70)
-		chance += 15
-	if (threat < 30)
-		chance -= 15
-	return round(max(0,chance))
-
 /// Removes type from the list
 /datum/game_mode/dynamic/proc/remove_from_list(list/type_list, type)
 	for(var/I in type_list)
@@ -803,7 +739,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 		return
 	if(EMERGENCY_ESCAPED_OR_ENDGAMED) // No more rules after the shuttle has left
 		return
-
+	if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called
+		return
 	update_playercounts()
 
 	if (forced_latejoin_rule)
@@ -814,28 +751,12 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 			picking_midround_latejoin_rule(list(forced_latejoin_rule), forced = TRUE)
 		forced_latejoin_rule = null
 
-	else if (latejoin_injection_cooldown < world.time && prob(get_injection_chance()))
+	else if (latejoin_injection_cooldown < world.time && prob(storyteller.get_injection_chance()))
 		SSblackbox.record_feedback("tally","dynamic",1,"Attempted latejoin injections")
-		var/list/drafted_rules = list()
-		for (var/datum/dynamic_ruleset/latejoin/rule in latejoin_rules)
-			if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost)
-				// Classic secret : only autotraitor/minor roles
-				if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
-					continue
-				// No stacking : only one round-ender, unless threat level > stacking_limit.
-				if (threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
-					if(rule.flags & HIGHLANDER_RULESET && highlander_executed)
-						continue
-
-				rule.candidates = list(newPlayer)
-				rule.trim_candidates()
-				if (rule.ready())
-					drafted_rules[rule] = rule.get_weight()
-
+		var/list/drafted_rules = storyteller.latejoin_draft(newPlayer)
 		if (drafted_rules.len > 0 && picking_midround_latejoin_rule(drafted_rules))
 			SSblackbox.record_feedback("tally","dynamic",1,"Successful latejoin injections")
-			var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min)
-			latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max)) + world.time
+			latejoin_injection_cooldown = storyteller.get_latejoin_cooldown() + world.time
 
 /// Refund threat, but no more than threat_level.
 /datum/game_mode/dynamic/proc/refund_threat(regain)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
index 7f6ea088a1..2f143f7233 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
@@ -80,9 +80,13 @@
 	/// Delay for when execute will get called from the time of post_setup (roundstart) or process (midround/latejoin).
 	/// Make sure your ruleset works with execute being called during the game when using this, and that the clean_up proc reverts it properly in case of faliure.
 	var/delay = 0
+	/// List of tags for use in storytellers.
+	var/list/property_weights = list()
 	/// Whether or not recent-round weight values are taken into account for this ruleset.
 	/// Weight reduction uses the same values as secret's recent-round mode weight reduction.
 	var/always_max_weight = FALSE
+	/// Weight reduction by recent-rounds. Saved on new.
+	var/weight_mult = 1
 
 /datum/dynamic_ruleset/New()
 	..()
@@ -96,13 +100,11 @@
 	var/high_population_requirements = CONFIG_GET(keyed_list/dynamic_high_population_requirement)
 	var/list/repeated_mode_adjust = CONFIG_GET(number_list/repeated_mode_adjust)
 	if(config_tag in weights)
-		var/weight_mult = 1
 		if(!always_max_weight && SSpersistence.saved_dynamic_rules.len == 3 && repeated_mode_adjust.len == 3)
 			var/saved_dynamic_rules = SSpersistence.saved_dynamic_rules
 			for(var/i in 1 to 3)
 				if(config_tag in saved_dynamic_rules[i])
 					weight_mult -= (repeated_mode_adjust[i]/100)
-		weight = weights[config_tag] * weight_mult
 	if(config_tag in costs)
 		cost = costs[config_tag]
 	if(config_tag in requirementses)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm
index b6cd313bfc..23e94c4065 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm
@@ -58,6 +58,7 @@
 	cost = 10
 	blocking_rules = list(/datum/dynamic_ruleset/roundstart/nuclear,/datum/dynamic_ruleset/midround/from_ghosts/nuclear)
 	requirements = list(70,60,50,50,40,40,40,30,20,15)
+	property_weights = list("story_potential" = 1, "trust" = 1, "chaos" = 1)
 	high_population_requirement = 15
 
 /datum/dynamic_ruleset/event/pirates/ready(forced = FALSE)
@@ -81,6 +82,7 @@
 	cost = 10
 	requirements = list(70,60,50,50,40,40,40,30,20,15)
 	high_population_requirement = 15
+	property_weights = list("chaos" = 1, "valid" = 1)
 
 //////////////////////////////////////////////
 //                                          //
@@ -100,6 +102,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5) // yes, can happen on fake-extended
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("chaos" = 1, "extended" = 2)
 
 /datum/dynamic_ruleset/event/ventclog/ready()
 	if(mode.threat_level > 30 && mode.threat >= 5 && prob(20))
@@ -133,10 +136,11 @@
 	required_enemies = list(1,1,0,0,0,0,0,0,0,0)
 	weight = 4
 	// no repeatable weight decrease. too variable to be unfun multiple times in one round
-	cost = 3
+	cost = 1
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("story_potential" = 1, "extended" = 1)
 	always_max_weight = TRUE
 
 //////////////////////////////////////////////
@@ -156,6 +160,7 @@
 	repeatable_weight_decrease = 2
 	requirements = list(60,50,40,30,30,30,30,30,30,30)
 	high_population_requirement = 30
+	property_weights = list("extended" = -2)
 
 /datum/dynamic_ruleset/event/meteor_wave/ready()
 	if(mode.threat_level > 40 && mode.threat >= 25 && prob(20))
@@ -190,6 +195,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/anomaly_flux
 	name = "Anomaly: Hyper-Energetic Flux"
@@ -203,6 +209,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 10
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/anomaly_gravitational
 	name = "Anomaly: Gravitational"
@@ -214,6 +221,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/anomaly_pyroclastic
 	name = "Anomaly: Pyroclastic"
@@ -227,6 +235,7 @@
 	requirements = list(10,10,10,10,10,10,10,10,10,10)
 	high_population_requirement = 10
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/anomaly_vortex
 	name = "Anomaly: Vortex"
@@ -240,6 +249,7 @@
 	requirements = list(10,10,10,10,10,10,10,10,10,10)
 	high_population_requirement = 10
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 //////////////////////////////////////////////
 //                                          //
@@ -259,6 +269,7 @@
 	requirements = list(10,10,10,10,10,10,10,10,10,10)
 	high_population_requirement = 10
 	repeatable = TRUE
+	property_weights = list("extended" = -1, "chaos" = 1)
 
 /datum/dynamic_ruleset/event/carp_migration
 	name = "Carp Migration"
@@ -270,6 +281,7 @@
 	requirements = list(10,10,10,10,10,10,10,10,10,10)
 	high_population_requirement = 10
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/communications_blackout
 	name = "Communications Blackout"
@@ -283,6 +295,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1, "chaos" = 1)
 
 /datum/dynamic_ruleset/event/processor_overload
 	name = "Processor Overload"
@@ -296,6 +309,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1, "chaos" = 1)
 	always_max_weight = TRUE
 
 /datum/dynamic_ruleset/event/space_dust
@@ -310,6 +324,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 	always_max_weight = TRUE
 
 /datum/dynamic_ruleset/event/major_dust
@@ -324,6 +339,7 @@
 	requirements = list(10,10,10,10,10,10,10,10,10,10)
 	high_population_requirement = 10
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/electrical_storm
 	name = "Electrical Storm"
@@ -337,6 +353,7 @@
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/event/heart_attack
 	name = "Random Heart Attack"
@@ -350,6 +367,7 @@
 	requirements = list(101,101,101,5,5,5,5,5,5,5)
 	high_population_requirement = 5
 	repeatable = TRUE
+	property_weights = list("extended" = 1)
 	always_max_weight = TRUE
 
 /datum/dynamic_ruleset/event/radiation_storm
@@ -362,3 +380,4 @@
 	required_enemies = list(1,1,1,1,1,1,1,1,1,1)
 	requirements = list(5,5,5,5,5,5,5,5,5,5)
 	high_population_requirement = 5
+	property_weights = list("extended" = 1,"chaos" = 1)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
index fe9347d9d5..f4e9971a05 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
@@ -69,8 +69,15 @@
 	high_population_requirement = 15
 	repeatable = TRUE
 	flags = TRAITOR_RULESET
+	property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1)
 	always_max_weight = TRUE
 
+/datum/dynamic_ruleset/latejoin/infiltrator/execute()
+	. = ..()
+	for(var/datum/mind/M in assigned)
+		log_admin("[M.name] was made into a traitor by dynamic.")
+		message_admins("[M.name] was made into a traitor by dynamic.")
+
 //////////////////////////////////////////////
 //                                          //
 //       REVOLUTIONARY PROVOCATEUR          //
@@ -94,6 +101,7 @@
 	requirements = list(101,101,70,40,40,40,40,40,40,40)
 	high_population_requirement = 40
 	flags = HIGHLANDER_RULESET
+	property_weights = list("trust" = -2, "chaos" = 2, "extended" = -2, "valid" = 2, "conversion" = 1)
 	var/required_heads_of_staff = 3
 	var/finished = FALSE
 	var/datum/team/revolution/revolution
@@ -123,6 +131,8 @@
 		revolution.update_objectives()
 		revolution.update_heads()
 		SSshuttle.registerHostileEnvironment(src)
+		log_admin("[M.name] was made into a revolutionary by dynamic.")
+		message_admins("[M.name] was made into a revolutionary by dynamic.")
 		return TRUE
 	else
 		log_game("DYNAMIC: [ruletype] [name] discarded [M.name] from head revolutionary due to ineligibility.")
@@ -187,30 +197,31 @@
 
 //////////////////////////////////////////////
 //                                          //
-//                 VAMPIRE                  //
+//               BLOODSUCKERS               //
 //                                          //
 //////////////////////////////////////////////
 
-/*
-/datum/dynamic_ruleset/latejoin/vampire
-	name = "vampire"
-	config_tag = "vampire_latejoin"
-	antag_flag = ROLE_VAMPIRE
-	antag_datum = ANTAG_DATUM_VAMPIRE
-	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
+/datum/dynamic_ruleset/latejoin/bloodsucker
+	name = "Bloodsucker Infiltrator"
+	config_tag = "latejoin_bloodsucker"
+	antag_datum = ANTAG_DATUM_BLOODSUCKER
+	antag_flag = ROLE_TRAITOR
 	restricted_roles = list("AI", "Cyborg")
+	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	required_candidates = 1
-	weight = 5
-	cost = 15
-	requirements = list(80,70,60,50,40,20,20,15,15,15)
+	weight = 3
+	cost = 10
+	property_weights = list("story_potential" = 2, "extended" = 2, "trust" = -2, "valid" = 1)
+	requirements = list(70,65,60,55,50,45,40,35,30,30)
+	high_population_requirement = 30
 	repeatable = TRUE
-	high_population_requirement = 15
 
-/datum/dynamic_ruleset/latejoin/vampire/pre_execute()
+/datum/dynamic_ruleset/latejoin/bloodsucker/execute()
 	var/mob/M = pick(candidates)
-	candidates -= M
 	assigned += M.mind
-	M.mind.restricted_roles = restricted_roles
-	M.mind.special_role = ROLE_VAMPIRE
+	M.mind.special_role = antag_flag
+	if(mode.make_bloodsucker(M.mind))
+		mode.bloodsuckers += M
+		log_admin("[M.name] was made into a bloodsucker by dynamic.")
+		message_admins("[M.name] was made into a bloodsucker by dynamic.")
 	return TRUE
-*/
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 91ac73d142..92a02f5920 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -17,10 +17,10 @@
 	var/list/living_antags = list()
 	var/list/dead_players = list()
 	var/list/list_observers = list()
+	var/list/ghost_eligible = list()
 
 /datum/dynamic_ruleset/midround/from_ghosts
 	weight = 0
-	required_type = /mob/dead/observer
 	/// Whether the ruleset should call generate_ruleset_body or not.
 	var/makeBody = TRUE
 
@@ -34,6 +34,8 @@
 	living_players = trim_list(mode.current_players[CURRENT_LIVING_PLAYERS])
 	living_antags = trim_list(mode.current_players[CURRENT_LIVING_ANTAGS])
 	list_observers = trim_list(mode.current_players[CURRENT_OBSERVERS])
+	var/datum/element/ghost_role_eligibility/eligibility = SSdcs.GetElement(/datum/element/ghost_role_eligibility)
+	ghost_eligible = trim_list(eligibility.get_all_ghost_role_eligible())
 
 /datum/dynamic_ruleset/midround/proc/trim_list(list/L = list())
 	var/list/trimmed_list = L.Copy()
@@ -70,6 +72,25 @@
 				continue
 	return trimmed_list
 
+/datum/dynamic_ruleset/midround/from_ghosts/trim_list(list/L = list())
+	var/list/trimmed_list = L.Copy()
+	for(var/mob/M in trimmed_list)
+		if (!M.client) // Are they connected?
+			trimmed_list.Remove(M)
+			continue
+		if(!mode.check_age(M.client, minimum_required_age))
+			trimmed_list.Remove(M)
+			continue
+		if(antag_flag_override)
+			if(!(antag_flag_override in M.client.prefs.be_special) || jobban_isbanned(M.ckey, antag_flag_override))
+				trimmed_list.Remove(M)
+				continue
+		else
+			if(!(antag_flag in M.client.prefs.be_special) || jobban_isbanned(M.ckey, antag_flag))
+				trimmed_list.Remove(M)
+				continue
+	return trimmed_list
+
 // You can then for example prompt dead players in execute() to join as strike teams or whatever
 // Or autotator someone
 
@@ -91,11 +112,15 @@
 			return FALSE
 	return TRUE
 
+/datum/dynamic_ruleset/midround/from_ghosts/ready(forced = FALSE)
+	if (required_candidates > ghost_eligible.len)
+		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
+		return FALSE
+	return ..()
+
+
 /datum/dynamic_ruleset/midround/from_ghosts/execute()
-	var/list/possible_candidates = list()
-	possible_candidates.Add(dead_players)
-	possible_candidates.Add(list_observers)
-	var/application_successful = send_applications(possible_candidates)
+	var/application_successful = send_applications(ghost_eligible)
 	return assigned.len > 0 && application_successful
 
 /// This sends a poll to ghosts if they want to be a ghost spawn from a ruleset.
@@ -108,8 +133,12 @@
 
 	candidates = pollGhostCandidates("The mode is looking for volunteers to become a [name]", antag_flag, SSticker.mode, antag_flag, poll_time = 300)
 
-	if(!candidates || candidates.len <= required_candidates)
+	if(!candidates || candidates.len < required_candidates)
 		message_admins("The ruleset [name] did not receive enough applications.")
+		if(candidates)
+			message_admins("Only received [candidates.len], needed [required_candidates].")
+		else
+			message_admins("There were no candidates.")
 		log_game("DYNAMIC: The ruleset [name] did not receive enough applications.")
 		return FALSE
 
@@ -180,6 +209,7 @@
 	repeatable = TRUE
 	high_population_requirement = 15
 	flags = TRAITOR_RULESET
+	property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1)
 	always_max_weight = TRUE
 
 /datum/dynamic_ruleset/midround/autotraitor/acceptable(population = 0, threat = 0)
@@ -214,6 +244,8 @@
 	living_players -= M
 	var/datum/antagonist/traitor/newTraitor = new
 	M.mind.add_antag_datum(newTraitor)
+	log_admin("[M] was made into a traitor by dynamic.")
+	message_admins("[M] was made into a traitor by dynamic.")
 	return TRUE
 
 
@@ -237,6 +269,7 @@
 	requirements = list(101,101,70,50,50,50,40,30,30,30)
 	high_population_requirement = 30
 	required_type = /mob/living/silicon/ai
+	property_weights = list("story_potential" = 2, "trust" = 1, "chaos" = 2)
 	var/ion_announce = 33
 	var/removeDontImproveChance = 10
 
@@ -261,6 +294,8 @@
 	var/datum/antagonist/traitor/AI = new
 	M.mind.special_role = antag_flag
 	M.mind.add_antag_datum(AI)
+	log_admin("[M] was made into a malf AI by dynamic.")
+	message_admins("[M] was made into a malf AI by dynamic.")
 	if(prob(ion_announce))
 		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", "ionstorm")
 		if(prob(removeDontImproveChance))
@@ -289,12 +324,10 @@
 	requirements = list(90,90,70,50,50,50,50,40,30,30)
 	high_population_requirement = 30
 	repeatable = TRUE
+	property_weights = list("story_potential" = 2, "trust" = 1, "chaos" = 2, "extended" = -2)
 	var/datum/mind/wizard
 
 /datum/dynamic_ruleset/midround/from_ghosts/wizard/ready(forced = FALSE)
-	if (required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
 	if(GLOB.wizardstart.len == 0)
 		log_admin("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.")
 		message_admins("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.")
@@ -337,6 +370,7 @@
 	cost = 35
 	requirements = list(90,90,90,80,70,60,50,40,40,40)
 	high_population_requirement = 40
+	property_weights = list("story_potential" = 2, "trust" = 2, "chaos" = 2, "extended" = -2, "valid" = 2)
 	var/operative_cap = list(2,2,3,3,4,5,5,5,5,5)
 	var/datum/team/nuclear/nuke_team
 	flags = HIGHLANDER_RULESET
@@ -354,12 +388,6 @@
 	required_candidates = operative_cap[indice_pop]
 	return ..()
 
-/datum/dynamic_ruleset/midround/from_ghosts/nuclear/ready(forced = FALSE)
-	if (required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
-	return ..()
-
 /datum/dynamic_ruleset/midround/from_ghosts/nuclear/finish_setup(mob/new_character, index)
 	new_character.mind.special_role = "Nuclear Operative"
 	new_character.mind.assigned_role = "Nuclear Operative"
@@ -390,12 +418,7 @@
 	requirements = list(101,101,101,80,60,50,50,50,50,50)
 	high_population_requirement = 50
 	repeatable = TRUE
-
-/datum/dynamic_ruleset/midround/from_ghosts/blob/ready(forced = FALSE)
-	if (required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
-	return ..()
+	property_weights = list("story_potential" = -1, "trust" = 2, "chaos" = 2, "extended" = -2, "valid" = 2)
 
 /datum/dynamic_ruleset/midround/from_ghosts/blob/generate_ruleset_body(mob/applicant)
 	var/body = applicant.become_overmind()
@@ -421,14 +444,9 @@
 	high_population_requirement = 50
 	repeatable_weight_decrease = 2
 	repeatable = TRUE
+	property_weights = list("story_potential" = -1, "trust" = 1, "chaos" = 2, "extended" = -2, "valid" = 2)
 	var/list/vents = list()
 
-/datum/dynamic_ruleset/midround/from_ghosts/xenomorph/ready(forced = FALSE)
-	if (required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
-	return ..()
-
 /datum/dynamic_ruleset/midround/from_ghosts/xenomorph/execute()
 	// 50% chance of being incremented by one
 	required_candidates += prob(50)
@@ -476,6 +494,7 @@
 	high_population_requirement = 50
 	repeatable_weight_decrease = 2
 	repeatable = TRUE
+	property_weights = list("story_potential" = 1, "trust" = 1, "extended" = 1, "valid" = 2, "integrity" = 2)
 	var/list/spawn_locs = list()
 
 /datum/dynamic_ruleset/midround/from_ghosts/nightmare/execute()
@@ -521,14 +540,9 @@
 	weight = 4
 	cost = 5
 	requirements = list(30,30,20,20,15,10,10,10,10,5) // yes, it can even happen in "extended"!
+	property_weights = list("story_potential" = 1, "extended" = 1, "valid" = -2)
 	high_population_requirement = 5
 
-/datum/dynamic_ruleset/midround/from_ghosts/sentient_disease/ready(forced = FALSE)
-	if (required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
-	return ..()
-
 /datum/dynamic_ruleset/midround/from_ghosts/sentient_disease/generate_ruleset_body(mob/applicant)
 	var/mob/camera/disease/virus = new /mob/camera/disease(SSmapping.get_station_center())
 	applicant.transfer_ckey(virus, FALSE)
@@ -555,17 +569,18 @@
 	cost = 5
 	requirements = list(30,30,30,30,20,15,15,15,15,15)
 	high_population_requirement = 15
+	property_weights = list("story_potential" = -2, "extended" = -1)
 	var/list/spawn_locs = list()
 
-/datum/dynamic_ruleset/midround/from_ghosts/revenant/ready(forced = FALSE)
+/datum/dynamic_ruleset/midround/from_ghosts/revenant/acceptable(population = 0,threat = 0)
 	var/deadMobs = 0
 	for(var/mob/M in GLOB.dead_mob_list)
 		deadMobs++
 	if(deadMobs < REVENANT_SPAWN_THRESHOLD)
 		return FALSE
-	if(required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/revenant/ready(forced = FALSE)
 	for(var/mob/living/L in GLOB.dead_mob_list) //look for any dead bodies
 		var/turf/T = get_turf(L)
 		if(T && is_station_level(T.z))
@@ -607,13 +622,11 @@
 	weight = 4
 	cost = 15
 	requirements = list(101,101,101,90,80,70,60,50,40,30)
+	property_weights = list("story_potential" = -2, "extended" = -2, "integrity" = 2, "valid" = 2, "trust" = 2)
 	high_population_requirement = 30
 	var/list/spawn_locs = list()
 
 /datum/dynamic_ruleset/midround/from_ghosts/slaughter_demon/ready(forced = FALSE)
-	if(required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
 	for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
 		if(isturf(L.loc))
 			spawn_locs += L.loc
@@ -659,13 +672,11 @@
 	blocking_rules = list(/datum/dynamic_ruleset/roundstart/nuclear,/datum/dynamic_ruleset/midround/from_ghosts/nuclear)
 	high_population_requirement = 15
 	var/datum/team/abductor_team/team
+	property_weights = list("story_potential" = 1, "extended" = -2, "valid" = 1, "trust" = -1, "chaos" = 2)
 	repeatable_weight_decrease = 4
 	repeatable = TRUE
 
 /datum/dynamic_ruleset/midround/from_ghosts/abductors/ready(forced = FALSE)
-	if(required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
 	team = new /datum/team/abductor_team
 	if(team.team_number > ABDUCTOR_MAX_TEAMS)
 		return FALSE
@@ -699,13 +710,11 @@
 	cost = 15
 	requirements = list(101,101,101,90,80,70,60,50,40,30)
 	high_population_requirement = 30
+	property_weights = list("story_potential" = 1, "extended" = -2, "valid" = 2)
 	var/list/spawn_locs = list()
 	var/spawn_loc
 
 /datum/dynamic_ruleset/midround/from_ghosts/ninja/ready(forced = FALSE)
-	if(required_candidates > (dead_players.len + list_observers.len))
-		SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts")
-		return FALSE
 	if(!spawn_loc)
 		var/list/spawn_locs = list()
 		for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
@@ -745,31 +754,3 @@
 
 #undef ABDUCTOR_MAX_TEAMS
 #undef REVENANT_SPAWN_THRESHOLD
-
-//////////////////////////////////////////////
-//                                          //
-//               BLOODSUCKERS               //
-//                                          //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/latejoin/bloodsucker
-  name = "Bloodsucker Infiltrator"
-  config_tag = "latejoin_bloodsucker"
-  antag_datum = ANTAG_DATUM_BLOODSUCKER
-  antag_flag = ROLE_TRAITOR
-  restricted_roles = list("AI", "Cyborg")
-  protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
-  required_candidates = 1
-  weight = 3
-  cost = 10
-  requirements = list(90,80,70,60,55,50,45,40,35,30)
-  high_population_requirement = 30
-  repeatable = TRUE
-
-/datum/dynamic_ruleset/latejoin/bloodsucker/execute()
-  var/mob/M = pick(candidates)
-  assigned += M.mind
-  M.mind.special_role = antag_flag
-  if(mode.make_bloodsucker(M.mind))
-    mode.bloodsuckers += M
-  return TRUE
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index e5bb0af464..abd40a1756 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -21,6 +21,7 @@
 	requirements = list(50,50,50,50,50,50,50,50,50,50)
 	high_population_requirement = 40
 	antag_cap = list(1,1,1,1,2,2,2,2,3,3)
+	property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1, "valid" = 1)
 	always_max_weight = TRUE
 	var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec)
 
@@ -61,6 +62,7 @@
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
 	high_population_requirement = 101
 	antag_cap = list(2,2,2,2,2,2,2,2,2,2)	// Can pick 3 per team, but rare enough it doesn't matter.
+	property_weights = list("story_potential" = 1, "trust" = -1, "extended" = 1, "valid" = 1)
 	var/list/datum/team/brother_team/pre_brother_teams = list()
 	var/const/min_team_size = 2
 
@@ -108,6 +110,7 @@
 	cost = 15
 	scaling_cost = 15
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	property_weights = list("trust" = -2, "valid" = 2)
 	high_population_requirement = 10
 	antag_cap = list(1,1,1,1,1,2,2,2,2,3)
 	var/team_mode_probability = 30
@@ -160,6 +163,7 @@
 	cost = 30
 	requirements = list(101,101,101,60,50,50,50,50,50,50)
 	high_population_requirement = 50
+	property_weights = list("story_potential" = 2, "trust" = 1, "chaos" = 2, "extended" = -2, "valid" = 2)
 	var/list/roundstart_wizards = list()
 
 /datum/dynamic_ruleset/roundstart/wizard/acceptable(population=0, threat=0)
@@ -222,6 +226,7 @@
 	weight = 3
 	cost = 30
 	requirements = list(101,101,101,80,70,60,50,50,50,50)
+	property_weights = list("story_potential" = -1, "trust" = -1, "chaos" = 1, "conversion" = 1, "extended" = -2, "valid" = 2)
 	high_population_requirement = 50
 	flags = HIGHLANDER_RULESET
 	antag_cap = list(2,2,2,3,3,4,4,4,4,4)
@@ -283,6 +288,7 @@
 	high_population_requirement = 50
 	flags = HIGHLANDER_RULESET
 	antag_cap = list(1,1,2,3,4,5,5,5,5,5)
+	property_weights = list("story_potential" = 2, "trust" = 2, "chaos" = 2, "extended" = -2, "valid" = 2)
 	var/datum/team/nuclear/nuke_team
 
 /datum/dynamic_ruleset/roundstart/nuclear/ready(forced = FALSE)
@@ -373,6 +379,7 @@
 	flags = HIGHLANDER_RULESET
 	// I give up, just there should be enough heads with 35 players...
 	minimum_players = 35
+	property_weights = list("trust" = -2, "chaos" = 2, "extended" = -2, "valid" = 2, "conversion" = 1)
 	var/datum/team/revolution/revolution
 	var/finished = FALSE
 
@@ -490,6 +497,7 @@
 	weight = 3
 	cost = 0
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
+	property_weights = list("extended" = 2)
 	high_population_requirement = 101
 
 /datum/dynamic_ruleset/roundstart/extended/pre_execute()
@@ -517,6 +525,7 @@
 	high_population_requirement = 50
 	flags = HIGHLANDER_RULESET
 	antag_cap = list(2,3,3,4,4,4,4,4,4,4)
+	property_weights = list("trust" = 2, "chaos" = 2, "extended" = -2, "conversion" = 1, "valid" = 2)
 	var/ark_time
 
 /datum/dynamic_ruleset/roundstart/clockcult/pre_execute()
@@ -616,6 +625,8 @@
 	antag_leader_datum = /datum/antagonist/nukeop/leader/clownop
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
 	high_population_requirement = 101
+	property_weights = list("trust" = 2, "chaos" = 2, "extended" = -2, "story_potential" = 2, "valid" = 2)
+
 
 /datum/dynamic_ruleset/roundstart/nuclear/clown_ops/pre_execute()
 	. = ..()
@@ -647,6 +658,7 @@
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
 	high_population_requirement = 101
 	antag_cap = list(1,1,1,2,2,2,3,3,3,4)
+	property_weights = list("extended" = 1)
 
 /datum/dynamic_ruleset/roundstart/devil/pre_execute()
 	var/num_devils = antag_cap[indice_pop]
@@ -698,6 +710,7 @@
 	cost = 0
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
 	high_population_requirement = 101
+	property_weights = list("extended" = -2, "chaos" = 2, "conversion" = 1, "valid" = 2)
 	var/players_per_carrier = 30
 	var/monkeys_to_win = 1
 	var/escaped_monkeys = 0
@@ -759,6 +772,7 @@
 	cost = 0
 	requirements = list(101,101,101,101,101,101,101,101,101,101)
 	high_population_requirement = 101
+	property_weights = list("extended" = -2, "chaos" = 2, "trust" = 2)
 	var/meteordelay = 2000
 	var/nometeors = 0
 	var/rampupdelta = 5
@@ -799,7 +813,8 @@
 	weight = 2
 	cost = 15
 	scaling_cost = 10
-	requirements = list(90,80,70,60,50,50,50,50,50,50)
+	property_weights = list("story_potential" = 1, "extended" = 1, "trust" = -2, "valid" = 1)
+	requirements = list(70,65,60,55,50,50,50,50,50,50)
 	high_population_requirement = 50
 	antag_cap = list(1,1,1,1,1,2,2,2,2,2)
 
diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
new file mode 100644
index 0000000000..afa6ed8ba7
--- /dev/null
+++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
@@ -0,0 +1,235 @@
+/datum/dynamic_storyteller
+	var/name = "none"
+	var/desc = "A coder's idiocy."
+	var/list/property_weights = list()
+	var/curve_centre = 0
+	var/curve_width = 1.8
+	var/forced_threat_level = -1
+	var/flags = 0
+	var/weight = 3 // how many rounds need to have been recently played for this storyteller to be left out of the vote
+	var/datum/game_mode/dynamic/mode = null
+
+/**
+Property weights are: 
+"story_potential" -- essentially how many different ways the antag can be played.
+"trust" -- How much it makes the crew trust each other. Negative values means they're suspicious. Team antags are like this.
+"chaos" -- How chaotic it makes the round. Has some overlap with "valid" and somewhat contradicts "extended".
+"valid" -- How likely the non-antag-enemy crew are to get involved, e.g. nukies encouraging the warden to 
+           let everyone into the armory, wizard moving around and being a nuisance, nightmare busting lights.
+"extended" -- How much the antag is conducive to a long round. Nukies and cults are bad for this; Wizard is less bad; and so on.
+"conversion" -- Basically a bool. Conversion antags, well, convert. It's its own class for a good reason.
+*/
+
+/datum/dynamic_storyteller/New()
+	..()
+	if (istype(SSticker.mode, /datum/game_mode/dynamic))
+		mode = SSticker.mode
+		GLOB.dynamic_curve_centre = curve_centre
+		GLOB.dynamic_curve_width = curve_width
+		GLOB.dynamic_forced_threat_level = forced_threat_level
+
+/datum/dynamic_storyteller/proc/start_injection_cooldowns()
+	var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_latejoin_delay_max + GLOB.dynamic_first_latejoin_delay_min)
+	mode.latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_first_latejoin_delay_min, GLOB.dynamic_first_latejoin_delay_max)) + world.time
+
+	var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_midround_delay_min + GLOB.dynamic_first_midround_delay_max)
+	mode.midround_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_first_midround_delay_min, GLOB.dynamic_first_midround_delay_max)) + world.time
+	
+	var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min)
+	mode.event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time)
+
+/datum/dynamic_storyteller/proc/do_process()
+	return
+
+/datum/dynamic_storyteller/proc/on_start()
+	return
+
+/datum/dynamic_storyteller/proc/get_midround_cooldown()
+	var/midround_injection_cooldown_middle = 0.5*(GLOB.dynamic_midround_delay_max + GLOB.dynamic_midround_delay_min)
+	return round(CLAMP(EXP_DISTRIBUTION(midround_injection_cooldown_middle), GLOB.dynamic_midround_delay_min, GLOB.dynamic_midround_delay_max))
+
+/datum/dynamic_storyteller/proc/get_event_cooldown()
+	var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min)
+	return round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max))
+
+/datum/dynamic_storyteller/proc/get_latejoin_cooldown()
+	var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min)
+	return round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max))
+
+/datum/dynamic_storyteller/proc/get_injection_chance(dry_run = FALSE)
+	if(mode.forced_injection)
+		mode.forced_injection = !dry_run
+		return 100
+	var/chance = 0
+	// If the high pop override is in effect, we reduce the impact of population on the antag injection chance
+	var/high_pop_factor = (mode.current_players[CURRENT_LIVING_PLAYERS].len >= GLOB.dynamic_high_pop_limit)
+	var/max_pop_per_antag = max(5,15 - round(mode.threat_level/10) - round(mode.current_players[CURRENT_LIVING_PLAYERS].len/(high_pop_factor ? 10 : 5)))
+	if (!mode.current_players[CURRENT_LIVING_ANTAGS].len)
+		chance += 80 // No antags at all? let's boost those odds!
+	else
+		var/current_pop_per_antag = mode.current_players[CURRENT_LIVING_PLAYERS].len / mode.current_players[CURRENT_LIVING_ANTAGS].len
+		if (current_pop_per_antag > max_pop_per_antag)
+			chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag))
+		else
+			chance += 25-10*(max_pop_per_antag-current_pop_per_antag)
+	if (mode.current_players[CURRENT_DEAD_PLAYERS].len > mode.current_players[CURRENT_LIVING_PLAYERS].len)
+		chance -= 30 // More than half the crew died? ew, let's calm down on antags
+	if (mode.threat > 70)
+		chance += 15
+	if (mode.threat < 30)
+		chance -= 15
+	return round(max(0,chance))
+
+/datum/dynamic_storyteller/proc/roundstart_draft()
+	var/list/drafted_rules = list()
+	for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules)
+		if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level) && mode.threat >= rule.cost)	// If we got the population and threat required
+			rule.candidates = mode.candidates.Copy()
+			rule.trim_candidates()
+			if (rule.ready() && rule.candidates.len > 0)
+				var/property_weight = 0
+				for(var/property in property_weights)
+					if(property in rule.property_weights) // just treat it as 0 if it's not in there
+						property_weight += rule.property_weights[property] * property_weights[property]
+				drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult
+	return drafted_rules
+
+/datum/dynamic_storyteller/proc/midround_draft()
+	var/list/drafted_rules = list()
+	for (var/datum/dynamic_ruleset/midround/rule in mode.midround_rules)
+		// if there are antags OR the rule is an antag rule, antag_acceptable will be true.
+		if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost)
+			// Classic secret : only autotraitor/minor roles
+			if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
+				continue
+			rule.trim_candidates()
+			if (rule.ready())
+				var/property_weight = 0
+				for(var/property in property_weights)
+					if(property in rule.property_weights)
+						property_weight += rule.property_weights[property] * property_weights[property]
+				drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult
+		else if(mode.threat < rule.cost)
+			SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend")
+	return drafted_rules
+
+/datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer)
+	var/list/drafted_rules = list()
+	for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules)
+		if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost)
+			// Classic secret : only autotraitor/minor roles
+			if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
+				continue
+			// No stacking : only one round-ender, unless threat level > stacking_limit.
+			if (mode.threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+				if(rule.flags & HIGHLANDER_RULESET && mode.highlander_executed)
+					continue
+
+			rule.candidates = list(newPlayer)
+			rule.trim_candidates()
+			if (rule.ready())
+				var/property_weight = 0
+				for(var/property in property_weights)
+					if(property in rule.property_weights)
+						property_weight += rule.property_weights[property] * property_weights[property]
+				drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult
+		else if(mode.threat < rule.cost)
+			SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend")
+	return drafted_rules
+
+/datum/dynamic_storyteller/proc/event_draft()
+	var/list/drafted_rules = list()
+	for(var/datum/dynamic_ruleset/event/rule in mode.events)
+		if(rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level) && mode.threat >= rule.cost)
+			if(rule.ready())
+				var/property_weight = 0
+				for(var/property in property_weights)
+					if(property in rule.property_weights)
+						property_weight += rule.property_weights[property] * property_weights[property]
+				drafted_rules[rule] = (rule.get_weight() + property_weight)*rule.weight_mult
+		else if(mode.threat < rule.cost)
+			SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend")
+	return drafted_rules
+
+
+/datum/dynamic_storyteller/cowabunga
+	name = "Chaotic"
+	curve_centre = 10
+	desc = "Chaos: high. Variation: high. Likely antags: clock cult, revs, wizard."
+	property_weights = list("extended" = -1, "chaos" = 10)
+	weight = 2
+	flags = WAROPS_ALWAYS_ALLOWED
+	var/refund_cooldown
+	
+/datum/dynamic_storyteller/cowabunga/get_midround_cooldown()
+	return ..() / 4
+	
+/datum/dynamic_storyteller/cowabunga/get_latejoin_cooldown()
+	return ..() / 4
+
+/datum/dynamic_storyteller/cowabunga/do_process()
+	if(refund_cooldown < world.time)
+		mode.refund_threat(10)
+		mode.log_threat("Cowabunga it is. Refunded 10 threat. Threat is now [mode.threat].")
+		refund_cooldown = world.time + 300 SECONDS
+
+/datum/dynamic_storyteller/team
+	name = "Teamwork"
+	desc = "Chaos: high. Variation: low. Likely antags: nukies, clockwork cult, wizard, blob, xenomorph."
+	curve_centre = 2
+	curve_width = 1.5
+	weight = 2
+	flags = WAROPS_ALWAYS_ALLOWED
+	property_weights = list("valid" = 3, "trust" = 5)
+
+/datum/dynamic_storyteller/team/get_injection_chance(dry_run = FALSE)
+	return (mode.current_players[CURRENT_LIVING_ANTAGS].len ? 0 : ..())
+
+/datum/dynamic_storyteller/conversion
+	name = "Conversion"
+	desc = "Chaos: high. Variation: medium. Likely antags: cults, bloodsuckers, revs."
+	curve_centre = 3
+	curve_width = 1
+	weight = 2
+	flags = WAROPS_ALWAYS_ALLOWED
+	property_weights = list("valid" = 1, "conversion" = 20)
+
+/datum/dynamic_storyteller/classic
+	name = "Random"
+	desc = "Chaos: varies. Variation: highest. No special weights attached."
+	weight = 6
+	curve_width = 4
+
+/datum/dynamic_storyteller/memes
+	name = "Story"
+	desc = "Chaos: varies. Variation: high. Likely antags: abductors, nukies, wizard, traitor."
+	curve_width = 4
+	property_weights = list("story_potential" = 10)
+
+/datum/dynamic_storyteller/suspicion
+	name = "Intrigue"
+	desc = "Chaos: low. Variation: high. Likely antags: traitor, bloodsucker. Rare: revs, blood cult."
+	curve_width = 4
+	property_weights = list("trust" = -5)
+
+/datum/dynamic_storyteller/liteextended
+	name = "Calm"
+	desc = "Chaos: low. Variation: medium. Likely antags: bloodsuckers, traitors, sentient disease, revenant."
+	curve_centre = -5
+	curve_width = 0.5
+	flags = NO_ASSASSIN
+	weight = 2
+	property_weights = list("extended" = 1, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10)
+
+/datum/dynamic_storyteller/liteextended/get_injection_chance(dry_run = FALSE)
+	return ..()/2
+
+/datum/dynamic_storyteller/extended
+	name = "Extended"
+	desc = "Chaos: none. Variation: none. Likely antags: none."
+	curve_centre = -20
+	weight = 2
+	curve_width = 0.5
+
+/datum/dynamic_storyteller/extended/on_start()
+	GLOB.dynamic_forced_extended = TRUE
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 520721560a..4fd4a7929d 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -14,14 +14,14 @@
 	circuit = /obj/item/circuitboard/machine/sleeper
 	req_access = list(ACCESS_CMO) //Used for reagent deletion and addition of non medicines
 	var/efficiency = 1
-	var/min_health = -25
+	var/min_health = 30
 	var/list/available_chems
 	var/controls_inside = FALSE
 	var/list/possible_chems = list(
-		list("epinephrine", "morphine", "salbutamol", "bicaridine", "kelotane"),
-		list("oculine","inacusiate"),
-		list("antitoxin", "mutadone", "mannitol", "pen_acid"),
-		list("omnizine")
+		list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/morphine, /datum/reagent/medicine/salbutamol, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/kelotane),
+		list(/datum/reagent/medicine/oculine,/datum/reagent/medicine/inacusiate),
+		list(/datum/reagent/medicine/antitoxin, /datum/reagent/medicine/mutadone, /datum/reagent/medicine/mannitol, /datum/reagent/medicine/pen_acid),
+		list(/datum/reagent/medicine/omnizine)
 	)
 	var/list/chem_buttons	//Used when emagged to scramble which chem is used, eg: antitoxin -> morphine
 	var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning
@@ -106,7 +106,7 @@
 		return
 	if(is_operational() && occupant)
 		var/datum/reagent/R = pick(reagents.reagent_list)
-		inject_chem(R.id, occupant)
+		inject_chem(R.type, occupant)
 		open_machine()
 	//Is this too much?
 	if(severity == EMP_HEAVY)
@@ -217,9 +217,9 @@
 	for(var/chem in available_chems)
 		var/datum/reagent/R = reagents.has_reagent(chem)
 		R = GLOB.chemical_reagents_list[chem]
-		data["synthchems"] += list(list("name" = R.name, "id" = R.id, "synth_allowed" = synth_allowed(chem)))
+		data["synthchems"] += list(list("name" = R.name, "id" = R.type, "synth_allowed" = synth_allowed(chem)))
 	for(var/datum/reagent/R in reagents.reagent_list)
-		data["chems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "purity" = R.purity, "allowed" = chem_allowed(R.id)))
+		data["chems"] += list(list("name" = R.name, "id" = R.type, "vol" = R.volume, "purity" = R.purity, "allowed" = chem_allowed(R.type)))
 
 	data["occupant"] = list()
 	var/mob/living/mob_occupant = occupant
@@ -289,23 +289,23 @@
 				open_machine()
 			. = TRUE
 		if("inject")
-			var/chem = params["chem"]
+			var/chem = text2path(params["chem"])
 			var/amount = text2num(params["volume"])
-			if(!is_operational() || !mob_occupant)
+			if(!is_operational() || !mob_occupant || isnull(chem))
 				return
-			if(mob_occupant.health < min_health && chem != "epinephrine")
+			if(mob_occupant.health < min_health && chem != /datum/reagent/medicine/epinephrine)
 				return
 			if(inject_chem(chem, usr, amount))
 				. = TRUE
 				if(scrambled_chems && prob(5))
 					to_chat(usr, "<span class='warning'>Chemical system re-route detected, results may not be as expected!</span>")
 		if("synth")
-			var/chem = params["chem"]
+			var/chem = text2path(params["chem"])
 			if(!is_operational())
 				return
 			reagents.add_reagent(chem_buttons[chem], 10) //other_purity = 0.75 for when the mechanics are in
 		if("purge")
-			var/chem = params["chem"]
+			var/chem = text2path(params["chem"])
 			if(allowed(usr))
 				if(!is_operational())
 					return
@@ -342,7 +342,7 @@
 	if(!mob_occupant || !mob_occupant.reagents)
 		return
 	var/amount = mob_occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency
-	var/occ_health = mob_occupant.health > min_health || chem == "epinephrine"
+	var/occ_health = mob_occupant.health > min_health || chem == /datum/reagent/medicine/epinephrine
 	return amount && occ_health
 
 /obj/machinery/sleeper/proc/synth_allowed(chem)
diff --git a/code/game/machinery/bloodbankgen.dm b/code/game/machinery/bloodbankgen.dm
index c92e55084d..948e9b98f9 100644
--- a/code/game/machinery/bloodbankgen.dm
+++ b/code/game/machinery/bloodbankgen.dm
@@ -123,15 +123,15 @@
 		if(reagents.total_volume >= reagents.maximum_volume || !bag || !bag.reagents.total_volume)
 			beep_stop_pumping()
 			return
-		var/blood_amount = bag.reagents.get_reagent_amount("blood")
+		var/blood_amount = bag.reagents.get_reagent_amount(/datum/reagent/blood)
 		//monitor the machine and blood bag's reagents storage.
 		var/amount = min(blood_amount, min(transfer_amount, reagents.maximum_volume - reagents.total_volume))
 		if(!amount)
 			beep_stop_pumping()
 			return
 		var/bonus = bag.blood_type == "SY" ? 0 : 5 * efficiency //no infinite loops using synthetics.
-		reagents.add_reagent("syntheticblood", amount + bonus)
-		bag.reagents.remove_reagent("blood", amount)
+		reagents.add_reagent(/datum/reagent/blood/synthetics, amount + bonus)
+		bag.reagents.remove_reagent(/datum/reagent/blood, amount)
 		update_icon()
 
 	if(filling)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 3181086caf..8fba287362 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -157,6 +157,8 @@
 		mess = TRUE
 		update_icon()
 		return FALSE
+	if(isvamp(clonemind)) //If the mind is a bloodsucker
+		return FALSE
 
 	attempting = TRUE //One at a time!!
 	countdown.start()
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 59c962994e..d02a0d8510 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -137,6 +137,11 @@
 				occupant_status += "</div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Health:</div><div class='progressBar'><div style='width: [viable_occupant.health]%;' class='progressFill good'></div></div><div class='statusValue'>[viable_occupant.health] %</div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Radiation Level:</div><div class='progressBar'><div style='width: [viable_occupant.radiation/(RAD_MOB_SAFE/100)]%;' class='progressFill bad'></div></div><div class='statusValue'>[viable_occupant.radiation/(RAD_MOB_SAFE/100)] %</div></div>"
+<<<<<<< HEAD
+=======
+				var/rejuvenators = viable_occupant.reagents.get_reagent_amount(/datum/reagent/medicine/potass_iodide)
+				occupant_status += "<div class='line'><div class='statusLabel'>Rejuvenators:</div><div class='progressBar'><div style='width: [round((rejuvenators / REJUVENATORS_MAX) * 100)]%;' class='progressFill highlight'></div></div><div class='statusValue'>[rejuvenators] units</div></div>"
+>>>>>>> 86beeb513c4256dceace96e7c2709aa63b6f77c8
 				occupant_status += "<div class='line'><div class='statusLabel'>Unique Enzymes :</div><div class='statusValue'><span class='highlight'>[viable_occupant.dna.unique_enzymes]</span></div></div>"
 				occupant_status += "<div class='line'><div class='statusLabel'>Last Operation:</div><div class='statusValue'>[last_change ? last_change : "----"]</div></div>"
 			else
@@ -554,7 +559,11 @@
 				scrambleready = world.time + SCRAMBLE_TIMEOUT
 				to_chat(usr,"<span class'notice'>DNA scrambled.</span>")
 				viable_occupant.radiation += RADIATION_STRENGTH_MULTIPLIER*50/(connected.damage_coeff ** 2)
-
+		if("rejuv")
+			if(viable_occupant && viable_occupant.reagents)
+				var/potassiodide_amount = viable_occupant.reagents.get_reagent_amount(/datum/reagent/medicine/potass_iodide)
+				var/can_add = max(min(REJUVENATORS_MAX - potassiodide_amount, REJUVENATORS_INJECT), 0)
+				viable_occupant.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, can_add)
 		if("setbufferlabel")
 			var/text = sanitize(input(usr, "Input a new label:", "Input a Text", null) as text|null)
 			if(num && text)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 98dd91d3bd..e9d3006b06 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -491,4 +491,4 @@
 
 //Attacks/effects.
 /obj/machinery/cryopod/blob_act()
-	return //Sorta gamey, but we don't really want these to be destroyed.
\ No newline at end of file
+	return //Sorta gamey, but we don't really want these to be destroyed.
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 52b52eb288..03c1bb3bc8 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -180,7 +180,7 @@
 		limit--
 	while(!FoundDoor && limit)
 	if (!FoundDoor)
-		log_world("### MAP WARNING, [src] at [AREACOORD(src)] failed to find a valid airlock to cyclelink with!")
+		log_mapping("[src] at [AREACOORD(src)] failed to find a valid airlock to cyclelink with!")
 		return
 	FoundDoor.cyclelinkedairlock = src
 	cyclelinkedairlock = FoundDoor
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 1c25c7b242..65f7602215 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -7,26 +7,51 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 	icon_state = "tdoppler"
 	density = TRUE
 	var/integrated = FALSE
+	var/list_limit = 100
+	var/cooldown = 10
+	var/next_announce = 0
 	var/max_dist = 150
 	verb_say = "states coldly"
+	var/list/message_log = list()
 
 /obj/machinery/doppler_array/Initialize()
 	. = ..()
 	GLOB.doppler_arrays += src
 
 /obj/machinery/doppler_array/ComponentInitialize()
+	. = ..()
 	AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,.proc/rot_message))
 
 /obj/machinery/doppler_array/Destroy()
 	GLOB.doppler_arrays -= src
 	return ..()
 
-/obj/machinery/doppler_array/examine(mob/user)
+/obj/machinery/doppler_array/ui_interact(mob/user)
 	. = ..()
-	. += "<span class='notice'>Its dish is facing to the [dir2text(dir)].</span>"
+	if(stat)
+		return FALSE
 
-/obj/machinery/doppler_array/process()
-	return PROCESS_KILL
+	var/list/dat = list()
+	for(var/i in 1 to LAZYLEN(message_log))
+		dat += "Log recording #[i]: [message_log[i]]<br/><br>"
+	dat += "<A href='?src=[REF(src)];delete_log=1'>Delete logs</A><br>"
+	dat += "<hr>"
+	dat += "<A href='?src=[REF(src)];refresh=1'>(Refresh)</A><br>"
+	dat += "</body></html>"
+	var/datum/browser/popup = new(user, "computer", name, 400, 500)
+	popup.set_content(dat.Join(" "))
+	popup.open()
+
+/obj/machinery/doppler_array/Topic(href, href_list)
+	if(..())
+		return
+	if(href_list["delete_log"])
+		LAZYCLEARLIST(message_log)
+	if(href_list["refresh"])
+		updateUsrDialog()
+
+	updateUsrDialog()
+	return
 
 /obj/machinery/doppler_array/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/wrench))
@@ -46,15 +71,18 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 	to_chat(user, "<span class='notice'>You adjust [src]'s dish to face to the [dir2text(dir)].</span>")
 	playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
 
-/obj/machinery/doppler_array/proc/sense_explosion(turf/epicenter,devastation_range,heavy_impact_range,light_impact_range,
-												  took,orig_dev_range,orig_heavy_range,orig_light_range)
+/obj/machinery/doppler_array/proc/sense_explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range,
+												  took, orig_dev_range, orig_heavy_range, orig_light_range)
 	if(stat & NOPOWER)
 		return FALSE
 	var/turf/zone = get_turf(src)
-
 	if(zone.z != epicenter.z)
 		return FALSE
 
+	if(next_announce > world.time)
+		return FALSE
+	next_announce = world.time + cooldown
+
 	var/distance = get_dist(epicenter, zone)
 	var/direct = get_dir(zone, epicenter)
 
@@ -80,8 +108,19 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 	else
 		for(var/message in messages)
 			say(message)
+		if(LAZYLEN(message_log) > list_limit)
+			say("Storage buffer is full! Clearing buffers...")
+			LAZYCLEARLIST(message_log)
+		LAZYADD(message_log, messages.Join(" "))
 	return TRUE
 
+/obj/machinery/doppler_array/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>Its dish is facing to the [dir2text(dir)].</span>"
+
+/obj/machinery/doppler_array/process()
+	return PROCESS_KILL
+
 /obj/machinery/doppler_array/power_change()
 	if(stat & BROKEN)
 		icon_state = "[initial(icon_state)]-broken"
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 71f39608b5..8f7fce8e3e 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -256,7 +256,6 @@
 					return
 	return ..()
 
-
 /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
 	if(.) //damage received
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 1e7d720ee9..b1783ba940 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -500,7 +500,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	else
 		return FALSE
 
-/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf)
+/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf, direction)
 	if(LAZYLEN(masters) && masters[user])
 		var/obj/effect/overlay/holo_pad_hologram/holo = masters[user]
 		var/transfered = FALSE
@@ -512,6 +512,8 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 				transfered = TRUE
 		//All is good.
 		holo.forceMove(new_turf)
+		if(direction)
+			holo.setDir(direction)
 		if(!transfered)
 			update_holoray(user,new_turf)
 	return TRUE
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 794509801b..bf9400219b 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -89,7 +89,7 @@
 			selected_category = href_list["category"]
 
 		if(href_list["disposeI"])  //Get rid of a reagent incase you add the wrong one by mistake
-			reagents.del_reagent(href_list["disposeI"])
+			reagents.del_reagent(text2path(href_list["disposeI"]))
 
 		if(href_list["make"])
 
@@ -100,10 +100,10 @@
 				return
 
 
-			var/synth_cost = being_built.reagents_list["synthflesh"]*prod_coeff
+			var/synth_cost = being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff
 			var/power = max(2000, synth_cost/5)
 
-			if(reagents.has_reagent("synthflesh", being_built.reagents_list["synthflesh"]*prod_coeff))
+			if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff))
 				busy = TRUE
 				use_power(power)
 				flick("limbgrower_fill",src)
@@ -117,8 +117,8 @@
 	return
 
 /obj/machinery/limbgrower/proc/build_item()
-	if(reagents.has_reagent("synthflesh", being_built.reagents_list["synthflesh"]*prod_coeff))	//sanity check, if this happens we are in big trouble
-		reagents.remove_reagent("synthflesh",being_built.reagents_list["synthflesh"]*prod_coeff)
+	if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff))	//sanity check, if this happens we are in big trouble
+		reagents.remove_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff)
 		var/buildpath = being_built.build_path
 		if(ispath(buildpath, /obj/item/bodypart))	//This feels like spatgheti code, but i need to initilise a limb somehow
 			build_limb(buildpath)
@@ -198,7 +198,7 @@
 
 	for(var/datum/reagent/R in reagents.reagent_list)
 		dat += "[R.name]: [R.volume]"
-		dat += "<A href='?src=[REF(src)];disposeI=[R.id]'>Purge</A><BR>"
+		dat += "<A href='?src=[REF(src)];disposeI=[R]'>Purge</A><BR>"
 
 	dat += "</div>"
 	return dat
@@ -208,12 +208,12 @@
 	return dat
 
 /obj/machinery/limbgrower/proc/can_build(datum/design/D)
-	return (reagents.has_reagent("synthflesh", D.reagents_list["synthflesh"]*prod_coeff)) //Return whether the machine has enough synthflesh to produce the design
+	return (reagents.has_reagent(/datum/reagent/medicine/synthflesh, D.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff)) //Return whether the machine has enough synthflesh to produce the design
 
 /obj/machinery/limbgrower/proc/get_design_cost(datum/design/D)
 	var/dat
 	if(D.reagents_list["synthflesh"])
-		dat += "[D.reagents_list["synthflesh"] * prod_coeff] Synthetic flesh "
+		dat += "[D.reagents_list[/datum/reagent/medicine/synthflesh] * prod_coeff] Synthetic flesh "
 	return dat
 
 /obj/machinery/limbgrower/emag_act(mob/user)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 4ed541ef10..c0f563d44d 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -18,6 +18,28 @@
 	. = ..()
 	update_icon()
 
+/obj/machinery/recharge_station/upgraded
+
+/obj/machinery/recharge_station/upgraded/Initialize()
+	. = ..()
+	component_parts = list()
+	component_parts += new /obj/item/circuitboard/machine/cyborgrecharger(null)
+	component_parts += new /obj/item/stock_parts/capacitor/super(null)
+	component_parts += new /obj/item/stock_parts/manipulator/pico(null)
+	component_parts += new /obj/item/stock_parts/cell/hyper(null)
+	RefreshParts()
+
+/obj/machinery/recharge_station/fullupgrade
+
+/obj/machinery/recharge_station/fullupgrade/Initialize()
+	. = ..()
+	component_parts = list()
+	component_parts += new /obj/item/circuitboard/machine/cyborgrecharger(null)
+	component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
+	component_parts += new /obj/item/stock_parts/manipulator/femto(null)
+	component_parts += new /obj/item/stock_parts/cell/bluespace(null)
+	RefreshParts()
+
 /obj/machinery/recharge_station/RefreshParts()
 	recharge_speed = 0
 	repairs = 0
diff --git a/modular_citadel/code/game/machinery/toylathe.dm b/code/game/machinery/toylathe.dm
similarity index 100%
rename from modular_citadel/code/game/machinery/toylathe.dm
rename to code/game/machinery/toylathe.dm
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index ae3fdb15b4..4d6c94ac88 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -191,11 +191,11 @@
 	if(!R || !patient || !SG || !(SG in chassis.equipment))
 		return 0
 	var/to_inject = min(R.volume, inject_amount)
-	if(to_inject && patient.reagents.get_reagent_amount(R.id) + to_inject <= inject_amount*2)
+	if(to_inject && patient.reagents.get_reagent_amount(R.type) + to_inject <= inject_amount*2)
 		occupant_message("Injecting [patient] with [to_inject] units of [R.name].")
 		log_message("Injecting [patient] with [to_inject] units of [R.name].")
 		log_combat(chassis.occupant, patient, "injected", "[name] ([R] - [to_inject] units)")
-		SG.reagents.trans_id_to(patient,R.id,to_inject)
+		SG.reagents.trans_id_to(patient,R.type,to_inject)
 		update_equip_info()
 	return
 
@@ -228,8 +228,8 @@
 	M.AdjustStun(-80)
 	M.AdjustKnockdown(-80)
 	M.AdjustUnconscious(-80)
-	if(M.reagents.get_reagent_amount("epinephrine") < 5)
-		M.reagents.add_reagent("epinephrine", 5)
+	if(M.reagents.get_reagent_amount(/datum/reagent/medicine/epinephrine) < 5)
+		M.reagents.add_reagent(/datum/reagent/medicine/epinephrine, 5)
 	chassis.use_power(energy_drain)
 	update_equip_info()
 
@@ -259,7 +259,7 @@
 	. = ..()
 	create_reagents(max_volume, NO_REACT)
 	syringes = new
-	known_reagents = list("epinephrine"="Epinephrine","charcoal"="Charcoal")
+	known_reagents = list(/datum/reagent/medicine/epinephrine = "Epinephrine", /datum/reagent/medicine/charcoal = "Charcoal")
 	processed_reagents = new
 
 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/detach()
@@ -330,8 +330,7 @@
 					if(M.can_inject(null, 1))
 						if(mechsyringe.reagents)
 							for(var/datum/reagent/A in mechsyringe.reagents.reagent_list)
-								R += A.id + " ("
-								R += num2text(A.volume) + "),"
+								R += "[A.name] ([num2text(A.volume)]"
 						mechsyringe.icon_state = initial(mechsyringe.icon_state)
 						mechsyringe.icon = initial(mechsyringe.icon)
 						mechsyringe.reagents.reaction(M, INJECT)
@@ -445,7 +444,7 @@
 	var/output
 	for(var/datum/reagent/R in reagents.reagent_list)
 		if(R.volume > 0)
-			output += "[R]: [round(R.volume,0.001)] - <a href=\"?src=[REF(src)];purge_reagent=[R.id]\">Purge Reagent</a><br />"
+			output += "[R]: [round(R.volume,0.001)] - <a href=\"?src=[REF(src)];purge_reagent=[R.type]\">Purge Reagent</a><br />"
 	if(output)
 		output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] - <a href=\"?src=[REF(src)];purge_all=1\">Purge All</a>"
 	return output || "None"
@@ -481,7 +480,7 @@
 		return 0
 	occupant_message("Analyzing reagents...")
 	for(var/datum/reagent/R in A.reagents.reagent_list)
-		if(R.can_synth && add_known_reagent(R.id,R.name))
+		if(R.can_synth && add_known_reagent(R.type,R.name))
 			occupant_message("Reagent analyzed, identified as [R.name] and added to database.")
 			send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form())
 	occupant_message("Analyzis complete.")
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 36708fcf90..30576a739d 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -171,7 +171,7 @@
 /obj/item/mecha_parts/mecha_equipment/extinguisher/Initialize()
 	. = ..()
 	create_reagents(1000)
-	reagents.add_reagent("water", 1000)
+	reagents.add_reagent(/datum/reagent/water, 1000)
 
 /obj/item/mecha_parts/mecha_equipment/extinguisher/action(atom/target) //copypasted from extinguisher. TODO: Rewrite from scratch.
 	if(!action_checks(target) || get_dist(chassis, target)>3)
@@ -262,14 +262,14 @@
 				occupant_message("Deconstructing [W]...")
 				if(do_after_cooldown(W))
 					chassis.spark_system.start()
-					W.ScrapeAway()
+					W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 					playsound(W, 'sound/items/deconstruct.ogg', 50, 1)
 			else if(isfloorturf(target))
 				var/turf/open/floor/F = target
 				occupant_message("Deconstructing [F]...")
 				if(do_after_cooldown(target))
 					chassis.spark_system.start()
-					F.ScrapeAway()
+					F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 					playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
 			else if (istype(target, /obj/machinery/door/airlock))
 				occupant_message("Deconstructing [target]...")
@@ -282,7 +282,7 @@
 				var/turf/open/space/S = target
 				occupant_message("Building Floor...")
 				if(do_after_cooldown(S))
-					S.PlaceOnTop(/turf/open/floor/plating)
+					S.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 					playsound(S, 'sound/items/deconstruct.ogg', 50, 1)
 					chassis.spark_system.start()
 			else if(isfloorturf(target))
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index 62a62b569d..dd335e8b37 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -286,10 +286,10 @@
 /obj/mecha/proc/mech_toxin_damage(mob/living/target)
 	playsound(src, 'sound/effects/spray2.ogg', 50, 1)
 	if(target.reagents)
-		if(target.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
-			target.reagents.add_reagent("cryptobiolin", force/2)
-		if(target.reagents.get_reagent_amount("toxin") + force < force*2)
-			target.reagents.add_reagent("toxin", force/2.5)
+		if(target.reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + force < force*2)
+			target.reagents.add_reagent(/datum/reagent/cryptobiolin, force/2)
+		if(target.reagents.get_reagent_amount(/datum/reagent/toxin) + force < force*2)
+			target.reagents.add_reagent(/datum/reagent/toxin, force/2.5)
 
 
 /obj/mecha/mech_melee_attack(obj/mecha/M)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 9c3df5395f..416644cada 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -107,7 +107,7 @@
 
 //Wrapper procs that handle sanity and user feedback
 /atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
-	if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored)
+	if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored || !user.can_buckle_others(M, src))
 		return FALSE
 
 	add_fingerprint(user)
diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm
index a4d0da1bbe..0c52f57ae9 100644
--- a/code/game/objects/effects/decals/cleanable/aliens.dm
+++ b/code/game/objects/effects/decals/cleanable/aliens.dm
@@ -9,7 +9,7 @@
 
 /obj/effect/decal/cleanable/blood/gibs/xeno
 	color = BLOOD_COLOR_XENO
-	gibs_reagent_id = "liquidxenogibs"
+	gibs_reagent_id = /datum/reagent/liquidgibs/xeno
 	gibs_bloodtype = "X*"
 
 /obj/effect/decal/cleanable/blood/gibs/xeno/Initialize(mapload, list/datum/disease/diseases)
diff --git a/code/game/objects/effects/decals/cleanable/gibs.dm b/code/game/objects/effects/decals/cleanable/gibs.dm
index 03eeca7d0b..9680dc2034 100644
--- a/code/game/objects/effects/decals/cleanable/gibs.dm
+++ b/code/game/objects/effects/decals/cleanable/gibs.dm
@@ -6,7 +6,7 @@
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
 	mergeable_decal = FALSE
 	var/body_colors = "#e3ba84"	//a default color just in case.
-	var/gibs_reagent_id = "liquidgibs"
+	var/gibs_reagent_id = /datum/reagent/liquidgibs
 	var/gibs_bloodtype = "A+"
 
 /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases)
@@ -120,7 +120,6 @@
 //Lizards
 /obj/effect/decal/cleanable/blood/gibs/human/lizard
 	body_colors = "117720"
-	gibs_reagent_id = "liquidgibs"
 	gibs_bloodtype = "L"
 
 /obj/effect/decal/cleanable/blood/gibs/human/lizard/Initialize(mapload, list/datum/disease/diseases)
@@ -148,7 +147,7 @@
 // Slime Gibs
 /obj/effect/decal/cleanable/blood/gibs/slime
 	desc = "They look gooey and gruesome."
-	gibs_reagent_id = "liquidslimegibs"
+	gibs_reagent_id = /datum/reagent/liquidgibs/slime
 	gibs_bloodtype = "GEL"
 
 /obj/effect/decal/cleanable/blood/gibs/slime/Initialize(mapload, list/datum/disease/diseases)
@@ -187,7 +186,7 @@
 
 /obj/effect/decal/cleanable/blood/gibs/synth
 	desc = "They look sludgy and disgusting."
-	gibs_reagent_id = "liquidsyntheticgibs"
+	gibs_reagent_id = /datum/reagent/liquidgibs/synth
 	gibs_bloodtype = "SY"
 
 /obj/effect/decal/cleanable/blood/gibs/synth/Initialize(mapload, list/datum/disease/diseases)
@@ -198,7 +197,7 @@
 /obj/effect/decal/cleanable/blood/gibs/ipc
 	desc = "They look sharp yet oozing."
 	body_colors = "00ff00"
-	gibs_reagent_id = "liquidoilgibs"
+	gibs_reagent_id = /datum/reagent/liquidgibs/oil
 	gibs_bloodtype = "HF"
 
 /obj/effect/decal/cleanable/blood/gibs/ipc/Initialize(mapload, list/datum/disease/diseases)
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 6f92e94759..6466ab594f 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -13,7 +13,7 @@
 
 /obj/effect/decal/cleanable/ash/Initialize()
 	. = ..()
-	reagents.add_reagent("ash", 30)
+	reagents.add_reagent(/datum/reagent/ash, 30)
 	pixel_x = rand(-5, 5)
 	pixel_y = rand(-5, 5)
 
@@ -27,7 +27,7 @@
 
 /obj/effect/decal/cleanable/ash/large/Initialize()
 	. = ..()
-	reagents.add_reagent("ash", 30) //double the amount of ash.
+	reagents.add_reagent(/datum/reagent/ash, 30) //double the amount of ash.
 
 /obj/effect/decal/cleanable/glass
 	name = "tiny shards"
@@ -131,12 +131,10 @@
 			playsound(get_turf(src), 'sound/items/drink.ogg', 50, 1) //slurp
 			H.visible_message("<span class='alert'>[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.</span>")
 			if(reagents)
-				for(var/datum/reagent/R in reagents.reagent_list)
-					if (istype(R, /datum/reagent/consumable))
-						var/datum/reagent/consumable/nutri_check = R
-						if(nutri_check.nutriment_factor >0)
-							H.nutrition += nutri_check.nutriment_factor * nutri_check.volume
-							reagents.remove_reagent(nutri_check.id,nutri_check.volume)
+				for(var/datum/reagent/consumable/R in reagents.reagent_list)
+					if(R.nutriment_factor > 0)
+						H.nutrition += R.nutriment_factor * R.volume
+						reagents.del_reagent(R.type)
 			reagents.trans_to(H, reagents.total_volume)
 			qdel(src)
 
diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
index 02bf51bdd9..3e94abbf93 100644
--- a/code/game/objects/effects/decals/cleanable/robots.dm
+++ b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -13,7 +13,7 @@
 
 /obj/effect/decal/cleanable/robot_debris/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
-	reagents.add_reagent("liquidoilgibs", 5)
+	reagents.add_reagent(/datum/reagent/liquidgibs, 5)
 
 /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions)
 	set waitfor = 0
@@ -53,8 +53,8 @@
 
 /obj/effect/decal/cleanable/oil/Initialize()
 	. = ..()
-	reagents.add_reagent("oil", 30)
-	reagents.add_reagent("liquidoilgibs", 5)
+	reagents.add_reagent(/datum/reagent/oil, 30)
+	reagents.add_reagent(/datum/reagent/liquidgibs/oil, 5)
 
 /obj/effect/decal/cleanable/oil/streak
 	random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 10ee73915c..da9c210234 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -55,7 +55,7 @@
 		var/obj/effect/decal/cleanable/plasma/P = (locate(/obj/effect/decal/cleanable/plasma) in get_turf(src))
 		if(!P)
 			P = new(loc)
-		P.reagents.add_reagent("stable_plasma", absorbed_plasma)
+		P.reagents.add_reagent(/datum/reagent/stable_plasma, absorbed_plasma)
 
 	flick("[icon_state]-disolve", src)
 	QDEL_IN(src, 5)
@@ -123,7 +123,7 @@
 	if(metal)
 		var/turf/T = get_turf(src)
 		if(isspaceturf(T)) //Block up any exposed space
-			T.PlaceOnTop(/turf/open/floor/plating/foam)
+			T.PlaceOnTop(/turf/open/floor/plating/foam, flags = CHANGETURF_INHERIT_AIR)
 		for(var/direction in GLOB.cardinals)
 			var/turf/cardinal_turf = get_step(T, direction)
 			if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index e01010baa5..0d4ca3d311 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -435,7 +435,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 
 //------Station Rooms Landmarks------------//
 /obj/effect/landmark/stationroom
-	var/list/template_names = list()
+	var/list/templates = list()
 	layer = BULLET_HOLE_LAYER
 
 /obj/effect/landmark/stationroom/New()
@@ -452,11 +452,11 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	if(!T)
 		return FALSE
 	if(!template_name)
-		for(var/t in template_names)
+		for(var/t in templates)
 			if(!SSmapping.station_room_templates[t])
 				log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
-				template_names -= t
-		template_name = safepick(template_names)
+				templates -= t
+		template_name = pickweight(templates)
 	if(!template_name)
 		GLOB.stationroom_landmarks -= src
 		qdel(src)
@@ -474,10 +474,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 // The landmark for the Engine on Box
 
 /obj/effect/landmark/stationroom/box/engine
-	template_names = list("Engine SM", "Engine Singulo", "Engine Tesla")
+	templates = list("Engine SM" = 3, "Engine Singulo" = 3, "Engine Tesla" = 3)
 	icon = 'icons/rooms/box/engine.dmi'
 
 
 /obj/effect/landmark/stationroom/box/engine/New()
 	. = ..()
-	template_names = CONFIG_GET(keyed_list/box_random_engine)
\ No newline at end of file
+	templates = CONFIG_GET(keyed_list/box_random_engine)
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 08f698e018..91133234d6 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -136,7 +136,7 @@
 	victim.put_in_hands(chainsaw, forced = TRUE)
 	chainsaw.attack_self(victim)
 	chainsaw.wield(victim)
-	victim.reagents.add_reagent("adminordrazine",25)
+	victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25)
 	to_chat(victim, "<span class='warning'>KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!</span>")
 
 	victim.client.color = pure_red
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a410827347..b50acb33af 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 	var/interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_PICKUP
 	//Citadel Edit for digitigrade stuff
-	var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+	var/mutantrace_variation = NONE //Are there special sprites for specific situations? Don't use this unless you need to.
 
 	var/item_color = null //this needs deprecating, soonish
 
diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index a68f2ecff6..ba0766de00 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -182,7 +182,7 @@ RSF
 	to_chat(user, "Fabricating Cookie..")
 	var/obj/item/reagent_containers/food/snacks/cookie/S = new /obj/item/reagent_containers/food/snacks/cookie(T)
 	if(toxin)
-		S.reagents.add_reagent("chloralhydrate", 10)
+		S.reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 10)
 	if (iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		R.cell.charge -= 100
diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm
index d8a21de35a..083246396b 100644
--- a/code/game/objects/items/airlock_painter.dm
+++ b/code/game/objects/items/airlock_painter.dm
@@ -68,7 +68,7 @@
 
 		// make some colorful reagent, and apply it to the lungs
 		L.create_reagents(10)
-		L.reagents.add_reagent("colorful_reagent", 10)
+		L.reagents.add_reagent(/datum/reagent/colorful_reagent, 10)
 		L.reagents.reaction(L, TOUCH, 1)
 
 		// TODO maybe add some colorful vomit?
@@ -81,7 +81,7 @@
 		return (TOXLOSS|OXYLOSS)
 	else if(can_use(user) && !L)
 		user.visible_message("<span class='suicide'>[user] is spraying toner on [user.p_them()]self from [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
-		user.reagents.add_reagent("colorful_reagent", 1)
+		user.reagents.add_reagent(/datum/reagent/colorful_reagent, 1)
 		user.reagents.reaction(user, TOUCH, 1)
 		return TOXLOSS
 
diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index 25ae182253..c725148d9a 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -120,4 +120,4 @@
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=50, MAT_GLASS=50)
-	grind_results = list("iron" = 10, "silicon" = 10)
+	grind_results = list(/datum/reagent/iron = 10, /datum/reagent/silicon = 10)
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index cf8d38d9c9..3838f90f9b 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -25,7 +25,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/smoketime = 5
 	w_class = WEIGHT_CLASS_TINY
 	heat = 1000
-	grind_results = list("phosphorus" = 2)
+	grind_results = list(/datum/reagent/phosphorus = 2)
 
 /obj/item/match/process()
 	smoketime--
@@ -113,7 +113,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/lastHolder = null
 	var/smoketime = 300
 	var/chem_volume = 30
-	var/list/list_reagents = list("nicotine" = 15)
+	var/list/list_reagents = list(/datum/reagent/drug/nicotine = 15)
 	heat = 1000
 
 /obj/item/clothing/mask/cigarette/suicide_act(mob/user)
@@ -169,15 +169,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	hitsound = 'sound/items/welder.ogg'
 	damtype = "fire"
 	force = 4
-	if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
+	if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
 		var/datum/effect_system/reagents_explosion/e = new()
-		e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
+		e.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) / 2.5, 1), get_turf(src), 0, 0)
 		e.start()
 		qdel(src)
 		return
-	if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
+	if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently
 		var/datum/effect_system/reagents_explosion/e = new()
-		e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
+		e.set_up(round(reagents.get_reagent_amount(/datum/reagent/fuel) / 5, 1), get_turf(src), 0, 0)
 		e.start()
 		qdel(src)
 		return
@@ -268,29 +268,29 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 /obj/item/clothing/mask/cigarette/uplift
 	desc = "An Uplift Smooth brand cigarette."
-	list_reagents = list("nicotine" = 7.5, "menthol" = 7.5)
+	list_reagents = list(/datum/reagent/drug/nicotine = 7.5, /datum/reagent/consumable/menthol = 7.5)
 
 /obj/item/clothing/mask/cigarette/robust
 	desc = "A Robust brand cigarette."
 
 /obj/item/clothing/mask/cigarette/robustgold
 	desc = "A Robust Gold brand cigarette."
-	list_reagents = list("nicotine" = 15, "gold" = 1)
+	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/gold = 1)
 
 /obj/item/clothing/mask/cigarette/carp
 	desc = "A Carp Classic brand cigarette."
 
 /obj/item/clothing/mask/cigarette/syndicate
 	desc = "An unknown brand cigarette."
-	list_reagents = list("nicotine" = 15, "omnizine" = 15)
+	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/medicine/omnizine = 15)
 
 /obj/item/clothing/mask/cigarette/shadyjims
 	desc = "A Shady Jim's Super Slims cigarette."
-	list_reagents = list("nicotine" = 15, "lipolicide" = 4, "ammonia" = 2, "plantbgone" = 1, "toxin" = 1.5)
+	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5)
 
 /obj/item/clothing/mask/cigarette/xeno
 	desc = "A Xeno Filtered brand cigarette."
-	list_reagents = list ("nicotine" = 20, "regen_jelly" = 15, "krokodil" = 4)
+	list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
 
 // Rollies.
 
@@ -313,17 +313,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	src.pixel_y = rand(-5, 5)
 
 /obj/item/clothing/mask/cigarette/rollie/nicotine
-	list_reagents = list("nicotine" = 15)
+	list_reagents = list(/datum/reagent/drug/nicotine = 15)
 
 /obj/item/clothing/mask/cigarette/rollie/trippy
-	list_reagents = list("nicotine" = 15, "mushroomhallucinogen" = 35)
+	list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/drug/mushroomhallucinogen = 35)
 	starts_lit = TRUE
 
 /obj/item/clothing/mask/cigarette/rollie/cannabis
-	list_reagents = list("space_drugs" = 15, "lipolicide" = 35)
+	list_reagents = list(/datum/reagent/drug/space_drugs = 15, /datum/reagent/toxin/lipolicide = 35)
 
 /obj/item/clothing/mask/cigarette/rollie/mindbreaker
-	list_reagents = list("mindbreaker" = 35, "lipolicide" = 15)
+	list_reagents = list(/datum/reagent/toxin/mindbreaker = 35, /datum/reagent/toxin/lipolicide = 15)
 
 /obj/item/cigbutt/roach
 	name = "roach"
@@ -377,7 +377,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_state = "cigbutt"
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
-	grind_results = list("carbon" = 2)
+	grind_results = list(/datum/reagent/carbon = 2)
 
 /obj/item/cigbutt/cigarbutt
 	name = "cigar butt"
@@ -506,7 +506,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 1500
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
-	grind_results = list("iron" = 1, "welding_fuel" = 5, "oil" = 5)
+	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
 
 /obj/item/lighter/Initialize()
 	. = ..()
@@ -665,7 +665,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	heat = 3000 //Blue flame!
 	light_color = LIGHT_COLOR_CYAN
 	overlay_state = "slime"
-	grind_results = list("iron" = 1, "welding_fuel" = 5, "pyroxadone" = 5)
+	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5)
 
 
 ///////////
@@ -719,7 +719,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/vape/Initialize(mapload, param_color)
 	. = ..()
 	create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
-	reagents.add_reagent("nicotine", 50)
+	reagents.add_reagent(/datum/reagent/drug/nicotine, 50)
 	if(!icon_state)
 		if(!param_color)
 			param_color = pick("red","blue","black","white","green","purple","yellow","orange")
@@ -810,14 +810,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 				reagents.reaction(C, INGEST, fraction)
 				if(!reagents.trans_to(C, REAGENTS_METABOLISM))
 					reagents.remove_any(REAGENTS_METABOLISM)
-				if(reagents.get_reagent_amount("welding_fuel"))
+				if(reagents.get_reagent_amount(/datum/reagent/fuel))
 					//HOT STUFF
 					C.fire_stacks = 2
 					C.IgniteMob()
 
-				if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
+				if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
 					var/datum/effect_system/reagents_explosion/e = new()
-					e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
+					e.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) / 2.5, 1), get_turf(src), 0, 0)
 					e.start()
 					qdel(src)
 				return
@@ -863,3 +863,205 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 	if(reagents && reagents.total_volume)
 		hand_reagents()
+
+///////////////
+/////BONGS/////
+///////////////
+
+/obj/item/bong
+	name = "bong"
+	desc = "A water bong used for smoking dried plants."
+	icon = 'icons/obj/bongs.dmi'
+	icon_state = null
+	item_state = null
+	w_class = WEIGHT_CLASS_NORMAL
+	light_color = "#FFCC66"
+	var/icon_off = "bong"
+	var/icon_on = "bong_lit"
+	var/chem_volume = 100
+	var/last_used_time //for cooldown
+	var/firecharges = 0 //used for counting how many hits can be taken before the flame goes out
+	var/list/list_reagents = list() //For the base reagents bongs could get
+
+
+/obj/item/bong/Initialize()
+	. = ..()
+	create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
+	reagents.add_reagent_list(list_reagents)
+	icon_state = icon_off
+
+/obj/item/bong/attackby(obj/item/O, mob/user, params)
+	. = ..()
+	//If we're using a dried plant..
+	if(istype(O,/obj/item/reagent_containers/food/snacks))
+		var/obj/item/reagent_containers/food/snacks/DP = O
+		if (DP.dry)
+			//Nothing if our bong is full
+			if (reagents.holder_full())
+				user.show_message("<span class='notice'>The bowl is full!</span>", MSG_VISUAL)
+				return
+
+			//Transfer reagents and remove the plant
+			user.show_message("<span class='notice'>You stuff the [DP] into the [src]'s bowl.</span>", MSG_VISUAL)
+			DP.reagents.trans_to(src, 100)
+			qdel(DP)
+			return
+		else
+			user.show_message("<span class='warning'>[DP] must be dried first!</span>", MSG_VISUAL)
+			return
+
+	if (O.get_temperature() <= 500)
+		return
+	if (reagents && reagents.total_volume) //if there's stuff in the bong
+		var/lighting_text = O.ignition_effect(src, user)
+		if(lighting_text)
+			//Logic regarding igniting it on
+			if (firecharges == 0)
+				user.show_message("<span class='notice'>You light the [src] with the [O]!</span>", MSG_VISUAL)
+				bongturnon()
+			else
+				user.show_message("<span class='notice'>You rekindle [src]'s flame with the [O]!</span>", MSG_VISUAL)
+
+			firecharges = 1
+			return
+	else
+		user.show_message("<span warning='notice'>There's nothing to light up in the bowl.</span>", MSG_VISUAL)
+		return
+
+/obj/item/bong/CtrlShiftClick(mob/user) //empty reagents on alt click
+	..()
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+
+	if (reagents && reagents.total_volume)
+		user.show_message("<span class='notice'>You empty the [src].</span>", MSG_VISUAL)
+		reagents.clear_reagents()
+		if(firecharges)
+			firecharges = 0
+			bongturnoff()
+	else
+		user.show_message("<span class='notice'>The [src] is already empty.</span>", MSG_VISUAL)
+
+/obj/item/bong/AltClick(mob/user)
+	..()
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+
+	if(firecharges)
+		firecharges = 0
+		bongturnoff()
+		user.show_message("<span class='notice'>You quench the flame.</span>", MSG_VISUAL)
+		return TRUE
+
+/obj/item/bong/examine(mob/user)
+	. = ..()
+	if(!reagents.total_volume)
+		. += "<span class='notice'>The bowl is empty.</span>"
+	else if (reagents.total_volume > 80)
+		. += "<span class='notice'>The bowl is filled to the brim.</span>"
+	else if (reagents.total_volume > 40)
+		. += "<span class='notice'>The bowl has plenty weed in it.</span>"
+	else
+		. += "<span class='notice'>The bowl has some weed in it.</span>"
+
+	. += "<span class='notice'>Ctrl+Shift-click to empty.</span>"
+	. += "<span class='notice'>Alt-click to extinguish.</span>"
+
+/obj/item/bong/ignition_effect(atom/A, mob/user)
+	if(firecharges)
+		. = "<span class='notice'>[user] lights [A] off of the [src].</span>"
+	else
+		. = ""
+
+/obj/item/bong/attack(mob/living/carbon/M, mob/living/carbon/user, obj/target)
+	//if it's lit up, some stuff in the bowl and the user is a target, and we're not on cooldown
+
+	if (M != user)
+		return ..()
+
+	if(user.is_mouth_covered(head_only = 1))
+		to_chat(user, "<span class='warning'>Remove your headgear first.</span>")
+		return ..()
+
+	if(user.is_mouth_covered(mask_only = 1))
+		to_chat(user, "<span class='warning'>Remove your mask first.</span>")
+		return ..()
+
+	if (!reagents.total_volume)
+		to_chat(user, "<span class='warning'>There's nothing in the bowl.</span>")
+		return ..()
+
+	if (!firecharges)
+		to_chat(user, "<span class='warning'>You have to light it up first.</span>")
+		return ..()
+
+	if (last_used_time + 30 >= world.time)
+		return ..()
+	var/hit_strength
+	var/noise
+	var/hittext = ""
+	//if the intent is help then you take a small hit, else a big one
+	if (user.a_intent == INTENT_HARM)
+		hit_strength = 2
+		noise = 100
+		hittext = "big hit"
+	else
+		hit_strength = 1
+		noise = 70
+		hittext = "hit"
+	//bubbling sound
+	playsound(user.loc,'sound/effects/bonghit.ogg', noise, 1)
+
+	last_used_time = world.time
+
+	//message
+	user.visible_message("<span class='notice'>[user] begins to take a [hittext] from the [src]!</span>", \
+								"<span class='notice'>You begin to take a [hittext] from [src].</span>")
+
+	//we take a hit here, after an uninterrupted delay
+	if(!do_after(user, 25, target = user))
+		return
+	if (!(reagents && reagents.total_volume))
+		return
+
+	var/fraction = 12 * hit_strength
+
+	var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new
+	s.set_up(reagents, hit_strength, 18, user.loc)
+	s.start()
+
+	reagents.reaction(user, INGEST, fraction)
+	if(!reagents.trans_to(user, fraction))
+		reagents.remove_any(fraction)
+
+	if (hit_strength == 2 && prob(15))
+		user.emote("cough")
+		user.adjustOxyLoss(15)
+
+	user.visible_message("<span class='notice'>[user] takes a [hittext] from the [src]!</span>", \
+							"<span class='notice'>You take a [hittext] from [src].</span>")
+
+	firecharges = firecharges - 1
+	if (!firecharges)
+		bongturnoff()
+	if (!reagents.total_volume)
+		firecharges = 0
+		bongturnoff()
+
+
+
+/obj/item/bong/proc/bongturnon()
+	icon_state = icon_on
+	set_light(3, 0.8)
+
+/obj/item/bong/proc/bongturnoff()
+	icon_state = icon_off
+	set_light(0, 0.0)
+
+
+
+/obj/item/bong/coconut
+	name = "coconut bong"
+	icon_off = "coconut_bong"
+	icon_on = "coconut_bong_lit"
+	desc = "A water bong used for smoking dried plants. This one's made out of a coconut and some bamboo."
\ No newline at end of file
diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm
index 8106733ac6..5f87f9ffd9 100644
--- a/code/game/objects/items/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/circuitboards/circuitboard.dm
@@ -12,7 +12,7 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	materials = list(MAT_GLASS=1000)
 	w_class = WEIGHT_CLASS_SMALL
-	grind_results = list("silicon" = 20)
+	grind_results = list(/datum/reagent/silicon = 20)
 	var/build_path = null
 
 /obj/item/circuitboard/proc/apply_default_parts(obj/machinery/M)
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 2b942b36ec..1c2f9a76bb 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -260,9 +260,8 @@
 		var/position = vending_names_paths.Find(build_path)
 		position = (position == vending_names_paths.len) ? 1 : (position + 1)
 		var/typepath = vending_names_paths[position]
-
-		to_chat(user, "<span class='notice'>You set the board to \"[vending_names_paths[typepath]]\".</span>")
 		set_type(typepath)
+		to_chat(user, "<span class='notice'>You set the board to \"[vending_names_paths[typepath]]\".</span>")
 	else
 		return ..()
 
@@ -1001,3 +1000,16 @@
 		/obj/item/stock_parts/capacitor = 1,
 		/obj/item/stack/cable_coil = 5,
 		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems
+
+/obj/item/circuitboard/machine/kinkmate
+	name = "Kinkmate Vendor (Machine Board)"
+	build_path = /obj/machinery/vending/kink
+	req_components = list(/obj/item/vending_refill/kink = 1)
+
+/obj/item/circuitboard/machine/autoylathe
+	name = "Autoylathe (Machine Board)"
+	build_path = /obj/machinery/autoylathe
+	req_components = list(
+		/obj/item/stock_parts/matter_bin = 3,
+		/obj/item/stock_parts/manipulator = 1,
+		/obj/item/stack/sheet/glass = 1)
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index 0ff54d884f..26c992b0bc 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -23,7 +23,7 @@
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 7
-	grind_results = list("lye" = 10)
+	grind_results = list(/datum/reagent/lye = 10)
 	var/cleanspeed = 50 //slower than mop
 	force_string = "robust... against germs"
 
@@ -180,4 +180,4 @@
 	name = "Canned Laughter"
 	desc = "Just looking at this makes you want to giggle."
 	icon_state = "laughter"
-	list_reagents = list("laughter" = 50)
\ No newline at end of file
+	list_reagents = list(/datum/reagent/consumable/laughter = 50)
\ No newline at end of file
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 41ab418cf2..143354b496 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -59,7 +59,7 @@
 
 	var/edible = TRUE // That doesn't mean eating it is a good idea
 
-	var/list/reagent_contents = list("nutriment" = 1)
+	var/list/reagent_contents = list(/datum/reagent/consumable/nutriment = 1)
 	// If the user can toggle the colour, a la vanilla spraycan
 	var/can_change_colour = FALSE
 
@@ -485,63 +485,63 @@
 	icon_state = "crayonred"
 	paint_color = "#DA0000"
 	item_color = "red"
-	reagent_contents = list("nutriment" = 1, "redcrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
 
 /obj/item/toy/crayon/orange
 	icon_state = "crayonorange"
 	paint_color = "#FF9300"
 	item_color = "orange"
-	reagent_contents = list("nutriment" = 1, "orangecrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/orange = 1)
 
 /obj/item/toy/crayon/yellow
 	icon_state = "crayonyellow"
 	paint_color = "#FFF200"
 	item_color = "yellow"
-	reagent_contents = list("nutriment" = 1, "yellowcrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/yellow = 1)
 
 /obj/item/toy/crayon/green
 	icon_state = "crayongreen"
 	paint_color = "#A8E61D"
 	item_color = "green"
-	reagent_contents = list("nutriment" = 1, "greencrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/green = 1)
 
 /obj/item/toy/crayon/blue
 	icon_state = "crayonblue"
 	paint_color = "#00B7EF"
 	item_color = "blue"
-	reagent_contents = list("nutriment" = 1, "bluecrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)
 
 /obj/item/toy/crayon/purple
 	icon_state = "crayonpurple"
 	paint_color = "#DA00FF"
 	item_color = "purple"
-	reagent_contents = list("nutriment" = 1, "purplecrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/purple = 1)
 
 /obj/item/toy/crayon/black
 	icon_state = "crayonblack"
 	paint_color = "#1C1C1C" //Not completely black because total black looks bad. So Mostly Black.
 	item_color = "black"
-	reagent_contents = list("nutriment" = 1, "blackcrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/black = 1)
 
 /obj/item/toy/crayon/white
 	icon_state = "crayonwhite"
 	paint_color = "#FFFFFF"
 	item_color = "white"
-	reagent_contents = list("nutriment" = 1, "whitecrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
 
 /obj/item/toy/crayon/mime
 	icon_state = "crayonmime"
 	desc = "A very sad-looking crayon."
 	paint_color = "#FFFFFF"
 	item_color = "mime"
-	reagent_contents = list("nutriment" = 1, "invisiblecrayonpowder" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent/crayonpowder/invisible = 1)
 	charges = -1
 
 /obj/item/toy/crayon/rainbow
 	icon_state = "crayonrainbow"
 	paint_color = "#FFF000"
 	item_color = "rainbow"
-	reagent_contents = list("nutriment" = 1, "colorful_reagent" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent = 1)
 	drawtype = RANDOM_ANY // just the default starter.
 
 	charges = -1
@@ -621,7 +621,7 @@
 	can_change_colour = TRUE
 	gang = TRUE //Gang check is true for all things upon the honored hierarchy of spraycans, except those that are FALSE.
 
-	reagent_contents = list("welding_fuel" = 1, "ethanol" = 1)
+	reagent_contents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol = 1)
 
 	pre_noise = TRUE
 	post_noise = FALSE
@@ -778,7 +778,7 @@
 
 	volume_multiplier = 25
 	charges = 100
-	reagent_contents = list("clf3" = 1)
+	reagent_contents = list(/datum/reagent/clf3 = 1)
 	actually_paints = FALSE
 	paint_color = "#000000"
 
@@ -791,7 +791,7 @@
 	use_overlays = FALSE
 	gang = FALSE
 
-	reagent_contents = list("lube" = 1, "banana" = 1)
+	reagent_contents = list(/datum/reagent/lube = 1, /datum/reagent/consumable/banana = 1)
 	volume_multiplier = 5
 
 /obj/item/toy/crayon/spraycan/lubecan/isValidSurface(surface)
@@ -811,7 +811,7 @@
 
 	pre_noise = FALSE
 	post_noise = FALSE
-	reagent_contents = list("nothing" = 1, "mutetoxin" = 1)
+	reagent_contents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/toxin/mutetoxin = 1)
 
 /obj/item/toy/crayon/spraycan/gang
 	charges = 20 // Charges back to 20, which is the default value for them.
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index d97c07bf87..ccffa413a6 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -700,10 +700,10 @@ GLOBAL_LIST_EMPTY(PDAs)
 		U << browse(null, "window=pda")
 	return
 
-/obj/item/pda/proc/remove_id()
-	if(issilicon(usr) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+/obj/item/pda/proc/remove_id(mob/user)
+	if(issilicon(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
-	do_remove_id(usr)
+	do_remove_id(user)
 
 /obj/item/pda/proc/do_remove_id(mob/user)
 	if(!id)
@@ -827,23 +827,23 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P)
 	send_message(U,list(P))
 
-/obj/item/pda/AltClick()
+/obj/item/pda/AltClick(mob/user)
 	. = ..()
 	if(id)
-		remove_id()
+		remove_id(user)
 		playsound(src, 'sound/machines/terminal_eject_disc.ogg', 50, 1)
 	else
-		remove_pen()
+		remove_pen(user)
 		playsound(src, 'sound/machines/button4.ogg', 50, 1)
 	return TRUE
 
-/obj/item/pda/CtrlClick()
+/obj/item/pda/CtrlClick(mob/user)
 	..()
 
 	if(isturf(loc)) //stops the user from dragging the PDA by ctrl-clicking it.
 		return
 
-	remove_pen()
+	remove_pen(user)
 
 /obj/item/pda/verb/verb_toggle_light()
 	set category = "Object"
@@ -857,7 +857,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	set src in usr
 
 	if(id)
-		remove_id()
+		remove_id(usr)
 	else
 		to_chat(usr, "<span class='warning'>This PDA does not have an ID in it!</span>")
 
@@ -896,7 +896,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/proc/id_check(mob/user, obj/item/card/id/I)
 	if(!I)
 		if(id && (src in user.contents))
-			remove_id()
+			remove_id(user)
 			return TRUE
 		else
 			var/obj/item/card/id/C = user.get_active_held_item()
diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm
index 9b4842b291..748c494737 100644
--- a/code/game/objects/items/devices/dogborg_sleeper.dm
+++ b/code/game/objects/items/devices/dogborg_sleeper.dm
@@ -12,7 +12,8 @@
 	var/cleaning = FALSE
 	var/cleaning_cycles = 10
 	var/patient_laststat = null
-	var/list/injection_chems = list("antitoxin", "epinephrine", "salbutamol", "bicaridine", "kelotane")
+	var/list/injection_chems = list(/datum/reagent/medicine/antitoxin, /datum/reagent/medicine/epinephrine,
+								/datum/reagent/medicine/salbutamol, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/kelotane)
 	var/eject_port = "ingestion"
 	var/escape_in_progress = FALSE
 	var/message_cooldown
@@ -183,7 +184,7 @@
 		data["chem"] = list()
 		for(var/chem in injection_chems)
 			var/datum/reagent/R = GLOB.chemical_reagents_list[chem]
-			data["chem"] += list(list("name" = R.name, "id" = R.id))
+			data["chem"] += list(list("name" = R.name, "id" = R.type))
 
 	data["occupant"] = list()
 	var/mob/living/mob_occupant = patient
@@ -227,8 +228,8 @@
 			go_out(null, usr)
 			. = TRUE
 		if("inject")
-			var/chem = params["chem"]
-			if(!patient)
+			var/chem = text2path(params["chem"])
+			if(!patient || !chem)
 				return
 			inject_chem(chem, usr)
 			. = TRUE
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index c861ac1512..7313ba8ff2 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -267,7 +267,7 @@
 	var/produce_heat = 1500
 	heat = 1000
 	light_color = LIGHT_COLOR_FLARE
-	grind_results = list("sulfur" = 15)
+	grind_results = list(/datum/reagent/sulfur = 15)
 
 /obj/item/flashlight/flare/New()
 	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
@@ -430,7 +430,7 @@
 	color = LIGHT_COLOR_GREEN
 	icon_state = "glowstick"
 	item_state = "glowstick"
-	grind_results = list("phenol" = 15, "hydrogen" = 10, "oxygen" = 5) //Meth-in-a-stick
+	grind_results = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10, /datum/reagent/oxygen = 5) //Meth-in-a-stick
 	rad_flags = RAD_NO_CONTAMINATE
 	var/fuel = 0
 
diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm
index 0c73d829ff..bf9c5daccd 100644
--- a/code/game/objects/items/devices/forcefieldprojector.dm
+++ b/code/game/objects/items/devices/forcefieldprojector.dm
@@ -2,7 +2,7 @@
 	name = "forcefield projector"
 	desc = "An experimental device that can create several forcefields at a distance."
 	icon = 'icons/obj/device.dmi'
-	icon_state = "signmaker_engi"
+	icon_state = "signmaker_forcefield"
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	item_flags = NOBLUDGEON
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 7dc2f1d60b..3ee4a14a91 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -8,7 +8,8 @@
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
 	var/mob/living/silicon/pai/pai
-	resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	max_integrity = 200
 
 /obj/item/paicard/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!</span>")
@@ -45,6 +46,8 @@
 			dat += "<b>Radio Uplink</b><br>"
 			dat += "Transmit: <A href='byond://?src=[REF(src)];wires=[WIRE_TX]'>[(pai.radio.wires.is_cut(WIRE_TX)) ? "Disabled" : "Enabled"]</A><br>"
 			dat += "Receive: <A href='byond://?src=[REF(src)];wires=[WIRE_RX]'>[(pai.radio.wires.is_cut(WIRE_RX)) ? "Disabled" : "Enabled"]</A><br>"
+			if(pai.radio_short)
+				dat += "<font color='red'>Reset radio short: <a href='byond://?src=[REF(src)];reset_radio_short=1'>\[RESET\]</a><br>"
 		else
 			dat += "<b>Radio Uplink</b><br>"
 			dat += "<font color=red><i>Radio firmware not loaded. Please install a pAI personality to load firmware.</i></font><br>"
@@ -82,7 +85,6 @@
 				pai.master = M.real_name
 				pai.master_dna = M.dna.unique_enzymes
 				to_chat(pai, "<span class='notice'>You have been bound to a new master.</span>")
-				pai.emittersemicd = FALSE
 		if(href_list["wipe"])
 			var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
 			if(confirm == "Yes")
@@ -96,6 +98,8 @@
 			var/wire = text2num(href_list["wires"])
 			if(pai.radio)
 				pai.radio.wires.cut(wire)
+		if(href_list["reset_radio_short"])
+			pai.unshort_radio()
 		if(href_list["setlaws"])
 			var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1]) as message),1,MAX_MESSAGE_LEN)
 			if(newlaws && pai)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 29009a88f7..c56c1e3eb5 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -265,7 +265,7 @@ SLIME SCANNER
 						temp_message += " <span class='info'>Subject has abnormal brain fuctions.</span>"
 
 					//Astrogen shenanigans
-					if(H.reagents.has_reagent("astral"))
+					if(H.reagents.has_reagent(/datum/reagent/fermi/astral))
 						if(H.mind)
 							temp_message += " <span class='danger'>Warning: subject may be possesed.</span>"
 						else
@@ -468,19 +468,18 @@ SLIME SCANNER
 			else
 				msg += "<span class='notice'>Subject is not addicted to any reagents.</span>\n"
 
-			if(M.reagents.has_reagent("fermiTox"))
-				var/datum/reagent/fermiTox = M.reagents.has_reagent("fermiTox")
-				switch(fermiTox.volume)
-					if(5 to 10)
-						msg += "<span class='notice'>Subject contains a low amount of toxic isomers.</span>\n"
-					if(10 to 25)
-						msg += "<span class='danger'>Subject contains toxic isomers.</span>\n"
-					if(25 to 50)
-						msg += "<span class='danger'>Subject contains a substantial amount of toxic isomers.</span>\n"
-					if(50 to 95)
-						msg += "<span class='danger'>Subject contains a high amount of toxic isomers.</span>\n"
-					if(95 to INFINITY)
-						msg += "<span class='danger'>Subject contains a extremely dangerous amount of toxic isomers.</span>\n"
+			var/datum/reagent/impure/fermiTox/F = M.reagents.has_reagent(/datum/reagent/impure/fermiTox)
+			switch(F?.volume)
+				if(5 to 10)
+					msg += "<span class='notice'>Subject contains a low amount of toxic isomers.</span>\n"
+				if(10 to 25)
+					msg += "<span class='danger'>Subject contains toxic isomers.</span>\n"
+				if(25 to 50)
+					msg += "<span class='danger'>Subject contains a substantial amount of toxic isomers.</span>\n"
+				if(50 to 95)
+					msg += "<span class='danger'>Subject contains a high amount of toxic isomers.</span>\n"
+				if(95 to INFINITY)
+					msg += "<span class='danger'>Subject contains a extremely dangerous amount of toxic isomers.</span>\n"
 
 			msg += "*---------*</span>"
 			to_chat(user, msg)
@@ -522,7 +521,7 @@ SLIME SCANNER
 	throw_range = 7
 	tool_behaviour = TOOL_ANALYZER
 	materials = list(MAT_METAL=30, MAT_GLASS=20)
-	grind_results = list("mercury" = 5, "iron" = 5, "silicon" = 5)
+	grind_results = list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
 	var/cooldown = FALSE
 	var/cooldown_time = 250
 	var/accuracy // 0 is the best accuracy.
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index b69d32617f..4585685cde 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -17,7 +17,7 @@
 	resistance_flags = FIRE_PROOF
 	var/max_water = 50
 	var/last_use = 1
-	var/chem = "water"
+	var/chem = /datum/reagent/water
 	var/safety = TRUE
 	var/refilling = FALSE
 	var/tanktype = /obj/structure/reagent_dispensers/watertank
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 76d3a9fbf5..b5fee4e8d7 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -332,9 +332,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("aluminium", 30)
-	B2.reagents.add_reagent("foaming_agent", 10)
-	B2.reagents.add_reagent("facid", 10)
+	B1.reagents.add_reagent(/datum/reagent/aluminium, 30)
+	B2.reagents.add_reagent(/datum/reagent/foaming_agent, 10)
+	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 10)
 
 	beakers += B1
 	beakers += B2
@@ -350,9 +350,9 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("aluminium", 75)
-	B2.reagents.add_reagent("smart_foaming_agent", 25)
-	B2.reagents.add_reagent("facid", 25)
+	B1.reagents.add_reagent(/datum/reagent/aluminium, 75)
+	B2.reagents.add_reagent(/datum/reagent/smart_foaming_agent, 25)
+	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 25)
 
 	beakers += B1
 	beakers += B2
@@ -368,9 +368,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("phosphorus", 25)
-	B2.reagents.add_reagent("stable_plasma", 25)
-	B2.reagents.add_reagent("sacid", 25)
+	B1.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+	B2.reagents.add_reagent(/datum/reagent/stable_plasma, 25)
+	B2.reagents.add_reagent(/datum/reagent/toxin/acid, 25)
 
 	beakers += B1
 	beakers += B2
@@ -386,10 +386,10 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("plantbgone", 25)
-	B1.reagents.add_reagent("potassium", 25)
-	B2.reagents.add_reagent("phosphorus", 25)
-	B2.reagents.add_reagent("sugar", 25)
+	B1.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
+	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
 
 	beakers += B1
 	beakers += B2
@@ -405,9 +405,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("fluorosurfactant", 40)
-	B2.reagents.add_reagent("water", 40)
-	B2.reagents.add_reagent("cleaner", 10)
+	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
+	B2.reagents.add_reagent(/datum/reagent/water, 40)
+	B2.reagents.add_reagent(/datum/reagent/space_cleaner, 10)
 
 	beakers += B1
 	beakers += B2
@@ -423,9 +423,9 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
 
-	B1.reagents.add_reagent("fluorosurfactant", 40)
-	B2.reagents.add_reagent("water", 40)
-	B2.reagents.add_reagent("ez_clean", 60) //ensures a  t h i c c  distribution
+	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 40)
+	B2.reagents.add_reagent(/datum/reagent/water, 40)
+	B2.reagents.add_reagent(/datum/reagent/space_cleaner/ez_clean, 60) //ensures a  t h i c c  distribution
 
 	beakers += B1
 	beakers += B2
@@ -442,10 +442,10 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
 
-	B1.reagents.add_reagent("condensedcapsaicin", 60)
-	B1.reagents.add_reagent("potassium", 40)
-	B2.reagents.add_reagent("phosphorus", 40)
-	B2.reagents.add_reagent("sugar", 40)
+	B1.reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 60)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 40)
+	B2.reagents.add_reagent(/datum/reagent/phosphorus, 40)
+	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 40)
 
 	beakers += B1
 	beakers += B2
@@ -461,11 +461,11 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
 
-	B1.reagents.add_reagent("facid", 290)
-	B1.reagents.add_reagent("potassium", 10)
-	B2.reagents.add_reagent("phosphorus", 10)
-	B2.reagents.add_reagent("sugar", 10)
-	B2.reagents.add_reagent("facid", 280)
+	B1.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 290)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 10)
+	B2.reagents.add_reagent(/datum/reagent/phosphorus, 10)
+	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 10)
+	B2.reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 280)
 
 	beakers += B1
 	beakers += B2
@@ -481,10 +481,10 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("colorful_reagent", 25)
-	B1.reagents.add_reagent("potassium", 25)
-	B2.reagents.add_reagent("phosphorus", 25)
-	B2.reagents.add_reagent("sugar", 25)
+	B1.reagents.add_reagent(/datum/reagent/colorful_reagent, 25)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
+	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
 
 	beakers += B1
 	beakers += B2
@@ -493,7 +493,7 @@
 	name = "generic glitter grenade"
 	desc = "You shouldn't see this description."
 	stage = READY
-	var/glitter_type = "glitter"
+	var/glitter_type = /datum/reagent/glitter
 
 /obj/item/grenade/chem_grenade/glitter/Initialize()
 	. = ..()
@@ -501,9 +501,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
 	B1.reagents.add_reagent(glitter_type, 25)
-	B1.reagents.add_reagent("potassium", 25)
-	B2.reagents.add_reagent("phosphorus", 25)
-	B2.reagents.add_reagent("sugar", 25)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 25)
+	B2.reagents.add_reagent(/datum/reagent/phosphorus, 25)
+	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 25)
 
 	beakers += B1
 	beakers += B2
@@ -511,17 +511,17 @@
 /obj/item/grenade/chem_grenade/glitter/pink
 	name = "pink glitter bomb"
 	desc = "For that HOT glittery look."
-	glitter_type = "pink_glitter"
+	glitter_type = /datum/reagent/glitter/pink
 
 /obj/item/grenade/chem_grenade/glitter/blue
 	name = "blue glitter bomb"
 	desc = "For that COOL glittery look."
-	glitter_type = "blue_glitter"
+	glitter_type = /datum/reagent/glitter/blue
 
 /obj/item/grenade/chem_grenade/glitter/white
 	name = "white glitter bomb"
 	desc = "For that somnolent glittery look."
-	glitter_type = "white_glitter"
+	glitter_type = /datum/reagent/glitter/white
 
 /obj/item/grenade/chem_grenade/clf3
 	name = "clf3 grenade"
@@ -533,10 +533,10 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
 
-	B1.reagents.add_reagent("fluorosurfactant", 250)
-	B1.reagents.add_reagent("clf3", 50)
-	B2.reagents.add_reagent("water", 250)
-	B2.reagents.add_reagent("clf3", 50)
+	B1.reagents.add_reagent(/datum/reagent/fluorosurfactant, 250)
+	B1.reagents.add_reagent(/datum/reagent/clf3, 50)
+	B2.reagents.add_reagent(/datum/reagent/water, 250)
+	B2.reagents.add_reagent(/datum/reagent/clf3, 50)
 
 	beakers += B1
 	beakers += B2
@@ -551,13 +551,13 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
 
-	B1.reagents.add_reagent("cryptobiolin", 75)
-	B1.reagents.add_reagent("water", 50)
-	B1.reagents.add_reagent("mutetoxin", 50)
-	B1.reagents.add_reagent("spore", 75)
-	B1.reagents.add_reagent("itching_powder", 50)
-	B2.reagents.add_reagent("fluorosurfactant", 150)
-	B2.reagents.add_reagent("mutagen", 150)
+	B1.reagents.add_reagent(/datum/reagent/cryptobiolin, 75)
+	B1.reagents.add_reagent(/datum/reagent/water, 50)
+	B1.reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 50)
+	B1.reagents.add_reagent(/datum/reagent/toxin/spore, 75)
+	B1.reagents.add_reagent(/datum/reagent/toxin/itching_powder, 50)
+	B2.reagents.add_reagent(/datum/reagent/fluorosurfactant, 150)
+	B2.reagents.add_reagent(/datum/reagent/toxin/mutagen, 150)
 	beakers += B1
 	beakers += B2
 
@@ -571,11 +571,11 @@
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
 
-	B1.reagents.add_reagent("potassium", 50)
-	B1.reagents.add_reagent("phosphorus", 50)
-	B1.reagents.add_reagent("fungalspores", 200)
-	B2.reagents.add_reagent("blood", 250)
-	B2.reagents.add_reagent("sugar", 50)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 50)
+	B1.reagents.add_reagent(/datum/reagent/phosphorus, 50)
+	B1.reagents.add_reagent(/datum/reagent/fungalspores, 200)
+	B2.reagents.add_reagent(/datum/reagent/blood, 250)
+	B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 50)
 
 	beakers += B1
 	beakers += B2
@@ -591,8 +591,8 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
 
-	B1.reagents.add_reagent("potassium", 100)
-	B2.reagents.add_reagent("holywater", 100)
+	B1.reagents.add_reagent(/datum/reagent/potassium, 100)
+	B2.reagents.add_reagent(/datum/reagent/water/holywater, 100)
 
 	beakers += B1
 	beakers += B2
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 923361de3c..c16b4a30a1 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -94,11 +94,11 @@
 		var/chem = pick(slime_chems)
 		var/amount = 5
 		if(chem == "lesser plasma") //In the rare case we get another rainbow.
-			chem = "plasma"
+			chem = /datum/reagent/toxin/plasma
 			amount = 4
 		if(chem == "holy water and uranium")
-			chem = "uranium"
-			reagents.add_reagent("holywater")
+			chem = /datum/reagent/uranium
+			reagents.add_reagent(/datum/reagent/water/holywater)
 		reagents.add_reagent(chem,amount)
 
 /obj/effect/payload_spawner/random_slime/spawn_payload(type, numspawned)
diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm
index 66897fa722..724cfc8f9d 100644
--- a/code/game/objects/items/grenades/flashbang.dm
+++ b/code/game/objects/items/grenades/flashbang.dm
@@ -20,10 +20,10 @@
 /obj/item/grenade/flashbang/proc/flashbang_mobs(turf/source, range)
 	var/list/banged = get_hearers_in_view(range, source)
 	var/list/flashed = viewers(range, source)
-	for(var/i in banged)
-		bang(i, source)
-	for(var/i in flashed)
-		flash(i, source)
+	for(var/mob/living/l in banged)
+		bang(l, source)
+	for(var/mob/living/l in flashed)
+		flash(l, source)
 
 /obj/item/grenade/flashbang/proc/bang(mob/living/M, turf/source)
 	if(M.stat == DEAD)	//They're dead!
diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm
index 78881d901e..eb58089293 100644
--- a/code/game/objects/items/holosign_creator.dm
+++ b/code/game/objects/items/holosign_creator.dm
@@ -79,7 +79,7 @@
 /obj/item/holosign_creator/atmos
 	name = "ATMOS holofan projector"
 	desc = "A holographic projector that creates holographic barriers that prevent changes in atmosphere conditions."
-	icon_state = "signmaker_engi"
+	icon_state = "signmaker_atmos"
 	holosign_type = /obj/structure/holosign/barrier/atmos
 	creation_time = 0
 	max_signs = 3
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 7a83893f8b..5367f3461c 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -308,7 +308,7 @@
 	block_chance = 50
 	var/shield_icon = "shield-red"
 
-/obj/item/nullrod/staff/worn_overlays(isinhands)
+/obj/item/nullrod/staff/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = list()
 	if(isinhands)
 		. += mutable_appearance('icons/effects/effects.dmi', shield_icon, MOB_LAYER + 0.01)
@@ -479,10 +479,10 @@
 
 	possessed = TRUE
 
-	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
+	var/list/mob/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
 
 	if(LAZYLEN(candidates))
-		var/mob/dead/observer/C = pick(candidates)
+		var/mob/C = pick(candidates)
 		var/mob/living/simple_animal/shade/S = new(src)
 		S.real_name = name
 		S.name = name
@@ -789,7 +789,7 @@
 
 	praying = TRUE
 	if(do_after(user, 20, target = M))
-		M.reagents?.add_reagent("holywater", 5)
+		M.reagents?.add_reagent(/datum/reagent/water/holywater, 5)
 		to_chat(M, "<span class='notice'>[user]'s prayer to [deity_name] has eased your pain!</span>")
 		M.adjustToxLoss(-5, TRUE, TRUE)
 		M.adjustOxyLoss(-5)
diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm
index 40f2741a17..16ac2ad692 100644
--- a/code/game/objects/items/hot_potato.dm
+++ b/code/game/objects/items/hot_potato.dm
@@ -75,7 +75,7 @@
 			L.SetKnockdown(0)
 			L.SetSleeping(0)
 			L.SetUnconscious(0)
-			L.reagents.add_reagent("muscle_stimulant", CLAMP(5 - L.reagents.get_reagent_amount("muscle_stimulant"), 0, 5))	//If you don't have legs or get bola'd, tough luck!
+			L.reagents.add_reagent(/datum/reagent/medicine/muscle_stimulant, CLAMP(5 - L.reagents.get_reagent_amount(/datum/reagent/medicine/muscle_stimulant), 0, 5))	//If you don't have legs or get bola'd, tough luck!
 			colorize(L)
 
 /obj/item/hot_potato/examine(mob/user)
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 75b0c67798..6cdc5ee824 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -33,7 +33,7 @@
 /obj/item/implant/adrenalin/activate()
 	. = ..()
 	uses--
-	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "regen_jelly" = 10, "stimulants" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
+	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/medicine/inaprovaline = 3, /datum/reagent/medicine/synaptizine = 10, /datum/reagent/medicine/regen_jelly = 10, /datum/reagent/medicine/stimulants = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
 	to_chat(imp_in, "<span class='notice'>You feel a sudden surge of energy!</span>")
 	if(!uses)
 		qdel(src)
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index ef2aa825e7..6665d91c2b 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -41,10 +41,10 @@
 	if(forkload)
 		if(M == user)
 			M.visible_message("<span class='notice'>[user] eats a delicious forkful of omelette!</span>")
-			M.reagents.add_reagent(forkload.id, 1)
+			M.reagents.add_reagent(forkload.type, 1)
 		else
 			M.visible_message("<span class='notice'>[user] feeds [M] a delicious forkful of omelette!</span>")
-			M.reagents.add_reagent(forkload.id, 1)
+			M.reagents.add_reagent(forkload.type, 1)
 		icon_state = "fork"
 		forkload = null
 
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 16262d61c3..4d60716d0c 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -339,7 +339,7 @@
 	. = ..()
 	. += "<span class='notice'>Alt-click to recolor it.</span>"
 
-/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
+/obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(active)
 		if(isinhands)
@@ -374,7 +374,7 @@
 			It appears to have a wooden grip and a shaved down guard."
 	icon_state = "cxsword_hilt_traitor"
 	force_on = 30
-	armour_penetration = 50
+	armour_penetration = 35
 	embedding = list("embedded_pain_multiplier" = 10, "embed_chance" = 75, "embedded_fall_chance" = 0, "embedded_impact_pain_multiplier" = 10)
 	block_chance = 50
 	hitsound_on = 'sound/weapons/blade1.ogg'
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index d8abff70a6..4242fb6c4b 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -216,10 +216,11 @@
 			return
 	else
 		if(last_hit < world.time)
+			if(target.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+				playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
+				return
 			if(ishuman(target))
 				var/mob/living/carbon/human/H = target
-				if (H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
-					return
 				if(check_martial_counter(H, user))
 					return
 			playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index 5d384a9346..a8b28f2544 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -25,7 +25,7 @@
 
 
 /obj/item/mop/proc/clean(turf/A)
-	if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1) || reagents.has_reagent("cleaner", 1))
+	if(reagents.has_reagent(/datum/reagent/water, 1) || reagents.has_reagent(/datum/reagent/water/holywater, 1) || reagents.has_reagent(/datum/reagent/consumable/ethanol/vodka, 1) || reagents.has_reagent(/datum/reagent/space_cleaner, 1))
 		SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 		A.clean_blood()
 		for(var/obj/effect/O in A)
@@ -98,7 +98,7 @@
 	stamusage = 1
 	var/refill_enabled = TRUE //Self-refill toggle for when a janitor decides to mop with something other than water.
 	var/refill_rate = 1 //Rate per process() tick mop refills itself
-	var/refill_reagent = "water" //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING
+	var/refill_reagent = /datum/reagent/water //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING
 
 /obj/item/mop/advanced/New()
 	..()
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index 27ed0f82e3..648f465a22 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -50,7 +50,6 @@
 		if(tank)
 			updateTank(tank, 1, user)
 
-
 /obj/item/melee/powerfist/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user)
 	if(removing)
 		if(!tank)
@@ -71,26 +70,42 @@
 
 
 /obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
-	if(!tank)
-		to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
-		return
-	if(tank && !tank.air_contents.remove(gasperfist * fisto_setting))
-		to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
-		playsound(loc, 'sound/effects/refill.ogg', 50, 1)
-		return
-	target.apply_damage(force * fisto_setting, BRUTE)
-	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-	new /obj/effect/temp_visual/kinetic_blast(target.loc)
-	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
-	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
+    if(!tank)
+        to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
+        return
+    var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
+    var/turf/T = get_turf(src)
+    if(!T)
+        return
+    T.assume_air(gasused)
+    T.air_update_turf()
+    if(!gasused)
+        to_chat(user, "<span class='warning'>\The [src]'s tank is empty!</span>")
+        target.apply_damage((force / 5), BRUTE)
+        playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
+        target.visible_message("<span class='danger'>[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+            "<span class='userdanger'>[user]'s punches you!</span>")
+        return
+    if(gasused.total_moles() < gasperfist * fisto_setting)
+        to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
+        playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
+        target.apply_damage((force / 2), BRUTE)
+        target.visible_message("<span class='danger'>[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+            "<span class='userdanger'>[user]'s punch strikes with force!</span>")
+        return
+    target.apply_damage(force * fisto_setting, BRUTE)
+    target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+        "<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
+    new /obj/effect/temp_visual/kinetic_blast(target.loc)
+    playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
+    playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
 
-	var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+    var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
 
-	target.throw_at(throw_target, 5 * fisto_setting, 0.2)
+    target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
 
-	log_combat(user, target, "power fisted", src)
+    log_combat(user, target, "power fisted", src)
 
-	user.changeNext_move(CLICK_CD_MELEE * click_delay)
+    user.changeNext_move(CLICK_CD_MELEE * click_delay)
 
-	return
+    return
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index ddc49a456c..5fd9600a97 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -98,7 +98,7 @@
 /obj/item/banner/medical/special_inspiration(mob/living/carbon/human/H)
 	H.adjustToxLoss(-15)
 	H.setOxyLoss(0)
-	H.reagents.add_reagent("inaprovaline", 5)
+	H.reagents.add_reagent(/datum/reagent/medicine/inaprovaline, 5)
 
 /obj/item/banner/science
 	name = "sciencia banner"
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 77bc7ed810..a0d58709c8 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -11,11 +11,9 @@
 	var/charge_cost = 30
 
 /obj/item/borg/stun/attack(mob/living/M, mob/living/user)
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
-			playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
-			return FALSE
+	if(M.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK))
+		playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
+		return FALSE
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		if(!R.cell.use(charge_cost))
@@ -816,3 +814,93 @@
 			return
 		else
 			to_chat(user, "<span class='danger'>Your gripper cannot hold \the [target].</span>")
+
+/obj/item/weapon/gripper/mining
+	name = "shelter capsule deployer"
+	desc = "A simple grasping tool for carrying and deploying shelter capsules."
+	icon_state = "gripper_mining"
+	can_hold = list(
+		/obj/item/survivalcapsule
+		)
+
+/obj/item/weapon/gripper/mining/attack_self()
+	if(wrapped)
+		wrapped.forceMove(get_turf(wrapped))
+		wrapped.attack_self()
+		wrapped = null
+	return
+
+/obj/item/gun/energy/plasmacutter/cyborg
+	name = "cyborg plasma cutter"
+	desc = "A basic variation of the plasma cutter, compressed into a cyborg chassis. Less effective than normal plasma cutters."
+	force = 15
+	ammo_type = list(/obj/item/ammo_casing/energy/plasma/weak)
+	can_charge = FALSE
+	selfcharge = EGUN_SELFCHARGE_BORG
+	cell_type = /obj/item/stock_parts/cell/secborg
+	charge_delay = 5
+
+/obj/item/cyborg_clamp
+	name = "cyborg loading clamp"
+	desc = "Equipment for supply cyborgs. Lifts objects and loads them into cargo. Will not carry living beings."
+	icon = 'icons/mecha/mecha_equipment.dmi'
+	icon_state = "mecha_clamp"
+	tool_behaviour = TOOL_RETRACTOR
+	item_flags = NOBLUDGEON
+	flags_1 = NONE
+	var/cargo_capacity = 8
+	var/cargo = list()
+
+/obj/item/cyborg_clamp/attack(mob/M, mob/user, def_zone)
+	return
+
+/obj/item/cyborg_clamp/afterattack(atom/movable/target, mob/user, proximity)
+	. = ..()
+	if(!proximity)
+		return FALSE
+	if(isobj(target))
+		var/obj/O = target
+		if(!O.anchored)
+			if(contents.len < cargo_capacity)
+				user.visible_message("[user] lifts [target] and starts to load it into its cargo compartment.")
+				O.anchored = TRUE
+				if(do_mob(user, O, 20))
+					for(var/mob/chump in target.GetAllContents())
+						to_chat(user, "<span class='warning'>Error: Living entity detected in [target]. Cannot load.</span>")
+						O.anchored = initial(O.anchored)
+						return
+					for(var/obj/item/disk/nuclear/diskie in target.GetAllContents())
+						to_chat(user, "<span class='warning'>Error: Nuclear class authorization device detected in [target]. Cannot load.</span>")
+						O.anchored = initial(O.anchored)
+						return
+					if(contents.len < cargo_capacity) //check both before and after
+						cargo += O
+						O.forceMove(src)
+						O.anchored = FALSE
+						to_chat(user, "<span class='notice'>[target] successfully loaded.</span>")
+						playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
+					else
+						to_chat(user, "<span class='warning'>Not enough room in cargo compartment! Maximum of [cargo_capacity] objects!</span>")
+						O.anchored = initial(O.anchored)
+						return
+				else
+					O.anchored = initial(O.anchored)
+			else
+				to_chat(user, "<span class='warning'>Not enough room in cargo compartment! Maximum of eight objects!</span>")
+		else
+			to_chat(user, "<span class='warning'>[target] is firmly secured!</span>")
+
+/obj/item/cyborg_clamp/attack_self(mob/user)
+	var/obj/chosen_cargo = input(user, "Drop what?") as null|anything in cargo
+	if(!chosen_cargo)
+		return
+	chosen_cargo.forceMove(get_turf(chosen_cargo))
+	cargo -= chosen_cargo
+	user.visible_message("[user] unloads [chosen_cargo] from its cargo.")
+	playsound(loc, 'sound/effects/bin_close.ogg', 50, 0)
+
+/obj/item/card/id/miningborg
+	name = "mining point card"
+	desc = "A robotic ID strip used for claiming and transferring mining points. Must be held in an active slot to transfer points."
+	access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
+	icon_state = "data_1"
\ No newline at end of file
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index bf363f959c..8c743cc3de 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -173,32 +173,64 @@
 		R.module.basic_modules += S
 		R.module.add_module(S, FALSE, TRUE)
 
-/obj/item/borg/upgrade/soh
-	name = "mining cyborg satchel of holding"
-	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
+/obj/item/borg/upgrade/premiumka
+	name = "mining cyborg premium KA"
+	desc = "A premium kinetic accelerator replacement for the mining module's standard kinetic accelerator."
 	icon_state = "cyborg_upgrade3"
 	require_module = 1
 	module_type = list(/obj/item/robot_module/miner)
 
-/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R)
+/obj/item/borg/upgrade/premiumka/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if(.)
-		for(var/obj/item/storage/bag/ore/cyborg/S in R.module)
-			R.module.remove_module(S, TRUE)
+		for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA in R.module)
+			for(var/obj/item/borg/upgrade/modkit/M in KA.modkits)
+				M.uninstall(src)
+			R.module.remove_module(KA, TRUE)
 
-		var/obj/item/storage/bag/ore/holding/H = new /obj/item/storage/bag/ore/holding(R.module)
-		R.module.basic_modules += H
-		R.module.add_module(H, FALSE, TRUE)
+		var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA = new /obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg(R.module)
+		R.module.basic_modules += PKA
+		R.module.add_module(PKA, FALSE, TRUE)
 
-/obj/item/borg/upgrade/soh/deactivate(mob/living/silicon/robot/R, user = usr)
+/obj/item/borg/upgrade/premiumka/deactivate(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if (.)
-		for(var/obj/item/storage/bag/ore/holding/H in R.module)
-			R.module.remove_module(H, TRUE)
+		for(var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA in R.module)
+			for(var/obj/item/borg/upgrade/modkit/M in PKA.modkits)
+				M.uninstall(src)
+			R.module.remove_module(PKA, TRUE)
 
-		var/obj/item/storage/bag/ore/cyborg/S = new (R.module)
-		R.module.basic_modules += S
-		R.module.add_module(S, FALSE, TRUE)
+		var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA = new (R.module)
+		R.module.basic_modules += KA
+		R.module.add_module(KA, FALSE, TRUE)
+		
+
+/obj/item/borg/upgrade/advcutter
+	name = "mining cyborg advanced plasma cutter"
+	desc = "An upgrade for the mining cyborgs plasma cutter, bringing it to advanced operation."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = list(/obj/item/robot_module/miner)
+
+/obj/item/borg/upgrade/advcutter/action(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if(.)
+		for(var/obj/item/gun/energy/plasmacutter/cyborg/C in R.module)
+			C.name = "advanced cyborg plasma cutter"
+			C.desc = "An improved version of the cyborg plasma cutter. Baring functionality identical to the standard hand held version."
+			C.icon_state = "adv_plasmacutter"
+			for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type)
+				L.projectile_type = /obj/item/projectile/plasma/adv
+
+/obj/item/borg/upgrade/advcutter/deactivate(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if (.)
+		for(var/obj/item/gun/energy/plasmacutter/cyborg/C in R.module)
+			C.name = initial(name)
+			C.desc = initial(desc)
+			C.icon_state = initial(icon_state)
+			for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type)
+				L.projectile_type = initial(L.projectile_type)
 
 /obj/item/borg/upgrade/tboh
 	name = "janitor cyborg trash bag of holding"
@@ -434,15 +466,15 @@
 	name = "medical cyborg expanded hypospray"
 	desc = "An upgrade to the Medical module's hypospray, allowing it \
 		to treat a wider range of conditions and problems."
-	additional_reagents = list("mannitol", "oculine", "inacusiate",
-		"mutadone", "haloperidol")
+	additional_reagents = list(/datum/reagent/medicine/mannitol, /datum/reagent/medicine/oculine, /datum/reagent/medicine/inacusiate,
+		/datum/reagent/medicine/mutadone, /datum/reagent/medicine/haloperidol)
 
 /obj/item/borg/upgrade/hypospray/high_strength
 	name = "medical cyborg high-strength hypospray"
 	desc = "An upgrade to the Medical module's hypospray, containing \
 		stronger versions of existing chemicals."
-	additional_reagents = list("oxandrolone", "sal_acid", "rezadone",
-		"pen_acid")
+	additional_reagents = list(/datum/reagent/medicine/oxandrolone, /datum/reagent/medicine/sal_acid,
+								/datum/reagent/medicine/rezadone, /datum/reagent/medicine/pen_acid)
 
 /obj/item/borg/upgrade/piercing_hypospray
 	name = "cyborg piercing hypospray"
diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm
index 49a735af9c..a660e76da1 100644
--- a/code/game/objects/items/stacks/bscrystal.dm
+++ b/code/game/objects/items/stacks/bscrystal.dm
@@ -10,7 +10,7 @@
 	points = 50
 	var/blink_range = 8 // The teleport range when crushed/thrown at someone.
 	refined_type = /obj/item/stack/sheet/bluespace_crystal
-	grind_results = list("bluespace" = 20)
+	grind_results = list(/datum/reagent/bluespace = 20)
 
 /obj/item/stack/ore/bluespace_crystal/refined
 	name = "refined bluespace crystal"
@@ -53,7 +53,7 @@
 	blink_range = 4 // Not as good as the organic stuff!
 	points = 0 //nice try
 	refined_type = null
-	grind_results = list("bluespace" = 10, "silicon" = 20)
+	grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/silicon = 20)
 
 //Polycrystals, aka stacks
 /obj/item/stack/sheet/bluespace_crystal
@@ -66,7 +66,7 @@
 	materials = list(MAT_BLUESPACE=MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
 	novariants = TRUE
-	grind_results = list("bluespace" = 20)
+	grind_results = list(/datum/reagent/bluespace = 20)
 	point_value = 30
 	var/crystal_type = /obj/item/stack/ore/bluespace_crystal/refined
 
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 178bdd8a5e..14c20af6b3 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -57,7 +57,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	var/heal_brute = 20
 	self_delay = 20
-	grind_results = list("styptic_powder" = 10)
+	grind_results = list(/datum/reagent/medicine/styptic_powder = 10)
 
 /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user)
 	if(M.stat == DEAD)
@@ -140,7 +140,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	var/heal_burn = 20
 	self_delay = 20
-	grind_results = list("silver_sulfadiazine" = 10)
+	grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10)
 
 /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user)
 	if(M.stat == DEAD)
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index c2c6015747..c42cfbe571 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -11,7 +11,7 @@
 	throw_range = 7
 	flags_1 = CONDUCT_1
 	max_amount = 60
-	grind_results = list("silicon" = 20, "copper" = 5)
+	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/copper = 5)
 
 /obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/stack/sheet/metal))
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index fe42f88f56..d89793f08e 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	sheettype = "diamond"
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list("carbon" = 20)
+	grind_results = list(/datum/reagent/carbon = 20)
 	point_value = 25
 	merge_type = /obj/item/stack/sheet/mineral/diamond
 
@@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list("uranium" = 20)
+	grind_results = list(/datum/reagent/uranium = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/uranium
 
@@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	resistance_flags = FLAMMABLE
 	max_integrity = 100
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
-	grind_results = list("plasma" = 20)
+	grind_results = list(/datum/reagent/toxin/plasma = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/plasma
 
@@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
 	singular_name = "gold bar"
 	sheettype = "gold"
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
-	grind_results = list("gold" = 20)
+	grind_results = list(/datum/reagent/gold = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/gold
 
@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
 	singular_name = "silver bar"
 	sheettype = "silver"
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
-	grind_results = list("silver" = 20)
+	grind_results = list(/datum/reagent/silver = 20)
 	point_value = 20
 	merge_type = /obj/item/stack/sheet/mineral/silver
 	tableVariant = /obj/structure/table/optable
@@ -262,7 +262,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
 	sheettype = "bananium"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
-	grind_results = list("banana" = 20)
+	grind_results = list(/datum/reagent/consumable/banana = 20)
 	point_value = 50
 	merge_type = /obj/item/stack/sheet/mineral/bananium
 
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
 	singular_name = "snow block"
 	force = 1
 	throwforce = 2
-	grind_results = list("ice" = 20)
+	grind_results = list(/datum/reagent/consumable/ice = 20)
 	merge_type = /obj/item/stack/sheet/mineral/snow
 
 GLOBAL_LIST_INIT(snow_recipes, list ( \
@@ -422,7 +422,7 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 	icon_state = "slag"
 	singular_name = "coal lump"
 	merge_type = /obj/item/stack/sheet/mineral/coal
-	grind_results = list("carbon" = 20)
+	grind_results = list(/datum/reagent/carbon = 20)
 
 /obj/item/stack/sheet/mineral/coal/attackby(obj/item/W, mob/user, params)
 	if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 4fc31ea674..89536ab53e 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	flags_1 = CONDUCT_1
 	resistance_flags = FIRE_PROOF
 	merge_type = /obj/item/stack/sheet/metal
-	grind_results = list("iron" = 20)
+	grind_results = list(/datum/reagent/iron = 20)
 	point_value = 2
 	tableVariant = /obj/structure/table
 
@@ -168,7 +168,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
 	resistance_flags = FIRE_PROOF
 	merge_type = /obj/item/stack/sheet/plasteel
-	grind_results = list("iron" = 20, "plasma" = 20)
+	grind_results = list(/datum/reagent/iron = 20, /datum/reagent/toxin/plasma = 20)
 	point_value = 23
 	tableVariant = /obj/structure/table/reinforced
 
@@ -238,7 +238,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/mineral/wood
 	novariants = TRUE
-	grind_results = list("carbon" = 20)
+	grind_results = list(/datum/reagent/carbon = 20)
 
 
 /obj/item/stack/sheet/mineral/wood/attackby(obj/item/W, mob/user, params) // NOTE: sheet_types.dm is where the WOOD stack lives. Maybe move this over there.
@@ -296,7 +296,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
 	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/mineral/bamboo
-	grind_results = list("carbon" = 5)
+	grind_results = list(/datum/reagent/carbon = 5)
 
 /obj/item/stack/sheet/mineral/bamboo/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.bamboo_recipes
@@ -398,39 +398,64 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
  * Cardboard
  */
 GLOBAL_LIST_INIT(cardboard_recipes, list ( \
-	new/datum/stack_recipe("box", /obj/item/storage/box), \
-	new/datum/stack_recipe("sec box", /obj/item/storage/box/seclooking), \
-	new/datum/stack_recipe("light tubes", /obj/item/storage/box/lights/tubes), \
-	new/datum/stack_recipe("light bulbs", /obj/item/storage/box/lights/bulbs), \
-	new/datum/stack_recipe("mouse traps", /obj/item/storage/box/mousetraps), \
-	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
-	new/datum/stack_recipe("power cell", /obj/item/storage/box/cells), \
-	new/datum/stack_recipe("02", /obj/item/storage/box/otwo), \
-	null, \
-	new/datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot), \
-	new/datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot), \
-	new/datum/stack_recipe("bean bag ammo box", /obj/item/storage/box/beanbag), \
-	new/datum/stack_recipe("12g ammo box", /obj/item/storage/box/lethalslugs), \
-	new/datum/stack_recipe("stun slug ammo box", /obj/item/storage/box/stunslug), \
-	new/datum/stack_recipe("tech shell ammo box", /obj/item/storage/box/techsslug), \
-	new/datum/stack_recipe("incendiary ammo box", /obj/item/storage/box/fireshot), \
-	new/datum/stack_recipe("firing pins", /obj/item/storage/box/firingpins), \
-	new/datum/stack_recipe("loose ammo", /obj/item/storage/box/ammoshells), \
-	null, \
-	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
-	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
-	new/datum/stack_recipe("folder", /obj/item/folder), \
-	new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4), \
-	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
-	null, \
-	new/datum/stack_recipe("colored brown", /obj/item/storage/box/brown), \
-	new/datum/stack_recipe("colored green", /obj/item/storage/box/green), \
-	new/datum/stack_recipe("colored red", /obj/item/storage/box/blue), \
-	new/datum/stack_recipe("colored blue", /obj/item/storage/box/red), \
-	new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \
-	new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \
-	new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \
-	))
+	new/datum/stack_recipe("box", /obj/item/storage/box),										\
+	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3),				\
+	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg),				\
+	new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4),					\
+	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5),					\
+	new/datum/stack_recipe("pizza box", /obj/item/pizzabox),									\
+	new/datum/stack_recipe("folder", /obj/item/folder),											\
+	// holy fuck why are there so many boxes
+	new/datum/stack_recipe_list("fancy boxes", list ( \
+		new /datum/stack_recipe("donut box", /obj/item/storage/fancy/donut_box), 				\
+		new /datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box), 					\
+		new /datum/stack_recipe("donk-pockets box", /obj/item/storage/box/donkpockets), 		\
+		new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes), 			\
+		new /datum/stack_recipe("box (internals)", /obj/item/storage/box/otwo), 				\
+		null, 																					\
+		new /datum/stack_recipe("security-styled box", /obj/item/storage/box/seclooking), 		\
+		new /datum/stack_recipe("buckshot shell box", /obj/item/storage/box/lethalshot),		\
+		new /datum/stack_recipe("rubber shot shell box", /obj/item/storage/box/rubbershot),		\
+		new /datum/stack_recipe("beanbag shell box", /obj/item/storage/box/beanbag),			\
+		new /datum/stack_recipe("slug shell box", /obj/item/storage/box/lethalslugs), 			\
+		new /datum/stack_recipe("stunslug shell box", /obj/item/storage/box/stunslug), 			\
+		new /datum/stack_recipe("tech shell box", /obj/item/storage/box/techsslug), 			\
+		new /datum/stack_recipe("incendiary ammo box", /obj/item/storage/box/fireshot), 		\
+		new /datum/stack_recipe("loose ammo box", /obj/item/storage/box/ammoshells), 			\
+		new /datum/stack_recipe("firing pins box", /obj/item/storage/box/firingpins), 			\
+		null,																					\
+		new /datum/stack_recipe("flashbang box", /obj/item/storage/box/flashbangs),				\
+		new /datum/stack_recipe("flashes box", /obj/item/storage/box/flashes),					\
+		new /datum/stack_recipe("handcuffs box", /obj/item/storage/box/handcuffs),				\
+		new /datum/stack_recipe("ID card box", /obj/item/storage/box/ids),						\
+		new /datum/stack_recipe("PDA box", /obj/item/storage/box/PDAs),							\
+		null,																					\
+		new /datum/stack_recipe("pill bottle box", /obj/item/storage/box/pillbottles),			\
+		new /datum/stack_recipe("beaker box", /obj/item/storage/box/beakers),					\
+		new /datum/stack_recipe("syringe box", /obj/item/storage/box/syringes),					\
+		new /datum/stack_recipe("latex gloves box", /obj/item/storage/box/gloves),				\
+		new /datum/stack_recipe("sterile masks box", /obj/item/storage/box/masks),				\
+		new /datum/stack_recipe("body bag box", /obj/item/storage/box/bodybags),				\
+		new /datum/stack_recipe("prescription glasses box", /obj/item/storage/box/rxglasses),	\
+		null,																					\
+		new /datum/stack_recipe("disk box", /obj/item/storage/box/disks),						\
+		new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes),			\
+		new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs),			\
+		new /datum/stack_recipe("mixed lights box", /obj/item/storage/box/lights/mixed),		\
+		new /datum/stack_recipe("power cell box", /obj/item/storage/box/cells), 				\
+		new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps),			\
+		new /datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box),				\
+		null,																					\
+		new /datum/stack_recipe("box (brown)", /obj/item/storage/box/brown), 					\
+		new /datum/stack_recipe("box (green)", /obj/item/storage/box/green), 					\
+		new /datum/stack_recipe("box (blue)", /obj/item/storage/box/blue), 						\
+		new /datum/stack_recipe("box (red)", /obj/item/storage/box/red), 						\
+		new /datum/stack_recipe("box (yellow)", /obj/item/storage/box/yellow), 					\
+		new /datum/stack_recipe("box (pink)", /obj/item/storage/box/pink), 						\
+		new /datum/stack_recipe("box (purple)", /obj/item/storage/box/purple), 					\
+		)),
+	null,																						\
+))
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap //it's cardboard you fuck
 	name = "cardboard"
@@ -456,7 +481,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 		var/atom/droploc = drop_location()
 		if(use(1))
 			playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
-			to_chat(user, "<span class='notice'>You stamp the cardboard! Its a clown box! Honk!</span>")
+			to_chat(user, "<span class='notice'>You stamp the cardboard! It's a clown box! Honk!</span>")
 			if (amount >= 0)
 				new/obj/item/storage/box/clown(droploc) //bugfix
 	else
@@ -486,7 +511,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 	sheettype = "runed"
 	merge_type = /obj/item/stack/sheet/runed_metal
 	novariants = TRUE
-	grind_results = list("iron" = 5, "blood" = 15)
+	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/blood = 15)
 
 /obj/item/stack/sheet/runed_metal/ratvar_act()
 	new /obj/item/stack/tile/brass(loc, amount)
@@ -521,31 +546,30 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
  */
 GLOBAL_LIST_INIT(brass_recipes, list ( \
 	new/datum/stack_recipe("wall gear", /obj/structure/destructible/clockwork/wall_gear, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
-	null,
+	null, \
 	new/datum/stack_recipe("brass pinion airlock", /obj/machinery/door/airlock/clockwork, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass pinion airlock - windowed", /obj/machinery/door/airlock/clockwork/brass, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \
-	null,
+	null, \
 	new/datum/stack_recipe("brass reflector", /obj/structure/destructible/clockwork/reflector, 10, time = 100, one_per_turf = TRUE, on_floor = TRUE, window_checks = TRUE), \
-	null,
+	null, \
 	new/datum/stack_recipe("brass window - directional", /obj/structure/window/reinforced/clockwork/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("brass window - fulltile", /obj/structure/window/reinforced/clockwork/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("brass chair", /obj/structure/chair/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass bar stool",  /obj/structure/chair/stool/bar/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass stool", /obj/structure/chair/stool/brass, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
-	null,
+	null, \
 	new/datum/stack_recipe("sender - pressure sensor", /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("sender - mech sensor", /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor/mech, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("sender - lever", /obj/structure/destructible/clockwork/trap/trigger/lever, 1, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("sender - repeater", /obj/structure/destructible/clockwork/trap/trigger/repeater, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
-	null,
+	null, \
 	new/datum/stack_recipe("receiver - brass skewer", /obj/structure/destructible/clockwork/trap/brass_skewer, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_ADJACENT), \
 	new/datum/stack_recipe("receiver - steam vent", /obj/structure/destructible/clockwork/trap/steam_vent, 3, time = 30, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_CARDINALS), \
 	new/datum/stack_recipe("receiver - power nullifier", /obj/structure/destructible/clockwork/trap/power_nullifier, 5, time = 20, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_CARDINALS), \
-	null,
+	null, \
 	new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty), \
-
 ))
 
 /obj/item/stack/tile/brass
@@ -562,7 +586,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	throw_range = 3
 	turf_type = /turf/open/floor/clockwork
 	novariants = FALSE
-	grind_results = list("iron" = 5, "teslium" = 15, "holyoil" = 1)
+	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/teslium = 15, /datum/reagent/fuel/holyoil = 1)
 	merge_type = /obj/item/stack/tile/brass
 	tableVariant = /obj/structure/table/reinforced/brass
 
@@ -615,7 +639,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	throw_range = 3
 	turf_type = /turf/open/floor/bronze
 	novariants = FALSE
-	grind_results = list("iron" = 5, "copper" = 3) //we have no "tin" reagent so this is the closest thing
+	grind_results = list(/datum/reagent/iron = 5, /datum/reagent/copper = 3) //we have no "tin" reagent so this is the closest thing
 	merge_type = /obj/item/stack/tile/bronze
 	tableVariant = /obj/structure/table/bronze
 
@@ -669,11 +693,12 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 1
 	throw_range = 3
-	grind_results = list("carbon" = 10)
+	grind_results = list(/datum/reagent/carbon = 10)
 	merge_type = /obj/item/stack/sheet/bone
 
 GLOBAL_LIST_INIT(plastic_recipes, list(
-	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
+	new /datum/stack_recipe("see-through plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
+	new /datum/stack_recipe("opaque plastic flaps", /obj/structure/plasticflaps/opaque, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
 	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
 	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
 	new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50),\
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index e8bd50f19b..4180681754 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -192,9 +192,15 @@
 		var/obj/O
 		if(R.max_res_amount > 1) //Is it a stack?
 			O = new R.result_type(usr.drop_location(), R.res_amount * multiplier)
+		else if(ispath(R.result_type, /turf))
+			var/turf/T = usr.drop_location()
+			if(!isturf(T))
+				return
+			T.PlaceOnTop(R.result_type, flags = CHANGETURF_INHERIT_AIR)
 		else
 			O = new R.result_type(usr.drop_location())
-		O.setDir(usr.dir)
+		if(O)
+			O.setDir(usr.dir)
 		use(R.req_amount * multiplier)
 
 		//START: oh fuck i'm so sorry
@@ -439,4 +445,4 @@
 
 /datum/stack_recipe_list/New(title, recipes)
 	src.title = title
-	src.recipes = recipes
\ No newline at end of file
+	src.recipes = recipes
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index eafa79798e..7664da6ce4 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -110,6 +110,7 @@
 	var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
 	var/mob/listeningTo
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+	var/range = null
 
 /obj/item/storage/bag/ore/ComponentInitialize()
 	. = ..()
@@ -130,7 +131,8 @@
 
 /obj/item/storage/bag/ore/dropped()
 	. = ..()
-	UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
+	if(listeningTo)
+		UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
 	listeningTo = null
 
 /obj/item/storage/bag/ore/proc/Pickup_ores(mob/living/user)
@@ -141,12 +143,21 @@
 		return
 	if (istype(user.pulling, /obj/structure/ore_box))
 		box = user.pulling
+	if(issilicon(user))
+		var/mob/living/silicon/robot/borgo = user
+		for(var/obj/item/cyborg_clamp/C in borgo.module.modules)
+			for(var/obj/structure/ore_box/B in C)
+				box = B
+
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	if(STR)
 		for(var/A in tile)
 			if (!is_type_in_typecache(A, STR.can_hold))
 				continue
 			if (box)
+				if(range)
+					for(var/obj/item/stack/ore/ore in range(range, user))
+						user.transferItemToLoc(ore, box)
 				user.transferItemToLoc(A, box)
 				show_message = TRUE
 			else if(SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, A, user, TRUE))
@@ -168,6 +179,7 @@
 
 /obj/item/storage/bag/ore/cyborg
 	name = "cyborg mining satchel"
+	range = 1
 
 /obj/item/storage/bag/ore/cyborg/ComponentInitialize()
 	. = ..()
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 3a4579d3f8..0961726e6e 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -24,7 +24,7 @@
 			add_overlay(M)
 	..()
 
-/obj/item/storage/belt/worn_overlays(isinhands, icon_file)
+/obj/item/storage/belt/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands && worn_overlays)
 		for(var/obj/item/I in contents)
@@ -61,6 +61,7 @@
 		/obj/item/radio,
 		/obj/item/clothing/gloves,
 		/obj/item/holosign_creator,
+		/obj/item/forcefield_projector,
 		/obj/item/assembly/signaler
 		))
 	STR.can_hold = can_hold
@@ -458,8 +459,7 @@
 		/obj/item/extinguisher/mini,
 		/obj/item/radio,
 		/obj/item/clothing/gloves,
-		/obj/item/holosign_creator/atmos,
-		/obj/item/holosign_creator/engineering,
+		/obj/item/holosign_creator,
 		/obj/item/forcefield_projector,
 		/obj/item/assembly/signaler,
 		/obj/item/lightreplacer,
@@ -571,6 +571,7 @@
 		/obj/item/reagent_containers/spray,
 		/obj/item/soap,
 		/obj/item/holosign_creator,
+		/obj/item/forcefield_projector,
 		/obj/item/key/janitor,
 		/obj/item/clothing/gloves,
 		/obj/item/melee/flyswatter,
@@ -582,7 +583,7 @@
 
 /obj/item/storage/belt/bandolier
 	name = "bandolier"
-	desc = "A bandolier for holding shotgun ammunition."
+	desc = "A bandolier for holding ammunition."
 	icon_state = "bandolier"
 	item_state = "bandolier"
 
@@ -592,7 +593,7 @@
 	STR.max_items = 18
 	STR.display_numerical_stacking = TRUE
 	STR.can_hold = typecacheof(list(
-		/obj/item/ammo_casing/shotgun
+		/obj/item/ammo_casing
 		))
 
 /obj/item/storage/belt/bandolier/durathread
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index c658eee3d5..e47021c1f6 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -163,16 +163,16 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			for(var/obj/effect/rune/R in orange(2,user))
 				R.invisibility = 0
 	if(user.mind && (user.mind.isholy))
-		if(A.reagents && A.reagents.has_reagent("water")) // blesses all the water in the holder
+		if(A.reagents && A.reagents.has_reagent(/datum/reagent/water)) // blesses all the water in the holder
 			to_chat(user, "<span class='notice'>You bless [A].</span>")
-			var/water2holy = A.reagents.get_reagent_amount("water")
-			A.reagents.del_reagent("water")
-			A.reagents.add_reagent("holywater",water2holy)
-		if(A.reagents && A.reagents.has_reagent("unholywater")) // yeah yeah, copy pasted code - sue me
+			var/water2holy = A.reagents.get_reagent_amount(/datum/reagent/water)
+			A.reagents.del_reagent(/datum/reagent/water)
+			A.reagents.add_reagent(/datum/reagent/water/holywater,water2holy)
+		if(A.reagents && A.reagents.has_reagent(/datum/reagent/fuel/unholywater)) // yeah yeah, copy pasted code - sue me
 			to_chat(user, "<span class='notice'>You purify [A].</span>")
-			var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
-			A.reagents.del_reagent("unholywater")
-			A.reagents.add_reagent("holywater",unholy2clean)
+			var/unholy2clean = A.reagents.get_reagent_amount(/datum/reagent/fuel/unholywater)
+			A.reagents.del_reagent(/datum/reagent/fuel/unholywater)
+			A.reagents.add_reagent(/datum/reagent/water/holywater,unholy2clean)
 	if(istype(A, /obj/item/twohanded/required/cult_bastard) && !iscultist(user))
 		var/obj/item/twohanded/required/cult_bastard/sword = A
 		to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 8c96e567d1..0ff20f16c5 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -205,7 +205,7 @@
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for
 	new /obj/item/clothing/glasses/hud/health/night(src)
-	
+
 /*
  * Pill Bottles
  */
@@ -439,8 +439,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src)
 
 /obj/item/storage/hypospraykit/fire
 	name = "burn treatment hypospray kit"
@@ -452,8 +452,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/burn(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/kelotane(src)
 
 /obj/item/storage/hypospraykit/toxin
 	name = "toxin treatment hypospray kit"
@@ -464,8 +464,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/toxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/antitoxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/antitoxin(src)
 
 /obj/item/storage/hypospraykit/o2
 	name = "oxygen deprivation hypospray kit"
@@ -476,8 +476,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/oxygen(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/dexalin(src)
 
 /obj/item/storage/hypospraykit/enlarge
 	name = "organomegaly trauma hypospray kit"
@@ -488,12 +488,12 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/enlarge(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/penisreduction(src)
 
 /obj/item/storage/hypospraykit/brute
 	name = "brute trauma hypospray kit"
@@ -504,8 +504,8 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/brute(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
 
 /obj/item/storage/hypospraykit/tactical
 	name = "combat hypospray kit"
@@ -517,8 +517,8 @@
 		return
 	new /obj/item/defibrillator/compact/combat/loaded(src)
 	new /obj/item/hypospray/mkii/CMO/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
 
 /obj/item/storage/hypospraykit/cmo
 	name = "deluxe hypospray kit"
@@ -537,11 +537,11 @@
 	if(empty)
 		return
 	new /obj/item/hypospray/mkii/CMO(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/charcoal(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/salglu(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/synthflesh(src)
 
 /obj/item/storage/box/vials
 	name = "box of hypovials"
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 1e37de2581..70c3a5dd4b 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -225,16 +225,31 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	STR.max_items = 10
 
 /obj/item/storage/toolbox/artistic/PopulateContents()
-	new/obj/item/storage/crayons(src)
-	new/obj/item/crowbar(src)
-	new/obj/item/stack/cable_coil/red(src)
-	new/obj/item/stack/cable_coil/yellow(src)
-	new/obj/item/stack/cable_coil/blue(src)
-	new/obj/item/stack/cable_coil/green(src)
-	new/obj/item/stack/cable_coil/pink(src)
-	new/obj/item/stack/cable_coil/orange(src)
-	new/obj/item/stack/cable_coil/cyan(src)
-	new/obj/item/stack/cable_coil/white(src)
+	new /obj/item/storage/crayons(src)
+	new /obj/item/crowbar(src)
+	new /obj/item/stack/cable_coil/red(src)
+	new /obj/item/stack/cable_coil/yellow(src)
+	new /obj/item/stack/cable_coil/blue(src)
+	new /obj/item/stack/cable_coil/green(src)
+	new /obj/item/stack/cable_coil/pink(src)
+	new /obj/item/stack/cable_coil/orange(src)
+	new /obj/item/stack/cable_coil/cyan(src)
+	new /obj/item/stack/cable_coil/white(src)
+
+/obj/item/storage/toolbox/ammo
+	name = "ammo box"
+	desc = "It contains a few clips."
+	icon_state = "ammobox"
+	item_state = "ammobox"
+
+/obj/item/storage/toolbox/ammo/PopulateContents()
+	new /obj/item/ammo_box/a762(src)
+	new /obj/item/ammo_box/a762(src)
+	new /obj/item/ammo_box/a762(src)
+	new /obj/item/ammo_box/a762(src)
+	new /obj/item/ammo_box/a762(src)
+	new /obj/item/ammo_box/a762(src)
+	new /obj/item/ammo_box/a762(src)
 
 /obj/item/storage/toolbox/gold_real
 	name = "golden toolbox"
@@ -314,4 +329,4 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 		generate_rubber_toolbox_icon()
 	icon = GLOB.rubber_toolbox_icons[icon_state]
 	. = ..()
-	AddComponent(/datum/component/bouncy)
\ No newline at end of file
+	AddComponent(/datum/component/bouncy)
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 484b9862ff..6972587263 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -36,7 +36,7 @@
 	. = ..()
 	if(preload_cell_type)
 		if(!ispath(preload_cell_type,/obj/item/stock_parts/cell))
-			log_world("### MAP WARNING, [src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
+			log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
 		else
 			cell = new preload_cell_type(src)
 	update_icon()
@@ -168,11 +168,9 @@
 
 
 /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user)
-	if(ishuman(L))
-		var/mob/living/carbon/human/H = L
-		if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
-			playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
-			return FALSE
+	if(L.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
+		playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
+		return FALSE
 	var/stunpwr = stunforce
 	var/obj/item/stock_parts/cell/our_cell = get_cell()
 	if(!our_cell)
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index f3be8cefc8..c1cbf534ca 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -148,7 +148,7 @@
 
 /obj/item/watertank/janitor/Initialize()
 	. = ..()
-	reagents.add_reagent("cleaner", 500)
+	reagents.add_reagent(/datum/reagent/space_cleaner, 500)
 
 /obj/item/reagent_containers/spray/mister/janitor
 	name = "janitor spray nozzle"
@@ -184,7 +184,7 @@
 
 /obj/item/watertank/atmos/Initialize()
 	. = ..()
-	reagents.add_reagent("water", 200)
+	reagents.add_reagent(/datum/reagent/water, 200)
 
 /obj/item/watertank/atmos/make_noz()
 	return new /obj/item/extinguisher/mini/nozzle(src)
@@ -376,7 +376,7 @@
 		filling.color = mix_color_from_reagents(reagents.reagent_list)
 		add_overlay(filling)
 
-/obj/item/reagent_containers/chemtank/worn_overlays(var/isinhands = FALSE) //apply chemcolor and level
+/obj/item/reagent_containers/chemtank/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE) //apply chemcolor and level
 	. = list()
 	//inhands + reagent_filling
 	if(!isinhands && reagents.total_volume)
@@ -436,13 +436,13 @@
 
 /obj/item/watertank/op/Initialize()
 	. = ..()
-	reagents.add_reagent("mutagen",350)
-	reagents.add_reagent("napalm",125)
-	reagents.add_reagent("welding_fuel",125)
-	reagents.add_reagent("clf3",300)
-	reagents.add_reagent("cryptobiolin",350)
-	reagents.add_reagent("plasma",250)
-	reagents.add_reagent("condensedcapsaicin",500)
+	reagents.add_reagent(/datum/reagent/toxin/mutagen,350)
+	reagents.add_reagent(/datum/reagent/napalm,125)
+	reagents.add_reagent(/datum/reagent/fuel,125)
+	reagents.add_reagent(/datum/reagent/clf3,300)
+	reagents.add_reagent(/datum/reagent/cryptobiolin,350)
+	reagents.add_reagent(/datum/reagent/toxin/plasma,250)
+	reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin,500)
 
 /obj/item/reagent_containers/spray/mister/op
 	desc = "A mister nozzle attached to several extended water tanks. It suspiciously has a compressor in the system and is labelled entirely in New Cyrillic."
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 91a94e05c3..599577a85b 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -53,7 +53,7 @@
 	base_overlay.appearance_flags = RESET_COLOR
 	add_overlay(base_overlay)
 
-/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file)
+/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(isinhands && random_color)
 		var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head")
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 65b240c528..a74ce67128 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -37,7 +37,7 @@
 /obj/item/weldingtool/Initialize()
 	. = ..()
 	create_reagents(max_fuel)
-	reagents.add_reagent("welding_fuel", max_fuel)
+	reagents.add_reagent(/datum/reagent/fuel, max_fuel)
 	update_icon()
 
 
@@ -97,7 +97,7 @@
 
 /obj/item/weldingtool/proc/explode()
 	var/turf/T = get_turf(loc)
-	var/plasmaAmount = reagents.get_reagent_amount("plasma")
+	var/plasmaAmount = reagents.get_reagent_amount(/datum/reagent/toxin/plasma)
 	dyn_explosion(T, plasmaAmount/5)//20 plasma in a standard welder has a 4 power explosion. no breaches, but enough to kill/dismember holder
 	qdel(src)
 
@@ -142,7 +142,7 @@
 
 
 /obj/item/weldingtool/attack_self(mob/user)
-	if(src.reagents.has_reagent("plasma"))
+	if(src.reagents.has_reagent(/datum/reagent/toxin/plasma))
 		message_admins("[ADMIN_LOOKUPFLW(user)] activated a rigged welder at [AREACOORD(user)].")
 		explode()
 	switched_on(user)
@@ -154,7 +154,7 @@
 
 // Returns the amount of fuel in the welder
 /obj/item/weldingtool/proc/get_fuel()
-	return reagents.get_reagent_amount("welding_fuel")
+	return reagents.get_reagent_amount(/datum/reagent/fuel)
 
 
 // Uses fuel from the welding tool.
@@ -165,7 +165,7 @@
 	if(used)
 		burned_fuel_for = 0
 	if(get_fuel() >= used)
-		reagents.remove_reagent("welding_fuel", used)
+		reagents.remove_reagent(/datum/reagent/fuel, used)
 		check_fuel()
 		return TRUE
 	else
@@ -333,7 +333,7 @@
 
 /obj/item/weldingtool/abductor/process()
 	if(get_fuel() <= max_fuel)
-		reagents.add_reagent("welding_fuel", 1)
+		reagents.add_reagent(/datum/reagent/fuel, 1)
 	..()
 
 /obj/item/weldingtool/hugetank
@@ -377,7 +377,7 @@
 	..()
 	if(get_fuel() < max_fuel && nextrefueltick < world.time)
 		nextrefueltick = world.time + 10
-		reagents.add_reagent("welding_fuel", 1)
+		reagents.add_reagent(/datum/reagent/fuel, 1)
 
 /obj/item/weldingtool/advanced
 	name = "advanced welding tool"
@@ -390,7 +390,7 @@
 
 /obj/item/weldingtool/advanced/process()
 	if(get_fuel() <= max_fuel)
-		reagents.add_reagent("welding_fuel", 1)
+		reagents.add_reagent(/datum/reagent/fuel, 1)
 	..()
 
 #undef WELDER_FUEL_BURN_INTERVAL
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 08c43f0437..cf891f5a47 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -353,7 +353,7 @@
 		update_light()
 	return TRUE
 
-/obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file)
+/obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(active)
 		if(isinhands)
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index b2158eb1c8..97f53d3ca7 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -70,12 +70,12 @@
 	name = "crushed can"
 	icon_state = "cola"
 	resistance_flags = NONE
-	grind_results = list("aluminium" = 10)
+	grind_results = list(/datum/reagent/aluminium = 10)
 
 /obj/item/trash/boritos
 	name = "boritos bag"
 	icon_state = "boritos"
-	grind_results = list("aluminium" = 1) //from the mylar bag
+	grind_results = list(/datum/reagent/aluminium = 1) //from the mylar bag
 
 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index dd7d46d0d7..84f14f50a5 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -556,7 +556,7 @@
 		update_light()
 	return TRUE
 
-/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file)
+/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(isinhands)
 		var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
@@ -872,7 +872,7 @@
 		user.visible_message("<span class='danger'>[user] blasts \the [target] with \the [src]!</span>")
 		playsound(target, 'sound/magic/disintegrate.ogg', 100, 1)
 		W.break_wall()
-		W.ScrapeAway()
+		W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 		return
 
 //HF blade
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index e61a17b4ec..9fa4d730b6 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -88,6 +88,28 @@
 	else
 		return ..()
 
+/obj/structure/chair/alt_attack_hand(mob/living/user)
+	if(Adjacent(user) && istype(user))
+		if(!item_chair || !user.can_hold_items() || !has_buckled_mobs() || buckled_mobs.len > 1 || dir != user.dir || flags_1 & NODECONSTRUCT_1)
+			return TRUE
+		if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+			to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+			return TRUE
+		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
+			return TRUE
+		var/mob/living/poordude = buckled_mobs[1]
+		if(!istype(poordude))
+			return TRUE
+		user.visible_message("<span class='notice'>[user] pulls [src] out from under [poordude].</span>", "<span class='notice'>You pull [src] out from under [poordude].</span>")
+		var/C = new item_chair(loc)
+		user.put_in_hands(C)
+		poordude.Knockdown(20)//rip in peace
+		user.adjustStaminaLoss(5)
+		unbuckle_all_mobs(TRUE)
+		qdel(src)
+		return TRUE
+
 /obj/structure/chair/attack_tk(mob/user)
 	if(!anchored || has_buckled_mobs() || !isturf(user.loc))
 		..()
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 82a0c4d32f..9935fc8ec5 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -252,7 +252,7 @@ LINEN BINS
 	add_overlay(g_mouth)
 	add_overlay(g_eyes)
 
-/obj/item/bedsheet/gondola/worn_overlays(isinhands = FALSE, icon_file)
+/obj/item/bedsheet/gondola/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands)
 		. += mutable_appearance(icon_file, g_mouth)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index aad68b2166..645d1e5d7a 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -22,7 +22,9 @@
 	if(opened || move_delay || user.stat || user.IsStun() || user.IsKnockdown() || user.IsUnconscious() || !isturf(loc) || !has_gravity(loc))
 		return
 	move_delay = TRUE
-	if(step(src, direction))
+	var/oldloc = loc
+	step(src, direction)
+	if(oldloc != loc)
 		addtimer(CALLBACK(src, .proc/ResetMoveDelay), (use_mob_movespeed ? user.movement_delay() : CONFIG_GET(number/movedelay/walk_delay)) * move_speed_multiplier)
 	else
 		ResetMoveDelay()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 8da50d488f..579b1444a5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -12,18 +12,12 @@
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/hardhat/weldhat/white(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
-	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/tank/jetpack/suit(src)
 	new /obj/item/cartridge/ce(src)
 	new /obj/item/radio/headset/heads/ce(src)
-	new /obj/item/storage/toolbox/mechanical(src)
-	new /obj/item/clothing/suit/hazardvest(src)
 	new /obj/item/megaphone/command(src)
 	new /obj/item/areaeditor/blueprints(src)
-	new /obj/item/airlock_painter(src)
 	new /obj/item/holosign_creator/engineering(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/multitool(src)
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/door_remote/chief_engineer(src)
@@ -67,7 +61,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/welding(src)
 	for(var/i in 1 to 3)
-		new /obj/item/weldingtool(src)
+		new /obj/item/weldingtool/largetank(src)
 
 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
@@ -84,7 +78,6 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/storage/box/emptysandbags(src)
 
-
 /obj/structure/closet/secure_closet/atmospherics
 	name = "\proper atmospheric technician's locker"
 	req_access = list(ACCESS_ATMOSPHERICS)
@@ -103,3 +96,33 @@
 	new /obj/item/clothing/head/hardhat/atmos(src)
 	new /obj/item/clothing/glasses/meson/engine/tray(src)
 	new /obj/item/extinguisher/advanced(src)
+
+/*
+ * Empty lockers
+ * Some of the lockers are filled with junk, and sometimes its nice to just fill it with your own set-up for your own map gimmicks.
+ */
+
+/obj/structure/closet/secure_closet/engineering_chief/empty
+
+/obj/structure/closet/secure_closet/engineering_chief/empty/PopulateContents()
+	return
+
+/obj/structure/closet/secure_closet/engineering_electrical/empty
+
+/obj/structure/closet/secure_closet/engineering_electrical/empty/PopulateContents()
+	return
+
+/obj/structure/closet/secure_closet/engineering_welding/empty
+
+/obj/structure/closet/secure_closet/engineering_welding/empty/PopulateContents()
+	return
+
+/obj/structure/closet/secure_closet/engineering_personal/empty
+
+/obj/structure/closet/secure_closet/engineering_personal/empty/PopulateContents()
+	return
+
+/obj/structure/closet/secure_closet/atmospherics/empty
+
+/obj/structure/closet/secure_closet/atmospherics/empty/PopulateContents()
+	return
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 771b4bc04e..8b078802f0 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -237,6 +237,12 @@
 	start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
 	req_access = list(ACCESS_RD)
 
+/obj/structure/displaycase/clown
+	desc = "In the event of clown, honk glass."
+	alert = TRUE
+	start_showpiece_type = /obj/item/bikehorn
+	req_access = list(ACCESS_CENT_GENERAL)
+
 /obj/structure/displaycase/trophy
 	name = "trophy display case"
 	desc = "Store your trophies of accomplishment in here, and they will stay forever."
diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm
index e7a0ac2d04..1da8a26b52 100644
--- a/code/game/objects/structures/divine.dm
+++ b/code/game/objects/structures/divine.dm
@@ -39,7 +39,7 @@
 		return
 	last_process = world.time
 	to_chat(user, "<span class='notice'>The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.</span>")
-	user.reagents.add_reagent("godblood",20)
+	user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20)
 	update_icon()
 	addtimer(CALLBACK(src, /atom/.proc/update_icon), time_between_uses)
 
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 4304e275d1..705ca9a884 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -605,7 +605,7 @@
 	rank = "Gunner"
 
 /obj/effect/mob_spawn/human/ghostcafe
-	name = "ghost cafe sleeper"
+	name = "Ghost Cafe Sleeper"
 	uses = -1
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
@@ -626,13 +626,20 @@
 		O.equip(new_spawn, FALSE, new_spawn.client)
 		SSjob.equip_loadout(null, new_spawn, FALSE)
 		SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
+		new_spawn.AddElement(/datum/element/ghost_role_eligibility)
+		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
+		to_chat(new_spawn,"<span class='boldwarning'>You maybe sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
+		to_chat(new_spawn,"<span class='boldwarning'>You can turn yourself into a ghost and freely reenter your body with the ghost action.</span>")
+		var/datum/action/ghost/G = new(new_spawn)
+		G.Grant(new_spawn)
 
 /datum/outfit/ghostcafe
 	name = "ID, jumpsuit and shoes"
 	uniform = /obj/item/clothing/under/color/random
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	id = /obj/item/card/id
+	r_hand = /obj/item/storage/box/syndie_kit/chameleon/ghostcafe
 
 
 /datum/outfit/ghostcafe/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
@@ -649,3 +656,17 @@
 		else
 			uniform = /obj/item/clothing/under/skirt/color/random
 
+/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
+	name = "ghost cafe costuming kit"
+	desc = "Look just the way you did in life - or better!"
+
+/obj/item/storage/box/syndie_kit/chameleon/ghostcafe/PopulateContents() // Doesn't contain a PDA, for isolation reasons.
+	new /obj/item/clothing/under/chameleon(src)
+	new /obj/item/clothing/suit/chameleon(src)
+	new /obj/item/clothing/gloves/chameleon(src)
+	new /obj/item/clothing/shoes/chameleon(src)
+	new /obj/item/clothing/glasses/chameleon(src)
+	new /obj/item/clothing/head/chameleon(src)
+	new /obj/item/clothing/mask/chameleon(src)
+	new /obj/item/storage/backpack/chameleon(src)
+	new /obj/item/clothing/neck/cloak/chameleon(src)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index c0519f2504..205e87329b 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -84,7 +84,7 @@
 
 /obj/structure/grille/attack_animal(mob/user)
 	. = ..()
-	if(!shock(user, 70))
+	if(!shock(user, 70) && !QDELETED(src)) //Last hit still shocks but shouldn't deal damage to the grille)
 		take_damage(rand(5,10), BRUTE, "melee", 1)
 
 /obj/structure/grille/attack_paw(mob/user)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index b946a06432..c41d6d32af 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -18,7 +18,7 @@
 	//	flags = CONDUCT_1
 
 /obj/structure/lattice/examine(mob/user)
-	..()
+	. = ..()
 	. += deconstruction_hints(user)
 
 /obj/structure/lattice/proc/deconstruction_hints(mob/user)
@@ -60,7 +60,7 @@
 		to_chat(user, "<span class='notice'>You build a floor.</span>")
 		var/turf/T = src.loc
 		if(isspaceturf(T))
-			T.PlaceOnTop(/turf/open/floor/plating)
+			T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			qdel(src)
 			return TRUE
 	return FALSE
diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm
index bd657fe1e8..f2c4e628e0 100644
--- a/code/game/objects/structures/stairs.dm
+++ b/code/game/objects/structures/stairs.dm
@@ -102,13 +102,13 @@
 /obj/structure/stairs/proc/force_open_above()
 	var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 	if(T && !istype(T))
-		T.ChangeTurf(/turf/open/openspace)
+		T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
 
 /obj/structure/stairs/proc/on_multiz_new(turf/source, dir)
 	if(dir == UP)
 		var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
 		if(T && !istype(T))
-			T.ChangeTurf(/turf/open/openspace)
+			T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
 
 /obj/structure/stairs/intercept_zImpact(atom/movable/AM, levels = 1)
 	. = ..()
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 99f8875aef..3c6a277307 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -182,6 +182,17 @@
 	else
 		return ..()
 
+/obj/structure/table/alt_attack_hand(mob/user)
+	if(user && Adjacent(user) && !user.incapacitated())
+		user.setClickCooldown(4)
+		if(istype(user) && user.a_intent == INTENT_HARM)
+			user.visible_message("<span class='warning'>[user] slams [user.p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
+			playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
+		else
+			user.visible_message("<span class='notice'>[user] slaps [user.p_their()] hands on [src].</span>", "<span class='notice'>You slap your hands on [src].</span>")
+			playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+		user.do_attack_animation(src)
+		return TRUE
 
 /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
 	if(!(flags_1 & NODECONSTRUCT_1))
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 76c8f7f11f..a8f95e30da 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -5,6 +5,8 @@
 	icon_state = "toilet00"
 	density = FALSE
 	anchored = TRUE
+	can_buckle = TRUE
+	buckle_lying = 0
 	var/open = FALSE			//if the lid is up
 	var/cistern = 0			//if the cistern bit is open
 	var/w_items = 0			//the combined w_class of all the items in the cistern
@@ -101,7 +103,7 @@
 		if (!open)
 			return
 		var/obj/item/reagent_containers/RG = I
-		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+		RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		to_chat(user, "<span class='notice'>You fill [RG] from [src]. Gross.</span>")
 	else
 		return ..()
@@ -199,7 +201,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "urinalcake"
 	w_class = WEIGHT_CLASS_TINY
-	list_reagents = list("chlorine" = 3, "ammonia" = 1)
+	list_reagents = list(/datum/reagent/chlorine = 3, /datum/reagent/ammonia = 1)
 
 /obj/item/reagent_containers/food/urinalcake/attack_self(mob/living/user)
 	user.visible_message("<span class='notice'>[user] squishes [src]!</span>", "<span class='notice'>You squish [src].</span>", "<i>You hear a squish.</i>")
@@ -461,7 +463,7 @@
 	desc = "A sink used for washing one's hands and face."
 	anchored = TRUE
 	var/busy = FALSE 	//Something's being washed at the moment
-	var/dispensedreagent = "water" // for whenever plumbing happens
+	var/dispensedreagent = /datum/reagent/water // for whenever plumbing happens
 
 
 /obj/structure/sink/attack_hand(mob/living/user)
@@ -536,7 +538,7 @@
 				return
 
 	if(istype(O, /obj/item/mop))
-		O.reagents.add_reagent("[dispensedreagent]", 5)
+		O.reagents.add_reagent(dispensedreagent, 5)
 		to_chat(user, "<span class='notice'>You wet [O] in [src].</span>")
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 		return
@@ -682,4 +684,4 @@
 			else
 				playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
 		if(BURN)
-			playsound(loc, 'sound/items/welder.ogg', 80, 1)
\ No newline at end of file
+			playsound(loc, 'sound/items/welder.ogg', 80, 1)
diff --git a/code/game/turfs/baseturf_skipover.dm b/code/game/turfs/baseturf_skipover.dm
index 644714f8ed..4df8c86e62 100644
--- a/code/game/turfs/baseturf_skipover.dm
+++ b/code/game/turfs/baseturf_skipover.dm
@@ -10,4 +10,9 @@
 
 /turf/baseturf_skipover/shuttle
 	name = "Shuttle baseturf skipover"
-	desc = "Acts as the bottom of the shuttle, if this isn't here the shuttle floor is broken through."
\ No newline at end of file
+	desc = "Acts as the bottom of the shuttle, if this isn't here the shuttle floor is broken through."
+
+/turf/baseturf_bottom
+	name = "Z-level baseturf placeholder"
+	desc = "Marker for z-level baseturf, usually resolves to space."
+	baseturfs = /turf/baseturf_bottom
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index 6a055bbd35..bc4cd8df33 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -1,6 +1,7 @@
 // This is a list of turf types we dont want to assign to baseturfs unless through initialization or explicitly
 GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 	/turf/open/space,
+	/turf/baseturf_bottom
 	)))
 
 /turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, flags)
@@ -56,12 +57,20 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 // Creates a new turf
 // new_baseturfs can be either a single type or list of types, formated the same as baseturfs. see turf.dm
 /turf/proc/ChangeTurf(path, list/new_baseturfs, flags)
-	if(!path)
-		return
-	if(path == /turf/open/space/basic)
-		// basic doesn't initialize and this will cause issues
-		// no warning though because this can happen naturaly as a result of it being built on top of
-		path = /turf/open/space
+	switch(path)
+		if(null)
+			return
+		if(/turf/baseturf_bottom)
+			path = SSmapping.level_trait(z, ZTRAIT_BASETURF) || /turf/open/space
+			if (!ispath(path))
+				path = text2path(path)
+				if (!ispath(path))
+					warning("Z-level [z] has invalid baseturf '[SSmapping.level_trait(z, ZTRAIT_BASETURF)]'")
+					path = /turf/open/space
+		if(/turf/open/space/basic)
+			// basic doesn't initialize and this will cause issues
+			// no warning though because this can happen naturaly as a result of it being built on top of
+			path = /turf/open/space
 	if(!GLOB.use_preloader && path == type && !(flags & CHANGETURF_FORCEOP)) // Don't no-op if the map loader requires it to be reconstructed
 		return src
 	if(flags & CHANGETURF_SKIP)
@@ -128,16 +137,15 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 /turf/open/ChangeTurf(path, list/new_baseturfs, flags)
 	if ((flags & CHANGETURF_INHERIT_AIR) && ispath(path, /turf/open))
 		SSair.remove_from_active(src)
-		var/stashed_air = air
-		air = null // so that it doesn't get deleted
+		var/datum/gas_mixture/stashed_air = new()
+		stashed_air.copy_from(air)
 		. = ..()
-		if (!. || . == src) // changeturf failed or didn't do anything
-			air = stashed_air
+		if (!.) // changeturf failed or didn't do anything
+			QDEL_NULL(stashed_air)
 			return
 		var/turf/open/newTurf = .
-		if (!istype(newTurf.air, /datum/gas_mixture/immutable/space))
-			QDEL_NULL(newTurf.air)
-			newTurf.air = stashed_air
+		newTurf.air.copy_from(stashed_air)
+		QDEL_NULL(stashed_air)
 		SSair.add_to_active(newTurf)
 	else
 		if(ispath(path,/turf/closed))
@@ -215,7 +223,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 			newT.assemble_baseturfs(initial(fake_turf_type.baseturfs)) // The baseturfs list is created like roundstart
 			if(!length(newT.baseturfs))
 				newT.baseturfs = list(baseturfs)
-			newT.baseturfs -= newT.baseturfs & GLOB.blacklisted_automated_baseturfs
+			newT.baseturfs -= GLOB.blacklisted_automated_baseturfs
 			newT.baseturfs.Insert(1, old_baseturfs) // The old baseturfs are put underneath
 			return newT
 		if(!length(baseturfs))
@@ -315,5 +323,5 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 	SSair.add_to_active(src)
 
 /turf/proc/ReplaceWithLattice()
-	ScrapeAway()
+	ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 	new /obj/structure/lattice(locate(x, y, z))
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 6297cadc63..9e593cafce 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -23,7 +23,7 @@
 	icon = 'icons/turf/walls.dmi'
 	explosion_block = 50
 
-/turf/closed/indestructible/TerraformTurf(path, defer_change = FALSE, ignore_air = FALSE)
+/turf/closed/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
 	return
 
 /turf/closed/indestructible/acid_act(acidpwr, acid_volume, acid_id)
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 4bdb13effc..577c45a7f0 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -58,7 +58,7 @@
 /turf/open/indestructible/singularity_act()
 	return
 
-/turf/open/indestructible/TerraformTurf(path, defer_change = FALSE, ignore_air = FALSE)
+/turf/open/indestructible/TerraformTurf(path, new_baseturf, flags, defer_change = FALSE, ignore_air = FALSE)
 	return
 
 /turf/open/indestructible/sound
diff --git a/code/game/turfs/openspace/openspace.dm b/code/game/turfs/openspace/openspace.dm
index e68aabcd08..66507e7053 100644
--- a/code/game/turfs/openspace/openspace.dm
+++ b/code/game/turfs/openspace/openspace.dm
@@ -106,7 +106,7 @@
 				qdel(L)
 				playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 				to_chat(user, "<span class='notice'>You build a floor.</span>")
-				PlaceOnTop(/turf/open/floor/plating)
+				PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			else
 				to_chat(user, "<span class='warning'>You need one floor tile to build a floor!</span>")
 		else
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm
index 0a7b507488..dab0c1c376 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -38,7 +38,7 @@
 	switch(passed_mode)
 		if(RCD_FLOORWALL)
 			to_chat(user, "<span class='notice'>You build a floor.</span>")
-			PlaceOnTop(/turf/open/floor/plating)
+			PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			return TRUE
 	return FALSE
 
@@ -70,7 +70,7 @@
 				playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 				to_chat(user, "<span class='notice'>You build a floor.</span>")
 				// Create a floor, which has this chasm underneath it
-				PlaceOnTop(/turf/open/floor/plating)
+				PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			else
 				to_chat(user, "<span class='warning'>You need one floor tile to build a floor!</span>")
 		else
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index d14a4c7385..f9153ff8bf 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -62,29 +62,29 @@
 	if(severity != 1 && shielded && target != src)
 		return
 	if(target == src)
-		ScrapeAway()
+		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 		return
 	if(target != null)
 		severity = 3
 
 	switch(severity)
 		if(1)
-			ScrapeAway(2)
+			ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
 		if(2)
 			switch(pick(1,2;75,3))
 				if(1)
 					if(!length(baseturfs) || !ispath(baseturfs[baseturfs.len-1], /turf/open/floor))
-						ScrapeAway()
+						ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 						ReplaceWithLattice()
 					else
-						ScrapeAway(2)
+						ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
 					if(prob(33))
 						new /obj/item/stack/sheet/metal(src)
 				if(2)
-					ScrapeAway(2)
+					ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
 				if(3)
 					if(prob(80))
-						ScrapeAway()
+						ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 					else
 						break_tile()
 					hotspot_expose(1000,CELL_VOLUME)
@@ -135,7 +135,7 @@
 	burnt = 1
 
 /turf/open/floor/proc/make_plating()
-	return ScrapeAway()
+	return ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 
 /turf/open/floor/ChangeTurf(path, new_baseturf, flags)
 	if(!isfloorturf(src))
@@ -177,7 +177,7 @@
 	I.play_tool_sound(src, 80)
 	return remove_tile(user, silent)
 
-/turf/open/floor/proc/remove_tile(mob/user, silent = FALSE, make_tile = TRUE)
+/turf/open/floor/proc/remove_tile(mob/user, silent = FALSE, make_tile = TRUE, forced = FALSE)
 	if(broken || burnt)
 		broken = 0
 		burnt = 0
@@ -191,37 +191,33 @@
 	return make_plating()
 
 /turf/open/floor/singularity_pull(S, current_size)
-	..()
-	if(current_size == STAGE_THREE)
-		if(prob(30))
+	. = ..()
+	switch(current_size)
+		if(STAGE_THREE)
+			if(floor_tile && prob(30))
+				remove_tile()
+		if(STAGE_FOUR)
+			if(floor_tile && prob(50))
+				remove_tile()
+		if(STAGE_FIVE to INFINITY)
 			if(floor_tile)
-				new floor_tile(src)
-				make_plating()
-	else if(current_size == STAGE_FOUR)
-		if(prob(50))
-			if(floor_tile)
-				new floor_tile(src)
-				make_plating()
-	else if(current_size >= STAGE_FIVE)
-		if(floor_tile)
-			if(prob(70))
-				new floor_tile(src)
-				make_plating()
-		else if(prob(50))
-			ReplaceWithLattice()
+				if(prob(70))
+					remove_tile()
+			else if(prob(50))
+				ReplaceWithLattice()
 
 /turf/open/floor/narsie_act(force, ignore_mobs, probability = 20)
 	. = ..()
 	if(.)
-		ChangeTurf(/turf/open/floor/engine/cult)
+		ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
 
 /turf/open/floor/ratvar_act(force, ignore_mobs)
 	. = ..()
 	if(.)
-		ChangeTurf(/turf/open/floor/clockwork)
+		ChangeTurf(/turf/open/floor/clockwork, flags = CHANGETURF_INHERIT_AIR)
 
 /turf/open/floor/acid_melt()
-	ScrapeAway()
+	ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 
 /turf/open/floor/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
@@ -267,7 +263,7 @@
 			A.autoclose = TRUE
 			return TRUE
 		if(RCD_DECONSTRUCT)
-			if(ScrapeAway() == src)
+			if(ScrapeAway(flags = CHANGETURF_INHERIT_AIR) == src)
 				return FALSE
 			to_chat(user, "<span class='notice'>You deconstruct [src].</span>")
 			return TRUE
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 82f1a88253..f38a8a3d9b 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -44,7 +44,7 @@
 	C.play_tool_sound(src, 80)
 	return remove_tile(user, silent, (C.tool_behaviour == TOOL_SCREWDRIVER))
 
-/turf/open/floor/wood/remove_tile(mob/user, silent = FALSE, make_tile = TRUE)
+/turf/open/floor/wood/remove_tile(mob/user, silent = FALSE, make_tile = TRUE, forced = FALSE)
 	if(broken || burnt)
 		broken = 0
 		burnt = 0
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index ae67edf073..8e0eace9cd 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -11,7 +11,7 @@
 	name = "plating"
 	icon_state = "plating"
 	intact = FALSE
-	baseturfs = /turf/open/space
+	baseturfs = /turf/baseturf_bottom
 	footstep = FOOTSTEP_PLATING
 	barefootstep = FOOTSTEP_HARD_BAREFOOT
 	clawfootstep = FOOTSTEP_HARD_CLAW
@@ -61,7 +61,7 @@
 			to_chat(user, "<span class='notice'>You begin reinforcing the floor...</span>")
 			if(do_after(user, 30, target = src))
 				if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine))
-					PlaceOnTop(/turf/open/floor/engine)
+					PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR)
 					playsound(src, 'sound/items/deconstruct.ogg', 80, 1)
 					R.use(2)
 					to_chat(user, "<span class='notice'>You reinforce the floor.</span>")
@@ -76,7 +76,7 @@
 			var/obj/item/stack/tile/W = C
 			if(!W.use(1))
 				return
-			var/turf/open/floor/T = PlaceOnTop(W.turf_type)
+			var/turf/open/floor/T = PlaceOnTop(W.turf_type, flags = CHANGETURF_INHERIT_AIR)
 			if(istype(W, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
 				var/obj/item/stack/tile/light/L = W
 				var/turf/open/floor/light/F = T
@@ -117,7 +117,7 @@
 				qdel(L)
 			to_chat(user, "<span class='notice'>You reinforce the foamed plating with tiling.</span>")
 			playsound(src, 'sound/weapons/Genhit.ogg', 50, TRUE)
-			ChangeTurf(/turf/open/floor/plating)
+			ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 	else
 		playsound(src, 'sound/weapons/tap.ogg', 100, TRUE) //The attack sound is muffled by the foam itself
 		user.changeNext_move(CLICK_CD_MELEE)
@@ -125,7 +125,7 @@
 		if(prob(I.force * 20 - 25))
 			user.visible_message("<span class='danger'>[user] smashes through [src]!</span>", \
 							"<span class='danger'>You smash through [src] with [I]!</span>")
-			ScrapeAway()
+			ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 		else
 			to_chat(user, "<span class='danger'>You hit [src], to no effect!</span>")
 
@@ -136,13 +136,13 @@
 /turf/open/floor/plating/foam/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
 	if(passed_mode == RCD_FLOORWALL)
 		to_chat(user, "<span class='notice'>You build a floor.</span>")
-		ChangeTurf(/turf/open/floor/plating)
+		ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 		return TRUE
 	return FALSE
 
 /turf/open/floor/plating/foam/ex_act()
 	..()
-	ScrapeAway()
+	ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 
 /turf/open/floor/plating/foam/tool_act(mob/living/user, obj/item/I, tool_type)
 	return
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 9f2da57312..ecc8ee5e8d 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -76,11 +76,6 @@
 			for(var/obj/item/stack/ore/O in src)
 				SEND_SIGNAL(W, COMSIG_PARENT_ATTACKBY, O)
 
-/turf/open/floor/plating/asteroid/singularity_act()
-	if(is_planet_level(z))
-		return ..()
-	ScrapeAway()
-
 /turf/open/floor/plating/asteroid/ex_act(severity, target)
 	. = SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target)
 	contents_explosion(severity, target)
@@ -132,6 +127,7 @@
 
 /turf/open/floor/plating/asteroid/airless
 	initial_gas_mix = AIRLESS_ATMOS
+	baseturfs = /turf/open/floor/plating/asteroid/airless
 	turf_type = /turf/open/floor/plating/asteroid/airless
 
 
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm
index b04f89f8be..7816341a0a 100644
--- a/code/game/turfs/simulated/floor/reinf_floor.dm
+++ b/code/game/turfs/simulated/floor/reinf_floor.dm
@@ -43,7 +43,7 @@
 			return TRUE
 		if(floor_tile)
 			new floor_tile(src, 2)
-		ScrapeAway()
+		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 	return TRUE
 
 /turf/open/floor/engine/acid_act(acidpwr, acid_volume)
@@ -56,34 +56,36 @@
 	if(severity != 1 && shielded && target != src)
 		return
 	if(target == src)
-		ScrapeAway()
+		ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 		return
 	switch(severity)
 		if(1)
 			if(prob(80))
 				if(!length(baseturfs) || !ispath(baseturfs[baseturfs.len-1], /turf/open/floor))
-					ScrapeAway()
+					ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 					ReplaceWithLattice()
 				else
-					ScrapeAway(2)
+					ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
 			else if(prob(50))
-				ScrapeAway(2)
+				ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
 			else
-				ScrapeAway()
+				ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 		if(2)
 			if(prob(50))
-				ScrapeAway()
+				ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 
 /turf/open/floor/engine/singularity_pull(S, current_size)
 	..()
-	if(current_size >= STAGE_FIVE)
+	if(current_size >= STAGE_FIVE && prob(30))
 		if(floor_tile)
-			if(prob(30))
-				new floor_tile(src)
-				make_plating()
-		else if(prob(30))
+			remove_tile(forced = TRUE)
+		else
 			ReplaceWithLattice()
 
+/turf/open/floor/engine/remove_tile(mob/user, silent = FALSE, make_tile = TRUE, forced = FALSE)
+	if(forced)
+		return ..()
+
 /turf/open/floor/engine/attack_paw(mob/user)
 	return attack_hand(user)
 
diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm
index 362b410cbb..2f8ae0cb93 100644
--- a/code/game/turfs/simulated/lava.dm
+++ b/code/game/turfs/simulated/lava.dm
@@ -54,7 +54,7 @@
 	switch(passed_mode)
 		if(RCD_FLOORWALL)
 			to_chat(user, "<span class='notice'>You build a floor.</span>")
-			PlaceOnTop(/turf/open/floor/plating)
+			PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			return TRUE
 	return FALSE
 
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index aeadceb2e5..73c1c465cd 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -47,7 +47,8 @@
 	return ..()
 
 
-/turf/closed/mineral/attackby(obj/item/I, mob/user, params)
+/turf/closed/mineral/attackby(obj/item/pickaxe/I, mob/user, params)
+	var/stored_dir = user.dir
 	if (!user.IsAdvancedToolUser())
 		to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
@@ -63,7 +64,12 @@
 		to_chat(user, "<span class='notice'>You start picking...</span>")
 
 		if(I.use_tool(src, user, 40, volume=50))
+			var/range = I.digrange //Store the current digrange so people don't cheese digspeed swapping for faster mining
 			if(ismineralturf(src))
+				if(I.digrange > 0)
+					for(var/turf/closed/mineral/M in range(user,range))
+						if(get_dir(user,M)&stored_dir)
+							M.gets_drilled()
 				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
 				gets_drilled(user)
 				SSblackbox.record_feedback("tally", "pick_used_mining", 1, I.type)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index f38f13e657..5278374abd 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -125,7 +125,7 @@
 				qdel(L)
 				playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 				to_chat(user, "<span class='notice'>You build a floor.</span>")
-				PlaceOnTop(/turf/open/floor/plating)
+				PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			else
 				to_chat(user, "<span class='warning'>You need one floor tile to build a floor!</span>")
 		else
@@ -212,7 +212,7 @@
 	switch(passed_mode)
 		if(RCD_FLOORWALL)
 			to_chat(user, "<span class='notice'>You build a floor.</span>")
-			PlaceOnTop(/turf/open/floor/plating)
+			PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			return TRUE
 	return FALSE
 
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d618e457b0..e81b3d1062 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -9,7 +9,7 @@
 	// A list will be created in initialization that figures out the baseturf's baseturf etc.
 	// In the case of a list it is sorted from bottom layer to top.
 	// This shouldn't be modified directly, use the helper procs.
-	var/list/baseturfs = /turf/open/space
+	var/list/baseturfs = /turf/baseturf_bottom
 
 	var/temperature = T20C
 	var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
@@ -391,7 +391,7 @@
 				continue
 			if(O.invisibility == INVISIBILITY_MAXIMUM)
 				O.singularity_act()
-	ScrapeAway()
+	ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 	return(2)
 
 /turf/proc/can_have_cabling()
@@ -554,14 +554,12 @@
 			clear_reagents_to_vomit_pool(C,V)
 
 /proc/clear_reagents_to_vomit_pool(mob/living/carbon/M, obj/effect/decal/cleanable/vomit/V)
+	for(var/datum/reagent/consumable/R in M.reagents.reagent_list)                //clears the stomach of anything that might be digested as food
+		if(R.nutriment_factor > 0)
+			M.reagents.del_reagent(R.type)
 	M.reagents.trans_to(V, M.reagents.total_volume / 10)
-	for(var/datum/reagent/R in M.reagents.reagent_list)                //clears the stomach of anything that might be digested as food
-		if(istype(R, /datum/reagent/consumable))
-			var/datum/reagent/consumable/nutri_check = R
-			if(nutri_check.nutriment_factor >0)
-				M.reagents.remove_reagent(R.id,R.volume)
 
 //Whatever happens after high temperature fire dies out or thermite reaction works.
 //Should return new turf
 /turf/proc/Melt()
-	return ScrapeAway()
+	return ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
diff --git a/code/game/world.dm b/code/game/world.dm
index 25b8c4d9f3..e68372d768 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -2,6 +2,9 @@
 
 GLOBAL_VAR(restart_counter)
 
+GLOBAL_VAR(topic_status_lastcache)
+GLOBAL_LIST(topic_status_cache)
+
 //This happens after the Master subsystem new(s) (it's a global datum)
 //So subsystems globals exist, but are not initialised
 /world/New()
@@ -108,9 +111,11 @@ GLOBAL_VAR(restart_counter)
 	GLOB.world_href_log = "[GLOB.log_directory]/hrefs.log"
 	GLOB.sql_error_log = "[GLOB.log_directory]/sql.log"
 	GLOB.world_qdel_log = "[GLOB.log_directory]/qdel.log"
+	GLOB.world_map_error_log = "[GLOB.log_directory]/map_errors.log"
 	GLOB.world_runtime_log = "[GLOB.log_directory]/runtime.log"
 	GLOB.query_debug_log = "[GLOB.log_directory]/query_debug.log"
 	GLOB.world_job_debug_log = "[GLOB.log_directory]/job_debug.log"
+	GLOB.subsystem_log = "[GLOB.log_directory]/subsystem.log"
 
 #ifdef UNIT_TESTS
 	GLOB.test_log = file("[GLOB.log_directory]/tests.log")
@@ -125,6 +130,7 @@ GLOBAL_VAR(restart_counter)
 	start_log(GLOB.world_qdel_log)
 	start_log(GLOB.world_runtime_log)
 	start_log(GLOB.world_job_debug_log)
+	start_log(GLOB.subsystem_log)
 
 	GLOB.changelog_hash = md5('html/changelog.html') //for telling if the changelog has changed recently
 	if(fexists(GLOB.config_error_log))
@@ -142,6 +148,14 @@ GLOBAL_VAR(restart_counter)
 /world/Topic(T, addr, master, key)
 	TGS_TOPIC	//redirect to server tools if necessary
 
+	if(!SSfail2topic)
+		return "Server not initialized."
+	else if(SSfail2topic.IsRateLimited(addr))
+		return "Rate limited."
+
+	if(length(T) > CONFIG_GET(number/topic_max_size))
+		return "Payload too large!"
+
 	var/static/list/topic_handlers = TopicHandlers()
 
 	var/list/input = params2list(T)
@@ -158,7 +172,7 @@ GLOBAL_VAR(restart_counter)
 		return
 
 	handler = new handler()
-	return handler.TryRun(input)
+	return handler.TryRun(input, addr)
 
 /world/proc/AnnouncePR(announcement, list/payload)
 	var/static/list/PRcounts = list()	//PR id -> number of times announced this round
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 839292871c..03670009f8 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -16,8 +16,16 @@
 	if (text2num(computer_id) == 2147483647) //this cid causes stickybans to go haywire
 		log_access("Failed Login (invalid cid): [key] [address]-[computer_id]")
 		return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided an invalid Computer ID.)")
-	var/admin = 0
+
+	if (type == "world")
+		return ..() //shunt world topic banchecks to purely to byond's internal ban system
+
 	var/ckey = ckey(key)
+	var/client/C = GLOB.directory[ckey]
+	if (C && ckey == C.ckey && computer_id == C.computer_id && address == C.address)
+		return //don't recheck connected clients.
+
+	var/admin = FALSE
 	if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey])
 		admin = 1
 
@@ -126,7 +134,6 @@
 			bannedckey = ban["ckey"]
 
 		var/newmatch = FALSE
-		var/client/C = GLOB.directory[ckey]
 		var/cachedban = SSstickyban.cache[bannedckey]
 
 		//rogue ban in the process of being reverted.
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 895f8c9f88..1cecbbd0e5 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -693,7 +693,7 @@
 	var/prev_dynamic_voting = CONFIG_GET(flag/dynamic_voting)
 	CONFIG_SET(flag/dynamic_voting,!prev_dynamic_voting)
 	if (!prev_dynamic_voting)
-		to_chat(world, "<B>Vote is now between extended and dynamic chaos.</B>")
+		to_chat(world, "<B>Vote is now a ranked choice of dynamic storytellers.</B>")
 	else
 		to_chat(world, "<B>Vote is now between extended and secret.</B>")
 	log_admin("[key_name(usr)] [prev_dynamic_voting ? "disabled" : "enabled"] dynamic voting.")
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 2b8d365e15..acd320856a 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -35,6 +35,9 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/cmd_admin_grantfullaccess,
 	/client/proc/cmd_admin_areatest_all,
 	/client/proc/cmd_admin_areatest_station,
+	#ifdef TESTING
+	/client/proc/see_dirty_varedits,
+	#endif
 	/client/proc/cmd_admin_test_atmos_controllers,
 	/client/proc/cmd_admin_rejuvenate,
 	/datum/admins/proc/show_traitor_panel,
@@ -84,8 +87,24 @@ GLOBAL_PROTECT(admin_verbs_debug_mapping)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Range")
 
+#ifdef TESTING
+GLOBAL_LIST_EMPTY(dirty_vars)
 
 
+/client/proc/see_dirty_varedits()
+	set category = "Mapping"
+	set name = "Dirty Varedits"
+
+	var/list/dat = list()
+	dat += "<h3>Abandon all hope ye who enter here</h3><br><br>"
+	for(var/thing in GLOB.dirty_vars)
+		dat += "[thing]<br>"
+		CHECK_TICK
+	var/datum/browser/popup = new(usr, "dirty_vars", "Dirty Varedits", 900, 750)
+	popup.set_content(dat.Join())
+	popup.open()
+#endif
+
 /client/proc/sec_camera_report()
 	set category = "Mapping"
 	set name = "Camera Report"
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 09a8f692d8..7675f858ee 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -137,9 +137,9 @@
 
 /datum/admins/proc/makeWizard()
 
-	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", ROLE_WIZARD, null)
+	var/list/mob/candidates = pollGhostCandidates("Do you wish to be considered for the position of a Wizard Foundation 'diplomat'?", ROLE_WIZARD, null)
 
-	var/mob/dead/observer/selected = pick_n_take(candidates)
+	var/mob/selected = pick_n_take(candidates)
 
 	var/mob/living/carbon/human/new_character = makeBody(selected)
 	new_character.mind.make_Wizard()
@@ -214,9 +214,9 @@
 
 /datum/admins/proc/makeNukeTeam()
 	var/datum/game_mode/nuclear/temp = new
-	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for a nuke team being sent in?", ROLE_OPERATIVE, temp)
-	var/list/mob/dead/observer/chosen = list()
-	var/mob/dead/observer/theghost = null
+	var/list/mob/candidates = pollGhostCandidates("Do you wish to be considered for a nuke team being sent in?", ROLE_OPERATIVE, temp)
+	var/list/mob/chosen = list()
+	var/mob/theghost = null
 
 	if(candidates.len)
 		var/numagents = 5
@@ -378,7 +378,7 @@
 		ertemplate.enforce_human = prefs["enforce_human"]["value"] == "Yes" ? TRUE : FALSE
 		ertemplate.opendoors = prefs["open_armory"]["value"] == "Yes" ? TRUE : FALSE
 
-		var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for [ertemplate.polldesc] ?", "deathsquad", null)
+		var/list/mob/candidates = pollGhostCandidates("Do you wish to be considered for [ertemplate.polldesc] ?", "deathsquad", null)
 		var/teamSpawned = FALSE
 
 		if(candidates.len > 0)
@@ -404,7 +404,7 @@
 					numagents--
 					continue // This guy's unlucky, not enough spawn points, we skip him.
 				var/spawnloc = spawnpoints[numagents]
-				var/mob/dead/observer/chosen_candidate = pick(candidates)
+				var/mob/chosen_candidate = pick(candidates)
 				candidates -= chosen_candidate
 				if(!chosen_candidate.key)
 					continue
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 433f52306b..dc6d12453d 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -484,11 +484,9 @@
 
 	user.do_attack_animation(L)
 
-	if(ishuman(L))
-		var/mob/living/carbon/human/H = L
-		if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
-			playsound(H, 'sound/weapons/genhit.ogg', 50, TRUE)
-			return FALSE
+	if(L.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+		playsound(L, 'sound/weapons/genhit.ogg', 50, TRUE)
+		return FALSE
 
 	switch (mode)
 		if(BATON_STUN)
@@ -797,7 +795,7 @@
 	icon_state = "bed"
 	can_buckle = 1
 
-	var/static/list/injected_reagents = list("corazone")
+	var/static/list/injected_reagents = list(/datum/reagent/medicine/corazone)
 
 /obj/structure/table/optable/abductor/Crossed(atom/movable/AM)
 	. = ..()
diff --git a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
index 3cb90d64bb..182fcea0c2 100644
--- a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
+++ b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
@@ -143,9 +143,9 @@
 	create_reagents(10)
 
 	if(overmind && overmind.blob_reagent_datum)
-		reagents.add_reagent(overmind.blob_reagent_datum.id, 10)
+		reagents.add_reagent(overmind.blob_reagent_datum.type, 10)
 	else
-		reagents.add_reagent("spore", 10)
+		reagents.add_reagent(/datum/reagent/toxin/spore, 10)
 
 	// Attach the smoke spreader and setup/start it.
 	S.attach(location)
diff --git a/code/modules/antagonists/blob/blob/powers.dm b/code/modules/antagonists/blob/blob/powers.dm
index 73c0776ad7..aeb1392432 100644
--- a/code/modules/antagonists/blob/blob/powers.dm
+++ b/code/modules/antagonists/blob/blob/powers.dm
@@ -166,7 +166,7 @@
 	if(!can_buy(40))
 		return
 
-	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a [blob_reagent_datum.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly
+	var/list/mob/candidates = pollGhostCandidates("Do you want to play as a [blob_reagent_datum.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly
 	if(LAZYLEN(candidates)) //if we got at least one candidate, they're a blobbernaut now.
 		B.max_integrity = initial(B.max_integrity) * 0.25 //factories that produced a blobbernaut have much lower health
 		B.obj_integrity = min(B.obj_integrity, B.max_integrity)
@@ -181,7 +181,7 @@
 		blobber.update_icons()
 		blobber.adjustHealth(blobber.maxHealth * 0.5)
 		blob_mobs += blobber
-		var/mob/dead/observer/C = pick(candidates)
+		var/mob/C = pick(candidates)
 		C.transfer_ckey(blobber)
 		SEND_SOUND(blobber, sound('sound/effects/blobattack.ogg'))
 		SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
index 9174692b49..bbb8aeca30 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
@@ -84,8 +84,8 @@
 	//It is called from your coffin on close (by you only)
 	if(poweron_masquerade == TRUE || owner.current.AmStaked())
 		return FALSE
-	owner.current.adjustStaminaLoss(-2 + (regenRate * -10) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more.
-	owner.current.adjustCloneLoss(-1 * (regenRate * 4) * mult, 0)
+	owner.current.adjustStaminaLoss(-2 + (regenRate * 8) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more.
+	owner.current.adjustCloneLoss(-0.1 * (regenRate * 2) * mult, 0)
 	owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (regenRate * 4) * mult) //adjustBrainLoss(-1 * (regenRate * 4) * mult, 0)
 	// No Bleeding
 	if(ishuman(owner.current)) //NOTE Current bleeding is horrible, not to count the amount of blood ballistics delete.
@@ -97,7 +97,7 @@
 		var/fireheal = 0 	// BURN: Heal in Coffin while Fakedeath, or when damage above maxhealth (you can never fully heal fire)
 		var/amInCoffinWhileTorpor = istype(C.loc, /obj/structure/closet/crate/coffin) && (mult == 0 || HAS_TRAIT(C, TRAIT_DEATHCOMA)) // Check for mult 0 OR death coma. (mult 0 means we're testing from coffin)
 		if(amInCoffinWhileTorpor)
-			mult *= 5 // Increase multiplier if we're sleeping in a coffin.
+			mult *= 4 // Increase multiplier if we're sleeping in a coffin.
 			fireheal = min(C.getFireLoss_nonProsthetic(), regenRate) // NOTE: Burn damage ONLY heals in torpor.
 			costMult = 0.25
 			C.ExtinguishMob()
@@ -118,6 +118,8 @@
 		if(bruteheal + fireheal + toxinheal > 0) 	// Just a check? Don't heal/spend, and return.
 			if(mult == 0)
 				return TRUE
+			if(owner.current.stat >= UNCONSCIOUS) //Faster regeneration while unconcious, so you dont have to wait all day
+				mult *= 2  
 			// We have damage. Let's heal (one time)
 			C.adjustBruteLoss(-bruteheal * mult, forced = TRUE)// Heal BRUTE / BURN in random portions throughout the body.
 			C.adjustFireLoss(-fireheal * mult, forced = TRUE)
@@ -187,19 +189,19 @@
 /datum/antagonist/bloodsucker/proc/HandleDeath()
 	// 	FINAL DEATH
 	// Fire Damage? (above double health)
-	if (owner.current.getFireLoss_nonProsthetic() >= owner.current.getMaxHealth() * 2)
+	if(owner.current.getFireLoss_nonProsthetic() >= owner.current.getMaxHealth() * 1.5)
 		FinalDeath()
 		return
 	// Staked while "Temp Death" or Asleep
-	if (owner.current.StakeCanKillMe() && owner.current.AmStaked())
+	if(owner.current.StakeCanKillMe() && owner.current.AmStaked())
 		FinalDeath()
 		return
 	// Not "Alive"?
-	if (!owner.current || !isliving(owner.current) || isbrain(owner.current) || !get_turf(owner.current))
+	if(!owner.current || !isliving(owner.current) || isbrain(owner.current) || !get_turf(owner.current))
 		FinalDeath()
 		return
 	// Missing Brain or Heart?
-	if (!owner.current.HaveBloodsuckerBodyparts())
+	if(!owner.current.HaveBloodsuckerBodyparts())
 		FinalDeath()
 		return
 				// Disable Powers: Masquerade	* NOTE * This should happen as a FLAW!
@@ -212,21 +214,21 @@
 	var/total_toxloss = owner.current.getToxLoss() //This is neater than just putting it in total_damage
 	var/total_damage = total_brute + total_burn + total_toxloss
 	// Died? Convert to Torpor (fake death)
-	if (owner.current.stat >= DEAD)
+	if(owner.current.stat >= DEAD)
 		Torpor_Begin()
 		to_chat(owner, "<span class='danger'>Your immortal body will not yet relinquish your soul to the abyss. You enter Torpor.</span>")
+		sleep(30) //To avoid spam
 		if (poweron_masquerade == TRUE)
 			to_chat(owner, "<span class='warning'>Your wounds will not heal until you disable the <span class='boldnotice'>Masquerade</span> power.</span>")
 	// End Torpor:
 	else	// No damage, OR toxin healed AND brute healed and NOT in coffin (since you cannot heal burn)
-		if (total_damage <= 0 || total_toxloss <= 0 && total_brute <= 0 && !istype(owner.current.loc, /obj/structure/closet/crate/coffin))
+		if(total_damage <= 0 || total_toxloss <= 0 && total_brute <= 0 && !istype(owner.current.loc, /obj/structure/closet/crate/coffin))
 			// Not Daytime, Not in Torpor
-			if (!SSticker.mode.is_daylight() && HAS_TRAIT_FROM(owner.current, TRAIT_DEATHCOMA, "bloodsucker"))
+			if(!SSticker.mode.is_daylight() && HAS_TRAIT_FROM(owner.current, TRAIT_DEATHCOMA, "bloodsucker"))
 				Torpor_End()
 		// Fake Unconscious
-		if (poweron_masquerade == TRUE && total_damage >= owner.current.getMaxHealth() - HEALTH_THRESHOLD_FULLCRIT)
+		if(poweron_masquerade == TRUE && total_damage >= owner.current.getMaxHealth() - HEALTH_THRESHOLD_FULLCRIT)
 			owner.current.Unconscious(20,1)
-
 	//HEALTH_THRESHOLD_CRIT 0
 	//HEALTH_THRESHOLD_FULLCRIT -30
 	//HEALTH_THRESHOLD_DEAD -100
@@ -241,8 +243,8 @@
 	owner.current.update_sight()
 	owner.current.reload_fullscreen()
 	// Disable ALL Powers
-	for (var/datum/action/bloodsucker/power in powers)
-		if (power.active && !power.can_use_in_torpor)
+	for(var/datum/action/bloodsucker/power in powers)
+		if(power.active && !power.can_use_in_torpor)
 			power.DeactivatePower()
 
 
@@ -281,7 +283,7 @@
 	// Free my Vassals!
 	FreeAllVassals()
 	// Elders get Dusted
-	if (vamplevel >= 4) // (vamptitle)
+	if(vamplevel >= 4) // (vamptitle)
 		owner.current.visible_message("<span class='warning'>[owner.current]'s skin crackles and dries, their skin and bones withering to dust. A hollow cry whips from what is now a sandy pile of remains.</span>", \
 			 "<span class='userdanger'>Your soul escapes your withering body as the abyss welcomes you to your Final Death.</span>", \
 			 "<span class='italics'>You hear a dry, crackling sound.</span>")
@@ -306,7 +308,7 @@
 	if (!isliving(src))
 		return
 	var/mob/living/L = src
-	if (!L.AmBloodsucker())
+	if(!L.AmBloodsucker())
 		return
 	// We're a vamp? Try to eat food...
 	var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
@@ -315,7 +317,7 @@
 
 /datum/antagonist/bloodsucker/proc/handle_eat_human_food(var/food_nutrition) // Called from snacks.dm and drinks.dm
 	set waitfor = FALSE
-	if (!owner.current || !iscarbon(owner.current))
+	if(!owner.current || !iscarbon(owner.current))
 		return
 	var/mob/living/carbon/C = owner.current
 	// Remove Nutrition, Give Bad Food
diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
index 97b4437298..844b523135 100644
--- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
@@ -35,8 +35,8 @@
 	var/warn_sun_burn = FALSE			// So we only get the sun burn message once per day.
 	var/had_toxlover = FALSE
 	// LISTS
-	var/static/list/defaultTraits = list (TRAIT_STABLEHEART, TRAIT_NOBREATH, TRAIT_SLEEPIMMUNE, TRAIT_NOCRITDAMAGE, TRAIT_RESISTCOLD, TRAIT_RADIMMUNE, TRAIT_VIRUSIMMUNE, TRAIT_NIGHT_VISION, \
-										  TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_AGEUSIA, TRAIT_COLDBLOODED, TRAIT_NONATURALHEAL, TRAIT_NOMARROW, TRAIT_NOPULSE, TRAIT_NOCLONE)
+	var/static/list/defaultTraits = list (TRAIT_STABLEHEART, TRAIT_NOBREATH, TRAIT_SLEEPIMMUNE, TRAIT_NOCRITDAMAGE, TRAIT_RESISTCOLD, TRAIT_RADIMMUNE, TRAIT_NIGHT_VISION, \
+										  TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_AGEUSIA, TRAIT_COLDBLOODED, TRAIT_NONATURALHEAL, TRAIT_NOMARROW, TRAIT_NOPULSE, TRAIT_VIRUSIMMUNE)
 	// NOTES: TRAIT_AGEUSIA <-- Doesn't like flavors.
 	// REMOVED: TRAIT_NODEATH
 	// TO ADD:
@@ -334,7 +334,7 @@ datum/antagonist/bloodsucker/proc/SpendRank()
 	// Assign True Reputation
 	if(vamplevel == 4)
 		SelectReputation(am_fledgling = FALSE, forced = TRUE)
-	to_chat(owner.current, "<span class='notice'>You are now a rank [vamplevel] Bloodsucker. Your strength, resistence, health, feed rate, regen rate, and maximum blood have all increased!</span>")
+	to_chat(owner.current, "<span class='notice'>You are now a rank [vamplevel] Bloodsucker. Your strength, health, feed rate, regen rate, and maximum blood have all increased!</span>")
 	to_chat(owner.current, "<span class='notice'>Your existing powers have all ranked up as well!</span>")
 	update_hud(TRUE)
 	owner.current.playsound_local(null, 'sound/effects/pope_entry.ogg', 25, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head.
diff --git a/code/modules/antagonists/bloodsucker/datum_vassal.dm b/code/modules/antagonists/bloodsucker/datum_vassal.dm
index 71ee0bcc1d..716b7ff223 100644
--- a/code/modules/antagonists/bloodsucker/datum_vassal.dm
+++ b/code/modules/antagonists/bloodsucker/datum_vassal.dm
@@ -56,11 +56,6 @@
 	var/obj/item/organ/eyes/vassal/E = new
 	E.Insert(owner.current)
 
-/obj/item/organ/eyes/vassal/
-	lighting_alpha = 180 //  LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE  <--- This is too low a value at 128. We need to SEE what the darkness is so we can hide in it.
-	see_in_dark = 12
-	flash_protect = -1 //These eyes are weaker to flashes, but let you see in the dark
-
 /datum/antagonist/vassal/proc/remove_thrall_eyes()
 	var/obj/item/organ/eyes/E = new
 	E.Insert(owner.current)
diff --git a/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm b/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm
index 5a905857c5..e4e26fe034 100644
--- a/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm
+++ b/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm
@@ -51,6 +51,11 @@
 	return "<span class='danger'>no</span>"	// Bloodsuckers don't have a heartbeat at all when stopped (default is "an unstable")
 // 		EYES 		//
 
+/obj/item/organ/eyes/vassal/
+	lighting_alpha = 180 //  LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE  <--- This is too low a value at 128. We need to SEE what the darkness is so we can hide in it.
+	see_in_dark = 12
+	flash_protect = -1 //These eyes are weaker to flashes, but let you see in the dark
+
 /obj/item/organ/eyes/vassal/bloodsucker
 	flash_protect = 2 //Eye healing isnt working properly
 	sight_flags = SEE_MOBS // Taken from augmented_eyesight.dm
diff --git a/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm b/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm
index 9db4cae1ff..b7c90523b6 100644
--- a/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm
+++ b/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm
@@ -78,7 +78,7 @@
 	var/mob/living/carbon/C = target
 	// Needs to be Down/Slipped in some way to Stake.
 	if(!C.can_be_staked() || target == user)
-		to_chat(user, "<span class='danger'>You cant stake [target] when they are moving moving about! They have to be laying down!</span>")
+		to_chat(user, "<span class='danger'>You can't stake [target] when they are moving about! They have to be laying down or grabbed by the neck!</span>")
 		return
 			// Oops! Can't.
 	if(HAS_TRAIT(C, TRAIT_PIERCEIMMUNE))
@@ -113,7 +113,7 @@
 // Can this target be staked? If someone stands up before this is complete, it fails. Best used on someone stationary.
 /mob/living/carbon/proc/can_be_staked()
 	//return resting || IsKnockdown() || IsUnconscious() || (stat && (stat != SOFT_CRIT || pulledby)) || (has_trait(TRAIT_FAKEDEATH)) || resting || IsStun() || IsFrozen() || (pulledby && pulledby.grab_state >= GRAB_NECK)
-	return (src.resting || src.lying)
+	return (resting || lying || IsUnconscious() || pulledby && pulledby.grab_state >= GRAB_NECK)
 	// ABOVE:  Taken from update_mobility() in living.dm
 
 /obj/item/stake/hardened
diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
index 3493622945..f66ce4a208 100644
--- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
+++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
@@ -130,7 +130,7 @@
 /obj/structure/bloodsucker/vassalrack/MouseDrop_T(atom/movable/O, mob/user)
 	if(!O.Adjacent(src) || O == user || !isliving(O) || !isliving(user) || useLock || has_buckled_mobs() || user.incapacitated())
 		return
-	if(!anchored && user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
+	if(!anchored && isvamp(user))
 		to_chat(user, "<span class='danger'>Until this rack is secured in place, it cannot serve its purpose.</span>")
 		return
 	// PULL TARGET: Remember if I was pullin this guy, so we can restore this
@@ -183,7 +183,7 @@
 
 /obj/structure/bloodsucker/vassalrack/user_unbuckle_mob(mob/living/M, mob/user)
 	// Attempt Unbuckle
-	if(!user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER))
+	if(!isvamp(user))
 		if(M == user)
 			M.visible_message("<span class='danger'>[user] tries to release themself from the rack!</span>",\
 							"<span class='danger'>You attempt to release yourself from the rack!</span>") //  For sound if not seen -->  "<span class='italics'>You hear a squishy wet noise.</span>")
@@ -453,7 +453,7 @@
 
 /obj/structure/bloodsucker/candelabrum/examine(mob/user)
 	. = ..()
-	if((user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) || isobserver(user))
+	if((isvamp()) || isobserver(user))
 		. += {"<span class='cult'>This is a magical candle which drains at the sanity of mortals who are not under your command while it is active.</span>"}
 		. += {"<span class='cult'>You can alt click on it from any range to turn it on remotely, or simply be next to it and click on it to turn it on and off normally.</span>"}
 /*	if(user.mind.has_antag_datum(ANTAG_DATUM_VASSAL)
@@ -461,15 +461,13 @@
 		You can turn it on and off by clicking on it while you are next to it</span>"} */
 
 /obj/structure/bloodsucker/candelabrum/attack_hand(mob/user)
-	var/datum/antagonist/bloodsucker/V = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) //I wish there was a better way to do this
 	var/datum/antagonist/vassal/T = user.mind.has_antag_datum(ANTAG_DATUM_VASSAL)
-	if(istype(V) || istype(T))
+	if(isvamp(user) || istype(T))
 		toggle()
 
 /obj/structure/bloodsucker/candelabrum/AltClick(mob/user)
-	var/datum/antagonist/bloodsucker/V = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
 	// Bloodsuckers can turn their candles on from a distance. SPOOOOKY.
-	if(istype(V))
+	if(isvamp(user))
 		toggle()
 
 /obj/structure/bloodsucker/candelabrum/proc/toggle(mob/user)
@@ -486,8 +484,7 @@
 	if(lit)
 		for(var/mob/living/carbon/human/H in viewers(7, src))
 			var/datum/antagonist/vassal/T = H.mind.has_antag_datum(ANTAG_DATUM_VASSAL)
-			var/datum/antagonist/bloodsucker/V = H.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
-			if(V || T) //We dont want vassals or vampires affected by this
+			if(isvamp(H) || T) //We dont want vassals or vampires affected by this
 				return
 			H.hallucination = 20
 			SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "vampcandle", /datum/mood_event/vampcandle)
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm b/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm
index cea942e26d..9126638fea 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm
@@ -9,8 +9,9 @@
 	bloodsucker_can_buy = TRUE
 	amToggle = TRUE
 	warn_constant_cost = TRUE
+	var/was_running
 
-	var/light_min = 0.5 	// If lum is above this, no good.
+	var/light_min = 0.2  	// If lum is above this, no good.
 
 /datum/action/bloodsucker/cloak/CheckCanUse(display_error)
 	. = ..()
@@ -26,18 +27,16 @@
 /datum/action/bloodsucker/cloak/ActivatePower()
 	var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
 	var/mob/living/user = owner
-	var/was_running = (user.m_intent == MOVE_INTENT_RUN)
+	was_running = (user.m_intent == MOVE_INTENT_RUN)
 	if(was_running)
 		user.toggle_move_intent()
 	ADD_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness")
 	while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
 		// Pay Blood Toll (if awake)
-		owner.alpha = max(0, owner.alpha - min(75, 20 + 15 * level_current))
+		owner.alpha = max(20, owner.alpha - min(75, 10 + 5 * level_current))
 		bloodsuckerdatum.AddBloodVolume(-0.2)
 		sleep(5) // Check every few ticks that we haven't disabled this power
 	// Return to Running (if you were before)
-	if(was_running && user.m_intent != MOVE_INTENT_RUN)
-		user.toggle_move_intent()
 
 /datum/action/bloodsucker/cloak/ContinueActive(mob/living/user, mob/living/target)
 	if (!..())
@@ -55,3 +54,5 @@
 	..()
 	REMOVE_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness")
 	user.alpha = 255
+	if(was_running && user.m_intent != MOVE_INTENT_RUN)
+		user.toggle_move_intent()
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm b/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm
index 6ee17b3014..0435ddccd5 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm
@@ -51,14 +51,17 @@
 	REMOVE_TRAIT(user, TRAIT_COLDBLOODED, "bloodsucker")
 	REMOVE_TRAIT(user, TRAIT_NOHARDCRIT, "bloodsucker")
 	REMOVE_TRAIT(user, TRAIT_NOSOFTCRIT, "bloodsucker")
+	REMOVE_TRAIT(user, TRAIT_VIRUSIMMUNE, "bloodsucker")
 	var/obj/item/organ/heart/vampheart/H = user.getorganslot(ORGAN_SLOT_HEART)
-
+	var/obj/item/organ/eyes/vassal/bloodsucker/E = user.getorganslot(ORGAN_SLOT_EYES)
+	E.flash_protect = 0 
+	
 	// WE ARE ALIVE! //
 	bloodsuckerdatum.poweron_masquerade = TRUE
 	while(bloodsuckerdatum && ContinueActive(user))
 
 		// HEART
-		if (istype(H))
+		if(istype(H))
 			H.FakeStart()
 
 		// 		PASSIVE (done from LIFE)
@@ -67,7 +70,7 @@
 		// Don't Heal
 
 		// Pay Blood Toll (if awake)
-		if (user.stat == CONSCIOUS)
+		if(user.stat == CONSCIOUS)
 			bloodsuckerdatum.AddBloodVolume(-0.2)
 
 		sleep(20) // Check every few ticks that we haven't disabled this power
@@ -89,9 +92,13 @@
 	ADD_TRAIT(user, TRAIT_COLDBLOODED, "bloodsucker")
 	ADD_TRAIT(user, TRAIT_NOHARDCRIT, "bloodsucker")
 	ADD_TRAIT(user, TRAIT_NOSOFTCRIT, "bloodsucker")
+	ADD_TRAIT(user, TRAIT_VIRUSIMMUNE, "bloodsucker")
 
 	// HEART
 	var/obj/item/organ/heart/H = user.getorganslot(ORGAN_SLOT_HEART)
+	var/obj/item/organ/eyes/vassal/bloodsucker/E = user.getorganslot(ORGAN_SLOT_EYES)
 	H.Stop()
 
+	E.flash_protect = 2
+
 	to_chat(user, "<span class='notice'>Your heart beats one final time, while your skin dries out and your icy pallor returns.</span>")
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
index 94bc0e11d0..7962c7d403 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm
@@ -89,17 +89,14 @@
 
 	if(istype(target))
 		target.Stun(40) //Utterly useless without this, its okay since there are so many checks to go through
-		target.silent = 45 //Shhhh little lamb
 		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 45) //So you cant rotate with combat mode, plus fancy status alert
 
 	if(do_mob(user, target, 40, 0, TRUE, extra_checks=CALLBACK(src, .proc/ContinueActive, user, target)))
 		PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
 		var/power_time = 90 + level_current * 12
-		target.silent = power_time + 20
-		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 100 + level_current * 15)
+		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time + 80)
 		to_chat(user, "<span class='notice'>[target] is fixed in place by your hypnotic gaze.</span>")
 		target.Stun(power_time)
-		//target.silent += power_time / 10 // Silent isn't based on ticks.
 		target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move //    target.changeNext_move(power_time) // check click.dm
 		target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze.
 		spawn(power_time)
diff --git a/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm b/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm
index c650a6af15..159c7b20b7 100644
--- a/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm
+++ b/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm
@@ -89,13 +89,7 @@
 	user.invisibility = INVISIBILITY_MAXIMUM
 
 	// LOSE CUFFS
-	if(user.handcuffed)
-		var/obj/O = user.handcuffed
-		user.dropItemToGround(O)
-	if(user.legcuffed)
-		var/obj/O = user.legcuffed
-		user.dropItemToGround(O)
-
+	
 	// Wait...
 	sleep(mist_delay / 2)
 
diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm
index 256d3e89e3..ba40388844 100644
--- a/code/modules/antagonists/changeling/powers/adrenaline.dm
+++ b/code/modules/antagonists/changeling/powers/adrenaline.dm
@@ -13,5 +13,5 @@
 
 //Recover from stuns.
 /obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)
-	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list("epinephrine" = 3, "changelingmeth" = 10, "mannitol" = 10, "regen_jelly" = 10, "changelingadrenaline" = 5), "<span class='notice'>Energy rushes through us.</span>", 0, 0.75, 0)
+	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list(/datum/reagent/medicine/epinephrine = 3, /datum/reagent/drug/methamphetamine/changeling = 10, /datum/reagent/medicine/mannitol = 10, /datum/reagent/medicine/regen_jelly = 10, /datum/reagent/medicine/changelingadrenaline = 5), "<span class='notice'>Energy rushes through us.</span>", 0, 0.75, 0)
 	return TRUE
\ No newline at end of file
diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm
index 971c811074..332f543545 100644
--- a/code/modules/antagonists/changeling/powers/linglink.dm
+++ b/code/modules/antagonists/changeling/powers/linglink.dm
@@ -58,7 +58,7 @@
 				target.mind.linglink = 1
 				target.say("[MODE_TOKEN_CHANGELING] AAAAARRRRGGGGGHHHHH!!")
 				to_chat(target, "<font color=#800040><span class='boldannounce'>You can now communicate in the changeling hivemind, say \"[MODE_TOKEN_CHANGELING] message\" to communicate!</span>")
-				target.reagents.add_reagent("salbutamol", 40) // So they don't choke to death while you interrogate them
+				target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 40) // So they don't choke to death while you interrogate them
 				sleep(1800)
 		SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]", "[i]"))
 		if(!do_mob(user, target, 20))
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 92a4f28308..b2ab5caef8 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -500,7 +500,7 @@
 /obj/item/clothing/suit/space/changeling/process()
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
-		H.reagents.add_reagent("salbutamol", REAGENTS_METABOLISM)
+		H.reagents.add_reagent(/datum/reagent/medicine/salbutamol, REAGENTS_METABOLISM)
 
 /obj/item/clothing/head/helmet/space/changeling
 	name = "flesh mass"
diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm
index 8d571d21e3..2a0451bc76 100644
--- a/code/modules/antagonists/changeling/powers/panacea.dm
+++ b/code/modules/antagonists/changeling/powers/panacea.dm
@@ -28,10 +28,10 @@
 			C.vomit(0, toxic = TRUE)
 		O.forceMove(get_turf(user))
 
-	user.reagents.add_reagent("mutadone", 10)
-	user.reagents.add_reagent("pen_jelly", 20)
-	user.reagents.add_reagent("antihol", 10)
-	user.reagents.add_reagent("mannitol", 25)
+	user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10)
+	user.reagents.add_reagent(/datum/reagent/medicine/pen_acid/pen_jelly, 20)
+	user.reagents.add_reagent(/datum/reagent/medicine/antihol, 10)
+	user.reagents.add_reagent(/datum/reagent/medicine/mannitol, 25)
 
 	if(isliving(user))
 		var/mob/living/L = user
diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm
index c58d934d6d..dc7887eee3 100644
--- a/code/modules/antagonists/changeling/powers/tiny_prick.dm
+++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -104,11 +104,11 @@
 	var/mob/living/carbon/C = target
 	. = TRUE
 	if(istype(C))
-		if(C.reagents.has_reagent("changeling_sting_real"))
-			C.reagents.add_reagent("changeling_sting_real",120)
+		if(C.reagents.has_reagent(/datum/reagent/changeling_string))
+			C.reagents.add_reagent(/datum/reagent/changeling_string,120)
 			log_combat(user, target, "stung", "transformation sting", ", extending the duration.")
 		else
-			C.reagents.add_reagent("changeling_sting_real",120,list("desired_dna" = selected_dna.dna))
+			C.reagents.add_reagent(/datum/reagent/changeling_string,120,list("desired_dna" = selected_dna.dna))
 			log_combat(user, target, "stung", "transformation sting", " new identity is '[selected_dna.dna.real_name]'")
 
 
@@ -243,8 +243,8 @@
 /obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/target)
 	log_combat(user, target, "stung", "LSD sting")
 	if(target.reagents)
-		target.reagents.add_reagent("regenerative_materia", 5)
-		target.reagents.add_reagent("mindbreaker", 5)
+		target.reagents.add_reagent(/datum/reagent/blob/regenerative_materia, 5)
+		target.reagents.add_reagent(/datum/reagent/toxin/mindbreaker, 5)
 	return TRUE
 
 /obj/effect/proc_holder/changeling/sting/cryo
@@ -262,5 +262,5 @@
 /obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target)
 	log_combat(user, target, "stung", "cryo sting")
 	if(target.reagents)
-		target.reagents.add_reagent("frostoil", 30)
+		target.reagents.add_reagent(/datum/reagent/consumable/frostoil, 30)
 	return TRUE
diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
index 1f616b7dbc..9f2ddfda47 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
@@ -100,7 +100,7 @@
 		var/burndamage = L.getFireLoss()
 		var/oxydamage = L.getOxyLoss()
 		var/totaldamage = brutedamage + burndamage + oxydamage
-		if(!totaldamage && (!L.reagents || !L.reagents.has_reagent("holywater")))
+		if(!totaldamage && (!L.reagents || !L.reagents.has_reagent(/datum/reagent/water/holywater)))
 			to_chat(ranged_ability_user, "<span class='inathneq'>\"[L] is unhurt and untainted.\"</span>")
 			return TRUE
 
@@ -108,7 +108,7 @@
 
 		to_chat(ranged_ability_user, "<span class='brass'>You bathe [L == ranged_ability_user ? "yourself":"[L]"] in Inath-neq's power!</span>")
 		var/targetturf = get_turf(L)
-		var/has_holy_water = (L.reagents && L.reagents.has_reagent("holywater"))
+		var/has_holy_water = (L.reagents && L.reagents.has_reagent(/datum/reagent/water/holywater))
 		var/healseverity = max(round(totaldamage*0.05, 1), 1) //shows the general severity of the damage you just healed, 1 glow per 20
 		for(var/i in 1 to healseverity)
 			new /obj/effect/temp_visual/heal(targetturf, "#1E8CE1")
@@ -129,7 +129,7 @@
 		playsound(targetturf, 'sound/magic/staff_healing.ogg', 50, 1)
 
 		if(has_holy_water)
-			L.reagents.remove_reagent("holywater", 1000)
+			L.reagents.del_reagent(/datum/reagent/water/holywater)
 
 		remove_ranged_ability()
 
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
index 88cf420420..e01156ba44 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
@@ -7,7 +7,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	flags_inv = HIDEEARS|HIDEHAIR|HIDEFACE|HIDESNOUT
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 	armor = list("melee" = 50, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 
 /obj/item/clothing/head/helmet/clockwork/Initialize()
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
index d4d5349c70..b12c72b4af 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
@@ -103,7 +103,7 @@
 	. = ..()
 	addtimer(CALLBACK(src, .proc/check_on_mob, user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
 
-/obj/item/clockwork/slab/worn_overlays(isinhands = FALSE, icon_file)
+/obj/item/clockwork/slab/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(isinhands && item_state && inhand_overlay)
 		var/mutable_appearance/M = mutable_appearance(icon_file, "slab_[inhand_overlay]")
diff --git a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
index 0365ae63af..501bcdc1c4 100644
--- a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
+++ b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
@@ -139,7 +139,7 @@
 	var/new_thing_type = fabrication_values["new_obj_type"]
 	if(isturf(target)) //if our target is a turf, we're just going to ChangeTurf it and assume it'll work out.
 		var/turf/T = target
-		T.ChangeTurf(new_thing_type)
+		T.ChangeTurf(new_thing_type, flags = CHANGETURF_INHERIT_AIR)
 	else
 		if(new_thing_type)
 			if(fabrication_values["dir_in_new"])
diff --git a/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm b/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm
index 32b1b61dd1..d823f19d4a 100644
--- a/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm
@@ -59,7 +59,7 @@
 				if(anchored)
 					T.PlaceOnTop(/turf/closed/wall/clockwork)
 				else
-					T.PlaceOnTop(/turf/open/floor/clockwork)
+					T.PlaceOnTop(/turf/open/floor/clockwork, flags = CHANGETURF_INHERIT_AIR)
 					new /obj/structure/falsewall/brass(T)
 				qdel(src)
 			else
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index b4ddb9dbff..f5be94a0e7 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -331,7 +331,7 @@
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 10)
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/suit/magusred
 	name = "magus robes"
@@ -424,7 +424,7 @@
 		return 1
 	return 0
 
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands)
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands && current_charges)
 		. += mutable_appearance('icons/effects/cult_effects.dmi', "shield-cult", MOB_LAYER + 0.01)
@@ -487,7 +487,7 @@
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "holyflask"
 	color = "#333333"
-	list_reagents = list("unholywater" = 50)
+	list_reagents = list(/datum/reagent/fuel/unholywater = 50)
 
 /obj/item/shuttle_curse
 	name = "cursed orb"
@@ -797,7 +797,7 @@
 		if(ishuman(target))
 			var/mob/living/carbon/human/H = target
 			if(H.stat != DEAD)
-				H.reagents.add_reagent("unholywater", 4)
+				H.reagents.add_reagent(/datum/reagent/fuel/unholywater, 4)
 		if(isshade(target) || isconstruct(target))
 			var/mob/living/simple_animal/M = target
 			if(M.health+5 < M.maxHealth)
@@ -898,7 +898,7 @@
 					if(ishuman(target))
 						var/mob/living/carbon/human/H = target
 						if(H.stat != DEAD)
-							H.reagents.add_reagent("unholywater", 7)
+							H.reagents.add_reagent(/datum/reagent/fuel/unholywater, 7)
 					if(isshade(target) || isconstruct(target))
 						var/mob/living/simple_animal/M = target
 						if(M.health+15 < M.maxHealth)
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index f38f379abe..6f340b9271 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -239,9 +239,9 @@
 		var/turf/T = safepick(validturfs)
 		if(T)
 			if(istype(T, /turf/open/floor/plating))
-				T.PlaceOnTop(/turf/open/floor/engine/cult)
+				T.PlaceOnTop(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
 			else
-				T.ChangeTurf(/turf/open/floor/engine/cult)
+				T.ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
 		else
 			var/turf/open/floor/engine/cult/F = safepick(cultturfs)
 			if(F)
diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm
index ff12a835ef..ba2a96289d 100644
--- a/code/modules/antagonists/cult/ritual.dm
+++ b/code/modules/antagonists/cult/ritual.dm
@@ -24,11 +24,11 @@ This file contains the cult dagger and rune list code
 
 /obj/item/melee/cultblade/dagger/attack(mob/living/M, mob/living/user)
 	if(iscultist(M))
-		if(M.reagents && M.reagents.has_reagent("holywater")) //allows cultists to be rescued from the clutches of ordained religion
+		if(M.reagents && M.reagents.has_reagent(/datum/reagent/water/holywater)) //allows cultists to be rescued from the clutches of ordained religion
 			to_chat(user, "<span class='cult'>You remove the taint from [M].</span>" )
-			var/holy2unholy = M.reagents.get_reagent_amount("holywater")
-			M.reagents.del_reagent("holywater")
-			M.reagents.add_reagent("unholywater",holy2unholy)
+			var/holy2unholy = M.reagents.get_reagent_amount(/datum/reagent/water/holywater)
+			M.reagents.del_reagent(/datum/reagent/water/holywater)
+			M.reagents.add_reagent(/datum/reagent/fuel/unholywater,holy2unholy)
 			log_combat(user, M, "smacked", src, " removing the holy water from them")
 		return FALSE
 	. = ..()
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
index 2e38734b6f..951fe4e18a 100644
--- a/code/modules/antagonists/devil/devil.dm
+++ b/code/modules/antagonists/devil/devil.dm
@@ -384,14 +384,14 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 		if(BANISH_WATER)
 			if(iscarbon(body))
 				var/mob/living/carbon/H = body
-				return H.reagents.has_reagent("holy water")
+				return H.reagents.has_reagent(/datum/reagent/water/holywater)
 			return 0
 		if(BANISH_COFFIN)
 			return (body && istype(body.loc, /obj/structure/closet/crate/coffin))
 		if(BANISH_FORMALDYHIDE)
 			if(iscarbon(body))
 				var/mob/living/carbon/H = body
-				return H.reagents.has_reagent("formaldehyde")
+				return H.reagents.has_reagent(/datum/reagent/toxin/formaldehyde)
 			return 0
 		if(BANISH_RUNES)
 			if(body)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 0a223f8b10..b5ce5538e9 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -76,9 +76,10 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 	CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
 	if(istype(SSticker.mode, /datum/game_mode/dynamic))
 		var/datum/game_mode/dynamic/mode = SSticker.mode
-		var/threat_spent = CONFIG_GET(number/dynamic_warops_cost)
-		mode.spend_threat(threat_spent)
-		mode.log_threat("Nuke ops spent [threat_spent] on war ops.")
+		if(!(mode.storyteller.flags & WAROPS_ALWAYS_ALLOWED))
+			var/threat_spent = CONFIG_GET(number/dynamic_warops_cost)
+			mode.spend_threat(threat_spent)
+			mode.log_threat("Nuke ops spent [threat_spent] on war ops.")
 	SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
 
 	qdel(src)
@@ -101,12 +102,13 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 			return FALSE
 	if(istype(SSticker.mode, /datum/game_mode/dynamic))
 		var/datum/game_mode/dynamic/mode = SSticker.mode
-		if(mode.threat_level < CONFIG_GET(number/dynamic_warops_requirement))
-			to_chat(user, "Due to the dynamic space in which the station resides, you are too deep into Nanotrasen territory to reasonably go loud.")
-			return FALSE
-		else if(mode.threat < CONFIG_GET(number/dynamic_warops_cost))
-			to_chat(user, "Due to recent threats on the station, Nanotrasen is looking too closely for a war declaration to be wise.")
-			return FALSE
+		if(!(mode.storyteller.flags & WAROPS_ALWAYS_ALLOWED))
+			if(mode.threat_level < CONFIG_GET(number/dynamic_warops_requirement))
+				to_chat(user, "Due to the dynamic space in which the station resides, you are too deep into Nanotrasen territory to reasonably go loud.")
+				return FALSE
+			else if(mode.threat < CONFIG_GET(number/dynamic_warops_cost))
+				to_chat(user, "Due to recent threats on the station, Nanotrasen is looking too closely for a war declaration to be wise.")
+				return FALSE
 	return TRUE
 
 /obj/item/nuclear_challenge/clownops
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index e1c50a7cf5..2186e8b49e 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -513,7 +513,7 @@
 /obj/machinery/nuclearbomb/beer/proc/fizzbuzz()
 	var/datum/reagents/R = new/datum/reagents(1000)
 	R.my_atom = src
-	R.add_reagent("beer", 100)
+	R.add_reagent(/datum/reagent/consumable/ethanol/beer, 100)
 
 	var/datum/effect_system/foam_spread/foam = new
 	foam.set_up(200, get_turf(src), R)
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index d7d88a9b6a..b98fa04504 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -26,6 +26,7 @@
 	spacewalk = TRUE
 	sight = SEE_SELF
 	throwforce = 0
+	blood_volume = 0
 
 	see_in_dark = 8
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index d6582a294f..d2e71615e3 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -353,7 +353,7 @@
 					to_chat(H, "<span class='revenminor'>You feel [pick("suddenly sick", "a surge of nausea", "like your skin is <i>wrong</i>")].</span>")
 			else
 				if(mob.reagents)
-					mob.reagents.add_reagent("plasma", 5)
+					mob.reagents.add_reagent(/datum/reagent/toxin/plasma, 5)
 		else
 			mob.adjustToxLoss(5)
 	for(var/obj/structure/spacevine/vine in T) //Fucking with botanists, the ability.
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index ac19df3631..595ce5bb90 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -80,6 +80,8 @@
 	if(istype(SSticker.mode,/datum/game_mode/dynamic))
 		mode = SSticker.mode
 		is_dynamic = TRUE
+		if(mode.storyteller.flags & NO_ASSASSIN)
+			is_hijacker = FALSE
 		if(GLOB.joined_player_list.len>=GLOB.dynamic_high_pop_limit)
 			is_hijacker = (prob(10) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement))
 		else
@@ -180,7 +182,7 @@
 			destroy_objective.owner = owner
 			destroy_objective.find_target()
 			add_objective(destroy_objective)
-		else if(prob(30))
+		else if(prob(30) || (is_dynamic && (mode.storyteller.flags & NO_ASSASSIN)))
 			var/datum/objective/maroon/maroon_objective = new
 			maroon_objective.owner = owner
 			maroon_objective.find_target()
diff --git a/code/modules/assembly/playback.dm b/code/modules/assembly/playback.dm
new file mode 100644
index 0000000000..088f186adc
--- /dev/null
+++ b/code/modules/assembly/playback.dm
@@ -0,0 +1,50 @@
+/obj/item/assembly/playback
+	name = "playback device"
+	desc = "A small electronic device able to record a voice sample, and repeat that sample when it receive a signal."
+	icon_state = "radio"
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
+	flags_1 = HEAR_1
+	attachable = TRUE
+	verb_say = "beeps"
+	verb_ask = "beeps"
+	verb_exclaim = "beeps"
+	var/listening = FALSE
+	var/recorded = "" //the activation message
+	var/languages
+
+/obj/item/assembly/playback/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source)
+	. = ..()
+	if(speaker == src)
+		return
+
+	if(listening && !radio_freq)
+		record_speech(speaker, raw_message, message_language)
+
+/obj/item/assembly/playback/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language)
+	recorded = raw_message
+	listening = FALSE
+	languages = message_language
+	say("Activation message is '[recorded]'.", language = message_language)
+
+/obj/item/assembly/playback/activate()
+	if(recorded == "") // Why say anything when there isn't anything to say
+		return FALSE
+	say("[recorded]", language = languages) // Repeat the message in the language it was said in
+	return TRUE
+
+/obj/item/assembly/playback/proc/record()
+	if(!secured || holder)
+		return FALSE
+	listening = !listening
+	say("[listening ? "Now" : "No longer"] recording input.")
+	return TRUE
+
+/obj/item/assembly/playback/attack_self(mob/user)
+	if(!user)
+		return FALSE
+	record()
+	return TRUE
+
+/obj/item/assembly/playback/toggle_secure()
+	. = ..()
+	listening = FALSE
\ No newline at end of file
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index f72f726988..36a58b2a70 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -15,6 +15,7 @@
 	verb_exclaim = "beeps"
 	var/listening = FALSE
 	var/recorded = "" //the activation message
+	var/languages // The Message's language
 	var/mode = 1
 	var/static/list/modes = list("inclusive",
 								 "exclusive",
@@ -33,23 +34,25 @@
 	if(listening && !radio_freq)
 		record_speech(speaker, raw_message, message_language)
 	else
-		if(check_activation(speaker, raw_message))
-			addtimer(CALLBACK(src, .proc/pulse, 0), 10)
+		if(message_language == languages) // If it isn't in the same language as the message, don't try to find the message
+			if(check_activation(speaker, raw_message))
+				addtimer(CALLBACK(src, .proc/pulse, 0), 10)
 
 /obj/item/assembly/voice/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language)
+	languages = message_language // Assign the message's language to a variable to use it elsewhere
 	switch(mode)
 		if(INCLUSIVE_MODE)
 			recorded = raw_message
 			listening = FALSE
-			say("Activation message is '[recorded]'.", message_language)
+			say("Activation message is '[recorded]'.", language = languages) // Say the message in the language it was said in
 		if(EXCLUSIVE_MODE)
 			recorded = raw_message
 			listening = FALSE
-			say("Activation message is '[recorded]'.", message_language)
+			say("Activation message is '[recorded]'.", language = languages)
 		if(RECOGNIZER_MODE)
 			recorded = speaker.GetVoice()
 			listening = FALSE
-			say("Your voice pattern is saved.", message_language)
+			say("Your voice pattern is saved.", language = languages)
 		if(VOICE_SENSOR_MODE)
 			if(length(raw_message))
 				addtimer(CALLBACK(src, .proc/pulse, 0), 10)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index 07ee17a1bd..6bafba9abc 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -61,8 +61,6 @@
 		//Actually transfer the gas
 		var/datum/gas_mixture/removed = air2.remove(transfer_moles)
 
-		removed.react(src)
-
 		update_parents()
 
 		return removed
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 38178a4339..db8a8e90ad 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -57,10 +57,10 @@
 							if(item.parent)
 								var/static/pipenetwarnings = 10
 								if(pipenetwarnings > 0)
-									warning("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) Nearby: ([item.x], [item.y], [item.z])")
+									log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) Nearby: ([item.x], [item.y], [item.z]).")
 									pipenetwarnings -= 1
 									if(pipenetwarnings == 0)
-										warning("build_pipeline(): further messages about pipenets will be suppressed")
+										log_mapping("build_pipeline(): further messages about pipenets will be suppressed")
 							members += item
 							possible_expansions += item
 
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index d0c78d21b3..329c77ba14 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -56,7 +56,7 @@
 	pixel_y = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
 
 /obj/machinery/meter/process_atmos()
-	if(!target)
+	if(!(target?.flags_1 & INITIALIZED_1))
 		icon_state = "meterX"
 		return 0
 
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index aa1abe56b4..85ac20ca0d 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -175,7 +175,7 @@
 	if(C.reagents.total_volume >= C.volume)
 		to_chat(user, "<span class='danger'>[C] is full.</span>")
 		return
-	C.reagents.add_reagent("plasma", rand(5, 10))
+	C.reagents.add_reagent(/datum/reagent/toxin/plasma, rand(5, 10))
 	user.visible_message("[user] scoops some plasma from the [src] with \the [C].", "<span class='notice'>You scoop out some plasma from the [src] using \the [C].</span>")
 
 /turf/open/lava/plasma/burn_stuff(AM)
@@ -488,8 +488,7 @@
 				/obj/item/grenade/clusterbuster/smoke = 15,
 				/obj/item/clothing/under/chameleon = 13,
 				/obj/item/clothing/shoes/chameleon/noslip = 10,
-				/obj/item/borg/upgrade/ddrill = 3,
-				/obj/item/borg/upgrade/soh = 3)
+				/obj/item/borg/upgrade/ddrill = 3)
 
 /obj/effect/spawner/lootdrop/snowdin/dungeonmid
 	name = "dungeon mid"
diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm
index 4f7b176691..fe3d831d81 100644
--- a/code/modules/buildmode/submodes/basic.dm
+++ b/code/modules/buildmode/submodes/basic.dm
@@ -22,9 +22,9 @@
 	if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
 		var/turf/T = object
 		if(isspaceturf(object))
-			T.PlaceOnTop(/turf/open/floor/plating)
+			T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 		else if(isplatingturf(object))
-			T.PlaceOnTop(/turf/open/floor/plasteel)
+			T.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
 		else if(isfloorturf(object))
 			T.PlaceOnTop(/turf/closed/wall)
 		else if(iswallturf(object))
@@ -35,7 +35,7 @@
 		log_admin("Build Mode: [key_name(c)] deleted [object] at [AREACOORD(object)]")
 		if(isturf(object))
 			var/turf/T = object
-			T.ScrapeAway()
+			T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 		else if(isobj(object))
 			qdel(object)
 		return
diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm
index 5137d0a6f3..ca76c80df7 100644
--- a/code/modules/cargo/bounties/reagent.dm
+++ b/code/modules/cargo/bounties/reagent.dm
@@ -12,7 +12,7 @@
 /datum/bounty/reagent/applies_to(obj/O)
 	if(!istype(O, /obj/item/reagent_containers))
 		return FALSE
-	if(!O.reagents || !O.reagents.has_reagent(wanted_reagent.id))
+	if(!O.reagents || !O.reagents.has_reagent(wanted_reagent.type))
 		return FALSE
 	if(O.flags_1 & HOLOGRAM_1)
 		return FALSE
@@ -21,7 +21,7 @@
 /datum/bounty/reagent/ship(obj/O)
 	if(!applies_to(O))
 		return
-	shipped_volume += O.reagents.get_reagent_amount(wanted_reagent.id)
+	shipped_volume += O.reagents.get_reagent_amount(wanted_reagent.type)
 	if(shipped_volume > required_volume)
 		shipped_volume = required_volume
 
@@ -29,7 +29,7 @@
 	if(!istype(other_bounty, /datum/bounty/reagent))
 		return TRUE
 	var/datum/bounty/reagent/R = other_bounty
-	return wanted_reagent.id != R.wanted_reagent.id
+	return wanted_reagent.type != R.wanted_reagent.type
 
 /datum/bounty/reagent/simple_drink
 	name = "Simple Drink"
diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm
index 58677814a6..259ea2d7e3 100644
--- a/code/modules/cargo/packs/armory.dm
+++ b/code/modules/cargo/packs/armory.dm
@@ -93,9 +93,12 @@
 
 /datum/supply_pack/security/armory/trackingimp
 	name = "Tracking Implants Crate"
-	desc = "Contains four tracking implants. Requires Armory access to open."
-	cost = 1050
-	contains = list(/obj/item/storage/box/trackimp)
+	desc = "Contains four tracking implants and three tracking speedloaders of tracing .38 ammo. Requires Armory access to open."
+	cost = 1100
+	contains = list(/obj/item/storage/box/trackimp,
+					/obj/item/ammo_box/c38/trac,
+					/obj/item/ammo_box/c38/trac,
+					/obj/item/ammo_box/c38/trac)
 	crate_name = "tracking implant crate"
 
 /datum/supply_pack/security/armory/fire
@@ -172,6 +175,32 @@
 					/obj/item/storage/box/beanbag)
 	crate_name = "riot shotgun crate"
 
+/datum/supply_pack/security/armory/russian
+	name = "Russian Surplus Crate"
+	desc = "Hello Comrade, we have the most modern russian military equipment the black market can offer, for the right price of course. Sadly we couldnt remove the lock so it requires Armory access to open."
+	cost = 5000
+	contraband = TRUE
+	contains = list(/obj/item/reagent_containers/food/snacks/rationpack,
+					/obj/item/ammo_box/a762,
+					/obj/item/storage/toolbox/ammo,
+					/obj/item/clothing/suit/armor/vest/russian,
+					/obj/item/clothing/head/helmet/rus_helmet,
+					/obj/item/clothing/shoes/russian,
+					/obj/item/clothing/gloves/combat,
+					/obj/item/clothing/under/syndicate/rus_army,
+					/obj/item/clothing/under/soviet,
+					/obj/item/clothing/mask/russian_balaclava,
+					/obj/item/clothing/head/helmet/rus_ushanka,
+					/obj/item/clothing/suit/armor/vest/russian_coat,
+					/obj/item/gun/ballistic/shotgun/boltaction,
+					/obj/item/gun/ballistic/shotgun/boltaction)
+	crate_name = "surplus military crate"
+
+/datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C)
+	for(var/i in 1 to 10)
+		var/item = pick(contains)
+		new item(C)
+
 /datum/supply_pack/security/armory/swat
 	name = "SWAT Crate"
 	desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open."
@@ -223,7 +252,7 @@
 					/obj/item/ammo_box/magazine/wt550m9)
 	crate_name = "auto rifle ammo crate"
 
-/datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 12 shots to stun crit someone
+/datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 12 shots to stamcrit someone
 	name = "WT-550 Semi-Auto SMG Non-Lethal Ammo Crate"
 	desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
 	cost = 1000
diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm
index 30153ef077..747e820f52 100644
--- a/code/modules/cargo/packs/emergency.dm
+++ b/code/modules/cargo/packs/emergency.dm
@@ -23,6 +23,21 @@
 	crate_name = "Biker Kit"
 	crate_type = /obj/structure/closet/crate/large
 
+/datum/supply_pack/emergency/bio
+	name = "Biological Emergency Crate"
+	desc = "This crate holds 2 full bio suits which will protect you from viruses, along with a bio bag and two spaceacillin syringes."
+	cost = 2000
+	contains = list(/obj/item/clothing/head/bio_hood,
+					/obj/item/clothing/head/bio_hood,
+					/obj/item/clothing/suit/bio_suit,
+					/obj/item/clothing/suit/bio_suit,
+					/obj/item/storage/bag/bio,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/clothing/gloves/color/latex/nitrile,
+					/obj/item/clothing/gloves/color/latex/nitrile)
+	crate_name = "bio suit crate"
+
 /datum/supply_pack/emergency/equipment
 	name = "Emergency Bot/Internals Crate"
 	desc = "Explosions got you down? These supplies are guaranteed to patch up holes, in stations and people alike! Comes with two floorbots, two medbots, five oxygen masks and five small oxygen tanks."
@@ -112,8 +127,8 @@
 	crate_type = /obj/structure/closet/crate/internals
 
 /datum/supply_pack/emergency/soft_suit
-	name = "Emergency Space Suit "
-	desc = "Are there bombs going off left and right? Are there meteors shooting around the station? Well then! Here's two fragile space suit for emergencies. Comes with air and masks."
+	name = "Emergency Space Suit"
+	desc = "Are there bombs going off left and right? Are there meteors shooting around the station? Well then! Here's two fragile space suits for emergencies. Comes with air and masks."
 	cost = 1200
 	contains = list(/obj/item/tank/internals/air,
 					/obj/item/tank/internals/air,
@@ -126,6 +141,18 @@
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 
+/datum/supply_pack/emergency/bomb
+	name = "Explosive Emergency Crate"
+	desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (Time not included.)"
+	cost = 1500
+	contains = list(/obj/item/clothing/head/bomb_hood,
+					/obj/item/clothing/suit/bomb_suit,
+					/obj/item/clothing/mask/gas,
+					/obj/item/screwdriver,
+					/obj/item/wirecutters,
+					/obj/item/multitool)
+	crate_name = "bomb suit crate"
+
 /datum/supply_pack/emergency/firefighting
 	name = "Firefighting Crate"
 	desc = "Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!"
@@ -307,4 +334,3 @@
 					/obj/item/reagent_containers/spray/plantbgone)
 	crate_name = "weed control crate"
 	crate_type = /obj/structure/closet/crate/secure/hydroponics
-
diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm
index 1b55c0540a..ebfb96ec23 100644
--- a/code/modules/cargo/packs/livestock.dm
+++ b/code/modules/cargo/packs/livestock.dm
@@ -25,6 +25,20 @@
 		new /obj/item/reagent_containers/food/snacks/grown/wheat(.)
 
 
+/datum/supply_pack/critter/parrot
+	name = "Bird Crate"
+	desc = "Contains five expert telecommunication birds."
+	cost = 4000
+	contains = list(/mob/living/simple_animal/parrot)
+	crate_name = "parrot crate"
+
+/datum/supply_pack/critter/parrot/generate()
+	. = ..()
+	for(var/i in 1 to 4)
+		new /mob/living/simple_animal/parrot(.)
+	if(prob(1))
+		new /mob/living/simple_animal/parrot/clock_hawk(.)
+
 /datum/supply_pack/critter/butterfly
 	name = "Butterflies Crate"
 	desc = "Not a very dangerous insect, but they do give off a better image than, say, flies or cockroaches."//is that a motherfucking worm reference
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 1e5097fd11..a60afe4f7a 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -57,6 +57,27 @@
 	crate_name = "blood freezer"
 	crate_type = /obj/structure/closet/crate/freezer
 
+/datum/supply_pack/medical/chemical
+	name = "Chemical Starter Kit Crate"
+	desc = "Contains twelve different chemicals, for all the fun experiments you can make."
+	cost = 1700
+	contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen,
+					/obj/item/reagent_containers/glass/bottle/carbon,
+					/obj/item/reagent_containers/glass/bottle/nitrogen,
+					/obj/item/reagent_containers/glass/bottle/oxygen,
+					/obj/item/reagent_containers/glass/bottle/fluorine,
+					/obj/item/reagent_containers/glass/bottle/phosphorus,
+					/obj/item/reagent_containers/glass/bottle/silicon,
+					/obj/item/reagent_containers/glass/bottle/chlorine,
+					/obj/item/reagent_containers/glass/bottle/radium,
+					/obj/item/reagent_containers/glass/bottle/sacid,
+					/obj/item/reagent_containers/glass/bottle/ethanol,
+					/obj/item/reagent_containers/glass/bottle/potassium,
+					/obj/item/clothing/glasses/science,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/storage/box/beakers)
+	crate_name = "chemical crate"
+
 /datum/supply_pack/medical/defibs
 	name = "Defibrillator Crate"
 	desc = "Contains two defibrillators for bringing the recently deceased back to life."
@@ -229,7 +250,7 @@
 
 /datum/supply_pack/medical/anitvirus
 	name = "Virus Containment Crate"
-	desc = "Viro let out a death plague Mk II again? Someone didnt wash their hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it breaks out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot."
+	desc = "Viro let out a death plague Mk II again? Someone didn't wash their hands? Old plagues born anew? Well, this crate is for you! Hope you cure it before it breaks out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot."
 	cost = 3000
 	access = ACCESS_MEDICAL
 	contains = list(/mob/living/simple_animal/bot/medbot,
@@ -245,4 +266,4 @@
 					/obj/item/storage/box/syringes,
 					/obj/item/storage/box/beakers)
 	crate_name = "virus containment unit crate"
-	crate_type = /obj/structure/closet/crate/secure/plasma
\ No newline at end of file
+	crate_type = /obj/structure/closet/crate/secure/plasma
diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm
index aa680e1b1e..f8656ef761 100644
--- a/code/modules/cargo/packs/misc.dm
+++ b/code/modules/cargo/packs/misc.dm
@@ -13,17 +13,16 @@
 //////////////////// Paperwork and Writing Supplies //////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-/* I did it Kevin
 /datum/supply_pack/misc/abandonedcrate
-	name = "Abandoned Crate"
-	desc = "Someone keeps finding these locked crates out in the boonies. How about you take a crack at it, we've had our fill. WARNING: EXPLOSIVE"
+	name = "Loot Box"
+	desc = "Try your luck with these highly secure loot boxes! Solve the lock, win great prizes! WARNING: EXPLOSIVE FAILURE."
 	contraband = TRUE
-	cost = 12800
+	cost = 15000
 	contains = list(/obj/structure/closet/crate/secure/loot)
 	crate_name = "abandoned crate"
 	crate_type = /obj/structure/closet/crate/large
 	dangerous = TRUE
-*/
+
 /datum/supply_pack/misc/artsupply
 	name = "Art Supplies"
 	desc = "Make some happy little accidents with six canvasses, two easels, two boxes of crayons, and a rainbow crayon!"
@@ -282,8 +281,7 @@
 					/obj/item/storage/book/bible/booze,
 					/obj/item/storage/book/bible/booze,
 					/obj/item/clothing/suit/hooded/chaplain_hoodie,
-					/obj/item/clothing/suit/hooded/chaplain_hoodie
-					)
+					/obj/item/clothing/suit/hooded/chaplain_hoodie)
 	crate_name = "religious supplies crate"
 
 /datum/supply_pack/misc/funeral
diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm
index 4a90af6fd0..dd0f987d25 100644
--- a/code/modules/cargo/packs/organic.dm
+++ b/code/modules/cargo/packs/organic.dm
@@ -47,6 +47,26 @@
 					/obj/item/storage/fancy/donut_box)
 	crate_name = "candy crate"
 
+/datum/supply_pack/organic/randomized/chef
+	name = "Excellent Meat Crate"
+	desc = "The best cuts in the whole galaxy."
+	cost = 2000
+	contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
+					/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
+					/obj/item/reagent_containers/food/snacks/meat/slab/bear,
+					/obj/item/reagent_containers/food/snacks/meat/slab/xeno,
+					/obj/item/reagent_containers/food/snacks/meat/slab/spider,
+					/obj/item/reagent_containers/food/snacks/meat/rawbacon,
+					/obj/item/reagent_containers/food/snacks/spiderleg,
+					/obj/item/reagent_containers/food/snacks/carpmeat,
+					/obj/item/reagent_containers/food/snacks/meat/slab/human)
+	crate_name = "food crate"
+
+/datum/supply_pack/organic/randomized/chef/fill(obj/structure/closet/crate/C)
+	for(var/i in 1 to 15)
+		var/item = pick(contains)
+		new item(C)
+
 /datum/supply_pack/organic/exoticseeds
 	name = "Exotic Seeds Crate"
 	desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!"
@@ -92,6 +112,26 @@
 					/obj/item/reagent_containers/food/snacks/grown/banana)
 	crate_name = "food crate"
 
+/datum/supply_pack/organic/randomized/chef/fruits
+	name = "Fruit Crate"
+	desc = "Rich in vitamins, may contain oranges."
+	cost = 1500
+	contains = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
+					/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
+					/obj/item/reagent_containers/food/snacks/grown/banana,
+					/obj/item/reagent_containers/food/snacks/grown/watermelon,
+					/obj/item/reagent_containers/food/snacks/grown/apple,
+					/obj/item/reagent_containers/food/snacks/grown/berries,
+					/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
+					/obj/item/reagent_containers/food/snacks/grown/pineapple,
+					/obj/item/reagent_containers/food/snacks/grown/cherries,
+					/obj/item/reagent_containers/food/snacks/grown/grapes,
+					/obj/item/reagent_containers/food/snacks/grown/grapes/green,
+					/obj/item/reagent_containers/food/snacks/grown/eggplant,
+					/obj/item/reagent_containers/food/snacks/grown/peach,
+					/obj/item/reagent_containers/food/snacks/grown/strawberry)
+	crate_name = "food crate"
+
 /datum/supply_pack/organic/fiestatortilla
 	name = "Fiesta Crate"
 	desc = "Spice up the kitchen with this fiesta themed food order! Contains 8 tortilla based food items, as well as a sombrero, moustache, and cloak!"
@@ -111,71 +151,6 @@
 					/obj/item/reagent_containers/glass/bottle/capsaicin)
 	crate_name = "fiesta crate"
 
-/datum/supply_pack/organic/fruit_1
-	name = "Fruit Basic Crate"
-	desc = "Getting scurvy on the station? Well heres your fixing! Contains three of each - bananas, watermelons, limes, lemons, oranges and even three pineapple."
-	cost = 2250
-	contains = list(/obj/item/reagent_containers/food/snacks/grown/watermelon,
-					/obj/item/reagent_containers/food/snacks/grown/watermelon,
-					/obj/item/reagent_containers/food/snacks/grown/watermelon,
-					/obj/item/reagent_containers/food/snacks/grown/pineapple,
-					/obj/item/reagent_containers/food/snacks/grown/pineapple,
-					/obj/item/reagent_containers/food/snacks/grown/pineapple,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/lime,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
-					/obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
-					/obj/item/reagent_containers/food/snacks/grown/banana,
-					/obj/item/reagent_containers/food/snacks/grown/banana,
-					/obj/item/reagent_containers/food/snacks/grown/banana)
-	crate_name = "fruit crate"
-
-/datum/supply_pack/organic/fruit_2
-	name = "Fruit Delux Crate"
-	desc = "Getting tired of the basic fruits and want to have something a bit more decadent! This crate is for you! Contains three of each - bunches of berries, apples, pineapples, cherries, green & red grapes, eggplants, bananas, peaches, and lastly seven strawberry. Includes one serving tray."
-	cost = 3500
-	contains = list(/obj/item/reagent_containers/food/snacks/grown/berries,
-					/obj/item/reagent_containers/food/snacks/grown/berries,
-					/obj/item/reagent_containers/food/snacks/grown/berries,
-					/obj/item/reagent_containers/food/snacks/grown/apple,
-					/obj/item/reagent_containers/food/snacks/grown/apple,
-					/obj/item/reagent_containers/food/snacks/grown/apple,
-					/obj/item/reagent_containers/food/snacks/grown/pineapple,
-					/obj/item/reagent_containers/food/snacks/grown/pineapple,
-					/obj/item/reagent_containers/food/snacks/grown/pineapple,
-					/obj/item/reagent_containers/food/snacks/grown/cherries,
-					/obj/item/reagent_containers/food/snacks/grown/cherries,
-					/obj/item/reagent_containers/food/snacks/grown/cherries,
-					/obj/item/reagent_containers/food/snacks/grown/grapes,
-					/obj/item/reagent_containers/food/snacks/grown/grapes,
-					/obj/item/reagent_containers/food/snacks/grown/grapes,
-					/obj/item/reagent_containers/food/snacks/grown/grapes/green,
-					/obj/item/reagent_containers/food/snacks/grown/grapes/green,
-					/obj/item/reagent_containers/food/snacks/grown/grapes/green,
-					/obj/item/reagent_containers/food/snacks/grown/banana,
-					/obj/item/reagent_containers/food/snacks/grown/banana,
-					/obj/item/reagent_containers/food/snacks/grown/banana,
-					/obj/item/reagent_containers/food/snacks/grown/eggplant,
-					/obj/item/reagent_containers/food/snacks/grown/eggplant,
-					/obj/item/reagent_containers/food/snacks/grown/eggplant,
-					/obj/item/reagent_containers/food/snacks/grown/peach,
-					/obj/item/reagent_containers/food/snacks/grown/peach,
-					/obj/item/reagent_containers/food/snacks/grown/peach,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/reagent_containers/food/snacks/grown/strawberry,
-					/obj/item/storage/bag/tray)
-	crate_name = "fruit crate"
-
 /datum/supply_pack/organic/grill
 	name = "Grilling Starter Kit"
 	desc = "Hey dad I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets."
@@ -283,6 +258,19 @@
 	considered <b>\[REDACTED\]</b> and returned at your leisure. Note that objects the anomaly produces are specifically attuned exactly to the individual opening the anomaly; regardless \
 	of species, the individual will find the object edible and it will taste great according to their personal definitions, which vary significantly based on person and species.")
 
+/datum/supply_pack/organic/randomized/chef/vegetables
+	name = "Vegetables Crate"
+	desc = "Grown in vats."
+	cost = 1300
+	contains = list(/obj/item/reagent_containers/food/snacks/grown/chili,
+					/obj/item/reagent_containers/food/snacks/grown/corn,
+					/obj/item/reagent_containers/food/snacks/grown/tomato,
+					/obj/item/reagent_containers/food/snacks/grown/potato,
+					/obj/item/reagent_containers/food/snacks/grown/carrot,
+					/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle,
+					/obj/item/reagent_containers/food/snacks/grown/onion,
+					/obj/item/reagent_containers/food/snacks/grown/pumpkin)
+	crate_name = "food crate"
 
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Hydroponics /////////////////////////////////////
@@ -372,6 +360,8 @@
 					/obj/item/hatchet,
 					/obj/item/cultivator,
 					/obj/item/plant_analyzer,
+					/obj/item/clothing/gloves/botanic_leather,
+					/obj/item/clothing/suit/apron,
 					/obj/item/flashlight,
 					/obj/item/seeds/carrot,
 					/obj/item/seeds/carrot,
diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm
index 981e343045..f14bc37371 100644
--- a/code/modules/cargo/packs/science.dm
+++ b/code/modules/cargo/packs/science.dm
@@ -54,7 +54,7 @@
 /datum/supply_pack/science/robotics/mecha_odysseus
 	name = "Circuit Crate (Odysseus)"
 	desc = "Ever wanted to build your own giant medical robot? Well, now you can! Contains the Odysseus main control board and Odysseus peripherals board. Requires Robotics access to open."
-	cost = 2500
+	cost = 1500
 	access = ACCESS_ROBOTICS
 	contains = list(/obj/item/circuitboard/mecha/odysseus/peripherals,
 					/obj/item/circuitboard/mecha/odysseus/main)
@@ -64,7 +64,7 @@
 /datum/supply_pack/science/robotics/mecha_ripley
 	name = "Circuit Crate (Ripley APLU)"
 	desc = "Rip apart rocks and xenomorphs alike with the Ripley APLU. Contains the Main Ripley control board, as well as the Ripley Peripherals board. Requires Robotics access to open."
-	cost = 3000
+	cost = 1200
 	access = ACCESS_ROBOTICS
 	contains = list(/obj/item/book/manual/ripley_build_and_repair,
 					/obj/item/circuitboard/mecha/ripley/main,
@@ -153,6 +153,13 @@
 	crate_name = "robotics assembly crate"
 	crate_type = /obj/structure/closet/crate/secure/science
 
+/datum/supply_pack/science/rped
+	name = "RPED crate"
+	desc = "Need to rebuild the ORM but science got annihilated after a bomb test? Buy this for the most advanced parts NT can give you."
+	cost = 1500
+	contains = list(/obj/item/storage/part_replacer/cargo)
+	crate_name = "\improper RPED crate"
+
 /datum/supply_pack/science/shieldwalls
 	name = "Shield Generator Crate"
 	desc = "These high powered Shield Wall Generators are guaranteed to keep any unwanted lifeforms on the outside, where they belong! Contains four shield wall generators. Requires Teleporter access to open."
@@ -188,7 +195,7 @@
 /datum/supply_pack/science/tablets
 	name = "Tablet Crate"
 	desc = "What's a computer? Contains five cargo tablets."
-	cost = 3000
+	cost = 1500
 	contains = list(/obj/item/modular_computer/tablet/preset/cargo,
 					/obj/item/modular_computer/tablet/preset/cargo,
 					/obj/item/modular_computer/tablet/preset/cargo,
diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm
index 0bda316ca3..69967d65d1 100644
--- a/code/modules/cargo/packs/security.dm
+++ b/code/modules/cargo/packs/security.dm
@@ -11,6 +11,23 @@
 	access = ACCESS_SECURITY
 	crate_type = /obj/structure/closet/crate/secure/gear
 
+/datum/supply_pack/security/ammo
+	name = "Ammo Crate - General Purpose"
+	desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of buckshot ammo, three boxes of rubber ammo and special .38 speedloarders. Requires Security access to open."
+	cost = 2500
+	contains = list(/obj/item/ammo_box/magazine/wt550m9,
+					/obj/item/ammo_box/magazine/wt550m9,
+					/obj/item/storage/box/lethalshot,
+					/obj/item/storage/box/lethalshot,
+					/obj/item/storage/box/lethalshot,
+					/obj/item/storage/box/rubbershot,
+					/obj/item/storage/box/rubbershot,
+					/obj/item/storage/box/rubbershot,
+					/obj/item/ammo_box/c38/trac,
+					/obj/item/ammo_box/c38/hotshot,
+					/obj/item/ammo_box/c38/iceblox)
+	crate_name = "ammo crate"
+
 /datum/supply_pack/security/armor
 	name = "Armor Crate"
 	desc = "Three vests of well-rounded, decently-protective armor. Requires Security access to open."
@@ -146,6 +163,13 @@
 					/obj/item/storage/box/handcuffs)
 	crate_name = "security supply crate"
 
+/datum/supply_pack/security/vending/security
+	name = "SecTech Supply Crate"
+	desc = "Officer Paul bought all the donuts? Then refill the security vendor with ths crate."
+	cost = 1500
+	contains = list(/obj/machinery/vending/security)
+	crate_name = "SecTech supply crate"
+
 /datum/supply_pack/security/firingpins
 	name = "Standard Firing Pins Crate"
 	desc = "Upgrade your arsenal with 10 standard firing pins. Requires Security access to open."
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index 8fd5b6eb58..01524b1910 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -103,7 +103,7 @@
 
 /datum/supply_pack/service/cutlery
 	name = "Kitchen Cutlery Deluxe Set"
-	desc = "Need to slice and dice away those ''Tomatoes''? Well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
+	desc = "Need to slice and dice away those \"Tomatoes\"? Well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
 	cost = 10000
 	contraband = TRUE
 	contains = list(/obj/item/sharpener, //Deluxe for a reason
@@ -127,6 +127,16 @@
 					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass)
 	crate_name = "kitchen cutlery deluxe set"
 
+/datum/supply_pack/service/replacementdb
+	name = "Replacement Defensive Bar Shotgun"
+	desc = "Someone stole the Bartender's twin-barreled possession? Give them another one at a significant markup. Comes with one unused double-barrel shotgun, shells not included. Requires bartender access to open."
+	cost = 2200
+	access = ACCESS_BAR
+	contraband = TRUE
+	contains = list(/obj/item/gun/ballistic/revolver/doublebarrel)
+	crate_name = "replacement double-barrel crate"
+	crate_type = /obj/structure/closet/crate/secure
+
 //////////////////////////////////////////////////////////////////////////////
 /////////////////////////////// Janitor //////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index ae9932e96f..361b2a7517 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -80,7 +80,3 @@
 	var/next_keysend_reset = 0
 	var/next_keysend_trip_reset = 0
 	var/keysend_tripped = FALSE
-
-	// stops players from coming back through ghost/midround roles after suicide/cryo
-	// for a duration set by CONFIG_GET(number/suicide_reenter_round_timer) and CONFIG_GET(number/roundstart_suicide_time_limit)
-	var/reenter_round_timeout = 0
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 48489df4c7..7b7cf3413e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -21,6 +21,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/last_ip
 	var/last_id
 
+	var/icon/custom_holoform_icon
+	var/list/cached_holoform_icons
+	var/last_custom_holoform = 0
+
 	//Cooldowns for saving/loading. These are four are all separate due to loading code calling these one after another
 	var/saveprefcooldown
 	var/loadprefcooldown
@@ -195,6 +199,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/auto_fit_viewport = TRUE
 
 	var/uplink_spawn_loc = UPLINK_PDA
+	
+	var/sprint_spacebar = FALSE
+	var/sprint_toggle = FALSE
 
 	var/list/exp = list()
 	var/list/menuoptions
@@ -889,6 +896,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "</a><br>"
 			dat += "<b>Ambient Occlusion:</b> <a href='?_src_=prefs;preference=ambientocclusion'>[ambientocclusion ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>Fit Viewport:</b> <a href='?_src_=prefs;preference=auto_fit_viewport'>[auto_fit_viewport ? "Auto" : "Manual"]</a><br>"
+			dat += "<b>Sprint Key:</b> <a href='?_src_=prefs;preference=sprint_key'>[sprint_spacebar ? "Space" : "Shift"]</a><br>"
+			dat += "<b>Toggle Sprint:</b> <a href='?_src_=prefs;preference=sprint_toggle'>[sprint_toggle ? "Enabled" : "Disabled"]</a><br>"
 
 			if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation))
 				var/p_map = preferred_map
@@ -2239,6 +2248,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(auto_fit_viewport && parent)
 						parent.fit_viewport()
 
+				if("sprint_key")
+					sprint_spacebar = !sprint_spacebar
+
+				if("sprint_toggle")
+					sprint_toggle = !sprint_toggle
+
 				if("save")
 					save_preferences()
 					save_character()
@@ -2411,3 +2426,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			return
 		else
 			custom_names[name_id] = sanitized_name
+
+/datum/preferences/proc/get_filtered_holoform(filter_type)
+	if(!custom_holoform_icon)
+		return
+	LAZYINITLIST(cached_holoform_icons)
+	if(!cached_holoform_icons[filter_type])
+		cached_holoform_icons[filter_type] = process_holoform_icon_filter(custom_holoform_icon, filter_type)
+	return cached_holoform_icons[filter_type]
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 5fdcbf0484..2472cbef78 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	24
+#define SAVEFILE_VERSION_MAX	25
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -113,6 +113,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		var/datum/quirk/exhibitionism/E
 		var/quirk_name = initial(E.name)
 		all_quirks += quirk_name
+	if(current_version < 25)
+		var/digi
+		S["feature_lizard_legs"] >> digi
+		if(digi == "Digitigrade Legs")
+			WRITE_FILE(S["feature_lizard_legs"], "Digitigrade")
 
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
@@ -167,6 +172,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["parallax"]			>> parallax
 	S["ambientocclusion"]	>> ambientocclusion
 	S["auto_fit_viewport"]	>> auto_fit_viewport
+	S["sprint_spacebar"]	>> sprint_spacebar
+	S["sprint_toggle"]		>> sprint_toggle
 	S["menuoptions"]		>> menuoptions
 	S["enable_tips"]		>> enable_tips
 	S["tip_delay"]			>> tip_delay
@@ -204,6 +211,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	parallax		= sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
 	ambientocclusion	= sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
 	auto_fit_viewport	= sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport))
+	sprint_spacebar	= sanitize_integer(sprint_spacebar, 0, 1, initial(sprint_spacebar))
+	sprint_toggle	= sanitize_integer(sprint_toggle, 0, 1, initial(sprint_toggle))
 	ghost_form		= sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form))
 	ghost_orbit 	= sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit))
 	ghost_accs		= sanitize_inlist(ghost_accs, GLOB.ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION)
@@ -264,6 +273,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["parallax"], parallax)
 	WRITE_FILE(S["ambientocclusion"], ambientocclusion)
 	WRITE_FILE(S["auto_fit_viewport"], auto_fit_viewport)
+	WRITE_FILE(S["sprint_spacebar"], sprint_spacebar)
+	WRITE_FILE(S["sprint_toggle"], sprint_toggle)
 	WRITE_FILE(S["menuoptions"], menuoptions)
 	WRITE_FILE(S["enable_tips"], enable_tips)
 	WRITE_FILE(S["tip_delay"], tip_delay)
@@ -503,7 +514,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	features["frills"]				= sanitize_inlist(features["frills"], GLOB.frills_list)
 	features["spines"]				= sanitize_inlist(features["spines"], GLOB.spines_list)
 	features["body_markings"]		= sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
-	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list)
+	features["legs"]				= sanitize_inlist(features["legs"], GLOB.legs_list, "Plantigrade")
 	features["deco_wings"] 			= sanitize_inlist(features["deco_wings"], GLOB.deco_wings_list, "None")
 	features["insect_fluff"]		= sanitize_inlist(features["insect_fluff"], GLOB.insect_fluffs_list)
 	features["insect_markings"] 	= sanitize_inlist(features["insect_markings"], GLOB.insect_markings_list, "None")
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 8b2a34a089..b67fe2b462 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -220,10 +220,14 @@
 		var/obj/item/I = target
 		I.item_state = initial(picked_item.item_state)
 		I.item_color = initial(picked_item.item_color)
-		if(istype(I, /obj/item/clothing) && istype(initial(picked_item), /obj/item/clothing))
-			var/obj/item/clothing/CL = I
-			var/obj/item/clothing/PCL = picked_item
-			CL.flags_cover = initial(PCL.flags_cover)
+	var/obj/item/clothing/CL = target
+	var/obj/item/clothing/PCL = new picked_item
+	if(istype(CL) && istype(PCL))
+		CL.flags_cover = PCL.flags_cover
+		CL.flags_inv = PCL.flags_inv
+		CL.mutantrace_variation = PCL.mutantrace_variation
+		CL.alternate_worn_icon = PCL.alternate_worn_icon
+		qdel(PCL)
 	target.icon = initial(picked_item.icon)
 
 /datum/action/item_action/chameleon/change/pda/update_item(obj/item/pda/picked_item)
@@ -634,6 +638,7 @@
 /obj/item/clothing/neck/cloak/chameleon
 	name = "black tie"
 	desc = "A neosilk clip-on tie."
+	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "blacktie"
 	item_color = "blacktie"
 	resistance_flags = NONE
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d9e967e54d..4d441e7e2b 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -57,7 +57,6 @@
 	//No idea what this is but eh	-tori
 	var/force_alternate_icon = FALSE
 
-
 /obj/item/clothing/Initialize()
 	. = ..()
 	if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE))
@@ -82,7 +81,7 @@
 /obj/item/reagent_containers/food/snacks/clothing
 	name = "oops"
 	desc = "If you're reading this it means I messed up. This is related to moths eating clothes and I didn't know a better way to do it than making a new food object."
-	list_reagents = list("nutriment" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	tastes = list("dust" = 1, "lint" = 1)
 
 /obj/item/clothing/attack(mob/M, mob/user, def_zone)
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 1a178158d8..d91a2b9a2c 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -54,6 +54,9 @@
 		H.blur_eyes(5)
 		eyes.applyOrganDamage(5)
 
+/obj/item/clothing/glasses/proc/ranged_attack(mob/living/carbon/human/user,atom/A, params)
+	return FALSE
+
 /obj/item/clothing/glasses/meson
 	name = "optical meson scanner"
 	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions."
@@ -300,7 +303,7 @@
 		add_atom_colour("#[user.eye_color]", FIXED_COLOUR_PRIORITY)
 		colored_before = TRUE
 
-/obj/item/clothing/glasses/sunglasses/blindfold/white/worn_overlays(isinhands = FALSE, file2use)
+/obj/item/clothing/glasses/sunglasses/blindfold/white/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands && ishuman(loc) && !colored_before)
 		var/mob/living/carbon/human/H = loc
diff --git a/code/modules/clothing/glasses/disablerglasses.dm b/code/modules/clothing/glasses/disablerglasses.dm
new file mode 100644
index 0000000000..a46e4c8339
--- /dev/null
+++ b/code/modules/clothing/glasses/disablerglasses.dm
@@ -0,0 +1,15 @@
+/obj/item/clothing/glasses/hud/security/sunglasses/disablers
+	name = "true stunglasses"
+	desc = "Made for only the best of shitsec. Wear 'em like you're gonna robust all of those fuckers."
+	var/beamtype = /obj/item/projectile/beam/disabler //change for adminbus
+
+/obj/item/clothing/glasses/hud/security/sunglasses/disablers/ranged_attack(mob/living/carbon/human/user,atom/A, params)
+	user.changeNext_move(CLICK_CD_RANGE)
+	var/obj/item/projectile/beam/disabler/LE = new beamtype( loc )
+	playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
+	LE.firer = src
+	LE.def_zone = user.get_organ_target()
+	LE.preparePixelProjectile(A, src, params)
+	LE.fire()
+	return TRUE
+	//shamelessly copied
\ No newline at end of file
diff --git a/code/modules/clothing/glasses/phantomthief.dm b/code/modules/clothing/glasses/phantomthief.dm
index f5a15f7900..96f5cfc201 100644
--- a/code/modules/clothing/glasses/phantomthief.dm
+++ b/code/modules/clothing/glasses/phantomthief.dm
@@ -26,7 +26,7 @@
 /obj/item/clothing/glasses/phantomthief/syndicate/proc/injectadrenaline(mob/user, combatmodestate)
 	if(istype(user) && combatmodestate && world.time >= nextadrenalinepop)
 		nextadrenalinepop = world.time + 5 MINUTES
-		user.reagents.add_reagent("syndicateadrenals", 5)
+		user.reagents.add_reagent(/datum/reagent/syndicateadrenals, 5)
 		user.playsound_local(user, 'sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
 
 /obj/item/clothing/glasses/phantomthief/syndicate/equipped(mob/user, slot)
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index ac491c2bc5..87d9f359eb 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -24,7 +24,7 @@
 	user.visible_message("<span class='suicide'>\the [src] are forcing [user]'s hands around [user.p_their()] neck! It looks like the gloves are possessed!</span>")
 	return OXYLOSS
 
-/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
+/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		if(damaged_clothes)
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index ec6db20cc4..a875561056 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -8,8 +8,6 @@
 	var/blockTracking = 0 //For AI tracking
 	var/can_toggle = null
 	dynamic_hair_suffix = "+generic"
-	var/muzzle_var = NORMAL_STYLE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION //not all hats have muzzles
 
 /obj/item/clothing/head/Initialize()
 	. = ..()
@@ -17,30 +15,6 @@
 		var/mob/living/carbon/human/H = loc
 		H.update_hair()
 
-/obj/item/clothing/head/equipped(mob/user, slot)
-	..()
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		var/datum/species/pref_species = H.dna.species
-
-		if(mutantrace_variation)
-			if("mam_snouts" in pref_species.default_features)
-				if(H.dna.features["mam_snouts"] != "None")
-					muzzle_var = ALT_STYLE
-				else
-					muzzle_var = NORMAL_STYLE
-
-			else if("snout" in pref_species.default_features)
-				if(H.dna.features["snout"] != "None")
-					muzzle_var = ALT_STYLE
-				else
-					muzzle_var = NORMAL_STYLE
-
-			else
-				muzzle_var = NORMAL_STYLE
-
-			H.update_inv_head()
-
 ///Special throw_impact for hats to frisbee hats at people to place them on their heads.
 /obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing)
 	. = ..()
@@ -74,7 +48,7 @@
 
 
 
-/obj/item/clothing/head/worn_overlays(isinhands = FALSE)
+/obj/item/clothing/head/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		if(damaged_clothes)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 19f03dfd0a..51822cab77 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -91,7 +91,7 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/head/hardhat/weldhat
 	name = "welding hard hat"
@@ -125,7 +125,7 @@
 		playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing
 	update_icon()
 
-/obj/item/clothing/head/hardhat/weldhat/worn_overlays(isinhands)
+/obj/item/clothing/head/hardhat/weldhat/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands)
 		. += mutable_appearance('icons/mob/head.dmi', "weldhelmet")
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index be6e270e45..c2992b7651 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -76,7 +76,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	dog_fashion = null
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/head/helmet/attack_self(mob/user)
 	if(can_toggle && !user.incapacitated())
@@ -217,7 +217,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	strip_delay = 80
 	dog_fashion = null
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 
 /obj/item/clothing/head/helmet/knight/Initialize(mapload)
@@ -246,7 +246,7 @@
 	icon_state = "skull"
 	item_state = "skull"
 	strip_delay = 100
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 //LightToggle
 
@@ -337,10 +337,28 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
 
-
 /obj/item/clothing/head/helmet/durathread
 	name = "makeshift helmet"
 	desc = "A hardhat with strips of leather and durathread for additional blunt protection."
 	icon_state = "durathread"
 	item_state = "durathread"
 	armor = list("melee" = 25, "bullet" = 10, "laser" = 20,"energy" = 10, "bomb" = 30, "bio" = 15, "rad" = 20, "fire" = 100, "acid" = 50)
+
+/obj/item/clothing/head/helmet/rus_helmet
+	name = "russian helmet"
+	desc = "It can hold a bottle of vodka."
+	icon_state = "rus_helmet"
+	item_state = "rus_helmet"
+	armor = list("melee" = 30, "bullet" = 25, "laser" = 20,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 50)
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/rushelmet
+
+/obj/item/clothing/head/helmet/rus_ushanka
+	name = "battle ushanka"
+	desc = "100% bear."
+	icon_state = "rus_ushanka"
+	item_state = "rus_ushanka"
+	clothing_flags = THICKMATERIAL
+	body_parts_covered = HEAD
+	cold_protection = HEAD
+	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 0)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 3fa5d56d1e..4c6a0fa3b6 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -66,7 +66,7 @@
 	item_state = "syndicate-helm-black-red"
 	desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/head/cueball
 	name = "cueball helmet"
@@ -392,3 +392,33 @@
 	desc = "A green Christmas Hat! How festive!"
 	icon_state = "christmashatg"
 	item_state = "christmashatg"
+
+/obj/item/clothing/head/cowboyhat
+	name = "cowboy hat"
+	desc = "A standard brown cowboy hat, yeehaw."
+	icon_state = "cowboyhat"
+	item_state= "cowboyhat"
+
+/obj/item/clothing/head/cowboyhat/black
+	name = "black cowboy hat"
+	desc = "A a black cowboy hat, perfect for any outlaw"
+	icon_state = "cowboyhat_black"
+	item_state= "cowboyhat_black"
+
+/obj/item/clothing/head/cowboyhat/white
+	name = "white cowboy hat"
+	desc = "A white cowboy hat, perfect for your every day rancher"
+	icon_state = "cowboyhat_white"
+	item_state= "cowboyhat_white"
+
+/obj/item/clothing/head/cowboyhat/pink
+	name = "pink cowboy hat"
+	desc = "A pink cowboy? more like cowgirl hat, just don't be a buckle bunny."
+	icon_state = "cowboyhat_pink"
+	item_state= "cowboyhat_pink"
+
+/obj/item/clothing/head/cowboyhat/sec
+	name = "security cowboy hat"
+	desc = "A security cowboy hat, perfect for any true lawman"
+	icon_state = "cowboyhat_sec"
+	item_state= "cowboyhat_sec"
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 127bf4c773..a18d68cc72 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -28,7 +28,7 @@
 	visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = FIRE_PROOF
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/head/welding/attack_self(mob/user)
 	weldingvisortoggle(user)
@@ -206,7 +206,7 @@
 		M.color = hair_color
 		add_overlay(M)
 
-/obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, file2use)
+/obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index c00e6f72e0..3b2edce795 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -8,9 +8,6 @@
 	var/modifies_speech = FALSE
 	var/mask_adjusted = 0
 	var/adjusted_flags = null
-	var/muzzle_var = NORMAL_STYLE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION //most masks have overrides, but not all probably.
-
 
 /obj/item/clothing/mask/attack_self(mob/user)
 	if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE))
@@ -24,28 +21,6 @@
 		RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
 	else
 		UnregisterSignal(M, COMSIG_MOB_SAY)
-	if(!ishuman(M))
-		return
-	var/mob/living/carbon/human/H = M
-	var/datum/species/pref_species = H.dna.species
-
-	if(mutantrace_variation)
-		if("mam_snouts" in pref_species.default_features)
-			if(H.dna.features["mam_snouts"] != "None")
-				muzzle_var = ALT_STYLE
-			else
-				muzzle_var = NORMAL_STYLE
-
-		else if("snout" in pref_species.default_features)
-			if(H.dna.features["snout"] != "None")
-				muzzle_var = ALT_STYLE
-			else
-				muzzle_var = NORMAL_STYLE
-
-		else
-			muzzle_var = NORMAL_STYLE
-
-		H.update_inv_wear_mask()
 
 /obj/item/clothing/mask/dropped(mob/M)
 	. = ..()
@@ -53,7 +28,7 @@
 
 /obj/item/clothing/mask/proc/handle_speech()
 
-/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
+/obj/item/clothing/mask/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		if(body_parts_covered & HEAD)
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 3960bdadeb..dc151cdd42 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -7,7 +7,7 @@
 	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_SMALL
 	actions_types = list(/datum/action/item_action/adjust)
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/balaclava/attack_self(mob/user)
 	adjustmask(user)
@@ -19,7 +19,7 @@
 	item_state = "luchag"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_SMALL
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 	modifies_speech = TRUE
 
 /obj/item/clothing/mask/luchador/handle_speech(datum/source, list/speech_args)
@@ -57,3 +57,12 @@
 	desc = "Worn by robust fighters who are willing to do anything to win."
 	icon_state = "luchar"
 	item_state = "luchar"
+
+/obj/item/clothing/mask/russian_balaclava
+	name = "russian balaclava"
+	desc = "Protects your face from snow."
+	icon_state = "rus_balaclava"
+	item_state = "rus_balaclava"
+	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
+	w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index f4335d17e8..b979e2e526 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -13,7 +13,7 @@
 	flags_cover = MASKCOVERSMOUTH
 	visor_flags_cover = MASKCOVERSMOUTH
 	resistance_flags = NONE
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/breath/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is wrapping \the [src]'s tube around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!</span>")
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index c613d1a91e..5aedf7045d 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -10,7 +10,7 @@
 	permeability_coefficient = 0.01
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
 	resistance_flags = NONE
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/gas/glass
 	name = "glass gas mask"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 4b8f16a77f..894ea2562f 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -7,7 +7,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	gas_transfer_coefficient = 0.9
 	equip_delay_other = 20
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/muzzle/attack_paw(mob/user)
 	if(iscarbon(user))
@@ -31,7 +31,7 @@
 	permeability_coefficient = 0.01
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 25, "rad" = 0, "fire" = 0, "acid" = 0)
 	actions_types = list(/datum/action/item_action/adjust)
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/surgical/attack_self(mob/user)
 	adjustmask(user)
@@ -41,7 +41,7 @@
 	desc = "Warning: moustache is fake."
 	icon_state = "fake-moustache"
 	flags_inv = HIDEFACE
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/fakemoustache/italian
 	name = "italian moustache"
@@ -71,7 +71,7 @@
 	name = "joy mask"
 	desc = "Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout."
 	icon_state = "joy"
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/pig
 	name = "pig mask"
@@ -242,7 +242,7 @@
 	slot_flags = ITEM_SLOT_MASK
 	adjusted_flags = ITEM_SLOT_HEAD
 	icon_state = "bandbotany"
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/mask/bandana/attack_self(mob/user)
 	adjustmask(user)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index e863dc8860..9a46b6b759 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -6,7 +6,7 @@
 	strip_delay = 40
 	equip_delay_other = 40
 
-/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
+/obj/item/clothing/neck/worn_overlays(isinhands = FALSE, icon_flag, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		if(body_parts_covered & HEAD)
@@ -192,7 +192,7 @@
 	tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
 	name = "[initial(name)] - [tagname]"
 
-/obj/item/clothing/neck/petcollar/worn_overlays(isinhands, icon_file)
+/obj/item/clothing/neck/petcollar/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(hasprimary | hassecondary | hastertiary)
 		if(!isinhands)	//prevents the worn sprites from showing up if you're just holding them
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 29fd06dcaf..4c8f9bdab2 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -53,7 +53,7 @@
 		return
 
 	var/obj/item/reagent_containers/glass/bucket/bucket = H.get_item_for_held_index(1)
-	bucket.reagents.add_reagent("water",70)
+	bucket.reagents.add_reagent(/datum/reagent/water,70)
 
 /datum/outfit/laser_tag
 	name = "Laser Tag Red"
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index a8406e3b12..eaaf4b90ce 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -15,9 +15,7 @@
 	var/offset = 0
 	var/equipped_before_drop = FALSE
 
-	//CITADEL EDIT Enables digitigrade shoe styles
-	var/adjusted = NORMAL_STYLE
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_DIGITIGRADE
 	var/last_bloodtype = ""	//used to track the last bloodtype to have graced these shoes; makes for better performing footprint shenanigans
 	var/last_blood_DNA = ""	//same as last one
 
@@ -51,7 +49,7 @@
 		last_bloodtype = blood_dna[blood_dna[blood_dna.len]]//trust me this works
 		last_blood_DNA = blood_dna[blood_dna.len]
 
-/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
+/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		var/bloody = FALSE
@@ -63,23 +61,12 @@
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
 		if(bloody)
-			if(adjusted == NORMAL_STYLE)
-				. += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = blood_DNA_to_color())
-			else
-				. += mutable_appearance('icons/mob/feet_digi.dmi', "shoeblood", color = blood_DNA_to_color())
+			var/file2use = style_flags & STYLE_DIGITIGRADE ? 'icons/mob/feet_digi.dmi' : 'icons/effects/blood.dmi'
+			. += mutable_appearance(file2use, "shoeblood", color = blood_DNA_to_color())
 
 /obj/item/clothing/shoes/equipped(mob/user, slot)
 	. = ..()
 
-	if(mutantrace_variation && ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(DIGITIGRADE in H.dna.species.species_traits)
-			adjusted = ALT_STYLE
-			H.update_inv_shoes()
-		else if(adjusted == ALT_STYLE)
-			adjusted = NORMAL_STYLE
-			H.update_inv_shoes()
-
 	if(offset && slot_flags & slotdefine2slotbit(slot))
 		user.pixel_y += offset
 		worn_y_dimension -= (offset * 2)
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 43c99fe7fd..c0e566cc0e 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -327,6 +327,13 @@
 		lightCycle = 0
 		active = FALSE
 
+/obj/item/clothing/shoes/russian
+	name = "russian boots"
+	desc = "Comfy shoes."
+	icon_state = "rus_shoes"
+	item_state = "rus_shoes"
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
+
 // kevin is into feet
 /obj/item/clothing/shoes/wraps
 	name = "gilded leg wraps"
@@ -347,4 +354,14 @@
 /obj/item/clothing/shoes/wraps/blue
 	name = "blue leg wraps"
 	desc = "Ankle coverings. Hang ten, brother."
-	icon_state = "bluecuffs"
\ No newline at end of file
+	icon_state = "bluecuffs"
+
+/obj/item/clothing/shoes/cowboyboots
+	name = "cowboy boots"
+	desc = "A standard pair of brown cowboy boots."
+	icon_state = "cowboyboots"
+
+/obj/item/clothing/shoes/cowboyboots/black
+	name = "black cowboy boots"
+	desc = "A pair of black cowboy boots, pretty easy to scuff up."
+	icon_state = "cowboyboots_black"
diff --git a/code/modules/clothing/shoes/vg_shoes.dm b/code/modules/clothing/shoes/vg_shoes.dm
index 627a061181..53b093dc72 100644
--- a/code/modules/clothing/shoes/vg_shoes.dm
+++ b/code/modules/clothing/shoes/vg_shoes.dm
@@ -5,7 +5,7 @@
 	icon_state = "leather"
 	item_color = "leather"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/magboots/deathsquad
 	desc = "Very expensive and advanced magnetic boots, used only by the elite during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -14,7 +14,7 @@
 	magboot_state = "DS-magboots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/magboots/atmos
 	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. These are painted in the colors of an atmospheric technician."
@@ -23,102 +23,102 @@
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	magboot_state = "atmosmagboots"
 	resistance_flags = FIRE_PROOF
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/simonshoes
 	name = "Simon's Shoes"
 	desc = "Simon's Shoes."
 	icon_state = "simonshoes"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/kneesocks
 	name = "kneesocks"
 	desc = "A pair of girly knee-high socks."
 	icon_state = "kneesock"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/jestershoes
 	name = "Jester Shoes"
 	desc = "As worn by the clowns of old."
 	icon_state = "jestershoes"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/aviatorboots
 	name = "Aviator Boots"
 	desc = "Boots suitable for just about any occasion."
 	icon_state = "aviator_boots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/libertyshoes
 	name = "Liberty Shoes"
 	desc = "Freedom isn't free, neither were these shoes."
 	icon_state = "libertyshoes"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/megaboots
 	name = "DRN-001 Boots"
 	desc = "Large armored boots, very weak to large spikes."
 	icon_state = "megaboots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/protoboots
 	name = "Prototype Boots"
 	desc = "Functionally identical to the DRN-001 model's boots, but in red."
 	icon_state = "protoboots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/megaxboots
 	name = "Maverick Hunter boots"
 	desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike."
 	icon_state = "megaxboots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/joeboots
 	name = "Sniper Boots"
 	desc = "Nearly identical to the Prototype's boots, except in black."
 	icon_state = "joeboots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/doomguy
 	name = "Doomguy's boots"
 	desc = "If you look closely, you might see skull fragments still buried in these boots."
 	icon_state = "doom"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/rottenshoes
 	name = "rotten shoes"
 	desc = "These shoes seem perfect for sneaking around."
 	icon_state = "rottenshoes"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/sandal/slippers
 	name = "magic slippers"
 	icon_state = "slippers"
 	desc = "For the wizard that puts comfort first. Who's going to laugh?"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/slippers_worn
 	name = "worn bunny slippers"
 	desc = "Fluffy..."
 	icon_state = "slippers_worn"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/jackboots/neorussian
 	name = "neo-Russian boots"
 	desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit."
 	icon_state = "nr_boots"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
\ No newline at end of file
+	mutantrace_variation = NONE
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index 57866b5131..f49c26ce49 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -21,7 +21,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = NONE
 	dog_fashion = null
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
 /obj/item/clothing/suit/space
@@ -46,4 +46,4 @@
 	equip_delay_other = 80
 	resistance_flags = NONE
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE //rated for cosmic radation :honk:
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 5a53e2776a..a8387c5ccc 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -26,6 +26,7 @@
 	actions_types = list(/datum/action/item_action/toggle)
 	armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 90, "rad" = 90, "fire" = 100, "acid" = 1000)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	mutantrace_variation = STYLE_DIGITIGRADE
 	var/list/chronosafe_items = list(/obj/item/chrono_eraser, /obj/item/gun/energy/chrono_gun)
 	var/obj/item/clothing/head/helmet/space/chronos/helmet = null
 	var/obj/effect/chronos_cam/camera = null
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index bf52b26ae9..984c19e202 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -180,7 +180,7 @@
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
 	resistance_flags = FIRE_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 
 	//Atmospherics
 /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos
@@ -202,7 +202,6 @@
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS					//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 
 	//Chief Engineer's hardsuit
@@ -226,7 +225,6 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/elite
 	jetpack = /obj/item/tank/jetpack/suit
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 	//Mining hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/mining
@@ -257,7 +255,7 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 
 /obj/item/clothing/suit/space/hardsuit/mining/Initialize()
 	. = ..()
@@ -353,7 +351,7 @@
 	allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
 	jetpack = /obj/item/tank/jetpack/suit
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 
 //Elite Syndie suit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
@@ -370,7 +368,6 @@
 	on = FALSE
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
-
 /obj/item/clothing/suit/space/hardsuit/syndi/elite
 	name = "elite syndicate hardsuit"
 	desc = "An elite version of the syndicate hardsuit, with improved armour and fireproofing. It is in travel mode."
@@ -382,7 +379,8 @@
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | ACID_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
+
 
 //The Owl Hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
@@ -404,6 +402,7 @@
 	item_state = "s_suit"
 	item_color = "owl"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 
 	//Wizard hardsuit
@@ -430,6 +429,7 @@
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS					//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 /obj/item/clothing/suit/space/hardsuit/wizard/Initialize()
 	. = ..()
@@ -455,7 +455,7 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical)
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 
 	//Research Director hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/rd
@@ -497,7 +497,6 @@
 	/obj/item/hand_tele, /obj/item/aicard)
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 	//Security hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/security
@@ -515,7 +514,7 @@
 	item_state = "sec_hardsuit"
 	armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 
 /obj/item/clothing/suit/space/hardsuit/security/Initialize()
 	. = ..()
@@ -536,7 +535,6 @@
 	armor = list("melee" = 45, "bullet" = 25, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 95, "acid" = 95)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
 	jetpack = /obj/item/tank/jetpack/suit
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 	//Captain
 /obj/item/clothing/head/helmet/space/hardsuit/captain
@@ -564,7 +562,6 @@
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT //this needed to be added a long fucking time ago
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/captain
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/space/hardsuit/captain/Initialize()
 	. = ..()
@@ -586,6 +583,7 @@
 	item_state = "clown_hardsuit"
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 30)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clown
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 /obj/item/clothing/suit/space/hardsuit/clown/mob_can_equip(mob/M, slot)
 	if(!..() || !ishuman(M))
@@ -614,6 +612,7 @@
 	slowdown = 3
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient
 	resistance_flags = FIRE_PROOF
+	mutantrace_variation = STYLE_DIGITIGRADE
 	var/footstep = 1
 	var/mob/listeningTo
 
@@ -627,7 +626,9 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient/mason
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | IMMUTABLE_SLOW
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	flags_1 = TESLA_IGNORE_1
 
 /obj/item/clothing/head/helmet/space/hardsuit/ancient/mason
 	name = "M.A.S.O.N RIG helmet"
@@ -637,12 +638,13 @@
 	armor = list("melee" = 20, "bullet" = 15, "laser" = 15, "energy" = 45, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	item_color = "ancient"
 	brightness_on = 16
-	clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS | SCAN_REAGENTS
 	flash_protect = 5 //We will not be flash by bombs
 	tint = 1
 	var/obj/machinery/doppler_array/integrated/bomb_radar
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS | SCAN_REAGENTS
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	flags_1 = TESLA_IGNORE_1
 
 /obj/item/clothing/head/helmet/space/hardsuit/ancient/mason/Initialize()
 	. = ..()
@@ -709,7 +711,6 @@
 	var/recharge_rate = 1 //How quickly the shield recharges once it starts charging
 	var/shield_state = "shield-old"
 	var/shield_on = "shield-old"
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/space/hardsuit/shielded/Initialize()
 	. = ..()
@@ -749,13 +750,11 @@
 			var/mob/living/carbon/human/C = loc
 			C.update_inv_wear_suit()
 
-/obj/item/clothing/suit/space/hardsuit/shielded/worn_overlays(isinhands)
-	. = list()
+/obj/item/clothing/suit/space/hardsuit/shielded/worn_overlays(isinhands, icon_file, style_flags = NONE)
+	. = ..()
 	if(!isinhands)
-		if(taurmode >= SNEK_TAURIC)
-			. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', shield_state, MOB_LAYER + 0.01)
-		else
-			. += mutable_appearance('icons/effects/effects.dmi', shield_state, MOB_LAYER + 0.01)
+		var/file2use = style_flags & STYLE_ALL_TAURIC ? 'modular_citadel/icons/mob/64x32_effects.dmi' : 'icons/effects/effects.dmi'
+		. += mutable_appearance(file2use, shield_state, MOB_LAYER + 0.01)
 
 /obj/item/clothing/head/helmet/space/hardsuit/shielded
 	resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -825,7 +824,7 @@
 	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
 	slowdown = 0
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
 
 /obj/item/clothing/suit/space/hardsuit/shielded/syndi/Initialize()
 	jetpack = new /obj/item/tank/jetpack/suit(src)
@@ -854,7 +853,6 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/swat
 	dog_fashion = /datum/dog_fashion/back/deathsquad
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/head/helmet/space/hardsuit/shielded/swat
 	name = "death commando helmet"
@@ -885,7 +883,7 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
 	var/energy_color = "#35FFF0"
 	var/obj/item/clothing/suit/space/hardsuit/lavaknight/linkedsuit = null
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/helmet/space/hardsuit/lavaknight/Initialize()
 	. = ..()
@@ -915,7 +913,7 @@
 
 	add_overlay(helm_overlay)
 
-/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file)
+/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands)
 		var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER)
@@ -934,8 +932,6 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/lavaknight
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	tauric = TRUE		//Citadel Add for tauric hardsuits
-
 	var/energy_color = "#35FFF0"
 
 /obj/item/clothing/suit/space/hardsuit/lavaknight/Initialize()
@@ -954,7 +950,7 @@
 
 	add_overlay(suit_overlay)
 
-/obj/item/clothing/suit/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file)
+/obj/item/clothing/suit/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands)
 		var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", ABOVE_LIGHTING_LAYER)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 88e17d158c..b9b51e5d1c 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -53,6 +53,7 @@ Contains:
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 50, "bio" = 90, "rad" = 20, "fire" = 100, "acid" = 100)
 	strip_delay = 120
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 /obj/item/clothing/head/helmet/space/beret
 	name = "officer's beret"
@@ -65,7 +66,7 @@ Contains:
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | ACID_PROOF
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/space/officer
 	name = "officer's jacket"
@@ -81,6 +82,7 @@ Contains:
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 	//NASA Voidsuit
 /obj/item/clothing/head/helmet/space/nasavoid
@@ -95,6 +97,7 @@ Contains:
 	item_state = "void"
 	desc = "An old, NASA CentCom branch designed, dark red space suit."
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 /obj/item/clothing/head/helmet/space/nasavoid/old
 	name = "Engineering Void Helmet"
@@ -116,7 +119,7 @@ Contains:
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
 	flags_cover = HEADCOVERSEYES
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 	dog_fashion = /datum/dog_fashion/head/santa
 
@@ -127,6 +130,7 @@ Contains:
 	item_state = "santa"
 	slowdown = 0
 	allowed = list(/obj/item) //for stuffing exta special presents
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 
 	//Space pirate outfit
@@ -140,14 +144,14 @@ Contains:
 	strip_delay = 40
 	equip_delay_other = 20
 	flags_cover = HEADCOVERSEYES
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/helmet/space/pirate/bandana
 	name = "royal bandana"
 	desc = "A space-proof bandanna crafted with reflective kevlar."
 	icon_state = "bandana"
 	item_state = "bandana"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/space/pirate
 	name = "royal waistcoat "
@@ -161,6 +165,7 @@ Contains:
 	armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75)
 	strip_delay = 40
 	equip_delay_other = 20
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 	//Emergency Response Team suits
 /obj/item/clothing/head/helmet/space/hardsuit/ert
@@ -189,7 +194,6 @@ Contains:
 	slowdown = 0
 	strip_delay = 130
 	resistance_flags = ACID_PROOF
-	tauric = TRUE	//Citadel Add for tauric hardsuits
 
 	//ERT Security
 /obj/item/clothing/head/helmet/space/hardsuit/ert/sec
@@ -251,6 +255,7 @@ Contains:
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert
 	armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC
 
 	//ERT Security
 /obj/item/clothing/head/helmet/space/hardsuit/ert/alert/sec
@@ -298,7 +303,6 @@ Contains:
 	item_state = "s_suit"
 	desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 65)
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/head/helmet/space/eva
 	name = "EVA helmet"
@@ -317,7 +321,7 @@ Contains:
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = ACID_PROOF | FIRE_PROOF
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/space/freedom
 	name = "eagle suit"
@@ -330,6 +334,7 @@ Contains:
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = ACID_PROOF | FIRE_PROOF
 	slowdown = 0
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 //Carpsuit, bestsuit, lovesuit
 /obj/item/clothing/head/helmet/space/hardsuit/carp
@@ -340,7 +345,7 @@ Contains:
 	armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75)	//As whimpy as a space carp
 	brightness_on = 0 //luminosity when on
 	actions_types = list()
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/helmet/space/hardsuit/carp/Initialize()
 	. = ..()
@@ -356,6 +361,7 @@ Contains:
 	armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75) //As whimpy whimpy whoo
 	allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/automatic/speargun)	//I'm giving you a hint here
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/carp
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
 	name = "paranormal response unit helmet"
@@ -366,7 +372,7 @@ Contains:
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	actions_types = list()
 	resistance_flags = FIRE_PROOF
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize()
 	. = ..()
@@ -380,7 +386,6 @@ Contains:
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize()
 	. = ..()
@@ -427,7 +432,6 @@ Contains:
 	slowdown = 2
 	armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0)
 	strip_delay = 65
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/space/fragile/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(!torn && prob(50))
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 7c829e7570..fee8dbce33 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -12,7 +12,6 @@
 	var/next_extinguish = 0
 	var/extinguish_cooldown = 100
 	var/extinguishes_left = 10
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/space/eva/plasmaman/examine(mob/user)
 	. = ..()
@@ -47,7 +46,7 @@
 	var/on = FALSE
 	var/light_overlay = "envirohelm-light"
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/helmet/space/plasmaman/attack_self(mob/user)
 	if(!light_overlay)
@@ -68,7 +67,7 @@
 		var/datum/action/A=X
 		A.UpdateButtonIcon()
 
-/obj/item/clothing/head/helmet/space/plasmaman/worn_overlays(isinhands, icon_file)
+/obj/item/clothing/head/helmet/space/plasmaman/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands && on)
 		. += mutable_appearance(icon_file, light_overlay)
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index e6710ee8f9..178e707125 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -14,7 +14,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
 	armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85)
-
+	mutantrace_variation = STYLE_DIGITIGRADE
 
 //Green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/green
@@ -50,6 +50,7 @@
 	name = "orange space suit"
 	icon_state = "syndicate-orange"
 	item_state = "syndicate-orange"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 //Blue syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/blue
@@ -109,7 +110,6 @@
 	name = "green space suit"
 	icon_state = "syndicate-black-med"
 	item_state = "syndicate-black"
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 
 //Black-orange syndicate space suit
@@ -134,6 +134,7 @@
 	name = "black and red space suit"
 	icon_state = "syndicate-black-red"
 	item_state = "syndicate-black-red"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 
 //Black with yellow/red engineering syndicate space suit
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index faec9e2f4c..d05afc15e0 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -9,56 +9,16 @@
 	var/blood_overlay_type = "suit"
 	var/togglename = null
 	var/suittoggled = FALSE
+	mutantrace_variation = STYLE_DIGITIGRADE
 
-	var/adjusted = NORMAL_STYLE
-	mutantrace_variation = MUTANTRACE_VARIATION
-	var/tauric = FALSE		//Citadel Add for tauric hardsuits
-	var/taurmode = NOT_TAURIC
-	var/dimension_x = 32
-	var/dimension_y = 32
-	var/center = FALSE	//Should we center the sprite?
-
-/obj/item/clothing/suit/equipped(mob/user, slot)
-	..()
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-
-		if(mutantrace_variation)
-			if(DIGITIGRADE in H.dna.species.species_traits)
-				adjusted = ALT_STYLE
-				H.update_inv_wear_suit()
-			else if(adjusted == ALT_STYLE)
-				adjusted = NORMAL_STYLE
-
-		if(("taur" in H.dna.species.mutant_bodyparts) && (H.dna.features["taur"] != "None"))
-			if(H.dna.features["taur"] in GLOB.noodle_taurs)
-				taurmode = SNEK_TAURIC
-				if(tauric == TRUE)
-					center = TRUE
-					dimension_x = 64
-			else if(H.dna.features["taur"] in GLOB.paw_taurs)
-				taurmode = PAW_TAURIC
-				if(tauric == TRUE)
-					center = TRUE
-					dimension_x = 64
-		else
-			taurmode = NOT_TAURIC
-			if(tauric == TRUE)
-				center = FALSE
-				dimension_x = 32
-		H.update_inv_wear_suit()
-
-
-/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
-	. = list()
+/obj/item/clothing/suit/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
+	. = ..()
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
 		if(blood_DNA)
-			if(tauric && taurmode >= SNEK_TAURIC)
-				. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
-			else
-				. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
+			var/file2use = (style_flags & STYLE_ALL_TAURIC) ? 'modular_citadel/icons/mob/64x32_effects.dmi' : 'icons/effects/blood.dmi'
+			. += mutable_appearance(file2use, "[blood_overlay_type]blood", color = blood_DNA_to_color())
 		var/mob/living/carbon/human/M = loc
 		if(ishuman(M) && M.w_uniform)
 			var/obj/item/clothing/under/U = M.w_uniform
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 19050dc36f..e536d307ef 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -248,3 +248,20 @@
 	max_integrity = 200
 	resistance_flags = FLAMMABLE
 	armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 5, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
+
+/obj/item/clothing/suit/armor/vest/russian
+	name = "russian vest"
+	desc = "A bulletproof vest with forest camo. Good thing there's plenty of forests to hide in around here, right?"
+	icon_state = "rus_armor"
+	item_state = "rus_armor"
+	armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50)
+/obj/item/clothing/suit/armor/vest/russian_coat
+	name = "russian battle coat"
+	desc = "Used in extremly cold fronts, made out of real bears."
+	icon_state = "rus_coat"
+	item_state = "rus_coat"
+	clothing_flags = THICKMATERIAL
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+	armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 50)
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 5d0a9b9914..5729daa741 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -9,7 +9,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE|HIDESNOUT
 	resistance_flags = ACID_PROOF
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/suit/bio_suit
 	name = "bio suit"
@@ -28,7 +28,7 @@
 	strip_delay = 70
 	equip_delay_other = 70
 	resistance_flags = ACID_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 //Standard biosuit, orange stripe
 /obj/item/clothing/head/bio_hood/general
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 4318839845..816f0edeba 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -207,7 +207,7 @@
 	item_state = "techpriest"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	hoodtype = /obj/item/clothing/head/hooded/techpriest
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/hooded/techpriest
 	name = "techpriest's hood"
@@ -216,4 +216,4 @@
 	item_state = "techpriesthood"
 	body_parts_covered = HEAD
 	flags_inv = HIDEHAIR|HIDEEARS
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 4e155cd341..4862512468 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -864,7 +864,7 @@
 	blood_overlay_type = "armor"
 	body_parts_covered = CHEST
 	resistance_flags = NONE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid
 
 /obj/item/clothing/suit/assu_suit
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 559d3006a1..79b221a807 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -179,8 +179,7 @@
 	RemoveHelmet()
 
 /obj/item/clothing/suit/space/hardsuit/proc/ToggleHelmet()
-	var/mob/living/carbon/human/H = src.loc
-	var/datum/species/pref_species = H.dna.species
+	var/mob/living/carbon/human/H = loc
 	if(!helmettype)
 		return
 	if(!helmet)
@@ -194,18 +193,6 @@
 				to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
 				return
 			else if(H.equip_to_slot_if_possible(helmet,SLOT_HEAD,0,0,1))
-				if(helmet.mutantrace_variation)
-					if("mam_snouts" in pref_species.default_features)
-						if(H.dna.features["mam_snouts"] != "None")
-							helmet.muzzle_var = ALT_STYLE
-
-					else if("snout" in pref_species.default_features)
-						if(H.dna.features["snout"] != "None")
-							helmet.muzzle_var = ALT_STYLE
-					else
-						helmet.muzzle_var = NORMAL_STYLE
-					H.update_inv_head()
-
 				to_chat(H, "<span class='notice'>You engage the helmet on the hardsuit.</span>")
 				suittoggled = TRUE
 				H.update_inv_wear_suit()
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index fbdca6ddbc..a6c272e550 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -21,7 +21,7 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/extinguisher, /obj/item/crowbar)
 	slowdown = 1
 	armor = list("melee" = 15, "bullet" = 5, "laser" = 20, "energy" = 10, "bomb" = 20, "bio" = 10, "rad" = 20, "fire" = 100, "acid" = 50)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
@@ -30,11 +30,12 @@
 	strip_delay = 60
 	equip_delay_other = 60
 	resistance_flags = FIRE_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/fire/firefighter
 	icon_state = "firesuit"
 	item_state = "firefighter"
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 
 /obj/item/clothing/suit/fire/heavy
@@ -50,6 +51,8 @@
 	icon_state = "atmos_firesuit"
 	item_state = "firesuit_atmos"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 /*
  * Bomb protection
@@ -71,7 +74,7 @@
 	equip_delay_other = 70
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = NONE
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 
 /obj/item/clothing/suit/bomb_suit
@@ -94,7 +97,7 @@
 	strip_delay = 70
 	equip_delay_other = 70
 	resistance_flags = NONE
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 
 /obj/item/clothing/head/bomb_hood/security
@@ -131,7 +134,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = NONE
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 /obj/item/clothing/suit/radiation
 	name = "radiation suit"
@@ -151,4 +154,4 @@
 	flags_inv = HIDEJUMPSUIT|HIDETAUR
 	resistance_flags = NONE
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
diff --git a/code/modules/clothing/suits/vg_suits.dm b/code/modules/clothing/suits/vg_suits.dm
index 08fe029f9e..be6cd9938e 100644
--- a/code/modules/clothing/suits/vg_suits.dm
+++ b/code/modules/clothing/suits/vg_suits.dm
@@ -9,7 +9,7 @@
 	siemens_coefficient = 0.5
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/xcomsquaddie/dredd
 	name = "Judge Armor"
@@ -18,7 +18,7 @@
 	item_state = "dredd-suit"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 
 /obj/item/clothing/suit/armor/xcomarmor
@@ -32,7 +32,7 @@
 	siemens_coefficient = 0.5
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/vest/neorussian
 	name = "neo-Russian vest"
@@ -41,7 +41,7 @@
 	item_state = "nr_vest"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/doomguy
 	name = "Doomguy's armor"
@@ -53,7 +53,7 @@
 	armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0)
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 
 /obj/item/clothing/suit/kaminacape
@@ -63,7 +63,7 @@
 	body_parts_covered = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/officercoat
 	name = "Officer's Coat"
@@ -71,7 +71,7 @@
 	icon_state = "officersuit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/soldiercoat
 	name = "Soldier's Coat"
@@ -79,7 +79,7 @@
 	icon_state = "soldiersuit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/russofurcoat
 	name = "russian fur coat"
@@ -89,7 +89,7 @@
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/doshjacket
 	name = "Plasterer's Jacket"
@@ -98,7 +98,7 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/maidapron
 	name = "Apron"
@@ -107,7 +107,7 @@
 	body_parts_covered = CHEST|GROIN
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/clownpiece
 	name = "small fairy wings"
@@ -116,7 +116,7 @@
 	body_parts_covered = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/clownpiece/flying
 	name = "small fairy wings"
@@ -124,7 +124,7 @@
 	icon_state = "clownpiece-fly"
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/raincoat
 	name = "Raincoat"
@@ -133,6 +133,6 @@
 	body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index bb5f909521..0322613c11 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -11,13 +11,12 @@
 	var/sensor_mode = NO_SENSORS
 	var/can_adjust = TRUE
 	var/adjusted = NORMAL_STYLE
-	var/suit_style = NORMAL_SUIT_STYLE
 	var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only
 	var/obj/item/clothing/accessory/attached_accessory
 	var/mutable_appearance/accessory_overlay
-	mutantrace_variation = MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+	mutantrace_variation = STYLE_DIGITIGRADE
 
-/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
+/obj/item/clothing/under/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 	if(!isinhands)
 		if(damaged_clothes)
@@ -49,8 +48,6 @@
 	if(random_sensor)
 		//make the sensor mode favor higher levels, except coords.
 		sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
-	adjusted = NORMAL_STYLE
-	suit_style = NORMAL_SUIT_STYLE
 	..()
 
 /obj/item/clothing/under/equipped(mob/user, slot)
@@ -61,14 +58,6 @@
 		if(!alt_covers_chest)
 			body_parts_covered |= CHEST
 
-	if(mutantrace_variation && ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(DIGITIGRADE in H.dna.species.species_traits)
-			suit_style = DIGITIGRADE_SUIT_STYLE
-		else
-			suit_style = NORMAL_SUIT_STYLE
-		H.update_inv_w_uniform()
-
 	if(attached_accessory && slot != SLOT_HANDS && ishuman(user))
 		var/mob/living/carbon/human/H = user
 		attached_accessory.on_uniform_equip(src, user)
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index c6796d64c9..e42049ef6b 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -69,7 +69,6 @@
 	item_state = "lb_suit"
 	item_color = "cargo"
 	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = MUTANTRACE_VARIATION
 	alt_covers_chest = TRUE
 
 /obj/item/clothing/under/rank/cargotech/skirt
@@ -132,7 +131,7 @@
 	item_color = "blueclown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/greenclown
 	name = "green clown suit"
@@ -142,7 +141,7 @@
 	item_color = "greenclown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/yellowclown
 	name = "yellow clown suit"
@@ -152,7 +151,7 @@
 	item_color = "yellowclown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/purpleclown
 	name = "purple clown suit"
@@ -162,7 +161,7 @@
 	item_color = "purpleclown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/orangeclown
 	name = "orange clown suit"
@@ -172,7 +171,7 @@
 	item_color = "orangeclown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/rainbowclown
 	name = "rainbow clown suit"
@@ -182,7 +181,7 @@
 	item_color = "rainbowclown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/clown/Initialize()
 	. = ..()
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 177bce672f..06aa5aeb0c 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -750,7 +750,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
 	slowdown = 1
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	can_adjust = FALSE
 	strip_delay = 80
 	var/next_extinguish = 0
diff --git a/code/modules/clothing/under/polychromic_clothes.dm b/code/modules/clothing/under/polychromic_clothes.dm
index 9649d93eed..53011d42d1 100644
--- a/code/modules/clothing/under/polychromic_clothes.dm
+++ b/code/modules/clothing/under/polychromic_clothes.dm
@@ -25,9 +25,9 @@
 	secondary_color = "#FFFFFF"
 	tertiary_color = "#808080"
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION //Not all clothes are currently digi-compatible (only the shorts are as of time of writing)
+	mutantrace_variation = NONE //Not all clothes are currently digi-compatible (only the shorts are as of time of writing)
 
-/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file)	//this is where the main magic happens.
+/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file, style_flags = NONE)	//this is where the main magic happens.
 	. = ..()
 	if(hasprimary | hassecondary | hastertiary)
 		if(!isinhands)	//prevents the worn sprites from showing up if you're just holding them
@@ -86,7 +86,7 @@
 	secondary_color = "#808080"
 	tertiary_color = "#808080"
 	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = MUTANTRACE_VARIATION	//to enable digitigrade wearing
+	mutantrace_variation = STYLE_DIGITIGRADE //to enable digitigrade wearing
 
 /obj/item/clothing/under/polychromic/jumpsuit
 	name = "polychromic tri-tone jumpsuit"
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 67ef30f0cc..a615081f24 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -4,7 +4,6 @@
 	gender = PLURAL
 	body_parts_covered = GROIN
 	fitted = NO_FEMALE_UNIFORM
-	mutantrace_variation = MUTANTRACE_VARIATION
 	can_adjust = FALSE
 
 /obj/item/clothing/under/shorts/red
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 4e3e1aa0cc..69db08d19d 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -68,9 +68,18 @@
 	item_color = "syndicate_combat"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/syndicate/rus_army
+	name = "advanced military tracksuit"
+	desc = "Military grade tracksuits for frontline squatting."
+	icon_state = "rus_under"
+	item_color = "rus_under"
+	can_adjust = FALSE
+	armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	resistance_flags = NONE 
+
 /obj/item/clothing/under/syndicate/baseball
 	name = "major league, number unknown"
-	desc = "A major league outfit with the number faded number on the back. Seems rather robust for just a game"
+	desc = "A major league outfit with the number faded number on the back. Seems rather robust for just a game..."
 	icon_state = "syndicatebaseball"
 	item_state = "syndicatebaseball"
 	item_color = "syndicatebaseball"
diff --git a/code/modules/clothing/under/vg_under.dm b/code/modules/clothing/under/vg_under.dm
index f416f2ecc5..555ed3b795 100644
--- a/code/modules/clothing/under/vg_under.dm
+++ b/code/modules/clothing/under/vg_under.dm
@@ -9,7 +9,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/stripper_green
 	name = "green stripper outfit"
@@ -19,7 +19,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/wedding/bride_orange
 	name = "orange wedding dress"
@@ -30,7 +30,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/wedding/bride_purple
 	name = "purple wedding dress"
@@ -41,7 +41,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/wedding/bride_blue
 	name = "blue wedding dress"
@@ -52,7 +52,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/wedding/bride_red
 	name = "red wedding dress"
@@ -63,7 +63,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/wedding/bride_white
 	name = "white wedding dress"
@@ -74,7 +74,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/mankini
 	name = "pink mankini"
@@ -84,7 +84,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 /*
 
 /obj/item/clothing/under/psysuit
@@ -129,7 +129,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/russobluecamooutfit
 	name = "russian blue camo"
@@ -140,7 +140,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/stilsuit
 	name = "stillsuit"
@@ -151,7 +151,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/aviatoruniform
 	name = "aviator uniform"
@@ -162,7 +162,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/bikersuit
 	name = "biker's outfit"
@@ -172,7 +172,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/jacketsuit
 	name = "richard's outfit"
@@ -183,7 +183,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 obj/item/clothing/under/mega
 	name = "\improper DRN-001 suit"
@@ -194,7 +194,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/proto
 	name = "The Prototype Suit"
@@ -205,7 +205,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/megax
 	name = "\improper Maverick Hunter regalia"
@@ -216,7 +216,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/joe
 	name = "The Sniper Suit"
@@ -227,7 +227,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/roll
 	name = "\improper DRN-002 Dress"
@@ -238,7 +238,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/gokugidown
 	name = "turtle hermit undershirt"
@@ -249,7 +249,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/gokugi
 	name = "turtle hermit outfit"
@@ -260,7 +260,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/doomguy
 	name = "\improper Doomguy's pants"
@@ -271,7 +271,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/vault13
 	name = "vault 13 Jumpsuit"
@@ -282,7 +282,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/vault
 	name = "vault jumpsuit"
@@ -293,7 +293,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/clownpiece
 	name = "Clownpiece's Pierrot suit"
@@ -304,7 +304,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/cia
 	name = "casual IAA outfit"
@@ -315,7 +315,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/greaser
 	name = "greaser outfit"
@@ -325,7 +325,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/greaser/New()
 	var/greaser_colour = "default"
@@ -344,7 +344,7 @@ obj/item/clothing/under/mega
 	item_color = "greaser_[greaser_colour]"
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 
 /obj/item/clothing/under/wintercasualwear
@@ -356,7 +356,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/casualwear
 	name = "spring casualwear"
@@ -367,7 +367,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/keyholesweater
 	name = "keyhole sweater"
@@ -378,7 +378,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/casualhoodie
 	name = "casual hoodie"
@@ -389,7 +389,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/casualhoodie/skirt
 	icon_state = "hoodieskirt"
@@ -397,7 +397,7 @@ obj/item/clothing/under/mega
 	item_color = "hoodieskirt"
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /*
 /obj/item/clothing/under/mummy_rags
@@ -432,5 +432,5 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
diff --git a/code/modules/crafting/recipes/recipes_misc.dm b/code/modules/crafting/recipes/recipes_misc.dm
index 70dd4d1370..38ae3560e5 100644
--- a/code/modules/crafting/recipes/recipes_misc.dm
+++ b/code/modules/crafting/recipes/recipes_misc.dm
@@ -358,3 +358,11 @@
 		time = 100
 		category = CAT_MISC
 		always_availible = FALSE	// Disabled til learned
+
+/datum/crafting_recipe/coconut_bong
+	name = "Coconut Bong"
+	result = /obj/item/bong/coconut
+	reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2,
+				/obj/item/reagent_containers/food/snacks/grown/coconut = 1)
+	time = 70
+	category = CAT_MISC
\ No newline at end of file
diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm
index 0f1a7452df..13c516960a 100644
--- a/code/modules/events/holiday/vday.dm
+++ b/code/modules/events/holiday/vday.dm
@@ -157,7 +157,7 @@
 	icon = 'icons/obj/holiday_misc.dmi'
 	icon_state = "candyheart"
 	desc = "A heart-shaped candy that reads: "
-	list_reagents = list("sugar" = 2)
+	list_reagents = list(/datum/reagent/consumable/sugar = 2)
 	junkiness = 5
 
 /obj/item/reagent_containers/food/snacks/candyheart/New()
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 65d96ad150..ea63ee611f 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -75,7 +75,7 @@
 /datum/round_event/santa/start()
 	var/list/candidates = pollGhostCandidates("Santa is coming to town! Do you want to be Santa?", poll_time=150)
 	if(LAZYLEN(candidates))
-		var/mob/dead/observer/C = pick(candidates)
+		var/mob/C = pick(candidates)
 		santa = new /mob/living/carbon/human(pick(GLOB.blobstart))
 		C.transfer_ckey(santa, FALSE)
 
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 79487a024c..9075f693db 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -15,48 +15,46 @@
 	var/randomProbability = 1
 	var/reagentsAmount = 100
 	var/list/saferChems = list(
-		"water",
-		"carbon",
-		"flour",
-		"cleaner",
-		"nutriment",
-		"condensedcapsaicin",
-		"mushroomhallucinogen",
-		"lube",
-		"pink_glitter",
-		"cryptobiolin",
-		"plantbgone",
-		"blood",
-		"charcoal",
-		"space_drugs",
-		"morphine",
-		"holywater",
-		"ethanol",
-		"hot_coco",
-		"sacid",
-		"mindbreaker",
-		"rotatium",
-		"bluespace",
-		"pax",
-		"laughter",
-		"concentrated_barbers_aid",
-		"colorful_reagent",
-		"dizzysolution",
-		"tiresolution",
-		"sodiumchloride",
-		"beer",
-		"hair_dye",
-		"sugar",
-		"white_glitter",
-		"growthserum",
-		"cornoil",
-		"uranium",
-		"carpet",
-		"firefighting_foam",
-		"semen",
-		"femcum",
-		"tearjuice",
-		"strange_reagent"
+		/datum/reagent/water,
+		/datum/reagent/carbon,
+		/datum/reagent/consumable/flour,
+		/datum/reagent/space_cleaner,
+		/datum/reagent/consumable/nutriment,
+		/datum/reagent/consumable/condensedcapsaicin,
+		/datum/reagent/drug/mushroomhallucinogen,
+		/datum/reagent/lube,
+		/datum/reagent/glitter/pink,
+		/datum/reagent/cryptobiolin,
+		/datum/reagent/toxin/plantbgone,
+		/datum/reagent/blood,
+		/datum/reagent/medicine/charcoal,
+		/datum/reagent/drug/space_drugs,
+		/datum/reagent/medicine/morphine,
+		/datum/reagent/water/holywater,
+		/datum/reagent/consumable/ethanol,
+		/datum/reagent/consumable/hot_coco,
+		/datum/reagent/toxin/acid,
+		/datum/reagent/toxin/mindbreaker,
+		/datum/reagent/toxin/rotatium,
+		/datum/reagent/bluespace,
+		/datum/reagent/pax,
+		/datum/reagent/consumable/laughter,
+		/datum/reagent/concentrated_barbers_aid,
+		/datum/reagent/colorful_reagent,
+		/datum/reagent/peaceborg_confuse,
+		/datum/reagent/peaceborg_tire,
+		/datum/reagent/consumable/sodiumchloride,
+		/datum/reagent/consumable/ethanol/beer,
+		/datum/reagent/hair_dye,
+		/datum/reagent/consumable/sugar,
+		/datum/reagent/glitter/white,
+		/datum/reagent/growthserum,
+		/datum/reagent/consumable/cornoil,
+		/datum/reagent/uranium,
+		/datum/reagent/carpet,
+		/datum/reagent/firefighting_foam,
+		/datum/reagent/consumable/tearjuice,
+		/datum/reagent/medicine/strange_reagent
 
 	)
 	//needs to be chemid unit checked at some point
@@ -165,7 +163,7 @@
 		if(vent && vent.loc && !vent.welded)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
-			R.add_reagent("beer", reagentsAmount)
+			R.add_reagent(/datum/reagent/consumable/ethanol/beer, reagentsAmount)
 
 			var/datum/effect_system/foam_spread/foam = new
 			foam.set_up(200, get_turf(vent), R)
@@ -180,7 +178,7 @@
 		if(vent && vent.loc && !vent.welded)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
-			R.add_reagent("semen", reagentsAmount)
+			R.add_reagent(/datum/reagent/consumable/semen, reagentsAmount)
 
 			var/datum/effect_system/foam_spread/foam = new
 			foam.set_up(200, get_turf(vent), R)
@@ -195,7 +193,7 @@
 		if(vent && vent.loc && !vent.welded)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
-			R.add_reagent("femcum", reagentsAmount)
+			R.add_reagent(/datum/reagent/consumable/femcum, reagentsAmount)
 
 			var/datum/effect_system/foam_spread/foam = new
 			foam.set_up(200, get_turf(vent), R)
diff --git a/code/modules/events/wizard/invincible.dm b/code/modules/events/wizard/invincible.dm
index 209bdd26c1..6ba9b44ee1 100644
--- a/code/modules/events/wizard/invincible.dm
+++ b/code/modules/events/wizard/invincible.dm
@@ -8,5 +8,5 @@
 /datum/round_event/wizard/invincible/start()
 
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		H.reagents.add_reagent("adminordrazine", 40) //100 ticks of absolute invinciblity (barring gibs)
+		H.reagents.add_reagent(/datum/reagent/medicine/adminordrazine, 40) //100 ticks of absolute invinciblity (barring gibs)
 		to_chat(H, "<span class='notice'>You feel invincible, nothing can hurt you!</span>")
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 92f412dd89..7111ae416b 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -194,7 +194,7 @@
 	name = "robust coffee"
 	desc = "Careful, the beverage you're about to enjoy is extremely hot."
 	icon_state = "coffee"
-	list_reagents = list("coffee" = 30)
+	list_reagents = list(/datum/reagent/consumable/coffee = 30)
 	spillable = TRUE
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
@@ -211,7 +211,7 @@
 	name = "ice cup"
 	desc = "Careful, cold ice, do not chew."
 	icon_state = "coffee"
-	list_reagents = list("ice" = 30)
+	list_reagents = list(/datum/reagent/consumable/ice = 30)
 	spillable = TRUE
 	isGlass = FALSE
 
@@ -231,12 +231,12 @@
 /obj/item/reagent_containers/food/drinks/mug/tea
 	name = "Duke Purple tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
-	list_reagents = list("tea" = 30)
+	list_reagents = list(/datum/reagent/consumable/tea = 30)
 
 /obj/item/reagent_containers/food/drinks/mug/coco
 	name = "Dutch hot coco"
 	desc = "Made in Space South America."
-	list_reagents = list("hot_coco" = 30, "sugar" = 5)
+	list_reagents = list(/datum/reagent/consumable/hot_coco = 30, /datum/reagent/consumable/sugar = 5)
 	foodtype = SUGAR
 	resistance_flags = FREEZE_PROOF
 
@@ -244,7 +244,7 @@
 	name = "cup ramen"
 	desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
 	icon_state = "ramen"
-	list_reagents = list("dry_ramen" = 30)
+	list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
 	foodtype = GRAIN
 	isGlass = FALSE
 
@@ -252,20 +252,20 @@
 	name = "space beer"
 	desc = "Beer. In space."
 	icon_state = "beer"
-	list_reagents = list("beer" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
 	foodtype = GRAIN | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/beer/light
 	name = "Carp Lite"
 	desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
-	list_reagents = list("light_beer" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
 
 /obj/item/reagent_containers/food/drinks/ale
 	name = "Magm-Ale"
 	desc = "A true dorf's drink of choice."
 	icon_state = "alebottle"
 	item_state = "beer"
-	list_reagents = list("ale" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
 	foodtype = GRAIN | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/sillycup
@@ -382,7 +382,7 @@
 	name = "detective's flask"
 	desc = "The detective's only true friend."
 	icon_state = "detflask"
-	list_reagents = list("whiskey" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
 
 /obj/item/reagent_containers/food/drinks/britcup
 	name = "cup"
@@ -431,27 +431,26 @@
 	name = "Space Cola"
 	desc = "Cola. in space."
 	icon_state = "cola"
-	list_reagents = list("cola" = 30)
+	list_reagents = list(/datum/reagent/consumable/space_cola = 30)
 	foodtype = SUGAR
 
 /obj/item/reagent_containers/food/drinks/soda_cans/tonic
 	name = "T-Borg's tonic water"
 	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
 	icon_state = "tonic"
-	list_reagents = list("tonic" = 50)
-	foodtype = ALCOHOL
+	list_reagents = list(/datum/reagent/consumable/tonic = 50)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/sodawater
 	name = "soda water"
 	desc = "A can of soda water. Why not make a scotch and soda?"
 	icon_state = "sodawater"
-	list_reagents = list("sodawater" = 50)
+	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime
 	name = "orange soda"
 	desc = "You wanted ORANGE. It gave you Lemon Lime."
 	icon_state = "lemon-lime"
-	list_reagents = list("lemon_lime" = 30)
+	list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
@@ -462,73 +461,73 @@
 	name = "Space-Up!"
 	desc = "Tastes like a hull breach in your mouth."
 	icon_state = "space-up"
-	list_reagents = list("space_up" = 30)
+	list_reagents = list(/datum/reagent/consumable/space_up = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/starkist
 	name = "Star-kist"
 	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
 	icon_state = "starkist"
-	list_reagents = list("cola" = 15, "orangejuice" = 15)
+	list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
 	foodtype = SUGAR | FRUIT | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind
 	name = "Space Mountain Wind"
 	desc = "Blows right through you like a space wind."
 	icon_state = "space_mountain_wind"
-	list_reagents = list("spacemountainwind" = 30)
+	list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
 	name = "Thirteen Loko"
 	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
 	icon_state = "thirteen_loko"
-	list_reagents = list("thirteenloko" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb
 	name = "Dr. Gibb"
 	desc = "A delicious mixture of 42 different flavors."
 	icon_state = "dr_gibb"
-	list_reagents = list("dr_gibb" = 30)
+	list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
 	name = "Pwr Game"
 	desc = "The only drink with the PWR that true gamers crave."
 	icon_state = "purple_can"
-	list_reagents = list("pwr_game" = 30)
+	list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/shamblers
 	name = "Shambler's juice"
 	desc = "~Shake me up some of that Shambler's Juice!~"
 	icon_state = "shamblers"
-	list_reagents = list("shamblers" = 30)
+	list_reagents = list(/datum/reagent/consumable/shamblers = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz
 	name = "Buzz Fuzz"
 	desc = "The sister drink of Shambler's Juice! Uses real honey, making it a sweet tooth's dream drink. The slogan reads ''A Hive of Flavour'', there's also a label about how it is adddicting."
 	icon_state = "honeysoda_can"
-	list_reagents = list("buzz_fuzz" = 25, "honey" = 5)
+	list_reagents = list(/datum/reagent/consumable/buzz_fuzz = 25, /datum/reagent/consumable/honey = 5)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
 	name = "Grey Bull"
 	desc = "Grey Bull, it gives you gloves!"
 	icon_state = "energy_drink"
-	list_reagents = list("grey_bull" = 20)
+	list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/air
 	name = "canned air"
 	desc = "There is no air shortage. Do not drink."
 	icon_state = "air"
-	list_reagents = list("nitrogen" = 24, "oxygen" = 6)
+	list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
 	name = "Monkey Energy"
 	desc = "Unleash the ape!"
 	icon_state = "monkey_energy"
-	list_reagents = list("monkey_energy" = 50)
+	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
 	foodtype = SUGAR | JUNKFOOD
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 271ff93b15..757af11b62 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -131,88 +131,87 @@
 	name = "Griffeater gin"
 	desc = "A bottle of high quality gin, produced in the New London Space Station."
 	icon_state = "ginbottle"
-	list_reagents = list("gin" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/gin/empty
-	list_reagents = list("gin" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/whiskey
 	name = "Uncle Git's special reserve"
 	desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
 	icon_state = "whiskeybottle"
-	list_reagents = list("whiskey" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/whiskey/empty
-	list_reagents = list("whiskey" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka
 	name = "Tunguska triple distilled"
 	desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
 	icon_state = "vodkabottle"
-	list_reagents = list("vodka" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka/empty
-	list_reagents = list("vodka" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
 	name = "Badminka vodka"
 	desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
 	icon_state = "badminka"
-	list_reagents = list("vodka" = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/tequila
 	name = "Caccavo guaranteed quality tequila"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
 	icon_state = "tequilabottle"
-	list_reagents = list("tequila" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/tequila/empty
-	list_reagents = list("tequila" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
 	name = "bottle of nothing"
 	desc = "A bottle filled with nothing."
 	icon_state = "bottleofnothing"
-	list_reagents = list("nothing" = 100)
+	list_reagents = list(/datum/reagent/consumable/nothing = 100)
 	foodtype = NONE
 
 /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/empty
-	list_reagents = list("nothing" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/patron
 	name = "Wrapp Artiste Patron"
 	desc = "Silver laced tequila, served in space night clubs across the galaxy."
 	icon_state = "patronbottle"
-	list_reagents = list("patron" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/patron/empty
-	list_reagents = list("patron" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/rum
 	name = "Captain Pete's Cuban spiced rum"
 	desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
 	icon_state = "rumbottle"
-	list_reagents = list("rum" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/rum/empty
-	list_reagents = list("rum" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/holywater
 	name = "flask of holy water"
 	desc = "A flask of the chaplain's holy water."
 	icon_state = "holyflask"
-	list_reagents = list("holywater" = 100)
+	list_reagents = list(/datum/reagent/water/holywater = 100)
 	foodtype = NONE
 
 /obj/item/reagent_containers/food/drinks/bottle/holywater/hell
 	desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
-	list_reagents = list("hell_water" = 100)
+	list_reagents = list(/datum/reagent/hellwater = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/holyoil
 	name = "flask of zelus oil"
 	desc = "A brass flask of Zelus oil, a viscous fluid scenting of brass. Can be thrown to deal damage from afar."
 	icon_state = "zelusflask"
-	list_reagents = list("holyoil" = 30)
+	list_reagents = list(/datum/reagent/fuel/holyoil = 30)
 	volume = 30
 	foodtype = NONE
 	force = 18
@@ -220,63 +219,63 @@
 	knockdown_duration = 18
 
 /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty
-	list_reagents = list("holyoil" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth
 	name = "Goldeneye vermouth"
 	desc = "Sweet, sweet dryness~"
 	icon_state = "vermouthbottle"
-	list_reagents = list("vermouth" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth/empty
-	list_reagents = list("vermouth" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/kahlua
 	name = "Robert Robust's coffee liqueur"
 	desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
 	icon_state = "kahluabottle"
-	list_reagents = list("kahlua" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100)
 	foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/drinks/bottle/kahlua/empty
-	list_reagents = list("kahlua" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/goldschlager
 	name = "College Girl goldschlager"
 	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
 	icon_state = "goldschlagerbottle"
-	list_reagents = list("goldschlager" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/goldschlager/empty
-	list_reagents = list("goldschlager" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/cognac
 	name = "Chateau de Baton premium cognac"
 	desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
 	icon_state = "cognacbottle"
-	list_reagents = list("cognac" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/cognac/empty
-	list_reagents = list("cognac" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/wine
 	name = "Doublebeard's bearded special wine"
 	desc = "A faint aura of unease and asspainery surrounds the bottle."
 	icon_state = "winebottle"
-	list_reagents = list("wine" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100)
 	foodtype = FRUIT | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/bottle/wine/empty
-	list_reagents = list("wine" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe
 	name = "extra-strong absinthe"
 	desc = "An strong alcoholic drink brewed and distributed by"
 	icon_state = "absinthebottle"
-	list_reagents = list("absinthe" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe/empty
-	list_reagents = list("absinthe" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
 	. = ..()
@@ -329,7 +328,7 @@
 	name = "bottle of lizard wine"
 	desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff."
 	icon_state = "lizardwine"
-	list_reagents = list("lizardwine" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100)
 	foodtype = FRUIT | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/bottle/hcider
@@ -337,28 +336,28 @@
 	desc = "Apple juice for adults."
 	icon_state = "hcider"
 	volume = 50
-	list_reagents = list("hcider" = 50)
+	list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50)
 
 /obj/item/reagent_containers/food/drinks/bottle/hcider/empty
-	list_reagents = list("hcider" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/grappa
 	name = "Phillipes well-aged Grappa"
 	desc = "Bottle of Grappa."
 	icon_state = "grappabottle"
-	list_reagents = list("grappa" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/grappa/empty
-	list_reagents = list("grappa" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/sake
 	name = "Ryo's traditional sake"
 	desc = "Sweet as can be, and burns like fire going down."
 	icon_state = "sakebottle"
-	list_reagents = list("sake" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/sake/empty
-	list_reagents = list("sake" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
 	. = ..()
@@ -375,48 +374,48 @@
 	name = "Fernet Bronca"
 	desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
 	icon_state = "fernetbottle"
-	list_reagents = list("fernet" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/fernet/empty
-	list_reagents = list("fernet" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/applejack
 	name = "Buckin' Bronco's Applejack"
 	desc = "Kicks like a horse, tastes like an apple!"
 	icon_state = "applejack_bottle"
-	list_reagents = list("applejack" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/applejack/empty
-	list_reagents = list("applejack" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/champagne
 	name = "Eau d' Dandy Brut Champagne"
 	desc = "Finely sourced from only the most pretentious French vineyards."
 	icon_state = "champagne_bottle"
-	list_reagents = list("champagne" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/champagne/empty
-	list_reagents = list("champagne" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/blazaam
 	name = "Ginbad's Blazaam"
 	desc = "You feel like you should give the bottle a good rub before opening."
 	icon_state = "blazaambottle"
-	list_reagents = list("blazaam" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/blazaam/empty
-	list_reagents = list("blazaam" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/trappist
 	name = "Mont de Requin Trappistes Bleu"
 	desc = "Brewed in space-Belgium. Fancy!"
 	icon_state = "trappistbottle"
 	volume = 50
-	list_reagents = list("trappist" = 50)
+	list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
 
 /obj/item/reagent_containers/food/drinks/bottle/trappist/empty
-	list_reagents = list("trappist" = 0)
+	list_reagents = null
 
 //////////////////////////JUICES AND STUFF ///////////////////////
 
@@ -428,7 +427,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("orangejuice" = 100)
+	list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
 	foodtype = FRUIT| BREAKFAST
 
 /obj/item/reagent_containers/food/drinks/bottle/cream
@@ -439,7 +438,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("cream" = 100)
+	list_reagents = list(/datum/reagent/consumable/cream = 100)
 	foodtype = DAIRY
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
@@ -450,7 +449,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("tomatojuice" = 100)
+	list_reagents = list(/datum/reagent/consumable/tomatojuice = 100)
 	foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/drinks/bottle/limejuice
@@ -461,7 +460,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("limejuice" = 100)
+	list_reagents = list(/datum/reagent/consumable/limejuice = 100)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/menthol
@@ -472,18 +471,18 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("menthol" = 100)
+	list_reagents = list(/datum/reagent/consumable/menthol = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine
 	name = "Jester Grenadine"
 	desc = "Contains 0% real cherries!"
 	icon_state = "grenadine"
 	isGlass = TRUE
-	list_reagents = list("grenadine" = 100)
+	list_reagents = list(/datum/reagent/consumable/grenadine = 100)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine/empty
-	list_reagents = list("grenadine" = 0)
+	list_reagents = null
 
 ////////////////////////// MOLOTOV ///////////////////////
 /obj/item/reagent_containers/food/drinks/bottle/molotov
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 1e5c2eaf60..0d769932db 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -81,19 +81,19 @@
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
 	name = "Soda Water"
-	list_reagents = list("sodawater" = 50)
+	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola
 	name = "Space Cola"
-	list_reagents = list("cola" = 50)
+	list_reagents = list(/datum/reagent/consumable/space_cola = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
-	list_reagents = list("nuka_cola" = 50)
+	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
 	name = "Syndicat Bomb"
-	list_reagents = list("syndicatebomb" = 50)
+	list_reagents = list(/datum/reagent/consumable/ethanol/syndicatebomb = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
@@ -103,7 +103,7 @@
 				to_chat(user, "<span class='notice'>[src] is full.</span>")
 			else
 				to_chat(user, "<span class='notice'>You break [E] in [src].</span>")
-				reagents.add_reagent("eggyolk", 5)
+				reagents.add_reagent(/datum/reagent/consumable/eggyolk, 5)
 				qdel(E)
 			return
 	else
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 7288d91f2d..d8dafb7b8e 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -15,19 +15,18 @@
 	volume = 50
 	//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change(changetype) to change names, descs and sprites.
 	var/list/possible_states = list(
-	 "ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."),
-	 "mustard" = list("mustard", "mustard bottle", "A spice mixed with enzymes and water."),
-	 "capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
-	 "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
-	 "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
-	 "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in its passage"),
-	 "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
-	 "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
-	 "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
-	 "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
-	 "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
-	 "bbqsauce" = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
-	 "peanut_butter" = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
+	 /datum/reagent/consumable/ketchup = list("ketchup", "ketchup bottle", "You feel more American already."),
+	 /datum/reagent/consumable/capsaicin = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
+	 /datum/reagent/consumable/enzyme = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
+	 /datum/reagent/consumable/soysauce = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
+	 /datum/reagent/consumable/frostoil = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in its passage"),
+	 /datum/reagent/consumable/sodiumchloride = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
+	 /datum/reagent/consumable/blackpepper = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
+	 /datum/reagent/consumable/cornoil = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
+	 /datum/reagent/consumable/sugar = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
+	 /datum/reagent/consumable/mayonnaise = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
+	 /datum/reagent/consumable/bbqsauce = list("bbqsauce", "BBQ sauce", "Hand wipes not included."),
+	 /datum/reagent/consumable/peanut_butter = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
 	var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
 
 /obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user)
@@ -117,12 +116,12 @@
 	name = "universal enzyme"
 	desc = "Used in cooking various dishes."
 	icon_state = "enzyme"
-	list_reagents = list("enzyme" = 50)
+	list_reagents = list(/datum/reagent/consumable/enzyme = 50)
 
 /obj/item/reagent_containers/food/condiment/sugar
 	name = "sugar bottle"
 	desc = "Tasty spacey sugar!"
-	list_reagents = list("sugar" = 50)
+	list_reagents = list(/datum/reagent/consumable/sugar = 50)
 
 /obj/item/reagent_containers/food/condiment/saltshaker		//Separate from above since it's a small shaker rather then
 	name = "salt shaker"											//	a large one.
@@ -131,7 +130,7 @@
 	possible_transfer_amounts = list(1,20) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 20
-	list_reagents = list("sodiumchloride" = 20)
+	list_reagents = list(/datum/reagent/consumable/sodiumchloride = 20)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/saltshaker/on_reagent_change(changetype)
@@ -154,11 +153,11 @@
 	if(!proximity)
 		return
 	if(isturf(target))
-		if(!reagents.has_reagent("sodiumchloride", 2))
+		if(!reagents.has_reagent(/datum/reagent/consumable/sodiumchloride, 2))
 			to_chat(user, "<span class='warning'>You don't have enough salt to make a pile!</span>")
 			return
 		user.visible_message("<span class='notice'>[user] shakes some salt onto [target].</span>", "<span class='notice'>You shake some salt onto [target].</span>")
-		reagents.remove_reagent("sodiumchloride", 2)
+		reagents.remove_reagent(/datum/reagent/consumable/sodiumchloride, 2)
 		new/obj/effect/decal/cleanable/salt(target)
 		return
 
@@ -169,7 +168,7 @@
 	possible_transfer_amounts = list(1,20) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 20
-	list_reagents = list("blackpepper" = 20)
+	list_reagents = list(/datum/reagent/consumable/blackpepper = 20)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/peppermill/on_reagent_change(changetype)
@@ -185,7 +184,7 @@
 	item_state = "carton"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	list_reagents = list("milk" = 50)
+	list_reagents = list(/datum/reagent/consumable/milk = 50)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/flour
@@ -193,7 +192,7 @@
 	desc = "A big bag of flour. Good for baking!"
 	icon_state = "flour"
 	item_state = "flour"
-	list_reagents = list("flour" = 30)
+	list_reagents = list(/datum/reagent/consumable/flour = 30)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/soymilk
@@ -203,7 +202,7 @@
 	item_state = "carton"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	list_reagents = list("soymilk" = 50)
+	list_reagents = list(/datum/reagent/consumable/soymilk = 50)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/rice
@@ -211,21 +210,21 @@
 	desc = "A big bag of rice. Good for cooking!"
 	icon_state = "rice"
 	item_state = "flour"
-	list_reagents = list("rice" = 30)
+	list_reagents = list(/datum/reagent/consumable/rice = 30)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/soysauce
 	name = "soy sauce"
 	desc = "A salty soy-based flavoring."
 	icon_state = "soysauce"
-	list_reagents = list("soysauce" = 50)
+	list_reagents = list(/datum/reagent/consumable/soysauce = 50)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/mayonnaise
 	name = "mayonnaise"
 	desc = "An oily condiment made from egg yolks."
 	icon_state = "mayonnaise"
-	list_reagents = list("mayonnaise" = 50)
+	list_reagents = list(/datum/reagent/consumable/mayonnaise = 50)
 	possible_states = list()
 
 
@@ -239,7 +238,17 @@
 	volume = 10
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list()
-	possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), "astrotame" = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."))
+	possible_states = list(/datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."),
+						/datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"),
+						/datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"),
+						/datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"),
+						/datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"),
+						/datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"),
+						/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"),
+						/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
+						/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."),
+						/datum/reagent/consumable/mustard = list("condi_mustard", "Mustard", "A spice mixed with enzymes and water."),
+						/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."))
 
 /obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
 	return
@@ -282,26 +291,26 @@
 /obj/item/reagent_containers/food/condiment/pack/ketchup
 	name = "ketchup pack"
 	originalname = "ketchup"
-	list_reagents = list("ketchup" = 10)
+	list_reagents = list(/datum/reagent/consumable/ketchup = 10)
 
 //Mustard
 /obj/item/reagent_containers/food/condiment/pack/mustard
 	name = "mustard pack"
 	originalname = "mustard"
-	list_reagents = list("mustard" = 10)
+	list_reagents = list(/datum/reagent/consumable/mustard = 10)
 
 //Hot sauce
 /obj/item/reagent_containers/food/condiment/pack/hotsauce
 	name = "hotsauce pack"
 	originalname = "hotsauce"
-	list_reagents = list("capsaicin" = 10)
+	list_reagents = list(/datum/reagent/consumable/capsaicin = 10)
 
 /obj/item/reagent_containers/food/condiment/pack/astrotame
 	name = "astrotame pack"
 	originalname = "astrotame"
-	list_reagents = list("astrotame" = 5)
+	list_reagents = list(/datum/reagent/consumable/astrotame = 5)
 
 /obj/item/reagent_containers/food/condiment/pack/bbqsauce
 	name = "bbq sauce pack"
 	originalname = "bbq sauce"
-	list_reagents = list("bbqsauce" = 10)
+	list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 239273e421..016e37a5c4 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -189,7 +189,7 @@
 	desc = "Delicious food on a stick."
 	ingredients_placement = INGREDIENTS_LINE
 	trash = /obj/item/stack/rods
-	list_reagents = list("nutriment" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	ingMax = 6
 	icon_state = "rod"
 
@@ -304,7 +304,7 @@
 		else if(contents.len >= 20)
 			to_chat(user, "<span class='warning'>You can't add more ingredients to [src]!</span>")
 		else
-			if(reagents.has_reagent("water", 10)) //are we starting a soup or a salad?
+			if(reagents.has_reagent(/datum/reagent/water, 10)) //are we starting a soup or a salad?
 				var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/soup(get_turf(src))
 				A.initialize_custom_food(src, S, user)
 			else
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 97e8423e78..c068c1aa40 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -19,11 +19,9 @@ Here is an example of the new formatting for anyone who wants to add more food i
 	name = "Xenoburger"													//Name that displays in the UI.
 	desc = "Smells caustic. Tastes like heresy."						//Duh
 	icon_state = "xburger"												//Refers to an icon in food.dmi
-/obj/item/reagent_containers/food/snacks/xenoburger/Initialize()		//Don't mess with this. | nO I WILL MESS WITH THIS
-	. = ..()														//Same here.
-	reagents.add_reagent("xenomicrobes", 10)						//This is what is in the food item. you may copy/paste
-	reagents.add_reagent("nutriment", 2)							//this line of code for all the contents.
-	bitesize = 3													//This is the amount each bite consumes.
+	list_reagents = list(/datum/reagent/xenomicrobes = 10,
+						/datum/reagent/consumable/nutriment = 2) 		//What's inside the snack.
+	bitesize = 3														//This is the amount each bite consumes.
 ```
 
 All foods are distributed among various categories. Use common sense.
@@ -62,7 +60,7 @@ All foods are distributed among various categories. Use common sense.
 		if(list_reagents)
 			for(var/rid in list_reagents)
 				var/amount = list_reagents[rid]
-				if(rid == "nutriment" || rid == "vitamin")
+				if(rid == /datum/reagent/consumable/nutriment || rid == /datum/reagent/consumable/nutriment/vitamin)
 					reagents.add_reagent(rid, amount, tastes.Copy())
 				else
 					reagents.add_reagent(rid, amount)
@@ -208,7 +206,7 @@ All foods are distributed among various categories. Use common sense.
 	if(bonus_reagents && bonus_reagents.len)
 		for(var/r_id in bonus_reagents)
 			var/amount = bonus_reagents[r_id]
-			if(r_id == "nutriment" || r_id == "vitamin")
+			if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
 				reagents.add_reagent(r_id, amount, tastes)
 			else
 				reagents.add_reagent(r_id, amount)
@@ -287,7 +285,7 @@ All foods are distributed among various categories. Use common sense.
 	if(S.bonus_reagents && S.bonus_reagents.len)
 		for(var/r_id in S.bonus_reagents)
 			var/amount = S.bonus_reagents[r_id] * cooking_efficiency
-			if(r_id == "nutriment" || r_id == "vitamin")
+			if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
 				S.reagents.add_reagent(r_id, amount, tastes)
 			else
 				S.reagents.add_reagent(r_id, amount)
diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm
index 6ae8836b28..e071fb3df7 100644
--- a/code/modules/food_and_drinks/food/snacks/dough.dm
+++ b/code/modules/food_and_drinks/food/snacks/dough.dm
@@ -8,7 +8,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "dough"
 	cooked_type = /obj/item/reagent_containers/food/snacks/store/bread/plain
-	list_reagents = list("nutriment" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("dough" = 1)
 	foodtype = GRAIN
@@ -36,7 +36,7 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/doughslice
 	slices_num = 3
 	cooked_type = /obj/item/reagent_containers/food/snacks/pizzabread
-	list_reagents = list("nutriment" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("dough" = 1)
 	foodtype = GRAIN
@@ -47,7 +47,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "pizzabread"
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pizza
-	list_reagents = list("nutriment" = 7)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7)
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("bread" = 1)
 	foodtype = GRAIN
@@ -69,7 +69,7 @@
 	desc = "A base for any self-respecting burger."
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "bun"
-	list_reagents = list("nutriment" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/burger
 	filling_color = "#CD853F"
 	tastes = list("bun" = 1) // the bun tastes of bun.
@@ -81,7 +81,7 @@
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "cakebatter"
 	cooked_type = /obj/item/reagent_containers/food/snacks/store/cake/plain
-	list_reagents = list("nutriment" = 9)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 9)
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("batter" = 1)
 	foodtype = GRAIN | DAIRY
@@ -106,7 +106,7 @@
 	slice_path = /obj/item/reagent_containers/food/snacks/rawpastrybase
 	slices_num = 3
 	cooked_type = /obj/item/reagent_containers/food/snacks/pie/plain
-	list_reagents = list("nutriment" = 9)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 9)
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("dough" = 1)
 	foodtype = GRAIN | DAIRY
@@ -118,7 +118,7 @@
 	icon_state = "rawpastrybase"
 	cooked_type = /obj/item/reagent_containers/food/snacks/pastrybase
 	filling_color = "#CD853F"
-	list_reagents = list("nutriment" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	tastes = list("raw pastry" = 1)
 	foodtype = GRAIN | DAIRY
 
@@ -127,7 +127,7 @@
 	desc = "A base for any self-respecting pastry."
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "pastrybase"
-	list_reagents = list("nutriment" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	filling_color = "#CD853F"
 	tastes = list("pastry" = 1)
 	foodtype = GRAIN | DAIRY
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 8f02cd81b4..28fb2edf61 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -8,7 +8,7 @@
 	icon_state = "meat"
 	dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	bitesize = 3
-	list_reagents = list("nutriment" = 3, "cooking_oil" = 2) //Meat has fats that a food processor can process into cooking oil
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2) //Meat has fats that a food processor can process into cooking oil
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
 	slices_num = 3
@@ -63,7 +63,7 @@
 	icon_state = "crabmeatraw"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/crab
 	bitesize = 3
-	list_reagents = list("nutriment" = 1, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3)
 	filling_color = "#EAD079"
 	tastes = list("raw crab" = 1)
 	foodtype = RAW | MEAT
@@ -72,8 +72,8 @@
 	name = "crab meat"
 	desc = "Some deliciously cooked crab meat."
 	icon_state = "crabmeat"
-	list_reagents = list("nutriment" = 2)
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 2, "cooking_oil" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 2)
 	filling_color = "#DFB73A"
 	tastes = list("crab" = 1)
 	foodtype = MEAT
@@ -88,7 +88,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	icon_state = "slimemeat"
 	desc = "Because jello wasn't offensive enough to vegans."
-	list_reagents = list("nutriment" = 3, "slimejelly" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/slimejelly = 3)
 	filling_color = "#00FFFF"
 	tastes = list("slime" = 1, "jelly" = 1)
 	foodtype = MEAT | RAW | TOXIC
@@ -96,7 +96,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
 	icon_state = "golemmeat"
 	desc = "Edible rocks, welcome to the future."
-	list_reagents = list("nutriment" = 3, "iron" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/iron = 3)
 	filling_color = "#A9A9A9"
 	tastes = list("rock" = 1)
 	foodtype = MEAT | RAW | GROSS
@@ -131,7 +131,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
 	icon_state = "flymeat"
 	desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
-	list_reagents = list("nutriment" = 3, "uranium" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/uranium = 3)
 	tastes = list("maggots" = 1, "the inside of a reactor" = 1)
 	foodtype = MEAT | RAW | GROSS
 
@@ -214,7 +214,7 @@
 	name = "killer tomato meat"
 	desc = "A slice from a huge tomato."
 	icon_state = "tomatomeat"
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	filling_color = "#FF0000"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
@@ -225,7 +225,7 @@
 	name = "bear meat"
 	desc = "A very manly slab of meat."
 	icon_state = "bearmeat"
-	list_reagents = list("nutriment" = 12, "morphine" = 5, "vitamin" = 2, "cooking_oil" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/medicine/morphine = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 6)
 	filling_color = "#FFB6C1"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/bear
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/bear
@@ -236,7 +236,7 @@
 	name = "xeno meat"
 	desc = "A slab of meat."
 	icon_state = "xenomeat"
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	bitesize = 4
 	filling_color = "#32CD32"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/xeno
@@ -248,7 +248,7 @@
 	name = "spider meat"
 	desc = "A slab of spider meat."
 	icon_state = "spidermeat"
-	list_reagents = list("nutriment" = 3, "toxin" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#7CFC00"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/spider
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/spider
@@ -258,7 +258,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/goliath
 	name = "goliath meat"
 	desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
-	list_reagents = list("nutriment" = 3, "toxin" = 5, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 5, /datum/reagent/consumable/cooking_oil = 3)
 	icon_state = "goliathmeat"
 	tastes = list("meat" = 1)
 	foodtype = RAW | MEAT | TOXIC
@@ -271,7 +271,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/meatwheat
 	name = "meatwheat clump"
 	desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
-	list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5, "cooking_oil" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/blood = 5, /datum/reagent/consumable/cooking_oil = 1)
 	filling_color = rgb(150, 0, 0)
 	icon_state = "meatwheat_clump"
 	bitesize = 4
@@ -281,7 +281,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/gorilla
 	name = "gorilla meat"
 	desc = "Much meatier than monkey meat."
-	list_reagents = list("nutriment" = 5, "vitamin" = 1, "cooking_oil" = 5) //Plenty of fat!
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 5) //Plenty of fat!
 
 /obj/item/reagent_containers/food/snacks/meat/rawbacon
 	name = "raw piece of bacon"
@@ -289,7 +289,7 @@
 	icon_state = "bacon"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/bacon
 	bitesize = 2
-	list_reagents = list("nutriment" = 1, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3)
 	filling_color = "#B22222"
 	tastes = list("bacon" = 1)
 	foodtype = RAW | MEAT
@@ -298,8 +298,8 @@
 	name = "piece of bacon"
 	desc = "A delicious piece of bacon."
 	icon_state = "baconcooked"
-	list_reagents = list("nutriment" = 2)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1, "cooking_oil" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 2)
 	filling_color = "#854817"
 	tastes = list("bacon" = 1)
 	foodtype = MEAT | BREAKFAST
@@ -307,7 +307,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/gondola
 	name = "gondola meat"
 	desc = "According to legends of old, consuming raw gondola flesh grants one inner peace."
-	list_reagents = list("nutriment" = 3, "tranquility" = 5, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/tranquility = 5, /datum/reagent/consumable/cooking_oil = 3)
 	tastes = list("meat" = 4, "tranquility" = 1)
 	filling_color = "#9A6750"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/gondola
@@ -321,8 +321,8 @@
 	name = "steak"
 	desc = "A piece of hot spicy meat."
 	icon_state = "meatsteak"
-	list_reagents = list("nutriment" = 5)
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	trash = /obj/item/trash/plate
 	filling_color = "#B22222"
 	foodtype = MEAT
@@ -383,7 +383,7 @@
 	icon_state = "rawcutlet"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/plain
 	bitesize = 2
-	list_reagents = list("nutriment" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	filling_color = "#B22222"
 	tastes = list("meat" = 1)
 	var/meat_type = "meat"
@@ -447,8 +447,8 @@
 	desc = "A cooked meat cutlet."
 	icon_state = "cutlet"
 	bitesize = 2
-	list_reagents = list("nutriment" = 2)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#B22222"
 	tastes = list("meat" = 1)
 	foodtype = MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 628b883e73..b18dfc7968 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -12,7 +12,7 @@
 	bitesize = 2
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/sandwich
 	filling_color = "#FFA500"
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	slot_flags = ITEM_SLOT_HEAD
 	customfoodfilling = 0 //to avoid infinite bread-ception
 	foodtype = GRAIN
@@ -22,8 +22,8 @@
 	name = "bread"
 	desc = "Some plain old earthen bread."
 	icon_state = "bread"
-	bonus_reagents = list("nutriment" = 7)
-	list_reagents = list("nutriment" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 7)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10)
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/bread
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/plain
 	tastes = list("bread" = 10)
@@ -41,8 +41,8 @@
 	desc = "The culinary base of every self-respecting eloquen/tg/entleman."
 	icon_state = "meatbread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/meat
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
-	list_reagents = list("nutriment" = 30, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "meat" = 10)
 	foodtype = GRAIN | MEAT
 
@@ -57,8 +57,8 @@
 	desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
 	icon_state = "xenomeatbread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/xenomeat
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
-	list_reagents = list("nutriment" = 30, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "acid" = 10)
 	foodtype = GRAIN | MEAT
 
@@ -67,7 +67,7 @@
 	desc = "A slice of delicious meatbread. Extra Heretical."
 	icon_state = "xenobreadslice"
 	filling_color = "#32CD32"
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/store/bread/spidermeat
@@ -75,8 +75,8 @@
 	desc = "Reassuringly green meatloaf made from spider meat."
 	icon_state = "spidermeatbread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/spidermeat
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
-	list_reagents = list("nutriment" = 30, "toxin" = 15, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/toxin = 15, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "cobwebs" = 5)
 	foodtype = GRAIN | MEAT | TOXIC
 
@@ -85,7 +85,7 @@
 	desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
 	icon_state = "xenobreadslice"
 	filling_color = "#7CFC00"
-	list_reagents = list("nutriment" = 6, "toxin" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT | TOXIC
 
 /obj/item/reagent_containers/food/snacks/store/bread/banana
@@ -93,8 +93,8 @@
 	desc = "A heavenly and filling treat."
 	icon_state = "bananabread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/banana
-	bonus_reagents = list("nutriment" = 5, "banana" = 20)
-	list_reagents = list("nutriment" = 20, "banana" = 20)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/banana = 20)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/banana = 20)
 	tastes = list("bread" = 10) // bananjuice will also flavour
 	foodtype = GRAIN | FRUIT
 
@@ -104,7 +104,7 @@
 	desc = "A slice of delicious banana bread."
 	icon_state = "bananabreadslice"
 	filling_color = "#FFD700"
-	list_reagents = list("nutriment" = 4, "banana" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 4)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/store/bread/tofu
@@ -112,8 +112,8 @@
 	desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
 	icon_state = "tofubread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/tofu
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 10)
-	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "tofu" = 10)
 	foodtype = GRAIN | VEGETABLES
 
@@ -122,7 +122,7 @@
 	desc = "A slice of delicious tofubread."
 	icon_state = "tofubreadslice"
 	filling_color = "#FF8C00"
-	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | VEGETABLES
 
 /obj/item/reagent_containers/food/snacks/store/bread/creamcheese
@@ -130,8 +130,8 @@
 	desc = "Yum yum yum!"
 	icon_state = "creamcheesebread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/creamcheese
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "cheese" = 10)
 	foodtype = GRAIN | DAIRY
 
@@ -140,7 +140,7 @@
 	desc = "A slice of yum!"
 	icon_state = "creamcheesebreadslice"
 	filling_color = "#FF8C00"
-	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | DAIRY
 
 /obj/item/reagent_containers/food/snacks/store/bread/mimana
@@ -148,8 +148,8 @@
 	desc = "Best eaten in silence."
 	icon_state = "mimanabread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/mimana
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 20, "mutetoxin" = 5, "nothing" = 5, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/toxin/mutetoxin = 5, /datum/reagent/consumable/nothing = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "silence" = 10)
 	foodtype = GRAIN | FRUIT
 
@@ -158,7 +158,7 @@
 	desc = "A slice of silence!"
 	icon_state = "mimanabreadslice"
 	filling_color = "#C0C0C0"
-	list_reagents = list("nutriment" = 2, "mutetoxin" = 1, "nothing" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/breadslice/custom
@@ -172,8 +172,8 @@
 	desc = "Bon appetit!"
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "baguette"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
 	bitesize = 3
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("bread" = 1)
@@ -189,12 +189,12 @@
 GLOBAL_VAR_INIT(frying_hardmode, TRUE)
 GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
 GLOBAL_LIST_INIT(frying_bad_chems, list(
-"bad_food" = 10,
-"clf3" = 2,
-"aranesp" = 2,
-"blackpowder" = 10,
-"phlogiston" = 3,
-"cyanide" = 3,
+/datum/reagent/toxin/bad_food = 10,
+/datum/reagent/clf3 = 2,
+/datum/reagent/drug/aranesp = 2,
+/datum/reagent/blackpowder = 10,
+/datum/reagent/phlogiston = 3,
+/datum/reagent/toxin/cyanide = 3,
 ))
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
@@ -268,8 +268,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	icon_state = "butteredtoast"
 	bitesize = 3
 	filling_color = "#FFA500"
-	list_reagents = list("nutriment" = 4)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("butter" = 1, "toast" = 1)
 	foodtype = GRAIN | BREAKFAST
 
@@ -279,8 +279,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "butterbiscuit"
 	filling_color = "#F0E68C"
-	list_reagents = list("nutriment" = 5)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("butter" = 1, "biscuit" = 1)
 	foodtype = GRAIN | BREAKFAST
 
@@ -291,8 +291,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	icon_state = "butterdog"
 	bitesize = 1
 	filling_color = "#F1F49A"
-	list_reagents = list("nutriment" = 5)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("butter", "exotic butter")
 
 /obj/item/reagent_containers/food/snacks/butterdog/ComponentInitialize()
diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm
index 8b6d6212f1..35b17e67f0 100644
--- a/code/modules/food_and_drinks/food/snacks_burgers.dm
+++ b/code/modules/food_and_drinks/food/snacks_burgers.dm
@@ -3,14 +3,14 @@
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "hburger"
 	bitesize = 3
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bun" = 4)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/plain
 	name = "burger"
 	desc = "The cornerstone of every nutritious breakfast."
-	bonus_reagents = list("vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/plain/Initialize()
@@ -31,7 +31,7 @@
 	var/subjectjob = null
 	name = "human burger"
 	desc = "A bloody burger."
-	bonus_reagents = list("vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
 	foodtype = MEAT | GRAIN | GROSS
 
 /obj/item/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list)
@@ -50,13 +50,13 @@
 /obj/item/reagent_containers/food/snacks/burger/corgi
 	name = "corgi burger"
 	desc = "You monster."
-	bonus_reagents = list("vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT | GROSS
 
 /obj/item/reagent_containers/food/snacks/burger/appendix
 	name = "appendix burger"
 	desc = "Tastes like appendicitis."
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
 	icon_state = "appendixburger"
 	tastes = list("bun" = 4, "grass" = 2)
 	foodtype = GRAIN | MEAT | GROSS
@@ -65,7 +65,7 @@
 	name = "fillet -o- carp sandwich"
 	desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
 	icon_state = "fishburger"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("bun" = 4, "fish" = 4)
 	foodtype = GRAIN | MEAT
 
@@ -73,7 +73,7 @@
 	name = "tofu burger"
 	desc = "What.. is that meat?"
 	icon_state = "tofuburger"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("bun" = 4, "tofu" = 4)
 	foodtype = GRAIN | VEGETABLES
 
@@ -81,8 +81,8 @@
 	name = "roburger"
 	desc = "The lettuce is the only organic component. Beep."
 	icon_state = "roburger"
-	bonus_reagents = list("nutriment" = 2, "nanomachines" = 2, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "nanomachines" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/nanomachines = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
 	foodtype = GRAIN | TOXIC
 
@@ -91,8 +91,8 @@
 	desc = "This massive patty looks like poison. Beep."
 	icon_state = "roburger"
 	volume = 120
-	bonus_reagents = list("nutriment" = 5, "nanomachines" = 70, "vitamin" = 10)
-	list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
 	foodtype = GRAIN | TOXIC
 
@@ -100,7 +100,7 @@
 	name = "xenoburger"
 	desc = "Smells caustic. Tastes like heresy."
 	icon_state = "xburger"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("bun" = 4, "acid" = 4)
 	foodtype = GRAIN | MEAT
 
@@ -108,29 +108,29 @@
 	name = "bearger"
 	desc = "Best served rawr."
 	icon_state = "bearger"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/clown
 	name = "clown burger"
 	desc = "This tastes funny..."
 	icon_state = "clownburger"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "banana" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/banana = 6)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/burger/mime
 	name = "mime burger"
 	desc = "Its taste defies language."
 	icon_state = "mimeburger"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 6, "nothing" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nothing = 6)
 	foodtype = GRAIN
 
 /obj/item/reagent_containers/food/snacks/burger/brain
 	name = "brainburger"
 	desc = "A strange looking burger. It looks almost sentient."
 	icon_state = "brainburger"
-	bonus_reagents = list("nutriment" = 6, "mannitol" = 6, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "mannitol" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bun" = 4, "brains" = 2)
 	foodtype = GRAIN | MEAT | GROSS
 
@@ -139,7 +139,7 @@
 	name = "ghost burger"
 	desc = "Too Spooky!"
 	icon_state = "ghostburger"
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 12)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 12)
 	tastes = list("bun" = 4, "ectoplasm" = 2)
 	foodtype = GRAIN
 	alpha = 170
@@ -188,7 +188,7 @@
 	desc = "Perfect for hiding the fact it's burnt to a crisp."
 	icon_state = "cburger"
 	color = "#DA0000FF"
-	bonus_reagents = list("redcrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/red = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/orange
@@ -196,7 +196,7 @@
 	desc = "Contains 0% juice."
 	icon_state = "cburger"
 	color = "#FF9300FF"
-	bonus_reagents = list("orangecrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/orange = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/yellow
@@ -204,7 +204,7 @@
 	desc = "Bright to the last bite."
 	icon_state = "cburger"
 	color = "#FFF200FF"
-	bonus_reagents = list("yellowcrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/yellow = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/green
@@ -212,7 +212,7 @@
 	desc = "It's not tainted meat, it's painted meat!"
 	icon_state = "cburger"
 	color = "#A8E61DFF"
-	bonus_reagents = list("greencrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/blue
@@ -220,7 +220,7 @@
 	desc = "Is this blue rare?"
 	icon_state = "cburger"
 	color = "#00B7EFFF"
-	bonus_reagents = list("bluecrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/blue = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/purple
@@ -228,7 +228,7 @@
 	desc = "Regal and low class at the same time."
 	icon_state = "cburger"
 	color = "#DA00FFFF"
-	bonus_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/purple = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/black
@@ -236,7 +236,7 @@
 	desc = "This is overcooked."
 	icon_state = "cburger"
 	color = "#1C1C1C"
-	bonus_reagents = list("blackcrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/black = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/white
@@ -244,14 +244,14 @@
 	desc = "Delicous Titanium!"
 	icon_state = "cburger"
 	color = "#FFFFFF"
-	bonus_reagents = list("whitecrayonpowder" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/white = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/spell
 	name = "spell burger"
 	desc = "This is absolutely Ei Nath."
 	icon_state = "spellburger"
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("bun" = 4, "magic" = 2)
 	foodtype = GRAIN | MEAT
 
@@ -259,8 +259,8 @@
 	name = "big bite burger"
 	desc = "Forget the Big Mac. THIS is the future!"
 	icon_state = "bigbiteburger"
-	bonus_reagents = list("vitamin" = 6)
-	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
 	w_class = WEIGHT_CLASS_NORMAL
 	foodtype = GRAIN | MEAT
 
@@ -272,21 +272,21 @@
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/jelly/slime
-	bonus_reagents = list("slimejelly" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | TOXIC
 
 /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
-	bonus_reagents = list("cherryjelly" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/burger/superbite
 	name = "super bite burger"
 	desc = "This is a mountain of a burger. FOOD!"
 	icon_state = "superbiteburger"
-	bonus_reagents = list("vitamin" = 10)
-	list_reagents = list("nutriment" = 40, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 40, /datum/reagent/consumable/nutriment/vitamin = 5)
 	w_class = WEIGHT_CLASS_NORMAL
 	bitesize = 7
 	volume = 100
@@ -297,29 +297,29 @@
 	name = "five alarm burger"
 	desc = "HOT! HOT!"
 	icon_state = "fivealarmburger"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "capsaicin" = 5, "condensedcapsaicin" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/condensedcapsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/rat
 	name = "rat burger"
 	desc = "Pretty much what you'd expect..."
 	icon_state = "ratburger"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT | GROSS
 
 /obj/item/reagent_containers/food/snacks/burger/baseball
 	name = "home run baseball burger"
 	desc = "It's still warm. The steam coming off of it looks like baseball."
 	icon_state = "baseball"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | GROSS
 
 /obj/item/reagent_containers/food/snacks/burger/baconburger
 	name = "bacon burger"
 	desc = "The perfect combination of all things American."
 	icon_state = "baconburger"
-	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bun" = 4, "bacon" = 2)
 	foodtype = GRAIN | MEAT
 
@@ -327,7 +327,7 @@
 	name = "soylent burger"
 	desc = "A eco-friendly burger made using upcycled low value biomass."
 	icon_state = "soylentburger"
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("bun" = 2, "assistant" = 4)
 	foodtype = GRAIN | MEAT | DAIRY
 
@@ -335,7 +335,7 @@
 	name = "mcrib"
 	desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
 	icon_state = "mcrib"
-	bonus_reagents = list("bbqsauce" = 5, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/bbqsauce = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("bun" = 2, "pork patty" = 4)
 	foodtype = GRAIN | MEAT
 
@@ -344,7 +344,7 @@
 	desc = "A cheap and greasy imitation of an eggs benedict."
 	icon_state = "mcguffin"
 	tastes = list("muffin" = 2, "bacon" = 3)
-	bonus_reagents = list("eggyolk" = 3, "nutriment" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/eggyolk = 3, /datum/reagent/consumable/nutriment = 1)
 	foodtype = GRAIN | MEAT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/burger/chicken
@@ -352,7 +352,7 @@
 	desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize homosexuality on the space frontier."
 	icon_state = "chickenburger"
 	tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1)
-	bonus_reagents = list("mayonnaise" = 3, "cooking_oil" = 2, "nutriment" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/mayonnaise = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/nutriment = 2)
 	foodtype = GRAIN | MEAT | FRIED
 
 /obj/item/reagent_containers/food/snacks/burger/cheese
@@ -360,7 +360,7 @@
 	desc = "This noble burger stands proudly clad in golden cheese."
 	icon_state = "cheeseburger"
 	tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 3)
-	bonus_reagents = list("nutriment" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	foodtype = GRAIN | MEAT | DAIRY
 
 /obj/item/reagent_containers/food/snacks/burger/cheese/Initialize()
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
index dd4dad4d9b..bb37ec9b5d 100644
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ b/code/modules/food_and_drinks/food/snacks_cake.dm
@@ -4,14 +4,14 @@
 	slices_num = 5
 	bitesize = 3
 	volume = 80
-	list_reagents = list("nutriment" = 20, "vitamin" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 1)
 	foodtype = GRAIN | DAIRY
 
 /obj/item/reagent_containers/food/snacks/cakeslice
 	icon = 'icons/obj/food/piecake.dmi'
 	trash = /obj/item/trash/plate
-	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	customfoodfilling = 0 //to avoid infinite cake-ception
 	tastes = list("cake" = 1)
 	foodtype = GRAIN | DAIRY
@@ -21,7 +21,7 @@
 	desc = "A plain cake, not a lie."
 	icon_state = "plaincake"
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/cake
-	bonus_reagents = list("nutriment" = 10, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("sweetness" = 2,"cake" = 5)
 	foodtype = GRAIN | DAIRY | SUGAR
 
@@ -40,8 +40,8 @@
 	icon_state = "carrotcake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/carrot
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "oculine" = 5, "vitamin" = 10)
-	list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/medicine/oculine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
 
@@ -50,7 +50,7 @@
 	desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
 	icon_state = "carrotcake_slice"
 	filling_color = "#FFA500"
-	list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/oculine = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
 
@@ -60,8 +60,8 @@
 	icon_state = "braincake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brain
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 5, "mannitol" = 10, "vitamin" = 10)
-	list_reagents = list("nutriment" = 20, "mannitol" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
 	foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
 
@@ -71,7 +71,7 @@
 	desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
 	icon_state = "braincakeslice"
 	filling_color = "#FF69B4"
-	list_reagents = list("nutriment" = 4, "mannitol" = 2, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/mannitol = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
 	foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
 
@@ -81,7 +81,7 @@
 	icon_state = "cheesecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/cheese
 	slices_num = 5
-	bonus_reagents = list("vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 4, "cream cheese" = 3)
 	foodtype = GRAIN | DAIRY
 
@@ -99,7 +99,7 @@
 	icon_state = "orangecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/orange
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
@@ -117,7 +117,7 @@
 	icon_state = "limecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lime
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
@@ -135,7 +135,7 @@
 	icon_state = "lemoncake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lemon
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
@@ -153,7 +153,7 @@
 	icon_state = "chocolatecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/chocolate
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
@@ -171,8 +171,8 @@
 	icon_state = "birthdaycake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 7, "sprinkles" = 10, "vitamin" = 5)
-	list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 5, "sweetness" = 1)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
@@ -181,7 +181,7 @@
 	desc = "A slice of your birthday."
 	icon_state = "birthdaycakeslice"
 	filling_color = "#DC143C"
-	list_reagents = list("nutriment" = 4, "sprinkles" = 2, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cake" = 5, "sweetness" = 1)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
@@ -191,7 +191,7 @@
 	icon_state = "applecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/apple
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
@@ -214,7 +214,7 @@
 	desc = "A cake made of slimes. Probably not electrified."
 	icon_state = "slimecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/slimecake
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
 	foodtype = GRAIN | DAIRY | SUGAR
 
@@ -231,7 +231,7 @@
 	desc = "A hollow cake with real pumpkin."
 	icon_state = "pumpkinspicecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pumpkinspice
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
 
@@ -248,7 +248,7 @@
 	desc = "A plain cake, filled with assortment of blackberries and strawberries!"
 	icon_state = "blackbarry_strawberries_cake_vanilla_cake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc
-	bonus_reagents = list("nutriment" = 14, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
@@ -265,7 +265,7 @@
 	desc = "A plain cake, filled with assortment of blackberries and strawberries!"
 	icon_state = "blackbarry_strawberries_cake_coco_cake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc
-	bonus_reagents = list("nutriment" = 14, "vitamin" = 4, "cocoa" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/coco = 5)
 	tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
@@ -282,7 +282,7 @@
 	desc = "A cake made for angels and chaplains alike! Contains holy water."
 	icon_state = "holy_cake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3, "holy_water" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/water/holywater = 10)
 	tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
 	foodtype = GRAIN | DAIRY | SUGAR
 
@@ -300,7 +300,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	icon_state = "pound_cake"
 	slices_num = 7 //Its ment to feed the party
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
-	bonus_reagents = list("nutriment" = 60)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 60)
 	tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1)
 	foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
 
@@ -317,7 +317,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A cake that is made with electronic boards and leaks acid..."
 	icon_state = "hardware_cake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
-	bonus_reagents = list("sacid" = 15, "oil" = 15)
+	bonus_reagents = list(/datum/reagent/toxin/acid = 15, /datum/reagent/oil = 15)
 	tastes = list("acid" = 1, "metal" = 1, "regret" = 10)
 	foodtype = GRAIN | GROSS
 
@@ -334,7 +334,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A vanilla frosted cake."
 	icon_state = "vanillacake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/vanilla_slice
-	bonus_reagents = list("sugar" = 15, "vanilla" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 15, /datum/reagent/consumable/vanilla = 15)
 	tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
 
@@ -351,7 +351,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A funny cake with a clown face on it."
 	icon_state = "clowncake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
-	bonus_reagents = list("sugar" = 15, "laugher" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 15, /datum/reagent/consumable/laughter = 15)
 	tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
 
@@ -368,7 +368,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A peach filled cake."
 	icon_state = "peachcake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/peach_slice
-	bonus_reagents = list("sugar" = 5, "peachjuice" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/peachjuice = 15)
 	tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
 
@@ -385,7 +385,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A spaceman's trumpet frosted cake."
 	icon_state = "trumpetcake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/trumpet
-	bonus_reagents = list("polypyr" = 15, "cream" = 5, "vitamin" = 5, "berryjuice" = 5)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 15, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/berryjuice = 5)
 	filling_color = "#7A3D80"
 	tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm
index 0d51db04ce..183e64ff7e 100644
--- a/code/modules/food_and_drinks/food/snacks_egg.dm
+++ b/code/modules/food_and_drinks/food/snacks_egg.dm
@@ -5,8 +5,8 @@
 	name = "chocolate egg"
 	desc = "Such, sweet, fattening food."
 	icon_state = "chocolateegg"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 4, "sweetness" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -15,7 +15,7 @@
 	name = "egg"
 	desc = "An egg!"
 	icon_state = "egg"
-	list_reagents = list("eggyolk" = 5)
+	list_reagents = list(/datum/reagent/consumable/eggyolk = 5)
 	cooked_type = /obj/item/reagent_containers/food/snacks/boiledegg
 	filling_color = "#F0E68C"
 	foodtype = MEAT
@@ -89,10 +89,10 @@
 	name = "fried egg"
 	desc = "A fried egg, with a touch of salt and pepper."
 	icon_state = "friedegg"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	bitesize = 1
 	filling_color = "#FFFFF0"
-	list_reagents = list("nutriment" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3)
 	tastes = list("egg" = 4, "salt" = 1, "pepper" = 1)
 	foodtype = MEAT | FRIED | BREAKFAST
 
@@ -100,9 +100,9 @@
 	name = "boiled egg"
 	desc = "A hard boiled egg."
 	icon_state = "egg"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#FFFFF0"
-	list_reagents = list("nutriment" = 2, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("egg" = 1)
 	foodtype = MEAT | BREAKFAST
 
@@ -111,8 +111,8 @@
 	desc = "That's all you can say!"
 	icon_state = "omelette"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 	bitesize = 1
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("egg" = 1, "cheese" = 1)
@@ -129,7 +129,7 @@
 				"<span class='notice'>You take a piece of omelette with your fork.</span>")
 
 			var/datum/reagent/R = pick(reagents.reagent_list)
-			reagents.remove_reagent(R.id, 1)
+			reagents.remove_reagent(R.type, 1)
 			F.forkload = R
 			if(reagents.total_volume <= 0)
 				qdel(src)
@@ -140,9 +140,9 @@
 	name = "eggs benedict"
 	desc = "There is only one egg on this, how rude."
 	icon_state = "benedict"
-	bonus_reagents = list("vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
 	trash = /obj/item/trash/plate
 	w_class = WEIGHT_CLASS_NORMAL
-	list_reagents = list("nutriment" = 6, "vitamin" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
 	foodtype = MEAT | BREAKFAST
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 4a4c5ddb88..5cef5b6fb6 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -3,8 +3,8 @@
 	desc = "Portable Ice-cream in its own packaging."
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "icecreamsandwich"
-	bonus_reagents = list("nutriment" = 1, "ice" = 2)
-	list_reagents = list("nutriment" = 2, "ice" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/ice = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2)
 	tastes = list("ice cream" = 1)
 	foodtype = GRAIN | DAIRY
 
@@ -12,8 +12,8 @@
 	name = "sundae"
 	desc = "A classic dessert."
 	icon_state = "sundae"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
-	list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "banana" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -22,8 +22,8 @@
 	name = "honkdae"
 	desc = "The clown's favorite dessert."
 	icon_state = "honkdae"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -33,8 +33,8 @@
 	trash = /obj/item/reagent_containers/food/drinks/drinkingglass
 	desc = "A long glass dish filled with ice-cream, chocolate and a banana down the middle. A timeless classic by any standards."
 	icon_state = "banana_split"
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 3)
-	list_reagents = list("nutriment" = 3, "banana" = 10, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/banana = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "banana" = 1, "charries" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -44,8 +44,8 @@
 	trash = /obj/item/reagent_containers/food/drinks/drinkingglass
 	desc = "A glass filled with cream, soda and ice-cream with a cherry on top."
 	icon_state = "cola_float"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "space coal" = 1, "cherries" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -55,8 +55,8 @@
 	trash = /obj/item/reagent_containers/food/drinks/drinkingglass
 	desc = "Cherries mixed with ice-cream, known for its filling tastes"
 	icon_state = "cherryshake"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
-	list_reagents = list("nutriment" = 3, "vitamin" = 2, "cherryshake" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cherryshake = 15)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "charries" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -66,8 +66,8 @@
 	trash = /obj/item/reagent_containers/food/drinks/drinkingglass
 	desc = "Cherries mixed with ice-cream, known for its filling tastes. This one is a exotic blue!"
 	icon_state = "bluecherryshake"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
-	list_reagents = list("nutriment" = 3, "vitamin" = 2, "bluecherryshake" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bluecherryshake = 10)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "blue cherries" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -76,8 +76,8 @@
 	name = "space freezy"
 	desc = "The best icecream in space."
 	icon_state = "spacefreezy"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#87CEFA"
 	tastes = list("blue cherries" = 2, "ice cream" = 2)
 	foodtype = FRUIT | DAIRY
@@ -91,8 +91,8 @@
 	icon = 'icons/obj/food/snowcones.dmi'
 	icon_state = "flavorless_sc"
 	trash = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups
-	bonus_reagents = list("water" = 10) //Base line will allways give water
-	list_reagents = list("water" = 1) // We dont get food for water/juices
+	bonus_reagents = list(/datum/reagent/water = 10) //Base line will allways give water
+	list_reagents = list(/datum/reagent/water = 1) // We dont get food for water/juices
 	filling_color = "#FFFFFF" //Ice is white
 	tastes = list("ice" = 1, "water" = 1)
 	foodtype = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit
@@ -101,7 +101,7 @@
 	name = "lime snowcone"
 	desc = "Lime syrup drizzled over a snowball in a paper cup."
 	icon_state = "lime_sc"
-	list_reagents = list("nutriment" = 1, "limejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "limes" = 5)
 	foodtype = FRUIT
 
@@ -109,7 +109,7 @@
 	name = "lemon snowcone"
 	desc = "Lemon syrup drizzled over a snowball in a paper cup."
 	icon_state = "lemon_sc"
-	list_reagents = list("nutriment" = 1, "lemonjuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
 	foodtype = FRUIT
 
@@ -117,7 +117,7 @@
 	name = "apple snowcone"
 	desc = "Apple syrup drizzled over a snowball in a paper cup."
 	icon_state = "amber_sc"
-	list_reagents = list("nutriment" = 1, "applejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/applejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "apples" = 5)
 	foodtype = FRUIT
 
@@ -125,7 +125,7 @@
 	name = "grape snowcone"
 	desc = "Grape syrup drizzled over a snowball in a paper cup."
 	icon_state = "grape_sc"
-	list_reagents = list("nutriment" = 1, "grapejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/grapejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "grape" = 5)
 	foodtype = FRUIT
 
@@ -133,7 +133,7 @@
 	name = "orange snowcone"
 	desc = "Orange syrup drizzled over a snowball in a paper cup."
 	icon_state = "orange_sc"
-	list_reagents = list("nutriment" = 1, "orangejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/orangejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "orange" = 5)
 	foodtype = FRUIT
 
@@ -141,7 +141,7 @@
 	name = "bluecherry snowcone"
 	desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
 	icon_state = "blue_sc"
-	list_reagents = list("nutriment" = 1, "bluecherryjelly" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/bluecherryjelly = 5)
 	tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5)
 	foodtype = FRUIT
 
@@ -149,7 +149,7 @@
 	name = "cherry snowcone"
 	desc = "Cherry syrup drizzled over a snowball in a paper cup."
 	icon_state = "red_sc"
-	list_reagents = list("nutriment" = 1, "cherryjelly" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5)
 	tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5)
 	foodtype = FRUIT
 
@@ -157,7 +157,7 @@
 	name = "kiwi snowcone"
 	desc = "A kiwi snowball in a paper cup."
 	icon_state = "kiwi_sc"
-	list_reagents = list("nutriment" = 3, "vitamin" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("ice" = 1, "space" = 3, "kiwi" = 5)
 	foodtype = FRUIT
 
@@ -165,7 +165,7 @@
 	name = "peach snowcone"
 	desc = "A peach snowball in a paper cup."
 	icon_state = "peach_sc"
-	list_reagents = list("nutriment" = 1, "peachjuice" = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/peachjuice = 10)
 	tastes = list("ice" = 1, "water" = 1, " peach" = 5)
 	foodtype = FRUIT
 
@@ -173,7 +173,7 @@
 	name = "strawberry snowcone"
 	desc = "A strawberry snowball in a paper cup."
 	icon_state = "blue_sc"
-	list_reagents = list("nutriment" = 1, "berryjuice" = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/berryjuice = 10)
 	tastes = list("ice" = 1, "water" = 1, " strawberry" = 5)
 	foodtype = FRUIT
 
@@ -181,7 +181,7 @@
 	name = "berry snowcone"
 	desc = "Berry syrup drizzled over a snowball in a paper cup."
 	icon_state = "berry_sc"
-	list_reagents = list("nutriment" = 1, "berryjuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/berryjuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "berries" = 5)
 	foodtype = FRUIT
 
@@ -189,7 +189,7 @@
 	name = "fruit salad snowcone"
 	desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
 	icon_state = "fruitsalad_sc"
-	list_reagents = list("nutriment" = 1, "lemonjuice" = 5, "limejuice" = 5, "orangejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
 	foodtype = FRUIT
 
@@ -197,7 +197,7 @@
 	name = "pineapple snowcone"
 	desc = "Pineapple syrup drizzled over a snowball in a paper cup."
 	icon_state = "pineapple_sc"
-	list_reagents = list("nutriment" = 1, "water" = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/water = 10)
 	tastes = list("ice" = 1, "water" = 1, "pineapples" = 5)
 	foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy
 
@@ -205,47 +205,47 @@
 	name = "mime snowcone"
 	desc = "..."
 	icon_state = "mime_sc"
-	list_reagents = list("nutriment" = 1, "nothing" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nothing = 5)
 	tastes = list("ice" = 1, "water" = 1, "nothing" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/clown
 	name = "clown snowcone"
 	desc = "Laughter drizzled over a snowball in a paper cup."
 	icon_state = "clown_sc"
-	list_reagents = list("nutriment" = 1, "laughter" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/laughter = 5)
 	tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/soda
 	name = "space cola snowcone"
 	desc = "Space Cola drizzled over a snowball in a paper cup."
 	icon_state = "soda_sc"
-	list_reagents = list("nutriment" = 1, "space_cola" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/space_cola = 5)
 	tastes = list("ice" = 1, "water" = 1, "cola" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
 	name = "Space Mountain Wind snowcone"
 	desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
 	icon_state = "kiwi_sc"
-	list_reagents = list("nutriment" = 1, "spacemountainwind" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5)
 	tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
 	name = "pwrgame snowcone"
 	desc = "Pwrgame soda drizzled over a snowball in a paper cup."
 	icon_state = "pwrgame_sc"
-	list_reagents = list("nutriment" = 1, "pwr_game" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pwr_game = 5)
 	tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/honey
 	name = "honey snowcone"
 	desc = "Honey drizzled over a snowball in a paper cup."
 	icon_state = "amber_sc"
-	list_reagents = list("nutriment" = 1, "honey" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/honey = 5)
 	tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1)
 
 /obj/item/reagent_containers/food/snacks/snowcones/rainbow
 	name = "rainbow snowcone"
 	desc = "A very colorful snowball in a paper cup."
 	icon_state = "rainbow_sc"
-	list_reagents = list("nutriment" = 5, "laughter" = 25)
-	tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)
\ No newline at end of file
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/laughter = 25)
+	tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index cf499c9d15..5103418e6b 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -8,10 +8,10 @@
 	desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
 	icon_state = "cubancarp"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	bitesize = 3
 	filling_color = "#CD853F"
-	list_reagents = list("nutriment" = 6, "capsaicin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 1)
 	tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
 	foodtype = MEAT
 
@@ -19,7 +19,7 @@
 	name = "carp fillet"
 	desc = "A fillet of spess carp meat."
 	icon_state = "fishfillet"
-	list_reagents = list("nutriment" = 3, "carpotoxin" = 2, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bitesize = 6
 	filling_color = "#FA8072"
 	tastes = list("fish" = 1)
@@ -37,8 +37,8 @@
 	name = "fish fingers"
 	desc = "A finger of fish."
 	icon_state = "fishfingers"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	bitesize = 1
 	filling_color = "#CD853F"
 	tastes = list("fish" = 1, "breadcrumbs" = 1)
@@ -48,8 +48,8 @@
 	name = "fish and chips"
 	desc = "I do say so myself chap."
 	icon_state = "fishandchips"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	filling_color = "#FA8072"
 	tastes = list("fish" = 1, "chips" = 1)
 	foodtype = MEAT | VEGETABLES | FRIED
@@ -59,8 +59,8 @@
 	desc = "A small cylindrical kudzu skin, filled with rice and fish."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_basic"
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	bitesize = 10
 	filling_color = "#F2EEEA" //rgb(242, 238, 234)
 	tastes = list("fish" = 1, "rice" = 2, "salt" = 1)
@@ -71,8 +71,8 @@
 	desc = "A peace  of carp lightly placed on some rice."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_adv"
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	bitesize = 10
 	filling_color = "#F2EEEA" //rgb(242, 238, 234)
 	tastes = list("fish" = 2, "rice" = 2, "salt" = 1)
@@ -83,8 +83,8 @@
 	desc = "A well prepared peace  of the best of the carp fillet placed on rice. Looks fancy and fresh!"
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_pro"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bitesize = 10
 	filling_color = "#F2EEEA" //rgb(242, 238, 234)
 	tastes = list("fish" = 3, "rice" = 2, "salt" = 1)
@@ -97,7 +97,7 @@
 	name = "tofu"
 	desc = "We all love tofu."
 	icon_state = "tofu"
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	filling_color = "#F0E68C"
 	tastes = list("tofu" = 1)
 	foodtype = VEGETABLES
@@ -106,7 +106,7 @@
 	name = "spider leg"
 	desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
 	icon_state = "spiderleg"
-	list_reagents = list("nutriment" = 2, "toxin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
 	cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg
 	filling_color = "#000000"
 	tastes = list("cobwebs" = 1)
@@ -117,8 +117,8 @@
 	desc = "Now you can feel like a real tourist vacationing in Ireland."
 	icon_state = "cornedbeef"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	tastes = list("meat" = 1, "cabbage" = 1)
 	foodtype = MEAT | VEGETABLES
 
@@ -127,8 +127,8 @@
 	desc = "Because eating bear wasn't manly enough."
 	icon_state = "bearsteak"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
-	list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/ethanol/manly_dorf = 5)
 	tastes = list("meat" = 1, "salmon" = 1)
 	foodtype = MEAT | ALCOHOL
 
@@ -136,7 +136,7 @@
 	name = "faggot"
 	desc = "A great meal all round. Not a cord of wood."
 	icon_state = "faggot"
-	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#800000"
 	tastes = list("meat" = 1)
 	foodtype = MEAT
@@ -146,8 +146,8 @@
 	desc = "A piece of mixed, long meat."
 	icon_state = "sausage"
 	filling_color = "#CD5C5C"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("meat" = 1)
 	foodtype = MEAT | BREAKFAST
 	var/roasted = FALSE
@@ -160,35 +160,35 @@
 	trash = /obj/item/stack/rods
 	icon_state = "kebab"
 	w_class = WEIGHT_CLASS_NORMAL
-	list_reagents = list("nutriment" = 8)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8)
 	tastes = list("meat" = 3, "metal" = 1)
 	foodtype = MEAT
 
 /obj/item/reagent_containers/food/snacks/kebab/human
 	name = "human-kebab"
 	desc = "A human meat, on a stick."
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("tender meat" = 3, "metal" = 1)
 	foodtype = MEAT | GROSS
 
 /obj/item/reagent_containers/food/snacks/kebab/monkey
 	name = "meat-kebab"
 	desc = "Delicious meat, on a stick."
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("meat" = 3, "metal" = 1)
 	foodtype = MEAT
 
 /obj/item/reagent_containers/food/snacks/kebab/tofu
 	name = "tofu-kebab"
 	desc = "Vegan meat, on a stick."
-	bonus_reagents = list("nutriment" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	tastes = list("tofu" = 3, "metal" = 1)
 	foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/snacks/kebab/tail
 	name = "lizard-tail kebab"
 	desc = "Severed lizard tail on a stick."
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
 	foodtype = MEAT
 
@@ -196,7 +196,7 @@
 	name = "raw khinkali"
 	desc = "One hundred khinkalis? Do I look like a pig?"
 	icon_state = "khinkali"
-	list_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	cooked_type = /obj/item/reagent_containers/food/snacks/khinkali
 	tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
 	foodtype = MEAT
@@ -205,7 +205,7 @@
 	name = "khinkali"
 	desc = "One hundred khinkalis? Do I look like a pig?"
 	icon_state = "khinkali"
-	list_reagents = list("nutriment" = 4, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bitesize = 3
 	filling_color = "#F0F0F0"
 	tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
@@ -216,7 +216,7 @@
 	desc = "Just add water!"
 	icon_state = "monkeycube"
 	bitesize = 12
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	filling_color = "#CD853F"
 	tastes = list("the jungle" = 1, "bananas" = 1)
 	foodtype = MEAT | SUGAR
@@ -244,10 +244,10 @@
 	name = "enchiladas"
 	desc = "Viva La Mexico!"
 	icon_state = "enchiladas"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bitesize = 4
 	filling_color = "#FFA07A"
-	list_reagents = list("nutriment" = 8, "capsaicin" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/capsaicin = 6)
 	tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
 	foodtype = MEAT
 
@@ -256,8 +256,8 @@
 	desc = "Even non-vegetarians will LOVE this!"
 	icon_state = "stewedsoymeat"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1)
-	list_reagents = list("nutriment" = 8)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8)
 	filling_color = "#D2691E"
 	tastes = list("soy" = 1, "vegetables" = 1)
 	foodtype = VEGETABLES
@@ -271,8 +271,8 @@
 	desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
 	icon_state = "spiderlegcooked"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "capsaicin" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 3, "capsaicin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 2)
 	filling_color = "#000000"
 	tastes = list("hot peppers" = 1, "cobwebs" = 1)
 	foodtype = MEAT
@@ -282,8 +282,8 @@
 	desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
 	icon_state = "spidereggsham"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
-	list_reagents = list("nutriment" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	bitesize = 4
 	filling_color = "#7FFF00"
 	tastes = list("meat" = 1, "the colour green" = 1)
@@ -293,8 +293,8 @@
 	name = "carp sashimi"
 	desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
 	icon_state = "sashimi"
-	bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
-	list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5)
 	filling_color = "#FA8072"
 	tastes = list("fish" = 1, "hot peppers" = 1)
 	foodtype = MEAT | TOXIC
@@ -302,8 +302,8 @@
 /obj/item/reagent_containers/food/snacks/nugget
 	name = "chicken nugget"
 	filling_color = "#B22222"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	tastes = list("\"chicken\"" = 1)
 	foodtype = MEAT
 
@@ -317,8 +317,8 @@
 	name = "pig in a blanket"
 	desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."
 	icon_state = "pigblanket"
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#800000"
 	tastes = list("meat" = 1, "butter" = 1)
 
@@ -328,14 +328,14 @@
 	icon_state = "dorndog"
 	trash = /obj/item/trash/plate/alt
 	tastes = list("hotdog" = 2, "mustard and ketchup" = 1, "fryed bread" = 1)
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 2, "mustard" = 5, "ketchup" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mustard = 5, /datum/reagent/consumable/ketchup = 5)
 
 /obj/item/reagent_containers/food/snacks/kebab/rat
 	name = "rat-kebab"
 	desc = "Not so delicious rat meat, on a stick."
 	icon_state = "ratkebab"
 	w_class = WEIGHT_CLASS_NORMAL
-	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("rat meat" = 1, "metal" = 1)
 	foodtype = MEAT | GROSS
 
@@ -343,20 +343,20 @@
 	name = "double rat-kebab"
 	icon_state = "doubleratkebab"
 	tastes = list("rat meat" = 2, "metal" = 1)
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 
 /obj/item/reagent_containers/food/snacks/kebab/fiesta
 	name = "fiesta skewer"
 	icon_state = "fiestaskewer"
 	tastes = list("tex-mex" = 3, "cumin" = 2)
-	bonus_reagents = list("vitamin" = 5, "capsaicin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 3)
 
 /obj/item/reagent_containers/food/snacks/bbqribs
 	name = "bbq ribs"
 	desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
 	icon_state = "ribs"
 	w_class = WEIGHT_CLASS_NORMAL
-	list_reagents = list("nutriment" = 8, "vitamin" = 2, "bbqsauce" = 5)
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("meat" = 3, "smokey sauce" = 1)
 	foodtype = MEAT
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index de22537063..a85623cabd 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -7,7 +7,7 @@
 	icon_state = "cheesewheel"
 	slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge
 	slices_num = 5
-	list_reagents = list("nutriment" = 15, "vitamin" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5)
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("cheese" = 1)
 	foodtype = DAIRY
@@ -17,7 +17,7 @@
 	desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
 	icon_state = "cheesewedge"
 	filling_color = "#FFD700"
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cheese" = 1)
 	foodtype = DAIRY
 
@@ -28,13 +28,13 @@
 	filling_color = "#FF1493"
 	tastes = list("watermelon" = 1)
 	foodtype = FRUIT
-	juice_results = list("watermelonjuice" = 5)
+	juice_results = list(/datum/reagent/consumable/watermelonjuice = 5)
 
 /obj/item/reagent_containers/food/snacks/candy_corn
 	name = "candy corn"
 	desc = "It's a handful of candy corn. Can be stored in a detective's hat."
 	icon_state = "candy_corn"
-	list_reagents = list("nutriment" = 4, "sugar" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2)
 	filling_color = "#FF8C00"
 	tastes = list("candy corn" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -43,7 +43,7 @@
 	name = "chocolate bar"
 	desc = "Such, sweet, fattening food."
 	icon_state = "chocolatebar"
-	list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -53,7 +53,7 @@
 	name = "huge mushroom slice"
 	desc = "A slice from a huge mushroom."
 	icon_state = "hugemushroomslice"
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("mushroom" = 1)
 	foodtype = VEGETABLES
 
@@ -62,7 +62,7 @@
 	desc = "Now let's find some cinema."
 	icon_state = "popcorn"
 	trash = /obj/item/trash/popcorn
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
 	filling_color = "#FFEFD5"
 	tastes = list("popcorn" = 3, "butter" = 1)
@@ -76,8 +76,8 @@
 	name = "loaded baked potato"
 	desc = "Totally baked."
 	icon_state = "loadedbakedpotato"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	filling_color = "#D2B48C"
 	tastes = list("potato" = 1)
 	foodtype = VEGETABLES | DAIRY
@@ -87,7 +87,7 @@
 	desc = "AKA: French Fries, Freedom Fries, etc."
 	icon_state = "fries"
 	trash = /obj/item/trash/plate
-	list_reagents = list("nutriment" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	filling_color = "#FFD700"
 	tastes = list("fries" = 3, "salt" = 1)
 	foodtype = VEGETABLES | GRAIN | FRIED
@@ -97,7 +97,7 @@
 	name = "tator tot"
 	desc = "A large fried potato nugget that may or may not try to valid you."
 	icon_state = "tatortot"
-	list_reagents = list("nutriment" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	filling_color = "FFD700"
 	tastes = list("potato" = 3, "valids" = 1)
 	foodtype = FRIED | VEGETABLES
@@ -108,7 +108,7 @@
 	desc = "Dope from a soy."
 	icon_state = "soydope"
 	trash = /obj/item/trash/plate
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	filling_color = "#DEB887"
 	tastes = list("soy" = 1)
 	foodtype = VEGETABLES
@@ -119,8 +119,8 @@
 	desc = "Fries. Covered in cheese. Duh."
 	icon_state = "cheesyfries"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	filling_color = "#FFD700"
 	tastes = list("fries" = 3, "cheese" = 1)
 	foodtype = VEGETABLES | GRAIN
@@ -129,7 +129,7 @@
 	name = "burned mess"
 	desc = "Someone should be demoted from cook for this."
 	icon_state = "badrecipe"
-	list_reagents = list("bad_food" = 30)
+	list_reagents = list(/datum/reagent/toxin/bad_food = 30)
 	filling_color = "#8B4513"
 	foodtype = GROSS
 	dunkable = TRUE
@@ -139,7 +139,7 @@
 	desc = "Tasty fries from fresh Carrots."
 	icon_state = "carrotfries"
 	trash = /obj/item/trash/plate
-	list_reagents = list("nutriment" = 3, "oculine" = 3, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFA500"
 	tastes = list("carrots" = 3, "salt" = 1)
 	foodtype = VEGETABLES
@@ -149,8 +149,8 @@
 	desc = "An apple coated in sugary sweetness."
 	icon_state = "candiedapple"
 	bitesize = 3
-	bonus_reagents = list("nutriment" = 2, "sugar" = 3)
-	list_reagents = list("nutriment" = 3, "sugar" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 2)
 	filling_color = "#FF4500"
 	tastes = list("apple" = 2, "sweetness" = 2)
 	foodtype = JUNKFOOD | FRUIT | SUGAR
@@ -161,7 +161,7 @@
 	icon_state = "mint"
 	bitesize = 1
 	trash = /obj/item/trash/plate
-	list_reagents = list("minttoxin" = 2)
+	list_reagents = list(/datum/reagent/toxin/minttoxin = 2)
 	filling_color = "#800000"
 	foodtype = TOXIC | SUGAR
 
@@ -169,8 +169,8 @@
 	name = "egg wrap"
 	desc = "The precursor to Pigs in a Blanket."
 	icon_state = "eggwrap"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
-	list_reagents = list("nutriment" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#F0E68C"
 	tastes = list("egg" = 1)
 	foodtype = MEAT | GRAIN
@@ -179,8 +179,8 @@
 	name = "tin of beans"
 	desc = "Musical fruit in a slightly less musical container."
 	icon_state = "beans"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10)
 	filling_color = "#B22222"
 	tastes = list("beans" = 1)
 	foodtype = VEGETABLES
@@ -189,7 +189,7 @@
 	name = "spider eggs"
 	desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
 	icon_state = "spidereggs"
-	list_reagents = list("nutriment" = 2, "toxin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
 	filling_color = "#008000"
 	tastes = list("cobwebs" = 1)
 	foodtype = MEAT | TOXIC
@@ -198,7 +198,7 @@
 	name = "spiderling"
 	desc = "It's slightly twitching in your hand. Ew..."
 	icon_state = "spiderling"
-	list_reagents = list("nutriment" = 1, "toxin" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 4)
 	filling_color = "#00800"
 	tastes = list("cobwebs" = 1, "guts" = 2)
 	foodtype = MEAT | TOXIC
@@ -207,7 +207,7 @@
 	name = "spider lollipop"
 	desc = "Still gross, but at least it has a mountain of sugar on it."
 	icon_state = "spiderlollipop"
-	list_reagents = list("nutriment" = 1, "toxin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //lollipop, but vitamins = toxins
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //lollipop, but vitamins = toxins
 	filling_color = "#00800"
 	tastes = list("cobwebs" = 1, "sugar" = 2)
 	foodtype = JUNKFOOD | SUGAR
@@ -217,7 +217,7 @@
 	desc = "Spider eggs wrapped in a thin salted Kudzu pod"
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_egg"
-	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FF3333" // R225 G051 B051
 	tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2)
 	foodtype = MEAT | VEGETABLES
@@ -226,8 +226,8 @@
 	name = "chocolate coin"
 	desc = "A completely edible but nonflippable festive coin."
 	icon_state = "chococoin"
-	bonus_reagents = list("nutriment" = 1, "sugar" = 1)
-	list_reagents = list("nutriment" = 3, "cocoa" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -236,8 +236,8 @@
 	name = "fudge dice"
 	desc = "A little cube of chocolate that tends to have a less intense taste if you eat too many at once."
 	icon_state = "chocodice"
-	bonus_reagents = list("nutriment" = 1, "sugar" = 1)
-	list_reagents = list("nutriment" = 3, "cocoa" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 1)
 	filling_color = "#A0522D"
 	trash = /obj/item/dice/fudge
 	tastes = list("fudge" = 1)
@@ -247,8 +247,8 @@
 	name = "chocolate orange"
 	desc = "A festive chocolate orange."
 	icon_state = "chocoorange"
-	bonus_reagents = list("nutriment" = 1, "sugar" = 1)
-	list_reagents = list("nutriment" = 3, "sugar" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 3, "oranges" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -258,8 +258,8 @@
 	desc = "The only good recipe for eggplant."
 	icon_state = "eggplantparm"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
-	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#BA55D3"
 	tastes = list("eggplant" = 3, "cheese" = 1)
 	foodtype = VEGETABLES | DAIRY
@@ -269,7 +269,7 @@
 	desc = "The base for all your burritos."
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "tortilla"
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#FFEFD5"
 	tastes = list("tortilla" = 1)
 	foodtype = GRAIN
@@ -278,8 +278,8 @@
 	name = "burrito"
 	desc = "Tortilla wrapped goodness."
 	icon_state = "burrito"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#FFEFD5"
 	tastes = list("torilla" = 2, "meat" = 3)
 	foodtype = GRAIN | MEAT
@@ -288,8 +288,8 @@
 	name = "cheesy burrito"
 	desc = "It's a burrito filled with cheese."
 	icon_state = "cheesyburrito"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 4, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFD800"
 	tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1)
 	foodtype = GRAIN | MEAT | DAIRY
@@ -298,8 +298,8 @@
 	name = "carne asada burrito"
 	desc = "The best burrito for meat lovers."
 	icon_state = "carneburrito"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#A0522D"
 	tastes = list("torilla" = 2, "meat" = 4)
 	foodtype = GRAIN | MEAT
@@ -308,8 +308,8 @@
 	name = "fuego plasma burrito"
 	desc = "A super spicy burrito."
 	icon_state = "fuegoburrito"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
-	list_reagents = list("nutriment" = 4, "capsaicin" = 5, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
 	filling_color = "#FF2000"
 	tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1)
 	foodtype = GRAIN | MEAT
@@ -319,7 +319,7 @@
 	desc = "Made with roasted sweet potatoes!"
 	icon_state = "yakiimo"
 	trash = /obj/item/trash/plate
-	list_reagents = list("nutriment" = 5, "vitamin" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#8B1105"
 	tastes = list("sweet potato" = 1)
 	foodtype = GRAIN | VEGETABLES | SUGAR
@@ -329,7 +329,7 @@
 	desc = "Sweet and crunchy."
 	icon_state = "roastparsnip"
 	trash = /obj/item/trash/plate
-	list_reagents = list("nutriment" = 3, "vitamin" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#FF5500"
 	tastes = list("parsnip" = 1)
 	foodtype = VEGETABLES
@@ -338,8 +338,8 @@
 	name = "melon fruit bowl"
 	desc = "For people who wants edible fruit bowls."
 	icon_state = "melonfruitbowl"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#FF5500"
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("melon" = 1)
@@ -349,8 +349,8 @@
 	name = "nachos"
 	desc = "Chips from Space Mexico."
 	icon_state = "nachos"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#F4A460"
 	tastes = list("nachos" = 1)
 	foodtype = VEGETABLES | FRIED
@@ -359,8 +359,8 @@
 	name = "cheesy nachos"
 	desc = "The delicious combination of nachos and melting cheese."
 	icon_state = "cheesynachos"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
 	filling_color = "#FFD700"
 	tastes = list("nachos" = 2, "cheese" = 1)
 	foodtype = VEGETABLES | FRIED | DAIRY
@@ -369,8 +369,8 @@
 	name = "Cuban nachos"
 	desc = "That's some dangerously spicy nachos."
 	icon_state = "cubannachos"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
-	list_reagents = list("nutriment" = 7, "capsaicin" = 8, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/capsaicin = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#DC143C"
 	tastes = list("nachos" = 2, "hot pepper" = 1)
 	foodtype = VEGETABLES | FRIED | DAIRY
@@ -379,8 +379,8 @@
 	name = "melon keg"
 	desc = "Who knew vodka was a fruit?"
 	icon_state = "melonkeg"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 3)
-	list_reagents = list("nutriment" = 9, "vodka" = 15, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/ethanol/vodka = 15, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#FFD700"
 	volume = 80
 	bitesize = 5
@@ -391,8 +391,8 @@
 	name = "honey nut bar"
 	desc = "Oats and nuts compressed together into a bar, held together with a honey glaze."
 	icon_state = "honeybar"
-	bonus_reagents = list("nutriment" = 2, "honey" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 5, "honey" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/honey = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/honey = 5)
 	filling_color = "#F2CE91"
 	tastes = list("oats" = 3, "nuts" = 2, "honey" = 1)
 	foodtype = FRUIT | SUGAR
@@ -401,8 +401,8 @@
 	name = "stuffed legion"
 	desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce."
 	icon_state = "stuffed_legion"
-	bonus_reagents = list("vitamin" = 3, "capsaicin" = 1, "tricordrazine" = 5)
-	list_reagents = list("nutriment" = 5, "vitamin" = 5, "capsaicin" = 2, "tricordrazine" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/medicine/tricordrazine = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/medicine/tricordrazine = 10)
 	tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1)
 	foodtype = MEAT
 
@@ -410,8 +410,8 @@
 	name = "Powercrepe"
 	desc = "With great power, comes great crepes.  It looks like a pancake filled with jelly but packs quite a punch."
 	icon_state = "powercrepe"
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 3, "iron" = 10)
-	list_reagents = list("nutriment" = 10, "vitamin" = 5, "cherryjelly" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/iron = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/cherryjelly = 5)
 	force = 20
 	throwforce = 10
 	block_chance = 50
@@ -426,7 +426,7 @@
 	desc = "A delicious lollipop. Makes for a great Valentine's present."
 	icon = 'icons/obj/lollipop.dmi'
 	icon_state = "lollipop_stick"
-	list_reagents = list("nutriment" = 1, "vitamin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2)	//Honk
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2)	//Honk
 	var/mutable_appearance/head
 	var/headcolor = rgb(0, 0, 0)
 	tastes = list("candy" = 1)
@@ -468,7 +468,7 @@
 	desc = "A colorful, sugary gumball."
 	icon = 'icons/obj/lollipop.dmi'
 	icon_state = "gumball"
-	list_reagents = list("sugar" = 5, "bicaridine" = 2, "kelotane" = 2)	//Kek
+	list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/medicine/kelotane = 2)	//Kek
 	tastes = list("candy")
 	foodtype = JUNKFOOD
 
@@ -495,8 +495,8 @@
 	name = "taco"
 	desc = "A traditional taco with meat, cheese, and lettuce."
 	icon_state = "taco"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 2)
-	list_reagents = list("nutriment" = 4, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "F0D830"
 	tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
 	foodtype = MEAT | DAIRY | GRAIN | VEGETABLES
@@ -504,8 +504,8 @@
 /obj/item/reagent_containers/food/snacks/taco/plain
 	desc = "A traditional taco with meat and cheese, minus the rabbit food."
 	icon_state = "taco_plain"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("taco" = 4, "meat" = 2, "cheese" = 2)
 	foodtype = MEAT | DAIRY | GRAIN
 
@@ -513,8 +513,8 @@
 	name = "Bran Requests Cereal"
 	desc = "A dry cereal that satiates your requests for bran. Tastes uniquely like raisins and salt."
 	icon_state = "bran_requests"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2, "sodiumchloride" = 5)
-	bonus_reagents = list("sodiumchloride" = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 5)
+	bonus_reagents = list(/datum/reagent/consumable/sodiumchloride = 10)
 	tastes = list("bran" = 4, "raisins" = 3, "salt" = 1)
 	foodtype = GRAIN | FRUIT
 
@@ -522,7 +522,7 @@
 	name = "stick of butter"
 	desc = "A stick of delicious, golden, fatty goodness."
 	icon_state = "butter"
-	list_reagents = list("nutriment" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#FFD700"
 	tastes = list("butter" = 1)
 	foodtype = DAIRY
@@ -531,7 +531,7 @@
 	name = "onion rings"
 	desc = "Onion slices coated in batter."
 	icon_state = "onionrings"
-	list_reagents = list("nutriment" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3)
 	filling_color = "#C0C9A0"
 	gender = PLURAL
 	tastes = list("batter" = 3, "onion" = 1)
@@ -549,7 +549,7 @@
 	name = "chocolate"
 	desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
 	icon_state = "tiny_chocolate"
-	list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1, "aphro" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1, /datum/reagent/drug/aphrodisiac = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -559,7 +559,7 @@
 	desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "riceball"
-	list_reagents = list("nutriment" = 6, "sodiumchloride" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/sodiumchloride = 2)
 	tastes = list("rice" = 3, "salt" = 1)
 	foodtype = GRAIN
 
@@ -567,7 +567,7 @@
 	name = "Canned Peaches"
 	desc = "Just a nice can of ripe peaches swimming in their own juices."
 	icon_state = "peachcan"
-	list_reagents = list("peachjuice" = 20, "sugar" = 8, "nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/peachjuice = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2)
 	filling_color = "#ffdf26"
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("peaches" = 7, "tin" = 1)
@@ -583,7 +583,7 @@
 	name = "Chocolate dipped strawberries"
 	desc = "A strawberry dipped in a bit of chocolate."
 	icon_state = "chocolatestrawberry"
-	list_reagents = list("sugar" = 5, "nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 2)
 	filling_color = "#ffdf26"
 	tastes = list("strawberries" = 5, "chocolate" = 3)
 	foodtype = FRUIT | SUGAR
@@ -593,7 +593,7 @@
 	name = "Chocolate dipped banana"
 	desc = "A banana dipped in a bit of chocolate and held on a stick."
 	icon_state = "banana_coco"
-	list_reagents = list("sugar" = 5, "nutriment" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#ffdf26"
 	tastes = list("banana" = 5, "chocolate" = 3)
 	foodtype = FRUIT | SUGAR
@@ -605,7 +605,7 @@
 	icon_state = "boritos"
 	trash = /obj/item/trash/boritos
 	bitesize = 2
-	list_reagents = list("nutriment" = 3, "cooking_oil" = 2, "sodiumchloride" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/sodiumchloride = 3)
 	filling_color = "#ECA735"
 	tastes = list("fried corn" = 1)
 	foodtype = JUNKFOOD | FRIED
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index de5d577193..516c8b2c31 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -8,8 +8,8 @@
 	icon = 'icons/obj/food/donut.dmi'
 	icon_state = "donut"
 	bitesize = 5
-	bonus_reagents = list("sugar" = 1)
-	list_reagents = list("nutriment" = 3, "sprinkles" = 1, "sugar" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/sugar = 2)
 	filling_color = "#D2691E"
 	tastes = list("donut" = 1)
 	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR | BREAKFAST
@@ -30,7 +30,7 @@
 	is_decorated = TRUE
 	name = "[decorated_adjective] [name]"
 	icon_state = decorated_icon //delish~!
-	reagents.add_reagent("sprinkles", 1)
+	reagents.add_reagent(/datum/reagent/consumable/sprinkles, 1)
 	filling_color = "#FF69B4"
 	return TRUE
 
@@ -58,15 +58,18 @@
 
 /obj/item/reagent_containers/food/snacks/donut/chaos/Initialize()
 	. = ..()
-	extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
+	extra_reagent = pick(/datum/reagent/consumable/nutriment, /datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil,
+					/datum/reagent/drug/krokodil, /datum/reagent/toxin/plasma, /datum/reagent/consumable/coco,
+					/datum/reagent/toxin/slimejelly, /datum/reagent/consumable/banana, /datum/reagent/consumable/berryjuice,
+					/datum/reagent/medicine/omnizine)
 	reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/reagent_containers/food/snacks/donut/meat
 	name = "Meat Donut"
 	desc = "Tastes as gross as it looks."
 	icon_state = "donut_meat"
-	bonus_reagents = list("ketchup" = 1)
-	list_reagents = list("nutriment" = 3, "ketchup" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/ketchup = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/ketchup = 2)
 	tastes = list("meat" = 1)
 	foodtype = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
 
@@ -74,7 +77,7 @@
 	name = "pink donut"
 	desc = "Goes great with a soy latte."
 	icon_state = "donut_pink"
-	bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1) //Extra sprinkles to reward frosting
+	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1) //Extra sprinkles to reward frosting
 	filling_color = "#E57d9A"
 	decorated_icon = "donut_homer"
 
@@ -82,7 +85,7 @@
 	name = "spaceman's donut"
 	desc = "Goes great with a cold beaker of malk."
 	icon_state = "donut_purple"
-	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "violets" = 1)
 	is_decorated = TRUE
 	filling_color = "#8739BF"
@@ -91,7 +94,7 @@
 	name = "apple donut"
 	desc = "Goes great with a shot of cinnamon schnapps."
 	icon_state = "donut_green"
-	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "green apples" = 1)
 	is_decorated = TRUE
 	filling_color = "#6ABE30"
@@ -100,7 +103,7 @@
 	name = "caramel donut"
 	desc = "Goes great with a mug of hot coco."
 	icon_state = "donut_beige"
-	bonus_reagents = list("caramel" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/caramel = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "buttery sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#D4AD5B"
@@ -109,7 +112,7 @@
 	name = "chocolate donut"
 	desc = "Goes great with a glass of warm milk."
 	icon_state = "donut_choc"
-	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1) //the coco reagent is just bitter.
+	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/sprinkles = 1) //the coco reagent is just bitter.
 	tastes = list("donut" = 4, "bitterness" = 1)
 	decorated_icon = "donut_choc_sprinkles"
 	filling_color = "#4F230D"
@@ -118,7 +121,7 @@
 	name = "blumpkin donut"
 	desc = "Goes great with a mug of soothing drunken blumpkin."
 	icon_state = "donut_blue"
-	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 2, "blumpkin" = 1)
 	is_decorated = TRUE
 	filling_color = "#2788C4"
@@ -127,7 +130,7 @@
 	name = "bungo donut"
 	desc = "Goes great with a mason jar of hippie's delight."
 	icon_state = "donut_yellow"
-	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/bungojuice = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "tropical sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#DEC128"
@@ -136,7 +139,7 @@
 	name = "matcha donut"
 	desc = "Goes great with a cup of tea."
 	icon_state = "donut_olive"
-	bonus_reagents = list("teapowder = 3", "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/toxin/teapowder = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "matcha" = 1)
 	is_decorated = TRUE
 	filling_color = "#879630"
@@ -148,7 +151,7 @@
 	desc = "You jelly?"
 	icon_state = "jelly"
 	decorated_icon = "jelly_homer"
-	bonus_reagents = list("sugar" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	extra_reagent = "berryjuice"
 	tastes = list("jelly" = 1, "donut" = 3)
 	foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST
@@ -156,7 +159,7 @@
 /obj/item/reagent_containers/food/snacks/donut/jelly/Initialize()
 	. = ..()
 	if(extra_reagent)
-		reagents.add_reagent("[extra_reagent]", 3)
+		reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/plain //use this ingame to avoid inheritance related crafting issues.
 
@@ -164,7 +167,7 @@
 	name = "pink jelly donut"
 	desc = "Goes great with a soy latte."
 	icon_state = "jelly_pink"
-	bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, "vitamin" = 1) //Extra sprinkles to reward frosting.
+	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting.
 	filling_color = "#E57d9A"
 	decorated_icon = "jelly_homer"
 
@@ -172,7 +175,7 @@
 	name = "spaceman's jelly donut"
 	desc = "Goes great with a cold beaker of malk."
 	icon_state = "jelly_purple"
-	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
 	is_decorated = TRUE
 	filling_color = "#8739BF"
@@ -181,7 +184,7 @@
 	name = "apple jelly donut"
 	desc = "Goes great with a shot of cinnamon schnapps."
 	icon_state = "jelly_green"
-	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
 	is_decorated = TRUE
 	filling_color = "#6ABE30"
@@ -190,7 +193,7 @@
 	name = "caramel jelly donut"
 	desc = "Goes great with a mug of hot coco."
 	icon_state = "jelly_beige"
-	bonus_reagents = list("caramel" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/caramel = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#D4AD5B"
@@ -199,7 +202,7 @@
 	name = "chocolate jelly donut"
 	desc = "Goes great with a glass of warm milk."
 	icon_state = "jelly_choc"
-	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, "vitamin" = 1) //the coco reagent is just bitter.
+	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
 	tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
 	decorated_icon = "jelly_choc_sprinkles"
 	filling_color = "#4F230D"
@@ -208,7 +211,7 @@
 	name = "blumpkin jelly donut"
 	desc = "Goes great with a mug of soothing drunken blumpkin."
 	icon_state = "jelly_blue"
-	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
 	is_decorated = TRUE
 	filling_color = "#2788C4"
@@ -217,7 +220,7 @@
 	name = "bungo jelly donut"
 	desc = "Goes great with a mason jar of hippie's delight."
 	icon_state = "jelly_yellow"
-	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/bungojuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#DEC128"
@@ -226,7 +229,7 @@
 	name = "matcha jelly donut"
 	desc = "Goes great with a cup of tea."
 	icon_state = "jelly_olive"
-	bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/toxin/teapowder = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
 	is_decorated = TRUE
 	filling_color = "#879630"
@@ -246,14 +249,14 @@
 	name = "pink jelly donut"
 	desc = "Goes great with a soy latte."
 	icon_state = "jelly_pink"
-	bonus_reagents = list("berryjuice" = 3, "sprinkles" = 1, "vitamin" = 1) //Extra sprinkles to reward frosting
+	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting
 	filling_color = "#E57d9A"
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
 	name = "spaceman's jelly donut"
 	desc = "Goes great with a cold beaker of malk."
 	icon_state = "jelly_purple"
-	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
 	is_decorated = TRUE
 	filling_color = "#8739BF"
@@ -262,7 +265,7 @@
 	name = "apple jelly donut"
 	desc = "Goes great with a shot of cinnamon schnapps."
 	icon_state = "jelly_green"
-	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
 	is_decorated = TRUE
 	filling_color = "#6ABE30"
@@ -271,7 +274,7 @@
 	name = "caramel jelly donut"
 	desc = "Goes great with a mug of hot coco."
 	icon_state = "jelly_beige"
-	bonus_reagents = list("caramel" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/caramel = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#D4AD5B"
@@ -280,7 +283,7 @@
 	name = "chocolate jelly donut"
 	desc = "Goes great with a glass of warm milk."
 	icon_state = "jelly_choc"
-	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, "vitamin" = 1) //the coco reagent is just bitter.
+	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
 	tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
 	decorated_icon = "jelly_choc_sprinkles"
 	filling_color = "#4F230D"
@@ -289,7 +292,7 @@
 	name = "blumpkin jelly donut"
 	desc = "Goes great with a mug of soothing drunken blumpkin."
 	icon_state = "jelly_blue"
-	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
 	is_decorated = TRUE
 	filling_color = "#2788C4"
@@ -298,7 +301,7 @@
 	name = "bungo jelly donut"
 	desc = "Goes great with a mason jar of hippie's delight."
 	icon_state = "jelly_yellow"
-	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/bungojuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#DEC128"
@@ -307,7 +310,7 @@
 	name = "matcha jelly donut"
 	desc = "Goes great with a cup of tea."
 	icon_state = "jelly_olive"
-	bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/toxin/teapowder = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
 	is_decorated = TRUE
 	filling_color = "#879630"
@@ -317,8 +320,8 @@
 	desc = "A sugar glazed donut."
 	icon_state = "donut_glaze"
 	bitesize = 10
-	bonus_reagents = list("sugar" = 3)
-	list_reagents = list("nutriment" = 3, "sugar" = 8)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 8)
 	filling_color = "#FFFFFF"
 	tastes = list("donut" = 1, "salt" = 3)
 	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
@@ -329,8 +332,8 @@
 	name = "muffin"
 	desc = "A delicious and spongy little cake."
 	icon_state = "muffin"
-	bonus_reagents = list("vitamin" = 1)
-	list_reagents = list("nutriment" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	filling_color = "#F4A460"
 	tastes = list("muffin" = 1)
 	foodtype = GRAIN | SUGAR | BREAKFAST
@@ -354,8 +357,8 @@
 	name = "chawanmushi"
 	desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
 	icon_state = "chawanmushi"
-	bonus_reagents = list("vitamin" = 1)
-	list_reagents = list("nutriment" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#FFE4E1"
 	tastes = list("custard" = 1)
 	foodtype = GRAIN | MEAT | VEGETABLES
@@ -367,8 +370,8 @@
 	desc = "Mmm, waffles."
 	icon_state = "waffles"
 	trash = /obj/item/trash/waffles
-	bonus_reagents = list("vitamin" = 1)
-	list_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#D2691E"
 	tastes = list("waffles" = 1)
 	foodtype = GRAIN | SUGAR | BREAKFAST
@@ -378,8 +381,8 @@
 	desc = "Not made of people. Honest." //Totally people.
 	icon_state = "soylent_green"
 	trash = /obj/item/trash/waffles
-	bonus_reagents = list("vitamin" = 1)
-	list_reagents = list("nutriment" = 10, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#9ACD32"
 	tastes = list("waffles" = 7, "people" = 1)
 	foodtype = GRAIN | MEAT
@@ -389,8 +392,8 @@
 	desc = "Not made of people. Honest." //Actually honest for once.
 	icon_state = "soylent_yellow"
 	trash = /obj/item/trash/waffles
-	bonus_reagents = list("vitamin" = 1)
-	list_reagents = list("nutriment" = 10, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#9ACD32"
 	tastes = list("waffles" = 7, "the colour green" = 1)
 	foodtype = GRAIN
@@ -401,8 +404,8 @@
 	icon_state = "rofflewaffles"
 	trash = /obj/item/trash/waffles
 	bitesize = 4
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 8, "mushroomhallucinogen" = 2, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/drug/mushroomhallucinogen = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#00BFFF"
 	tastes = list("waffle" = 1, "mushrooms" = 1)
 	foodtype = GRAIN | VEGETABLES | SUGAR | BREAKFAST
@@ -414,8 +417,8 @@
 	desc = "COOKIE!!!"
 	icon_state = "COOKIE!!!"
 	bitesize = 1
-	bonus_reagents = list("nutriment" = 1)
-	list_reagents = list("nutriment" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cookie" = 1)
 	foodtype = GRAIN | SUGAR
@@ -425,7 +428,7 @@
 	name = "\improper Donk-pocket"
 	desc = "The food of choice for the seasoned traitor."
 	icon_state = "donkpocket"
-	list_reagents = list("nutriment" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm
 	filling_color = "#CD853F"
 	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
@@ -434,8 +437,8 @@
 /obj/item/reagent_containers/food/snacks/donkpocket/warm
 	name = "warm Donk-pocket"
 	desc = "The heated food of choice for the seasoned traitor."
-	bonus_reagents = list("omnizine" = 3)
-	list_reagents = list("nutriment" = 4, "omnizine" = 3)
+	bonus_reagents = list(/datum/reagent/medicine/omnizine = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 3)
 	cooked_type = null
 	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
 	foodtype = GRAIN
@@ -444,7 +447,7 @@
 	name = "\improper Dank-pocket"
 	desc = "The food of choice for the seasoned botanist."
 	icon_state = "dankpocket"
-	list_reagents = list("lipolicide" = 3, "space_drugs" = 3, "nutriment" = 4)
+	list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
 	filling_color = "#00FF00"
 	tastes = list("meat" = 2, "dough" = 2)
 	foodtype = GRAIN | VEGETABLES
@@ -453,8 +456,8 @@
 	name = "fortune cookie"
 	desc = "A true prophecy in each cookie!"
 	icon_state = "fortune_cookie"
-	bonus_reagents = list("nutriment" = 2)
-	list_reagents = list("nutriment" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3)
 	filling_color = "#F4A460"
 	tastes = list("cookie" = 1)
 	foodtype = GRAIN | SUGAR
@@ -463,8 +466,8 @@
 	name = "poppy pretzel"
 	desc = "It's all twisted up!"
 	icon_state = "poppypretzel"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#F0E68C"
 	tastes = list("pretzel" = 1)
 	foodtype = GRAIN | SUGAR
@@ -473,8 +476,8 @@
 	name = "plump helmet biscuit"
 	desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
 	icon_state = "phelmbiscuit"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#F0E68C"
 	tastes = list("mushroom" = 1, "biscuit" = 1)
 	foodtype = GRAIN | VEGETABLES
@@ -484,18 +487,18 @@
 	if(fey)
 		name = "exceptional plump helmet biscuit"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
-		bonus_reagents = list("omnizine" = 5, "nutriment" = 1, "vitamin" = 1)
+		bonus_reagents = list(/datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	. = ..()
 	if(fey)
-		reagents.add_reagent("omnizine", 5)
+		reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
 
 /obj/item/reagent_containers/food/snacks/cracker
 	name = "cracker"
 	desc = "It's a salted cracker."
 	icon_state = "cracker"
 	bitesize = 1
-	bonus_reagents = list("nutriment" = 1)
-	list_reagents = list("nutriment" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cracker" = 1)
 	foodtype = GRAIN
@@ -505,8 +508,8 @@
 	desc = "Fresh footlong ready to go down on."
 	icon_state = "hotdog"
 	bitesize = 3
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
-	list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
 	filling_color = "#8B0000"
 	tastes = list("bun" = 3, "meat" = 2)
 	foodtype = GRAIN | MEAT | VEGETABLES
@@ -515,8 +518,8 @@
 	name = "meat bun"
 	desc = "Has the potential to not be Dog."
 	icon_state = "meatbun"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#8B0000"
 	tastes = list("bun" = 3, "meat" = 2)
 	foodtype = GRAIN | MEAT | VEGETABLES
@@ -525,7 +528,7 @@
 	name = "khachapuri"
 	desc = "Bread with egg and cheese?"
 	icon_state = "khachapuri"
-	list_reagents = list("nutriment" = 12, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFFF4D"
 	tastes = list("bread" = 1, "egg" = 1, "cheese" = 1)
 	foodtype = GRAIN | MEAT | DAIRY
@@ -534,8 +537,8 @@
 	name = "sugar cookie"
 	desc = "Just like your little sister used to make."
 	icon_state = "sugarcookie"
-	bonus_reagents = list("nutriment" = 1, "sugar" = 3)
-	list_reagents = list("nutriment" = 3, "sugar" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3)
 	filling_color = "#CD853F"
 	tastes = list("sweetness" = 1)
 	foodtype = GRAIN | JUNKFOOD | SUGAR
@@ -545,8 +548,8 @@
 	name = "chocolate cornet"
 	desc = "Which side's the head, the fat end or the thin end?"
 	icon_state = "chococornet"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#FFE4C4"
 	tastes = list("biscuit" = 3, "chocolate" = 1)
 	foodtype = GRAIN | JUNKFOOD
@@ -555,8 +558,8 @@
 	name = "oatmeal cookie"
 	desc = "The best of both cookie and oat."
 	icon_state = "oatmealcookie"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#D2691E"
 	tastes = list("cookie" = 2, "oat" = 1)
 	foodtype = GRAIN
@@ -566,8 +569,8 @@
 	name = "raisin cookie"
 	desc = "Why would you put raisins on a cookie?"
 	icon_state = "raisincookie"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cookie" = 1, "raisins" = 1)
 	foodtype = GRAIN | FRUIT
@@ -577,8 +580,8 @@
 	name = "cherry cupcake"
 	desc = "A sweet cupcake with cherry bits."
 	icon_state = "cherrycupcake"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cake" = 3, "cherry" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
@@ -587,8 +590,8 @@
 	name = "blue cherry cupcake"
 	desc = "Blue cherries inside a delicious cupcake."
 	icon_state = "bluecherrycupcake"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cake" = 3, "blue cherry" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
@@ -597,8 +600,8 @@
 	name = "strawberry cupcake"
 	desc = "Strawberry inside a delicious cupcake."
 	icon_state = "strawberrycupcake"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#F0E68C"
 	tastes = list("cake" = 2, "strawberry" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
@@ -607,8 +610,8 @@
 	name = "honey bun"
 	desc = "A sticky pastry bun glazed with honey."
 	icon_state = "honeybun"
-	bonus_reagents = list("nutriment" = 1, "honey" = 1)
-	list_reagents = list("nutriment" = 5, "honey" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/honey = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/honey = 5)
 	filling_color = "#F2CE91"
 	tastes = list("pastry" = 1, "sweetness" = 1)
 	foodtype = GRAIN | SUGAR
@@ -620,8 +623,8 @@
 	desc = "A fluffy pancake. The softer, superior relative of the waffle."
 	icon_state = "pancakes_1"
 	item_state = "pancakes"
-	bonus_reagents = list("vitamin" = 1)
-	list_reagents = list("nutriment" = 4, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#D2691E"
 	tastes = list("pancakes" = 1)
 	foodtype = GRAIN | SUGAR | BREAKFAST
@@ -631,8 +634,8 @@
 	desc = "A fluffy and delicious blueberry pancake."
 	icon_state = "bbpancakes_1"
 	item_state = "bbpancakes"
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("pancakes" = 1, "blueberries" = 1)
 
 /obj/item/reagent_containers/food/snacks/pancakes/chocolatechip
@@ -640,8 +643,8 @@
 	desc = "A fluffy and delicious chocolate chip pancake."
 	icon_state = "ccpancakes_1"
 	item_state = "ccpancakes"
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("pancakes" = 1, "chocolate" = 1)
 
 /obj/item/reagent_containers/food/snacks/pancakes/Initialize()
diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index bc66d353e1..357a921c66 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -5,7 +5,7 @@
 	bitesize = 3
 	w_class = WEIGHT_CLASS_NORMAL
 	volume = 80
-	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("pie" = 1)
 	foodtype = GRAIN
 
@@ -14,7 +14,7 @@
 	desc = "A simple pie, still delicious."
 	icon_state = "pie"
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pie
-	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("pie" = 1)
 	foodtype = GRAIN
 
@@ -23,8 +23,8 @@
 	desc = "Just like back home, on clown planet! HONK!"
 	icon_state = "pie"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("pie" = 1)
 	foodtype = GRAIN | DAIRY | SUGAR
 	var/stunning = TRUE
@@ -61,7 +61,7 @@
 	qdel(src)
 
 /obj/item/reagent_containers/food/snacks/pie/cream/nostun
-	list_reagents = list("laughter" = 15)
+	list_reagents = list(/datum/reagent/consumable/laughter = 15)
 	stunning = FALSE
 
 /obj/item/reagent_containers/food/snacks/pie/cream/body
@@ -90,8 +90,8 @@
 	name = "berry clafoutis"
 	desc = "No black birds, this is a good sign."
 	icon_state = "berryclafoutis"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/berryjuice = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("pie" = 1, "blackberries" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -99,8 +99,8 @@
 	name = "beary pie"
 	desc = "No brown bears, this is a good sign."
 	icon_state = "bearypie"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
-	list_reagents = list("nutriment" = 2, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("pie" = 1, "meat" = 1, "salmon" = 1)
 	foodtype = GRAIN | SUGAR
 
@@ -108,7 +108,7 @@
 	name = "meat-pie"
 	icon_state = "meatpie"
 	desc = "An old barber recipe, very delicious!"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("pie" = 1, "meat" = 1)
 	foodtype = GRAIN | MEAT
 
@@ -117,7 +117,7 @@
 	name = "tofu-pie"
 	icon_state = "meatpie"
 	desc = "A delicious tofu pie."
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("pie" = 1, "tofu" = 1)
 	foodtype = GRAIN
 
@@ -127,8 +127,8 @@
 	desc = "Sweet and tasty poison pie."
 	icon_state = "amanita_pie"
 	bitesize = 4
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 6, "amatoxin" = 3, "mushroomhallucinogen" = 1, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin/amatoxin = 3, /datum/reagent/drug/mushroomhallucinogen = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("pie" = 1, "mushroom" = 1)
 	foodtype = GRAIN | VEGETABLES | TOXIC | GROSS
 
@@ -137,7 +137,7 @@
 	name = "plump pie"
 	desc = "I bet you love stuff made out of plump helmets!"
 	icon_state = "plump_pie"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("pie" = 1, "mushroom" = 1)
 	foodtype = GRAIN | VEGETABLES
 
@@ -148,9 +148,9 @@
 	if(fey)
 		name = "exceptional plump pie"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
-		bonus_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 4)
+		bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	if(fey)
-		reagents.add_reagent("omnizine", 5)
+		reagents.add_reagent(/datum/reagent/medicine/omnizine, 5)
 
 
 /obj/item/reagent_containers/food/snacks/pie/xemeatpie
@@ -158,7 +158,7 @@
 	icon_state = "xenomeatpie"
 	desc = "A delicious meatpie. Probably heretical."
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
 	foodtype = GRAIN | MEAT
 
@@ -167,7 +167,7 @@
 	name = "apple pie"
 	desc = "A pie containing sweet sweet love...or apple."
 	icon_state = "applepie"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("pie" = 1, "apple" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -175,7 +175,7 @@
 	name = "cherry pie"
 	desc = "Taste so good, make a grown man cry."
 	icon_state = "cherrypie"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("pie" = 7, "Nicole Paige Brooks" = 2)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -186,7 +186,7 @@
 	icon_state = "pumpkinpie"
 	slice_path = /obj/item/reagent_containers/food/snacks/pumpkinpieslice
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("pie" = 1, "pumpkin" = 1)
 	foodtype = GRAIN | VEGETABLES
 
@@ -197,7 +197,7 @@
 	icon_state = "pumpkinpieslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FFA500"
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	tastes = list("pie" = 1, "pumpkin" = 1)
 	foodtype = GRAIN | VEGETABLES
 
@@ -205,8 +205,8 @@
 	name = "golden apple streusel tart"
 	desc = "A tasty dessert that won't make it through a metal detector."
 	icon_state = "gappletart"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/gold = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -214,8 +214,8 @@
 	name = "grape tart"
 	desc = "A tasty dessert that reminds you of the wine you didn't make."
 	icon_state = "grapetart"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 4, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("pie" = 1, "grape" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -223,8 +223,8 @@
 	name = "mime tart"
 	desc = "..."
 	icon_state = "mimetart"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4, "nothing" = 10)
-	list_reagents = list("nutriment" = 5, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nothing = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("pie" = 1, "nothing" = 1)
 	foodtype = GRAIN
 
@@ -232,8 +232,8 @@
 	name = "berry tart"
 	desc = "A tasty dessert of many different small barries on a thin pie crust."
 	icon_state = "berrytart"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 3, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("pie" = 1, "berries" = 2)
 	foodtype = GRAIN | FRUIT
 
@@ -241,8 +241,8 @@
 	name = "chocolate lava tart"
 	desc = "A tasty dessert made of chocaloate, with a liquid core."
 	icon_state = "cocolavatart"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 4, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("pie" = 1, "grape" = 1)
 	foodtype = GRAIN | SUGAR
 
@@ -252,7 +252,7 @@
 	icon_state = "blumpkinpie"
 	slice_path = /obj/item/reagent_containers/food/snacks/blumpkinpieslice
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("pie" = 1, "a mouthful of pool water" = 1)
 	foodtype = GRAIN | VEGETABLES
 
@@ -263,7 +263,7 @@
 	icon_state = "blumpkinpieslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#1E90FF"
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	tastes = list("pie" = 1, "a mouthful of pool water" = 1)
 	foodtype = GRAIN | VEGETABLES
 
@@ -273,7 +273,7 @@
 	icon_state = "dulcedebatata"
 	slice_path = /obj/item/reagent_containers/food/snacks/dulcedebatataslice
 	slices_num = 5
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 8)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 8)
 	tastes = list("jelly" = 1, "sweet potato" = 1)
 	foodtype = GRAIN | VEGETABLES | SUGAR
 
@@ -284,7 +284,7 @@
 	icon_state = "dulcedebatataslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#8B4513"
-	list_reagents = list("nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	tastes = list("jelly" = 1, "sweet potato" = 1)
 	foodtype = GRAIN | VEGETABLES | SUGAR
 
@@ -292,7 +292,7 @@
 	name = "frosty pie"
 	desc = "Tastes like blue and cold."
 	icon_state = "frostypie"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("mint" = 1, "pie" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -302,7 +302,7 @@
 	icon_state = "baklava"
 	slice_path = /obj/item/reagent_containers/food/snacks/baklavaslice
 	slices_num = 6
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("nuts" = 1, "pie" = 1)
 	foodtype = GRAIN
 
@@ -313,7 +313,7 @@
 	icon_state = "baklavaslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#1E90FF"
-	list_reagents = list("nutriment" = 2, "vitamin" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("nuts" = 1, "pie" = 1)
 	foodtype = GRAIN
 
@@ -321,7 +321,7 @@
 	name = "strawberry pie"
 	desc = "A strawberry pie."
 	icon_state = "strawberrypie"
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("strawberry" = 1, "pie" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR
 
@@ -329,6 +329,6 @@
 	name = "peach pie"
 	desc = "A pie with peach filling."
 	icon_state = "strawberrypie"
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "peachjuice" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/peachjuice = 15)
 	tastes = list("peach" = 1, "pie" = 1)
 	foodtype = GRAIN | FRUIT
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index 74fd7dda65..ebc67a28c1 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -6,13 +6,13 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	slices_num = 6
 	volume = 80
-	list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES
 
 /obj/item/reagent_containers/food/snacks/pizzaslice
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
-	list_reagents = list("nutriment" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	foodtype = GRAIN | DAIRY | VEGETABLES
 
 /obj/item/reagent_containers/food/snacks/pizza/margherita
@@ -20,7 +20,7 @@
 	desc = "The most cheezy pizza in galaxy."
 	icon_state = "pizzamargherita"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/margherita
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
 	foodtype = GRAIN | VEGETABLES
 
@@ -41,8 +41,8 @@
 	desc = "Greasy pizza with delicious meat."
 	icon_state = "meatpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/meat
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 8)
-	list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 8)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 8)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 	foodtype = GRAIN | VEGETABLES| DAIRY | MEAT
 
@@ -59,8 +59,8 @@
 	desc = "Very special pizza."
 	icon_state = "mushroompizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/mushroom
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 30, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
 	foodtype = GRAIN | VEGETABLES | DAIRY
 
@@ -77,8 +77,8 @@
 	desc = "No one of Tomatos Sapiens were harmed during making this pizza."
 	icon_state = "vegetablepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/vegetable
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/oculine = 12, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
 	foodtype = GRAIN | VEGETABLES | DAIRY
 
@@ -95,8 +95,8 @@
 	desc = "Who thought this would be a good idea?"
 	icon_state = "donkpocketpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "omnizine" = 10, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
 	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
 
@@ -113,8 +113,8 @@
 	desc = "The hippie's pizza of choice."
 	icon_state = "dankpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/dank
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
-	list_reagents = list("nutriment" = 25, "doctorsdelight" = 5, "tomatojuice" = 6, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 	foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
 
@@ -131,7 +131,7 @@
 	desc = "You can really smell the sassiness."
 	icon_state = "sassysagepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/sassysage
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 	foodtype = GRAIN | VEGETABLES | DAIRY
 
@@ -148,7 +148,7 @@
 	desc = "The pizza equivalent of Einstein's riddle."
 	icon_state = "pineapplepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
-	bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2)
 	foodtype = PINEAPPLE //Over powering tast of gods fruit
 
@@ -162,7 +162,7 @@
 
 /obj/item/reagent_containers/food/snacks/pizza/pineapple/anomaly
 	desc = "A anomaly made pizza with pineapple..."
-	bonus_reagents = list("nutriment" = 16, "vitamin" = 16)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 16, /datum/reagent/consumable/nutriment/vitamin = 16)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2, "good" = 10)
 
 /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple/anomaly
@@ -174,7 +174,7 @@
 	desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni."
 	icon_state = "arnoldpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
-	bonus_reagents = list("nutriment" = 30, "vitamin" = 6, "iron" = 10, "omnizine" = 30)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
 
 /obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm
index f5fcec0ac5..e272733235 100644
--- a/code/modules/food_and_drinks/food/snacks_salad.dm
+++ b/code/modules/food_and_drinks/food/snacks_salad.dm
@@ -5,7 +5,7 @@
 	trash = /obj/item/reagent_containers/glass/bowl
 	bitesize = 3
 	w_class = WEIGHT_CLASS_NORMAL
-	list_reagents = list("nutriment" = 7, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("leaves" = 1)
 	foodtype = VEGETABLES
 
@@ -17,8 +17,8 @@
 	name = "\improper Aesir salad"
 	desc = "Probably too incredible for mortal men to fully enjoy."
 	icon_state = "aesirsalad"
-	bonus_reagents = list("omnizine" = 2, "vitamin" = 6)
-	list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/medicine/omnizine = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("leaves" = 1)
 	foodtype = VEGETABLES
 
@@ -26,8 +26,8 @@
 	name = "herb salad"
 	desc = "A tasty salad with apples on top."
 	icon_state = "herbsalad"
-	bonus_reagents = list("vitamin" = 4)
-	list_reagents = list("nutriment" = 8, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("leaves" = 1, "apple" = 1)
 	foodtype = VEGETABLES | FRUIT
 
@@ -35,8 +35,8 @@
 	name = "valid salad"
 	desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
 	icon_state = "validsalad"
-	bonus_reagents = list("doctorsdelight" = 5, "vitamin" = 4)
-	list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
 	foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
 
@@ -44,8 +44,8 @@
 	name = "oatmeal"
 	desc = "A nice bowl of oatmeal."
 	icon_state = "oatmeal"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
-	list_reagents = list("nutriment" = 7, "milk" = 10, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("oats" = 1, "milk" = 1)
 	foodtype = DAIRY | GRAIN | BREAKFAST
 
@@ -53,7 +53,7 @@
 	name = "fruit salad"
 	desc = "Your standard fruit salad."
 	icon_state = "fruitsalad"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("fruit" = 1)
 	foodtype = FRUIT | BREAKFAST
 
@@ -61,8 +61,8 @@
 	name = "jungle salad"
 	desc = "Exotic fruits in a bowl."
 	icon_state = "junglesalad"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
-	list_reagents = list("nutriment" = 7, "banana" = 5, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("fruit" = 1, "the jungle" = 1)
 	foodtype = FRUIT | BREAKFAST
 
@@ -70,8 +70,8 @@
 	name = "citrus delight"
 	desc = "Citrus overload!"
 	icon_state = "citrusdelight"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
-	list_reagents = list("nutriment" = 7, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("sourness" = 1, "leaves" = 1)
 	foodtype = FRUIT | BREAKFAST
 
@@ -80,7 +80,7 @@
 	desc = "A bowl of raw rice."
 	icon_state = "ricebowl"
 	cooked_type = /obj/item/reagent_containers/food/snacks/salad/boiledrice
-	list_reagents = list("nutriment" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	tastes = list("rice" = 1)
 	foodtype = GRAIN | RAW
 
@@ -88,8 +88,8 @@
 	name = "boiled rice"
 	desc = "A warm bowl of rice."
 	icon_state = "boiledrice"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 5, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("rice" = 1)
 	foodtype = GRAIN | BREAKFAST
 
@@ -97,7 +97,7 @@
 	name = "rice pudding"
 	desc = "Everybody loves rice pudding!"
 	icon_state = "ricepudding"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("rice" = 1, "sweetness" = 1)
 	foodtype = GRAIN | DAIRY
 
@@ -105,7 +105,7 @@
 	name = "rice and pork"
 	desc = "Well, it looks like pork..."
 	icon_state = "riceporkbowl"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("rice" = 1, "meat" = 1)
 	foodtype = GRAIN | MEAT
 
@@ -113,6 +113,6 @@
 	name = "egg bowl"
 	desc = "A bowl of rice with a fried egg."
 	icon_state = "eggbowl"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("rice" = 1, "egg" = 1)
 	foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
index 17a710ada2..3cc4cfe63f 100644
--- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
@@ -4,8 +4,8 @@
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "sandwich"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
 	cooked_type = /obj/item/reagent_containers/food/snacks/toastedsandwich
 	tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
 	foodtype = GRAIN | VEGETABLES
@@ -16,8 +16,8 @@
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "toastedsandwich"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "carbon" = 2)
-	list_reagents = list("nutriment" = 6, "carbon" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/carbon = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/carbon = 2)
 	tastes = list("toast" = 1)
 	foodtype = GRAIN
 
@@ -27,8 +27,8 @@
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "toastedsandwich"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 7, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("toast" = 1, "cheese" = 1)
 	foodtype = GRAIN | DAIRY
 
@@ -43,13 +43,13 @@
 	foodtype = GRAIN
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/slime
-	bonus_reagents = list("slimejelly" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype  = GRAIN | TOXIC
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
-	bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/pbj
@@ -59,13 +59,13 @@
 	tastes = list("bread" = 1, "jelly" = 1, "peanuts" = 1)
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
-	bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
-	bonus_reagents = list("slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 2, "slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype  = GRAIN | TOXIC
 
 /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
@@ -75,8 +75,8 @@
 	icon_state = "peanutbuttersandwich"
 	trash = /obj/item/trash/plate
 	bitesize = 3
-	bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 2, "peanut_butter" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype  = GRAIN
 
 /obj/item/reagent_containers/food/snacks/notasandwich
@@ -85,8 +85,8 @@
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "notasandwich"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("vitamin" = 6)
-	list_reagents = list("nutriment" = 6, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("nothing suspicious" = 1)
 	foodtype = GRAIN | GROSS
 
@@ -101,13 +101,13 @@
 	foodtype = GRAIN
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
-	bonus_reagents = list("cherryjelly" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | FRUIT | SUGAR
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
-	bonus_reagents = list("slimejelly" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | TOXIC | SUGAR
 
 /obj/item/reagent_containers/food/snacks/peanut_buttertoast
@@ -117,8 +117,8 @@
 	icon_state = "peanutbuttertoast"
 	trash = /obj/item/trash/plate
 	bitesize = 3
-	bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
-	list_reagents = list("nutriment" = 1, "peanut_butter" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("toast" = 1, "peanuts" = 1)
 	foodtype = GRAIN
 
@@ -128,8 +128,8 @@
 	desc = "This seems awfully bitter."
 	icon = 'icons/obj/food/burgerbread.dmi'
 	icon_state = "twobread"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 2, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("bread" = 2)
 	foodtype = GRAIN
 
@@ -139,6 +139,6 @@
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "tunasandwich"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2)
 	foodtype = GRAIN | MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index 47c9f02fb9..a0e1ebcb39 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -4,7 +4,7 @@
 	trash = /obj/item/reagent_containers/glass/bowl
 	bitesize = 5
 	volume = 80
-	list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("tasteless soup" = 1)
 	foodtype = VEGETABLES
 
@@ -16,7 +16,7 @@
 	name = "wish soup"
 	desc = "I wish this was soup."
 	icon_state = "wishsoup"
-	list_reagents = list("water" = 10)
+	list_reagents = list(/datum/reagent/water = 10)
 	tastes = list("wishes" = 1)
 
 /obj/item/reagent_containers/food/snacks/soup/wish/Initialize()
@@ -24,17 +24,17 @@
 	var/wish_true = prob(25)
 	if(wish_true)
 		desc = "A wish come true!"
-		bonus_reagents = list("nutriment" = 9, "vitamin" = 1)
+		bonus_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 1)
 	if(wish_true)
-		reagents.add_reagent("nutriment", 9)
-		reagents.add_reagent("vitamin", 1)
+		reagents.add_reagent(/datum/reagent/consumable/nutriment, 9)
+		reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 1)
 		foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/snacks/soup/meatball
 	name = "meatball soup"
 	desc = "You've got balls kid, BALLS!"
 	icon_state = "meatballsoup"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("meat" = 1)
 	foodtype = MEAT
 
@@ -42,8 +42,8 @@
 	name = "slime soup"
 	desc = "If no water is available, you may substitute tears."
 	icon_state = "slimesoup"
-	bonus_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("slime" = 1)
 	foodtype = TOXIC | SUGAR
 
@@ -51,8 +51,8 @@
 	name = "tomato soup"
 	desc = "Smells like copper."
 	icon_state = "tomatosoup"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
-	list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/blood = 10, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("iron" = 1)
 	foodtype = GROSS
 
@@ -61,8 +61,8 @@
 	desc = "A savory dish of alien wing wang in soy."
 	icon_state = "wingfangchu"
 	trash = /obj/item/reagent_containers/glass/bowl
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/soysauce = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("soy" = 1)
 	foodtype = MEAT
 
@@ -70,8 +70,8 @@
 	name = "clown's tears"
 	desc = "Not very funny."
 	icon_state = "clownstears"
-	bonus_reagents = list("nutriment" = 1, "banana" = 5, "vitamin" = 8, "clownstears" = 10)
-	list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8, "clownstears" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/clownstears = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/clownstears = 10)
 	tastes = list("a bad joke" = 1)
 	foodtype = FRUIT | SUGAR
 
@@ -79,7 +79,7 @@
 	name = "vegetable soup"
 	desc = "A true vegan meal."
 	icon_state = "vegetablesoup"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("vegetables" = 1)
 	foodtype = VEGETABLES
 
@@ -87,7 +87,7 @@
 	name = "nettle soup"
 	desc = "To think, the botanist would've beat you to death with one of these."
 	icon_state = "nettlesoup"
-	bonus_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/medicine/omnizine = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("nettles" = 1)
 	foodtype = VEGETABLES
 
@@ -96,21 +96,23 @@
 	desc = "The mystery is, why aren't you eating it?"
 	icon_state = "mysterysoup"
 	var/extra_reagent = null
-	list_reagents = list("nutriment" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 	tastes = list("chaos" = 1)
 
 /obj/item/reagent_containers/food/snacks/soup/mystery/Initialize()
 	. = ..()
-	extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
-	bonus_reagents = list("[extra_reagent]" = 5, "nutriment" = 6)
-	reagents.add_reagent("[extra_reagent]", 5)
+	extra_reagent = pick(/datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil,
+					/datum/reagent/medicine/omnizine, /datum/reagent/consumable/banana, /datum/reagent/blood,
+					/datum/reagent/toxin/slimejelly, /datum/reagent/toxin, /datum/reagent/carbon, /datum/reagent/medicine/oculine)
+	bonus_reagents = list(extra_reagent = 5, /datum/reagent/consumable/nutriment = 6)
+	reagents.add_reagent(extra_reagent, 5)
 
 /obj/item/reagent_containers/food/snacks/soup/hotchili
 	name = "hot chili"
 	desc = "A five alarm Texan Chili!"
 	icon_state = "hotchili"
-	bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("hot peppers" = 1)
 	foodtype = VEGETABLES
 
@@ -118,8 +120,8 @@
 	name = "cold chili"
 	desc = "This slush is barely a liquid!"
 	icon_state = "coldchili"
-	bonus_reagents = list("nutriment" = 1, "tomatojuice" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/frostoil = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("tomato" = 1, "mint" = 1)
 	foodtype = VEGETABLES
 
@@ -127,8 +129,8 @@
 	name = "monkey's delight"
 	desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas."
 	icon_state = "monkeysdelight"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
-	list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("the jungle" = 1, "banana" = 1)
 	foodtype = FRUIT
 
@@ -136,8 +138,8 @@
 	name = "tomato soup"
 	desc = "Drinking this feels like being a vampire! A tomato vampire..."
 	icon_state = "tomatosoup"
-	bonus_reagents = list("nutriment" = 1, "tomatojuice" = 10, "vitamin" = 3)
-	list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("tomato" = 1)
 	foodtype = VEGETABLES
 
@@ -145,7 +147,7 @@
 	name = "eyeball soup"
 	desc = "It looks back at you..."
 	icon_state = "eyeballsoup"
-	bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/liquidgibs = 3)
 	tastes = list("tomato" = 1, "squirming" = 1)
 	foodtype = MEAT | GROSS
 
@@ -153,7 +155,7 @@
 	name = "milosoup"
 	desc = "The universes best soup! Yum!!!"
 	icon_state = "milosoup"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("milo" = 1) // wtf is milo
 	foodtype = GROSS
 
@@ -161,8 +163,8 @@
 	name = "chantrelle soup"
 	desc = "A delicious and hearty mushroom soup."
 	icon_state = "mushroomsoup"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
-	list_reagents = list("nutriment" = 8, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("mushroom" = 1)
 	foodtype = VEGETABLES
 
@@ -170,7 +172,7 @@
 	name = "beet soup"
 	desc = "Wait, how do you spell it again..?"
 	icon_state = "beetsoup"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/snacks/soup/beet/Initialize()
@@ -184,8 +186,8 @@
 	desc = "Jello gelatin, from Alfred Hubbard's cookbook."
 	icon_state = "spacylibertyduff"
 	bitesize = 3
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 6)
 	tastes = list("jelly" = 1, "mushroom" = 1)
 	foodtype = VEGETABLES
 
@@ -194,8 +196,8 @@
 	desc = "Looks curiously toxic."
 	icon_state = "amanitajelly"
 	bitesize = 3
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
-	list_reagents = list("nutriment" = 6, "mushroomhallucinogen" = 3, "amatoxin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/toxin/amatoxin = 6)
 	tastes = list("jelly" = 1, "mushroom" = 1)
 	foodtype = VEGETABLES | TOXIC
 
@@ -203,8 +205,8 @@
 	name = "stew"
 	desc = "A nice and warm stew. Healthy and strong."
 	icon_state = "stew"
-	bonus_reagents = list("nutriment" = 1, "tomatojuice" = 5, "vitamin" = 5)
-	list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	bitesize = 7
 	volume = 100
 	tastes = list("tomato" = 1, "carrot" = 1)
@@ -214,7 +216,7 @@
 	name = "sweet potato soup"
 	desc = "Delicious sweet potato in soup form."
 	icon_state = "sweetpotatosoup"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("sweet potato" = 1)
 	foodtype = VEGETABLES | SUGAR
 
@@ -222,7 +224,7 @@
 	name = "red beet soup"
 	desc = "Quite a delicacy."
 	icon_state = "redbeetsoup"
-	bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("beet" = 1)
 	foodtype = VEGETABLES
 
@@ -230,8 +232,8 @@
 	name = "electron soup"
 	desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup."
 	icon_state = "electronsoup"
-	list_reagents = list("nutriment" = 3, "liquidelectricity" = 5)
-	tastes = list("mushroom" = 1, "electrons" = 4, "shockingly good")
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 5)
+	tastes = list("mushroom" = 1, "electrons" = 4, "shockingly good" = 1)
 	filling_color = "#CC2B52"
 	foodtype = VEGETABLES | TOXIC
 
@@ -239,8 +241,8 @@
 	name = "bungo curry"
 	desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!"
 	icon_state = "bungocurry"
-	bonus_reagents = list("vitamin" = 11)
-	list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 11)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5)
 	tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1)
 	filling_color = "#E6A625"
 	foodtype = VEGETABLES | FRUIT | DAIRY
diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
index 70a1922050..d54ba6f030 100644
--- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
@@ -4,7 +4,7 @@
 	desc = "Now that's a nic'e pasta!"
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "spaghetti"
-	list_reagents = list("nutriment" = 1, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	cooked_type = /obj/item/reagent_containers/food/snacks/boiledspaghetti
 	filling_color = "#F0E68C"
 	tastes = list("pasta" = 1)
@@ -16,8 +16,8 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "spaghettiboiled"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 2)
-	list_reagents = list("nutriment" = 2, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pasta
 	filling_color = "#F0E68C"
 	tastes = list("pasta" = 1)
@@ -30,8 +30,8 @@
 	icon_state = "pastatomato"
 	trash = /obj/item/trash/plate
 	bitesize = 4
-	bonus_reagents = list("nutriment" = 1, "tomatojuice" = 10, "vitamin" = 4)
-	list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#DC143C"
 	tastes = list("pasta" = 1, "tomato" = 1)
 	foodtype = GRAIN | VEGETABLES
@@ -43,8 +43,8 @@
 	icon_state = "copypasta"
 	trash = /obj/item/trash/plate
 	bitesize = 4
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 12, "tomatojuice" = 20, "vitamin" = 8)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
 	filling_color = "#DC143C"
 	tastes = list("pasta" = 1, "tomato" = 1)
 	foodtype = GRAIN | VEGETABLES
@@ -55,8 +55,8 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "meatballspaghetti"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
-	list_reagents = list("nutriment" = 8, "vitamin" = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#F0E68C"
 	tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
 	foodtype = GRAIN | MEAT
@@ -67,8 +67,8 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "spesslaw"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
-	list_reagents = list("nutriment" = 8, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
 	filling_color = "#F0E68C"
 	tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
 	foodtype = GRAIN
@@ -79,8 +79,8 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "chowmein"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 4)
-	list_reagents = list("nutriment" = 7, "vitamin" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("noodle" = 1, "tomato" = 1)
 	foodtype = GRAIN
 
@@ -90,7 +90,7 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "beefnoodle"
 	trash = /obj/item/reagent_containers/glass/bowl
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
 	tastes = list("noodle" = 1, "meat" = 1)
 	foodtype = GRAIN | MEAT
 
@@ -100,6 +100,6 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "butternoodles"
 	trash = /obj/item/trash/plate
-	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("noodle" = 1, "butter" = 1)
 	foodtype = GRAIN | DAIRY
diff --git a/code/modules/food_and_drinks/food/snacks_sushi.dm b/code/modules/food_and_drinks/food/snacks_sushi.dm
index a4cbc5e344..d16ca79001 100644
--- a/code/modules/food_and_drinks/food/snacks_sushi.dm
+++ b/code/modules/food_and_drinks/food/snacks_sushi.dm
@@ -5,7 +5,7 @@
 	desc = "A bowl of sticky rice for making sushi."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushi_rice"
-	list_reagents = list("sodiumchloride" = 5)
+	list_reagents = list(/datum/reagent/consumable/sodiumchloride = 5)
 	tastes = list("rice" = 5, "salt" = 1)
 	foodtype = GRAIN
 
@@ -14,7 +14,7 @@
 	desc = "A thin, light salt sheet of plant mater. This is commenly used in sushi recipes,"
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sea_weed"
-	list_reagents = list("sodiumchloride" = 2)
+	list_reagents = list(/datum/reagent/consumable/sodiumchloride = 2)
 	tastes = list("plants" = 2, "salt" = 1)
 	foodtype = VEGETABLES
 
@@ -24,7 +24,7 @@
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "tuna_can"
 //trash = /obj/item/trash/tuna_used //I dont know if I like this idea - A Masked Cat
-	list_reagents = list("sodiumchloride" = 5, "mercury" = 2)
+	list_reagents = list(/datum/reagent/consumable/sodiumchloride = 5, /datum/reagent/mercury = 2)
 	tastes = list("tuna" = 15, "mercury" = 1, "salt" = 3)
 	foodtype = MEAT
 
@@ -34,8 +34,8 @@
 	desc = "A small cylindrical filled with rice and fish."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_basic"
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
 	bitesize = 1
 	filling_color = "#F2EEEA" //rgb(242, 238, 234)
 	tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
@@ -46,8 +46,8 @@
 	desc = "A pice of carp lightly placed on some rice."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_adv"
-	bonus_reagents = list("vitamin" = 2)
-	list_reagents = list("nutriment" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	bitesize = 1
 	filling_color = "#F2EEEA" //rgb(242, 238, 234)
 	tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
@@ -58,8 +58,8 @@
 	desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!"
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_pro"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-	list_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 	bitesize = 1
 	filling_color = "#F2EEEA" //rgb(242, 238, 234)
 	tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
@@ -70,7 +70,7 @@
 	desc = "Spider eggs wrapped in a thin salted Kudzu pod"
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "sushie_egg"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FF3333" // R225 G051 B051
 	tastes = list("seaweed" = 1, "salty" = 2)
 	foodtype = MEAT | VEGETABLES
@@ -80,7 +80,7 @@
 	desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
 	icon = 'modular_citadel/icons/obj/food/food.dmi'
 	icon_state = "riceball"
-	list_reagents = list("nutriment" = 5, "sodiumchloride" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sodiumchloride = 2)
 	tastes = list("rice" = 4, "salt" = 1)
 	foodtype = GRAIN
 
@@ -88,8 +88,8 @@
 	name = "carp sashimi"
 	desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
 	icon_state = "sashimi"
-	bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
-	list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5)
 	filling_color = "#FA8072"
 	tastes = list("fish" = 1, "hot peppers" = 1)
 	foodtype = MEAT | TOXIC
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index 8f661b868e..239dd433b0 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -7,7 +7,7 @@
 	desc = "Nougat love it or hate it."
 	icon_state = "candy"
 	trash = /obj/item/trash/candy
-	list_reagents = list("nutriment" = 1, "sugar" = 3, "cocoa" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coco = 3)
 	junkiness = 25
 	filling_color = "#D2691E"
 	tastes = list("candy" = 1)
@@ -18,7 +18,7 @@
 	icon_state = "sosjerky"
 	desc = "Beef jerky made from the finest space cows."
 	trash = /obj/item/trash/sosjerky
-	list_reagents = list("nutriment" = 1, "sugar" = 3, "sodiumchloride" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 2)
 	junkiness = 25
 	filling_color = "#8B0000"
 	tastes = list("dried meat" = 1)
@@ -27,7 +27,7 @@
 /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	name = "homemade beef jerky"
 	desc = "Homemade beef jerky made from the finest space cows."
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
 	junkiness = 0
 
 /obj/item/reagent_containers/food/snacks/chips
@@ -36,7 +36,7 @@
 	icon_state = "chips"
 	trash = /obj/item/trash/chips
 	bitesize = 1
-	list_reagents = list("nutriment" = 1, "sugar" = 3, "sodiumchloride" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 1)
 	junkiness = 20
 	filling_color = "#FFD700"
 	tastes = list("salt" = 1, "crisps" = 1)
@@ -47,7 +47,7 @@
 	icon_state = "4no_raisins"
 	desc = "Best raisins in the universe. Not sure why."
 	trash = /obj/item/trash/raisins
-	list_reagents = list("nutriment" = 2, "sugar" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 4)
 	junkiness = 25
 	filling_color = "#8B0000"
 	tastes = list("dried raisins" = 1)
@@ -56,7 +56,7 @@
 /obj/item/reagent_containers/food/snacks/no_raisin/healthy
 	name = "homemade raisins"
 	desc = "Homemade raisins, the best in all of spess."
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	junkiness = 0
 	foodtype = FRUIT
 
@@ -64,7 +64,7 @@
 	name = "space twinkie"
 	icon_state = "space_twinkie"
 	desc = "Guaranteed to survive longer than you will."
-	list_reagents = list("sugar" = 4)
+	list_reagents = list(/datum/reagent/consumable/sugar = 4)
 	junkiness = 25
 	filling_color = "#FFD700"
 	foodtype = JUNKFOOD | GRAIN | SUGAR
@@ -74,7 +74,7 @@
 	desc = "Bite sized cheesie snacks that will honk all over your mouth."
 	icon_state = "cheesie_honkers"
 	trash = /obj/item/trash/cheesie
-	list_reagents = list("nutriment" = 1, "sugar" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3)
 	junkiness = 25
 	filling_color = "#FFD700"
 	tastes = list("cheese" = 5, "crisps" = 2)
@@ -85,7 +85,7 @@
 	icon_state = "syndi_cakes"
 	desc = "An extremely moist snack cake that tastes just as good after being nuked."
 	trash = /obj/item/trash/syndi_cakes
-	list_reagents = list("nutriment" = 4, "doctorsdelight" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5)
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
 	foodtype = GRAIN | FRUIT | VEGETABLES
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 1bc2e4bb89..27ee54815f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -52,7 +52,7 @@ God bless America.
 /obj/machinery/deepfryer/Initialize()
 	. = ..()
 	create_reagents(50, OPENCONTAINER)
-	reagents.add_reagent("cooking_oil", 25)
+	reagents.add_reagent(/datum/reagent/consumable/cooking_oil, 25)
 	component_parts = list()
 	component_parts += new /obj/item/circuitboard/machine/deep_fryer(null)
 	component_parts += new /obj/item/stock_parts/micro_laser(null)
@@ -81,9 +81,9 @@ God bless America.
 		qdel(I)
 		return
 	if(istype(I,/obj/item/clothing/head/mob_holder))
-		to_chat(user, "<span class='warning'>This does not fit in the fryer.</span>") // TODO: Deepfrying instakills mobs, spawns a whole deep-fried mob. 
+		to_chat(user, "<span class='warning'>This does not fit in the fryer.</span>") // TODO: Deepfrying instakills mobs, spawns a whole deep-fried mob.
 		return
-	if(!reagents.has_reagent("cooking_oil"))
+	if(!reagents.has_reagent(/datum/reagent/consumable/cooking_oil))
 		to_chat(user, "<span class='warning'>[src] has no cooking oil to fry with!</span>")
 		return
 	if(I.resistance_flags & INDESTRUCTIBLE)
@@ -107,7 +107,7 @@ God bless America.
 
 /obj/machinery/deepfryer/process()
 	..()
-	var/datum/reagent/consumable/cooking_oil/C = reagents.has_reagent("cooking_oil")
+	var/datum/reagent/consumable/cooking_oil/C = reagents.has_reagent(/datum/reagent/consumable/cooking_oil)
 	if(!C)
 		return
 	reagents.chem_temp = C.fry_temperature
diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
index 4dda9dd773..68cc84c639 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
@@ -35,16 +35,16 @@
 	dat += "Portion: <a href='?src=[REF(src)];portion=1'>[portion]</a><br>"
 	for(var/datum/reagent/R in reagents.reagent_list)
 		dat += "[R.name]: [R.volume] "
-		dat += "<a href='?src=[REF(src)];disposeI=[R.id]'>Purge</a>"
+		dat += "<a href='?src=[REF(src)];disposeI=[R.type]'>Purge</a>"
 		if (glasses > 0)
-			dat += "<a href='?src=[REF(src)];pour=[R.id]'>Pour in a glass</a>"
-		dat += "<a href='?src=[REF(src)];mix=[R.id]'>Add to the mixer</a><br>"
+			dat += "<a href='?src=[REF(src)];pour=[R.type]'>Pour in a glass</a>"
+		dat += "<a href='?src=[REF(src)];mix=[R.type]'>Add to the mixer</a><br>"
 	dat += "</div><br><b>MIXER CONTENTS</b><br><div class='statusDisplay'>"
 	for(var/datum/reagent/R in mixer.reagents.reagent_list)
 		dat += "[R.name]: [R.volume] "
-		dat += "<a href='?src=[REF(src)];transfer=[R.id]'>Transfer back</a>"
+		dat += "<a href='?src=[REF(src)];transfer=[R.type]'>Transfer back</a>"
 		if (glasses > 0)
-			dat += "<a href='?src=[REF(src)];m_pour=[R.id]'>Pour in a glass</a>"
+			dat += "<a href='?src=[REF(src)];m_pour=[R.type]'>Pour in a glass</a>"
 		dat += "<br>"
 	dat += "</div><br><b>STORED FOOD</b><br><div class='statusDisplay'>"
 	for(var/V in stored_food)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index e02c3c1334..e5c5a4f933 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -176,7 +176,7 @@
 		newmeat.name = "[sourcename] [newmeat.name]"
 		if(istype(newmeat))
 			newmeat.subjectname = sourcename
-			newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first
+			newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced) // Thehehe. Fat guys go first
 			if(sourcejob)
 				newmeat.subjectjob = sourcejob
 		allmeat[i] = newmeat
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index 449da2afe3..c52389cd56 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -52,10 +52,10 @@
 				grill_loop.start()
 				return
 		else
-			if(I.reagents.has_reagent("monkey_energy"))
-				grill_fuel += (20 * (I.reagents.get_reagent_amount("monkey_energy")))
+			if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
+				grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
 				to_chat(user, "<span class='notice'>You pour the Monkey Energy in [src].</span>")
-				I.reagents.remove_reagent("monkey_energy", I.reagents.get_reagent_amount("monkey_energy"))
+				I.reagents.remove_reagent("monkey_energy", I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))
 				update_icon()
 				return
 	..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
index 8db6956da9..71becf0542 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
@@ -25,37 +25,37 @@
 	var/flavour_name = "vanilla"
 	var/obj/item/reagent_containers/beaker = null
 	var/static/list/icecream_vat_reagents = list(
-		"milk" = 6,
-		"flour" = 6,
-		"sugar" = 6,
-		"ice" = 6,
-		"cocoa" = 6,
-		"vanilla" = 6,
-		"berryjuice" = 6,
-		"singulo" = 6,
-		"peachjuice" = 6,
-		"grapejuice" = 6)
+		/datum/reagent/consumable/milk = 6,
+		/datum/reagent/consumable/flour = 6,
+		/datum/reagent/consumable/sugar = 6,
+		/datum/reagent/consumable/ice = 6,
+		/datum/reagent/consumable/coco = 6,
+		/datum/reagent/consumable/vanilla = 6,
+		/datum/reagent/consumable/berryjuice = 6,
+		/datum/reagent/consumable/ethanol/singulo = 6,
+		/datum/reagent/consumable/peachjuice = 6,
+		/datum/reagent/consumable/grapejuice = 6)
 
 /obj/machinery/icecream_vat/proc/get_ingredient_list(type)
 	switch(type)
 		if(ICECREAM_CHOCOLATE)
-			return list("milk", "ice", "cocoa")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/coco)
 		if(ICECREAM_STRAWBERRY)
-			return list("milk", "ice", "berryjuice")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/berryjuice)
 		if(ICECREAM_CUSTOM)
-			return list("milk", "ice")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice)
 		if(ICECREAM_PEACH)
-			return list("milk", "ice", "peachjuice")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/peachjuice)
 		if(ICECREAM_GRAPE)
-			return list("milk", "ice", "grapejuice")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/grapejuice)
 		if(ICECREAM_BLUE)
-			return list("milk", "ice", "singulo")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/ethanol/singulo)
 		if(CONE_WAFFLE)
-			return list("flour", "sugar")
+			return list(/datum/reagent/consumable/flour, /datum/reagent/consumable/sugar)
 		if(CONE_CHOC)
-			return list("flour", "sugar", "cocoa")
+			return list(/datum/reagent/consumable/flour, /datum/reagent/consumable/sugar, /datum/reagent/consumable/coco)
 		else //ICECREAM_VANILLA
-			return list("milk", "ice", "vanilla")
+			return list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/vanilla)
 
 
 /obj/machinery/icecream_vat/proc/get_flavour_name(flavour_type)
@@ -113,7 +113,7 @@
 	dat += "<b>VAT CONTENT</b><br>"
 	for(var/datum/reagent/R in reagents.reagent_list)
 		dat += "[R.name]: [R.volume]"
-		dat += "<A href='?src=[REF(src)];disposeI=[R.id]'>Purge</A><BR>"
+		dat += "<A href='?src=[REF(src)];disposeI=[R.type]'>Purge</A><BR>"
 	dat += "<a href='?src=[REF(src)];refresh=1'>Refresh</a> <a href='?src=[REF(src)];close=1'>Close</a>"
 
 	var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src)
@@ -132,7 +132,7 @@
 				else
 					I.add_ice_cream(flavour_name)
 				if(I.reagents.total_volume < 10)
-					I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
+					I.reagents.add_reagent(/datum/reagent/consumable/sugar, 10 - I.reagents.total_volume)
 				updateDialog()
 			else
 				to_chat(user, "<span class='warning'>There is not enough ice cream left!</span>")
@@ -228,7 +228,7 @@
 	desc = "Delicious waffle cone, but no ice cream."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time
-	list_reagents = list("nutriment" = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	tastes = list("cream" = 2, "waffle" = 1)
 	var/ice_creamed = 0
 	var/cone_type
@@ -244,9 +244,9 @@
 	icon_state = "icecream_cone_[cone_name]"
 	switch (cone_type)
 		if ("waffle")
-			reagents.add_reagent("nutriment", 1)
+			reagents.add_reagent(/datum/reagent/consumable/nutriment, 1)
 		if ("chocolate")
-			reagents.add_reagent("cocoa", 1) // chocolate ain't as nutritious kids
+			reagents.add_reagent(/datum/reagent/consumable/coco, 1) // chocolate ain't as nutritious kids
 
 	desc = "Delicious [cone_name] cone, but no ice cream."
 
@@ -256,31 +256,31 @@
 	switch (flavour_name) // adding the actual reagents advertised in the ingredient list
 		if ("vanilla")
 			desc = "A delicious [cone_type] cone filled with vanilla ice cream. All the other ice creams take content from it."
-			reagents.add_reagent("vanilla", 3)
+			reagents.add_reagent(/datum/reagent/consumable/vanilla, 3)
 			filling_color = "#ECE1C1"
 		if ("chocolate")
 			desc = "A delicious [cone_type] cone filled with chocolate ice cream. Surprisingly, made with real cocoa."
-			reagents.add_reagent("cocoa", 3)
+			reagents.add_reagent(/datum/reagent/consumable/coco, 3)
 			filling_color = "#93673B"
 		if ("strawberry")
 			desc = "A delicious [cone_type] cone filled with strawberry ice cream. Definitely not made with real strawberries."
-			reagents.add_reagent("berryjuice", 3)
+			reagents.add_reagent(/datum/reagent/consumable/berryjuice, 3)
 			filling_color = "#EFB4B4"
 		if ("peach")
 			desc = "A delicious [cone_type] cone filled with peach ice cream. Definitely made with real peaches!"
-			reagents.add_reagent("peachjuice", 3)
+			reagents.add_reagent(/datum/reagent/consumable/peachjuice, 3)
 			filling_color = "#E78108"
 		if ("grape")
 			desc = "A delicious [cone_type] cone filled with grape ice cream. Surprisingly, made with real pink grape, likely not real sugarcanes used."
-			reagents.add_reagent("grapejuice", 3)
+			reagents.add_reagent(/datum/reagent/consumable/grapejuice, 3)
 			filling_color = "#FF1493"
 		if ("blue")
 			desc = "A delicious [cone_type] cone filled with blue ice cream. Made with real... blue?"
-			reagents.add_reagent("singulo", 3)
+			reagents.add_reagent(/datum/reagent/consumable/ethanol/singulo, 3)
 			filling_color = "#ACBCED"
 		if ("mob")
 			desc = "A suspicious [cone_type] cone filled with bright red ice cream. That's probably not strawberry..."
-			reagents.add_reagent("liquidgibs", 3)
+			reagents.add_reagent(/datum/reagent/liquidgibs, 3)
 			filling_color = "#EFB4B4"
 		if ("custom")
 			if(R && R.total_volume >= 4) //consumable reagents have stronger taste so higher volume will allow non-food flavourings to break through better.
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 4efac6f508..e4d36b29d2 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -134,8 +134,8 @@
 
 	if(istype(O, /obj/item/reagent_containers/spray))
 		var/obj/item/reagent_containers/spray/clean_spray = O
-		if(clean_spray.reagents.has_reagent("cleaner", clean_spray.amount_per_transfer_from_this))
-			clean_spray.reagents.remove_reagent("cleaner", clean_spray.amount_per_transfer_from_this,1)
+		if(clean_spray.reagents.has_reagent(/datum/reagent/space_cleaner, clean_spray.amount_per_transfer_from_this))
+			clean_spray.reagents.remove_reagent(/datum/reagent/space_cleaner, clean_spray.amount_per_transfer_from_this,1)
 			playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 			user.visible_message("[user] has cleaned \the [src].", "<span class='notice'>You clean \the [src].</span>")
 			dirty = 0
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 355660ecec..da67eaa9cf 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -86,7 +86,7 @@
 			tag_overlay.pixel_y = boxes.len * 3
 			add_overlay(tag_overlay)
 
-/obj/item/pizzabox/worn_overlays(isinhands, icon_file)
+/obj/item/pizzabox/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = list()
 	var/current_offset = 2
 	if(isinhands)
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 9dbddfb519..9df650500a 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -2,385 +2,385 @@
 
 /datum/chemical_reaction/goldschlager
 	name = "Goldschlager"
-	id = "goldschlager"
-	results = list("goldschlager" = 10)
-	required_reagents = list("vodka" = 10, "gold" = 1)
+	id = /datum/reagent/consumable/ethanol/goldschlager
+	results = list(/datum/reagent/consumable/ethanol/goldschlager = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 10, /datum/reagent/gold = 1)
 
 /datum/chemical_reaction/patron
 	name = "Patron"
-	id = "patron"
-	results = list("patron" = 10)
-	required_reagents = list("tequila" = 10, "silver" = 1)
+	id = /datum/reagent/consumable/ethanol/patron
+	results = list(/datum/reagent/consumable/ethanol/patron = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 10, /datum/reagent/silver = 1)
 
 /datum/chemical_reaction/bilk
 	name = "Bilk"
-	id = "bilk"
-	results = list("bilk" = 2)
-	required_reagents = list("milk" = 1, "beer" = 1)
+	id = /datum/reagent/consumable/ethanol/bilk
+	results = list(/datum/reagent/consumable/ethanol/bilk = 2)
+	required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ethanol/beer = 1)
 
 /datum/chemical_reaction/icetea
 	name = "Iced Tea"
-	id = "icetea"
-	results = list("icetea" = 4)
-	required_reagents = list("ice" = 1, "tea" = 3)
+	id = /datum/reagent/consumable/icetea
+	results = list(/datum/reagent/consumable/icetea = 4)
+	required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
 
 /datum/chemical_reaction/icecoffee
 	name = "Iced Coffee"
-	id = "icecoffee"
-	results = list("icecoffee" = 4)
-	required_reagents = list("ice" = 1, "coffee" = 3)
+	id = /datum/reagent/consumable/icecoffee
+	results = list(/datum/reagent/consumable/icecoffee = 4)
+	required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/coffee = 3)
 
 /datum/chemical_reaction/nuka_cola
 	name = "Nuka Cola"
-	id = "nuka_cola"
-	results = list("nuka_cola" = 6)
-	required_reagents = list("uranium" = 1, "cola" = 6)
+	id = /datum/reagent/consumable/nuka_cola
+	results = list(/datum/reagent/consumable/nuka_cola = 6)
+	required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/space_cola = 6)
 
 /datum/chemical_reaction/moonshine
 	name = "Moonshine"
-	id = "moonshine"
-	results = list("moonshine" = 10)
-	required_reagents = list("nutriment" = 5, "sugar" = 5)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/moonshine
+	results = list(/datum/reagent/consumable/ethanol/moonshine = 10)
+	required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/wine
 	name = "Wine"
-	id = "wine"
-	results = list("wine" = 10)
-	required_reagents = list("grapejuice" = 10)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/wine
+	results = list(/datum/reagent/consumable/ethanol/wine = 10)
+	required_reagents = list(/datum/reagent/consumable/grapejuice = 10)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/spacebeer
 	name = "Space Beer"
-	id = "spacebeer"
-	results = list("beer" = 10)
-	required_reagents = list("flour" = 10)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/beer
+	results = list(/datum/reagent/consumable/ethanol/beer = 10)
+	required_reagents = list(/datum/reagent/consumable/flour = 10)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/vodka
 	name = "Vodka"
-	id = "vodka"
-	results = list("vodka" = 10)
-	required_reagents = list("potato" = 10)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/vodka
+	results = list(/datum/reagent/consumable/ethanol/vodka = 10)
+	required_reagents = list(/datum/reagent/consumable/potato_juice = 10)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/kahlua
 	name = "Kahlua"
-	id = "kahlua"
-	results = list("kahlua" = 5)
-	required_reagents = list("coffee" = 5, "sugar" = 5)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/kahlua
+	results = list(/datum/reagent/consumable/ethanol/kahlua = 5)
+	required_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/sugar = 5)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/gin_tonic
 	name = "Gin and Tonic"
-	id = "gintonic"
-	results = list("gintonic" = 3)
-	required_reagents = list("gin" = 2, "tonic" = 1)
+	id = /datum/reagent/consumable/ethanol/gintonic
+	results = list(/datum/reagent/consumable/ethanol/gintonic = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/tonic = 1)
 
 /datum/chemical_reaction/rum_coke
 	name = "Rum and Coke"
-	id = "rumcoke"
-	results = list("rumcoke" = 3)
-	required_reagents = list("rum" = 2, "cola" = 1)
+	id = /datum/reagent/consumable/ethanol/rum_coke
+	results = list(/datum/reagent/consumable/ethanol/rum_coke = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/space_cola = 1)
 
 /datum/chemical_reaction/cuba_libre
 	name = "Cuba Libre"
-	id = "cubalibre"
-	results = list("cubalibre" = 4)
-	required_reagents = list("rumcoke" = 3, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/cuba_libre
+	results = list(/datum/reagent/consumable/ethanol/cuba_libre = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum_coke = 3, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/martini
 	name = "Classic Martini"
-	id = "martini"
-	results = list("martini" = 3)
-	required_reagents = list("gin" = 2, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/martini
+	results = list(/datum/reagent/consumable/ethanol/martini = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 /datum/chemical_reaction/vodkamartini
 	name = "Vodka Martini"
-	id = "vodkamartini"
-	results = list("vodkamartini" = 3)
-	required_reagents = list("vodka" = 2, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/vodkamartini
+	results = list(/datum/reagent/consumable/ethanol/vodkamartini = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 /datum/chemical_reaction/white_russian
 	name = "White Russian"
-	id = "whiterussian"
-	results = list("whiterussian" = 5)
-	required_reagents = list("blackrussian" = 3, "cream" = 2)
+	id = /datum/reagent/consumable/ethanol/white_russian
+	results = list(/datum/reagent/consumable/ethanol/white_russian = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 3, /datum/reagent/consumable/cream = 2)
 
 /datum/chemical_reaction/whiskey_cola
 	name = "Whiskey Cola"
-	id = "whiskeycola"
-	results = list("whiskeycola" = 3)
-	required_reagents = list("whiskey" = 2, "cola" = 1)
+	id = /datum/reagent/consumable/ethanol/whiskey_cola
+	results = list(/datum/reagent/consumable/ethanol/whiskey_cola = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/space_cola = 1)
 
 /datum/chemical_reaction/screwdriver
 	name = "Screwdriver"
-	id = "screwdrivercocktail"
-	results = list("screwdrivercocktail" = 3)
-	required_reagents = list("vodka" = 2, "orangejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/screwdrivercocktail
+	results = list(/datum/reagent/consumable/ethanol/screwdrivercocktail = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/orangejuice = 1)
 
 /datum/chemical_reaction/bloody_mary
 	name = "Bloody Mary"
-	id = "bloodymary"
-	results = list("bloodymary" = 4)
-	required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/bloody_mary
+	results = list(/datum/reagent/consumable/ethanol/bloody_mary = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/gargle_blaster
 	name = "Pan-Galactic Gargle Blaster"
-	id = "gargleblaster"
-	results = list("gargleblaster" = 5)
-	required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/gargle_blaster
+	results = list(/datum/reagent/consumable/ethanol/gargle_blaster = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/ethanol/gin = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/brave_bull
 	name = "Brave Bull"
-	id = "bravebull"
-	results = list("bravebull" = 3)
-	required_reagents = list("tequila" = 2, "kahlua" = 1)
+	id = /datum/reagent/consumable/ethanol/brave_bull
+	results = list(/datum/reagent/consumable/ethanol/brave_bull = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/ethanol/kahlua = 1)
 
 /datum/chemical_reaction/tequila_sunrise
 	name = "Tequila Sunrise"
-	id = "tequilasunrise"
-	results = list("tequilasunrise" = 5)
-	required_reagents = list("tequila" = 2, "orangejuice" = 2, "grenadine" = 1)
+	id = /datum/reagent/consumable/ethanol/tequila_sunrise
+	results = list(/datum/reagent/consumable/ethanol/tequila_sunrise = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/grenadine = 1)
 
 /datum/chemical_reaction/toxins_special
 	name = "Toxins Special"
-	id = "toxinsspecial"
-	results = list("toxinsspecial" = 5)
-	required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2)
+	id = /datum/reagent/consumable/ethanol/toxins_special
+	results = list(/datum/reagent/consumable/ethanol/toxins_special = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/vermouth = 1, /datum/reagent/toxin/plasma = 2)
 
 /datum/chemical_reaction/beepsky_smash
 	name = "Beepksy Smash"
-	id = "beepksysmash"
-	results = list("beepskysmash" = 5)
-	required_reagents = list("limejuice" = 2, "quadruple_sec" = 2, "iron" = 1)
+	id = /datum/reagent/consumable/ethanol/beepsky_smash
+	results = list(/datum/reagent/consumable/ethanol/beepsky_smash = 5)
+	required_reagents = list(/datum/reagent/consumable/limejuice = 2, /datum/reagent/consumable/ethanol/quadruple_sec = 2, /datum/reagent/iron = 1)
 
 /datum/chemical_reaction/doctor_delight
 	name = "The Doctor's Delight"
-	id = "doctordelight"
-	results = list("doctorsdelight" = 5)
-	required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "cryoxadone" = 1)
+	id = /datum/reagent/consumable/doctor_delight
+	results = list(/datum/reagent/consumable/doctor_delight = 5)
+	required_reagents = list(/datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/medicine/cryoxadone = 1)
 
 /datum/chemical_reaction/irish_cream
 	name = "Irish Cream"
-	id = "irishcream"
-	results = list("irishcream" = 3)
-	required_reagents = list("whiskey" = 2, "cream" = 1)
+	id = /datum/reagent/consumable/ethanol/irish_cream
+	results = list(/datum/reagent/consumable/ethanol/irish_cream = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/cream = 1)
 
 /datum/chemical_reaction/manly_dorf
 	name = "The Manly Dorf"
-	id = "manlydorf"
-	results = list("manlydorf" = 3)
-	required_reagents = list ("beer" = 1, "ale" = 2)
+	id = /datum/reagent/consumable/ethanol/manly_dorf
+	results = list(/datum/reagent/consumable/ethanol/manly_dorf = 3)
+	required_reagents = list (/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/ethanol/ale = 2)
 
 /datum/chemical_reaction/greenbeer
 	name = "Green Beer"
-	id = "greenbeer"
-	results = list("greenbeer" = 10)
-	required_reagents = list("greencrayonpowder" = 1, "beer" = 10)
+	id = /datum/reagent/consumable/ethanol/beer/green
+	results = list(/datum/reagent/consumable/ethanol/beer/green = 10)
+	required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 1, /datum/reagent/consumable/ethanol/beer = 10)
 
 /datum/chemical_reaction/hooch
 	name = "Hooch"
-	id = "hooch"
-	results = list("hooch" = 3)
-	required_reagents = list ("ethanol" = 2, "welding_fuel" = 1)
-	required_catalysts = list("enzyme" = 1)
+	id = /datum/reagent/consumable/ethanol/hooch
+	results = list(/datum/reagent/consumable/ethanol/hooch = 3)
+	required_reagents = list (/datum/reagent/consumable/ethanol = 2, /datum/reagent/fuel = 1)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 1)
 
 /datum/chemical_reaction/irish_coffee
 	name = "Irish Coffee"
-	id = "irishcoffee"
-	results = list("irishcoffee" = 2)
-	required_reagents = list("irishcream" = 1, "coffee" = 1)
+	id = /datum/reagent/consumable/ethanol/irishcoffee
+	results = list(/datum/reagent/consumable/ethanol/irishcoffee = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/coffee = 1)
 
 /datum/chemical_reaction/b52
 	name = "B-52"
-	id = "b52"
-	results = list("b52" = 3)
-	required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
+	id = /datum/reagent/consumable/ethanol/b52
+	results = list(/datum/reagent/consumable/ethanol/b52 = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/cognac = 1)
 
 /datum/chemical_reaction/atomicbomb
 	name = "Atomic Bomb"
-	id = "atomicbomb"
-	results = list("atomicbomb" = 10)
-	required_reagents = list("b52" = 10, "uranium" = 1)
+	id = /datum/reagent/consumable/ethanol/atomicbomb
+	results = list(/datum/reagent/consumable/ethanol/atomicbomb = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/b52 = 10, /datum/reagent/uranium = 1)
 
 /datum/chemical_reaction/margarita
 	name = "Margarita"
-	id = "margarita"
-	results = list("margarita" = 3)
-	required_reagents = list("tequila" = 2, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/margarita
+	results = list(/datum/reagent/consumable/ethanol/margarita = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/longislandicedtea
 	name = "Long Island Iced Tea"
-	id = "longislandicedtea"
-	results = list("longislandicedtea" = 4)
-	required_reagents = list("vodka" = 1, "gin" = 1, "tequila" = 1, "cubalibre" = 1)
+	id = /datum/reagent/consumable/ethanol/longislandicedtea
+	results = list(/datum/reagent/consumable/ethanol/longislandicedtea = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/ethanol/gin = 1, /datum/reagent/consumable/ethanol/tequila = 1, /datum/reagent/consumable/ethanol/cuba_libre = 1)
 
 /datum/chemical_reaction/threemileisland
 	name = "Three Mile Island Iced Tea"
-	id = "threemileisland"
-	results = list("threemileisland" = 10)
-	required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
+	id = /datum/reagent/consumable/ethanol/threemileisland
+	results = list(/datum/reagent/consumable/ethanol/threemileisland = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/longislandicedtea = 10, /datum/reagent/uranium = 1)
 
 /datum/chemical_reaction/whiskeysoda
 	name = "Whiskey Soda"
-	id = "whiskeysoda"
-	results = list("whiskeysoda" = 3)
-	required_reagents = list("whiskey" = 2, "sodawater" = 1)
+	id = /datum/reagent/consumable/ethanol/whiskeysoda
+	results = list(/datum/reagent/consumable/ethanol/whiskeysoda = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/sodawater = 1)
 
 /datum/chemical_reaction/black_russian
 	name = "Black Russian"
-	id = "blackrussian"
-	results = list("blackrussian" = 5)
-	required_reagents = list("vodka" = 3, "kahlua" = 2)
+	id = /datum/reagent/consumable/ethanol/black_russian
+	results = list(/datum/reagent/consumable/ethanol/black_russian = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2)
 
 /datum/chemical_reaction/manhattan
 	name = "Manhattan"
-	id = "manhattan"
-	results = list("manhattan" = 3)
-	required_reagents = list("whiskey" = 2, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/manhattan
+	results = list(/datum/reagent/consumable/ethanol/manhattan = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 /datum/chemical_reaction/manhattan_proj
 	name = "Manhattan Project"
-	id = "manhattan_proj"
-	results = list("manhattan_proj" = 10)
-	required_reagents = list("manhattan" = 10, "uranium" = 1)
+	id = /datum/reagent/consumable/ethanol/manhattan_proj
+	results = list(/datum/reagent/consumable/ethanol/manhattan_proj = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 10, /datum/reagent/uranium = 1)
 
 /datum/chemical_reaction/vodka_tonic
 	name = "Vodka and Tonic"
-	id = "vodkatonic"
-	results = list("vodkatonic" = 3)
-	required_reagents = list("vodka" = 2, "tonic" = 1)
+	id = /datum/reagent/consumable/ethanol/vodkatonic
+	results = list(/datum/reagent/consumable/ethanol/vodkatonic = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/tonic = 1)
 
 /datum/chemical_reaction/gin_fizz
 	name = "Gin Fizz"
-	id = "ginfizz"
-	results = list("ginfizz" = 4)
-	required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/ginfizz
+	results = list(/datum/reagent/consumable/ethanol/ginfizz = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/bahama_mama
 	name = "Bahama mama"
-	id = "bahama_mama"
-	results = list("bahama_mama" = 6)
-	required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/bahama_mama
+	results = list(/datum/reagent/consumable/ethanol/bahama_mama = 6)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/singulo
 	name = "Singulo"
-	id = "singulo"
-	results = list("singulo" = 10)
-	required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
+	id = /datum/reagent/consumable/ethanol/singulo
+	results = list(/datum/reagent/consumable/ethanol/singulo = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 5, /datum/reagent/radium = 1, /datum/reagent/consumable/ethanol/wine = 5)
 
 /datum/chemical_reaction/alliescocktail
 	name = "Allies Cocktail"
-	id = "alliescocktail"
-	results = list("alliescocktail" = 2)
-	required_reagents = list("martini" = 1, "vodka" = 1)
+	id = /datum/reagent/consumable/ethanol/alliescocktail
+	results = list(/datum/reagent/consumable/ethanol/alliescocktail = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/martini = 1, /datum/reagent/consumable/ethanol/vodka = 1)
 
 /datum/chemical_reaction/demonsblood
 	name = "Demons Blood"
-	id = "demonsblood"
-	results = list("demonsblood" = 4)
-	required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
+	id = /datum/reagent/consumable/ethanol/demonsblood
+	results = list(/datum/reagent/consumable/ethanol/demonsblood = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/dr_gibb = 1)
 
 /datum/chemical_reaction/booger
 	name = "Booger"
-	id = "booger"
-	results = list("booger" = 4)
-	required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/booger
+	results = list(/datum/reagent/consumable/ethanol/booger = 4)
+	required_reagents = list(/datum/reagent/consumable/cream = 1, /datum/reagent/consumable/banana = 1, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/watermelonjuice = 1)
 
 /datum/chemical_reaction/antifreeze
 	name = "Anti-freeze"
-	id = "antifreeze"
-	results = list("antifreeze" = 4)
-	required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/antifreeze
+	results = list(/datum/reagent/consumable/ethanol/antifreeze = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/barefoot
 	name = "Barefoot"
-	id = "barefoot"
-	results = list("barefoot" = 3)
-	required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/barefoot
+	results = list(/datum/reagent/consumable/ethanol/barefoot = 3)
+	required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
 
 /datum/chemical_reaction/sbiten
 	name = "Sbiten"
-	id = "sbiten"
-	results = list("sbiten" = 10)
-	required_reagents = list("vodka" = 10, "capsaicin" = 1)
+	id = /datum/reagent/consumable/ethanol/sbiten
+	results = list(/datum/reagent/consumable/ethanol/sbiten = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 10, /datum/reagent/consumable/capsaicin = 1)
 
 /datum/chemical_reaction/red_mead
 	name = "Red Mead"
-	id = "red_mead"
-	results = list("red_mead" = 2)
-	required_reagents = list("blood" = 1, "mead" = 1)
+	id = /datum/reagent/consumable/ethanol/red_mead
+	results = list(/datum/reagent/consumable/ethanol/red_mead = 2)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/ethanol/mead = 1)
 
 /datum/chemical_reaction/mead
 	name = "Mead"
-	id = "mead"
-	results = list("mead" = 2)
-	required_reagents = list("honey" = 2)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/mead
+	results = list(/datum/reagent/consumable/ethanol/mead = 2)
+	required_reagents = list(/datum/reagent/consumable/honey = 2)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/iced_beer
 	name = "Iced Beer"
-	id = "iced_beer"
-	results = list("iced_beer" = 6)
-	required_reagents = list("beer" = 5, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/iced_beer
+	results = list(/datum/reagent/consumable/ethanol/iced_beer = 6)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 5, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/grog
 	name = "Grog"
-	id = "grog"
-	results = list("grog" = 2)
-	required_reagents = list("rum" = 1, "water" = 1)
+	id = /datum/reagent/consumable/ethanol/grog
+	results = list(/datum/reagent/consumable/ethanol/grog = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/water = 1)
 
 /datum/chemical_reaction/soy_latte
 	name = "Soy Latte"
-	id = "soy_latte"
-	results = list("soy_latte" = 2)
-	required_reagents = list("coffee" = 1, "soymilk" = 1)
+	id = /datum/reagent/consumable/soy_latte
+	results = list(/datum/reagent/consumable/soy_latte = 2)
+	required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/soymilk = 1)
 
 /datum/chemical_reaction/cafe_latte
 	name = "Cafe Latte"
-	id = "cafe_latte"
-	results = list("cafe_latte" = 2)
-	required_reagents = list("coffee" = 1, "milk" = 1)
+	id = /datum/reagent/consumable/cafe_latte
+	results = list(/datum/reagent/consumable/cafe_latte = 2)
+	required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/milk = 1)
 
 /datum/chemical_reaction/acidspit
 	name = "Acid Spit"
-	id = "acidspit"
-	results = list("acidspit" = 6)
-	required_reagents = list("sacid" = 1, "wine" = 5)
+	id = /datum/reagent/consumable/ethanol/acid_spit
+	results = list(/datum/reagent/consumable/ethanol/acid_spit = 6)
+	required_reagents = list(/datum/reagent/toxin/acid = 1, /datum/reagent/consumable/ethanol/wine = 5)
 
 /datum/chemical_reaction/amasec
 	name = "Amasec"
-	id = "amasec"
-	results = list("amasec" = 10)
-	required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
+	id = /datum/reagent/consumable/ethanol/amasec
+	results = list(/datum/reagent/consumable/ethanol/amasec = 10)
+	required_reagents = list(/datum/reagent/iron = 1, /datum/reagent/consumable/ethanol/wine = 5, /datum/reagent/consumable/ethanol/vodka = 5)
 
 /datum/chemical_reaction/changelingsting
 	name = "Changeling Sting"
-	id = "changelingsting"
-	results = list("changelingsting" = 5)
-	required_reagents = list("screwdrivercocktail" = 1, "lemon_lime" = 2)
+	id = /datum/reagent/consumable/ethanol/changelingsting
+	results = list(/datum/reagent/consumable/ethanol/changelingsting = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/screwdrivercocktail = 1, /datum/reagent/consumable/lemon_lime = 2)
 
 /datum/chemical_reaction/aloe
 	name = "Aloe"
-	id = "aloe"
-	results = list("aloe" = 2)
-	required_reagents = list("irishcream" = 1, "watermelonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/aloe
+	results = list(/datum/reagent/consumable/ethanol/aloe = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/watermelonjuice = 1)
 
 /datum/chemical_reaction/andalusia
 	name = "Andalusia"
-	id = "andalusia"
-	results = list("andalusia" = 3)
-	required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/andalusia
+	results = list(/datum/reagent/consumable/ethanol/andalusia = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1)
 
 /datum/chemical_reaction/neurotoxin
 	name = "Neurotoxin"
-	id = "neurotoxin"
-	results = list("neurotoxin" = 2)
-	required_reagents = list("gargleblaster" = 1, "morphine" = 1)
+	id = /datum/reagent/consumable/ethanol/neurotoxin
+	results = list(/datum/reagent/consumable/ethanol/neurotoxin = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gargle_blaster = 1, /datum/reagent/medicine/morphine = 1)
 	//FermiChem vars: Easy to make, but hard to make potent
 	OptimalTempMin 		= 100 // Lower area of bell curve for determining heat based rate reactions
 	OptimalTempMax		= 950 // Upper end for above
@@ -404,8 +404,8 @@
 	var/datum/reagent/consumable/ethanol/neurotoxin/Nt = locate(/datum/reagent/consumable/ethanol/neurotoxin) in my_atom.reagents.reagent_list
 	var/cached_volume = Nt.volume
 	if(Nt.purity < 0.5)
-		holder.remove_reagent(src.id, cached_volume)
-		holder.add_reagent("neuroweak", cached_volume)
+		holder.remove_reagent(type, cached_volume)
+		holder.add_reagent(/datum/reagent/consumable/ethanol/neuroweak, cached_volume)
 */
 
 /datum/chemical_reaction/neurotoxin/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)//reduced size
@@ -414,415 +414,415 @@
 
 /datum/chemical_reaction/snowwhite
 	name = "Snow White"
-	id = "snowwhite"
-	results = list("snowwhite" = 2)
-	required_reagents = list("beer" = 1, "lemon_lime" = 1)
+	id = /datum/reagent/consumable/ethanol/snowwhite
+	results = list(/datum/reagent/consumable/ethanol/snowwhite = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/lemon_lime = 1)
 
 /datum/chemical_reaction/irishcarbomb
 	name = "Irish Car Bomb"
-	id = "irishcarbomb"
-	results = list("irishcarbomb" = 2)
-	required_reagents = list("ale" = 1, "irishcream" = 1)
+	id = /datum/reagent/consumable/ethanol/irishcarbomb
+	results = list(/datum/reagent/consumable/ethanol/irishcarbomb = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/ale = 1, /datum/reagent/consumable/ethanol/irish_cream = 1)
 
 /datum/chemical_reaction/syndicatebomb
 	name = "Syndicate Bomb"
-	id = "syndicatebomb"
-	results = list("syndicatebomb" = 2)
-	required_reagents = list("beer" = 1, "whiskeycola" = 1)
+	id = /datum/reagent/consumable/ethanol/syndicatebomb
+	results = list(/datum/reagent/consumable/ethanol/syndicatebomb = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/ethanol/whiskey_cola = 1)
 
 /datum/chemical_reaction/erikasurprise
 	name = "Erika Surprise"
-	id = "erikasurprise"
-	results = list("erikasurprise" = 5)
-	required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/erikasurprise
+	results = list(/datum/reagent/consumable/ethanol/erikasurprise = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/ale = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/banana = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/devilskiss
 	name = "Devils Kiss"
-	id = "devilskiss"
-	results = list("devilskiss" = 3)
-	required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
+	id = /datum/reagent/consumable/ethanol/devilskiss
+	results = list(/datum/reagent/consumable/ethanol/devilskiss = 3)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/rum = 1)
 
 /datum/chemical_reaction/hippiesdelight
 	name = "Hippies Delight"
-	id = "hippiesdelight"
-	results = list("hippiesdelight" = 2)
-	required_reagents = list("mushroomhallucinogen" = 1, "gargleblaster" = 1)
+	id = /datum/reagent/consumable/ethanol/hippies_delight
+	results = list(/datum/reagent/consumable/ethanol/hippies_delight = 2)
+	required_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 1, /datum/reagent/consumable/ethanol/gargle_blaster = 1)
 
 /datum/chemical_reaction/bananahonk
 	name = "Banana Honk"
-	id = "bananahonk"
-	results = list("bananahonk" = 2)
-	required_reagents = list("laughter" = 1, "cream" = 1)
+	id = /datum/reagent/consumable/ethanol/bananahonk
+	results = list(/datum/reagent/consumable/ethanol/bananahonk = 2)
+	required_reagents = list(/datum/reagent/consumable/laughter = 1, /datum/reagent/consumable/cream = 1)
 
 /datum/chemical_reaction/silencer
 	name = "Silencer"
-	id = "silencer"
-	results = list("silencer" = 3)
-	required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
+	id = /datum/reagent/consumable/ethanol/silencer
+	results = list(/datum/reagent/consumable/ethanol/silencer = 3)
+	required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/driestmartini
 	name = "Driest Martini"
-	id = "driestmartini"
-	results = list("driestmartini" = 2)
-	required_reagents = list("nothing" = 1, "gin" = 1)
+	id = /datum/reagent/consumable/ethanol/driestmartini
+	results = list(/datum/reagent/consumable/ethanol/driestmartini = 2)
+	required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/ethanol/gin = 1)
 
 /datum/chemical_reaction/thirteenloko
 	name = "Thirteen Loko"
-	id = "thirteenloko"
-	results = list("thirteenloko" = 3)
-	required_reagents = list("vodka" = 1, "coffee" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/thirteenloko
+	results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/chocolatepudding
 	name = "Chocolate Pudding"
-	id = "chocolatepudding"
-	results = list("chocolatepudding" = 20)
-	required_reagents = list("chocolate_milk" = 10, "eggyolk" = 5)
+	id = /datum/reagent/consumable/chocolatepudding
+	results = list(/datum/reagent/consumable/chocolatepudding = 20)
+	required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 10, /datum/reagent/consumable/eggyolk = 5)
 
 /datum/chemical_reaction/vanillapudding
 	name = "Vanilla Pudding"
-	id = "vanillapudding"
-	results = list("vanillapudding" = 20)
-	required_reagents = list("vanilla" = 5, "milk" = 5, "eggyolk" = 5)
+	id = /datum/reagent/consumable/vanillapudding
+	results = list(/datum/reagent/consumable/vanillapudding = 20)
+	required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/eggyolk = 5)
 
 /datum/chemical_reaction/drunkenblumpkin
 	name = "Drunken Blumpkin"
-	id = "drunkenblumpkin"
-	results = list("drunkenblumpkin" = 4)
-	required_reagents = list("blumpkinjuice" = 1, "irishcream" = 2, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/drunkenblumpkin
+	results = list(/datum/reagent/consumable/ethanol/drunkenblumpkin = 4)
+	required_reagents = list(/datum/reagent/consumable/blumpkinjuice = 1, /datum/reagent/consumable/ethanol/irish_cream = 2, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/pumpkin_latte
 	name = "Pumpkin space latte"
-	id = "pumpkin_latte"
-	results = list("pumpkin_latte" = 15)
-	required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
+	id = /datum/reagent/consumable/pumpkin_latte
+	results = list(/datum/reagent/consumable/pumpkin_latte = 15)
+	required_reagents = list(/datum/reagent/consumable/pumpkinjuice = 5, /datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/cream = 5)
 
 /datum/chemical_reaction/gibbfloats
 	name = "Gibb Floats"
-	id = "gibbfloats"
-	results = list("gibbfloats" = 15)
-	required_reagents = list("dr_gibb" = 5, "ice" = 5, "cream" = 5)
+	id = /datum/reagent/consumable/gibbfloats
+	results = list(/datum/reagent/consumable/gibbfloats = 15)
+	required_reagents = list(/datum/reagent/consumable/dr_gibb = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5)
 
 /datum/chemical_reaction/triple_citrus
 	name = "triple_citrus"
-	id = "triple_citrus"
-	results = list("triple_citrus" = 5)
-	required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
+	id = /datum/reagent/consumable/triple_citrus
+	results = list(/datum/reagent/consumable/triple_citrus = 5)
+	required_reagents = list(/datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/orangejuice = 1)
 
 /datum/chemical_reaction/grape_soda
 	name = "grape soda"
-	id = "grapesoda"
-	results = list("grapesoda" = 2)
-	required_reagents = list("grapejuice" = 1, "sodawater" = 1)
+	id = /datum/reagent/consumable/grape_soda
+	results = list(/datum/reagent/consumable/grape_soda = 2)
+	required_reagents = list(/datum/reagent/consumable/grapejuice = 1, /datum/reagent/consumable/sodawater = 1)
 
 /datum/chemical_reaction/grappa
 	name = "grappa"
-	id = "grappa"
-	results = list("grappa" = 10)
-	required_reagents = list ("wine" = 10)
-	required_catalysts = list ("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/grappa
+	results = list(/datum/reagent/consumable/ethanol/grappa = 10)
+	required_reagents = list (/datum/reagent/consumable/ethanol/wine = 10)
+	required_catalysts = list (/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/whiskey_sour
 	name = "Whiskey Sour"
-	id = "whiskey_sour"
-	results = list("whiskey_sour" = 3)
-	required_reagents = list("whiskey" = 1, "lemonjuice" = 1, "sugar" = 1)
+	id = /datum/reagent/consumable/ethanol/whiskey_sour
+	results = list(/datum/reagent/consumable/ethanol/whiskey_sour = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/sugar = 1)
 	mix_message = "The mixture darkens to a rich gold hue."
 
 /datum/chemical_reaction/fetching_fizz
 	name = "Fetching Fizz"
-	id = "fetching_fizz"
-	results = list("fetching_fizz" = 3)
-	required_reagents = list("nuka_cola" = 1, "iron" = 1) //Manufacturable from only the mining station
+	id = /datum/reagent/consumable/ethanol/fetching_fizz
+	results = list(/datum/reagent/consumable/ethanol/fetching_fizz = 3)
+	required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station
 	mix_message = "The mixture slightly vibrates before settling."
 
 /datum/chemical_reaction/hearty_punch
 	name = "Hearty Punch"
-	id = "hearty_punch"
-	results = list("hearty_punch" = 1)  //Very little, for balance reasons
-	required_reagents = list("bravebull" = 5, "syndicatebomb" = 5, "absinthe" = 5)
+	id = /datum/reagent/consumable/ethanol/hearty_punch
+	results = list(/datum/reagent/consumable/ethanol/hearty_punch = 1)  //Very little, for balance reasons
+	required_reagents = list(/datum/reagent/consumable/ethanol/brave_bull = 5, /datum/reagent/consumable/ethanol/syndicatebomb = 5, /datum/reagent/consumable/ethanol/absinthe = 5)
 	mix_message = "The mixture darkens to a healthy crimson."
 	required_temp = 315 //Piping hot!
 
 /datum/chemical_reaction/bacchus_blessing
 	name = "Bacchus' Blessing"
-	id = "bacchus_blessing"
-	results = list("bacchus_blessing" = 4)
-	required_reagents = list("hooch" = 1, "absinthe" = 1, "manlydorf" = 1, "syndicatebomb" = 1)
+	id = /datum/reagent/consumable/ethanol/bacchus_blessing
+	results = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/hooch = 1, /datum/reagent/consumable/ethanol/absinthe = 1, /datum/reagent/consumable/ethanol/manly_dorf = 1, /datum/reagent/consumable/ethanol/syndicatebomb = 1)
 	mix_message = "<span class='warning'>The mixture turns to a sickening froth.</span>"
 
 /datum/chemical_reaction/lemonade
 	name = "Lemonade"
-	id = "lemonade"
-	results = list("lemonade" = 5)
-	required_reagents = list("lemonjuice" = 2, "water" = 2, "sugar" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/lemonade
+	results = list(/datum/reagent/consumable/lemonade = 5)
+	required_reagents = list(/datum/reagent/consumable/lemonjuice = 2, /datum/reagent/water = 2, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ice = 1)
 	mix_message = "You're suddenly reminded of home."
 
 /datum/chemical_reaction/arnold_palmer
 	name = "Arnold Palmer"
-	id = "arnold_palmer"
-	results = list("arnold_palmer" = 2)
-	required_reagents = list("tea" = 1, "lemonade" = 1)
+	id = /datum/reagent/consumable/tea/arnold_palmer
+	results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
+	required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
 	mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
 
 /datum/chemical_reaction/chocolate_milk
 	name = "chocolate milk"
-	id = "chocolate_milk"
-	results = list("chocolate_milk" = 2)
-	required_reagents = list("milk" = 1, "cocoa" = 1)
+	id = /datum/reagent/consumable/milk/chocolate_milk
+	results = list(/datum/reagent/consumable/milk/chocolate_milk = 2)
+	required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/coco = 1)
 	mix_message = "The color changes as the mixture blends smoothly."
 
 /datum/chemical_reaction/eggnog
 	name = "eggnog"
-	id = "eggnog"
-	results = list("eggnog" = 15)
-	required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5)
+	id = /datum/reagent/consumable/ethanol/eggnog
+	results = list(/datum/reagent/consumable/ethanol/eggnog = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 5)
 
 /datum/chemical_reaction/narsour
 	name = "Nar'sour"
-	id = "narsour"
-	results = list("narsour" = 1)
-	required_reagents = list("blood" = 1, "lemonjuice" = 1, "demonsblood" = 1)
+	id = /datum/reagent/consumable/ethanol/narsour
+	results = list(/datum/reagent/consumable/ethanol/narsour = 1)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/demonsblood = 1)
 	mix_message = "The mixture develops a sinister glow."
 	mix_sound = 'sound/effects/singlebeat.ogg'
 
 /datum/chemical_reaction/quadruplesec
 	name = "Quadruple Sec"
-	id = "quadruple_sec"
-	results = list("quadruple_sec" = 15)
-	required_reagents = list("triple_sec" = 5, "triple_citrus" = 5, "creme_de_menthe" = 5)
+	id = /datum/reagent/consumable/ethanol/quadruple_sec
+	results = list(/datum/reagent/consumable/ethanol/quadruple_sec = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 5, /datum/reagent/consumable/triple_citrus = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5)
 	mix_message = "The snap of a taser emanates clearly from the mixture as it settles."
 	mix_sound = 'sound/weapons/taser.ogg'
 
 /datum/chemical_reaction/grasshopper
 	name = "Grasshopper"
-	id = "grasshopper"
-	results = list("grasshopper" = 15)
-	required_reagents = list("cream" = 5, "creme_de_menthe" = 5, "creme_de_cacao" = 5)
+	id = /datum/reagent/consumable/ethanol/grasshopper
+	results = list(/datum/reagent/consumable/ethanol/grasshopper = 15)
+	required_reagents = list(/datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5, /datum/reagent/consumable/ethanol/creme_de_cacao = 5)
 	mix_message = "A vibrant green bubbles forth as the mixture emulsifies."
 
 /datum/chemical_reaction/stinger
 	name = "Stinger"
-	id = "stinger"
-	results = list("stinger" = 15)
-	required_reagents = list("whiskey" = 10, "creme_de_menthe" = 5 )
+	id = /datum/reagent/consumable/ethanol/stinger
+	results = list(/datum/reagent/consumable/ethanol/stinger = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 10, /datum/reagent/consumable/ethanol/creme_de_menthe = 5)
 
 /datum/chemical_reaction/quintuplesec
 	name = "Quintuple Sec"
-	id = "quintuple_sec"
-	results = list("quintuple_sec" = 15)
-	required_reagents = list("quadruple_sec" = 5, "clownstears" = 5, "syndicatebomb" = 5)
+	id = /datum/reagent/consumable/ethanol/quintuple_sec
+	results = list(/datum/reagent/consumable/ethanol/quintuple_sec = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/quadruple_sec = 5, /datum/reagent/consumable/clownstears = 5, /datum/reagent/consumable/ethanol/syndicatebomb = 5)
 	mix_message = "Judgement is upon you."
 	mix_message = 'sound/items/airhorn2.ogg'
 
 /datum/chemical_reaction/bastion_bourbon
 	name = "Bastion Bourbon"
-	id = "bastion_bourbon"
-	results = list("bastion_bourbon" = 2)
-	required_reagents = list("tea" = 1, "creme_de_menthe" = 1, "triple_citrus" = 1, "berryjuice" = 1) //herbal and minty, with a hint of citrus and berry
+	id = /datum/reagent/consumable/ethanol/bastion_bourbon
+	results = list(/datum/reagent/consumable/ethanol/bastion_bourbon = 2)
+	required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/berryjuice = 1) //herbal and minty, with a hint of citrus and berry
 	mix_message = "You catch an aroma of hot tea and fruits as the mix blends into a blue-green color."
 
 /datum/chemical_reaction/squirt_cider
 	name = "Squirt Cider"
-	id = "squirt_cider"
-	results = list("squirt_cider" = 1)
-	required_reagents = list("water" = 1, "tomatojuice" = 1, "nutriment" = 1)
+	id = /datum/reagent/consumable/ethanol/squirt_cider
+	results = list(/datum/reagent/consumable/ethanol/squirt_cider = 1)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/consumable/nutriment = 1)
 	mix_message = "The mix swirls and turns a bright red that reminds you of an apple's skin."
 
 /datum/chemical_reaction/fringe_weaver
 	name = "Fringe Weaver"
-	id = "fringe_weaver"
-	results = list("fringe_weaver" = 10)
-	required_reagents = list("ethanol" = 9, "sugar" = 1) //9 karmotrine, 1 adelhyde
+	id = /datum/reagent/consumable/ethanol/fringe_weaver
+	results = list(/datum/reagent/consumable/ethanol/fringe_weaver = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 9, /datum/reagent/consumable/sugar = 1) //9 karmotrine, 1 adelhyde
 	mix_message = "The mix turns a pleasant cream color and foams up."
 
 /datum/chemical_reaction/sugar_rush
 	name = "Sugar Rush"
-	id = "sugar_rush"
-	results = list("sugar_rush" = 4)
-	required_reagents = list("sugar" = 2, "lemonjuice" = 1, "wine" = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
+	id = /datum/reagent/consumable/ethanol/sugar_rush
+	results = list(/datum/reagent/consumable/ethanol/sugar_rush = 4)
+	required_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/wine = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
 	mix_message = "The mixture bubbles and brightens into a girly pink."
 
 /datum/chemical_reaction/crevice_spike
 	name = "Crevice Spike"
-	id = "crevice_spike"
-	results = list("crevice_spike" = 6)
-	required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy)
+	id = /datum/reagent/consumable/ethanol/crevice_spike
+	results = list(/datum/reagent/consumable/ethanol/crevice_spike = 6)
+	required_reagents = list(/datum/reagent/consumable/limejuice = 2, /datum/reagent/consumable/capsaicin = 4) //2 powdered delta (sour), 4 flanergide (spicy)
 	mix_message = "The mixture stings your eyes as it settles."
 
 /datum/chemical_reaction/sake
 	name = "sake"
-	id = "sake"
-	results = list("sake" = 10)
-	required_reagents = list("rice" = 10)
-	required_catalysts = list("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/sake
+	results = list(/datum/reagent/consumable/ethanol/sake = 10)
+	required_reagents = list(/datum/reagent/consumable/rice = 10)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 	mix_message = "The rice grains ferment into a clear, sweet-smelling liquid."
 
 /datum/chemical_reaction/peppermint_patty
 	name = "Peppermint Patty"
-	id = "peppermint_patty"
-	results = list("peppermint_patty" = 10)
-	required_reagents = list("hot_coco" = 6, "creme_de_cacao" = 1, "creme_de_menthe" = 1, "vodka" = 1, "menthol" = 1)
+	id = /datum/reagent/consumable/ethanol/peppermint_patty
+	results = list(/datum/reagent/consumable/ethanol/peppermint_patty = 10)
+	required_reagents = list(/datum/reagent/consumable/hot_coco = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1)
 	mix_message = "The coco turns mint green just as the strong scent hits your nose."
 
 /datum/chemical_reaction/alexander
 	name = "Alexander"
-	id = "alexander"
-	results = list("alexander" = 3)
-	required_reagents = list("cognac" = 1, "creme_de_cacao" = 1, "cream" = 1)
+	id = /datum/reagent/consumable/ethanol/alexander
+	results = list(/datum/reagent/consumable/ethanol/alexander = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/cream = 1)
 
 /datum/chemical_reaction/sidecar
 	name = "Sidecar"
-	id = "sidecar"
-	results = list("sidecar" = 4)
-	required_reagents = list("cognac" = 2, "triple_sec" = 1, "lemonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/sidecar
+	results = list(/datum/reagent/consumable/ethanol/sidecar = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 2, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/lemonjuice = 1)
 
 /datum/chemical_reaction/between_the_sheets
 	name = "Between the Sheets"
-	id = "between_the_sheets"
-	results = list("between_the_sheets" = 5)
-	required_reagents = list("rum" = 1, "sidecar" = 4)
+	id = /datum/reagent/consumable/ethanol/between_the_sheets
+	results = list(/datum/reagent/consumable/ethanol/between_the_sheets = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/sidecar = 4)
 
 /datum/chemical_reaction/kamikaze
 	name = "Kamikaze"
-	id = "kamikaze"
-	results = list("kamikaze" = 3)
-	required_reagents = list("vodka" = 1, "triple_sec" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/kamikaze
+	results = list(/datum/reagent/consumable/ethanol/kamikaze = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/mojito
 	name = "Mojito"
-	id = "mojito"
-	results = list("mojito" = 5)
-	required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
+	id = /datum/reagent/consumable/ethanol/mojito
+	results = list(/datum/reagent/consumable/ethanol/mojito = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/menthol = 1)
 
 /datum/chemical_reaction/fernet_cola
 	name = "Fernet Cola"
-	id = "fernet_cola"
-	results = list("fernet_cola" = 2)
-	required_reagents = list("fernet" = 1, "cola" = 1)
+	id = /datum/reagent/consumable/ethanol/fernet_cola
+	results = list(/datum/reagent/consumable/ethanol/fernet_cola = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/fernet = 1, /datum/reagent/consumable/space_cola = 1)
 
 /datum/chemical_reaction/fanciulli
 	name = "Fanciulli"
-	id = "fanciulli"
-	results = list("fanciulli" = 2)
-	required_reagents = list("manhattan" = 1, "fernet" = 1)
+	id = /datum/reagent/consumable/ethanol/fanciulli
+	results = list(/datum/reagent/consumable/ethanol/fanciulli = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 1, /datum/reagent/consumable/ethanol/fernet = 1)
 
 /datum/chemical_reaction/branca_menta
 	name = "Branca Menta"
-	id = "branca_menta"
-	results = list("branca_menta" = 3)
-	required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/branca_menta
+	results = list(/datum/reagent/consumable/ethanol/branca_menta = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/fernet = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/pwrgame
 	name = "Power Gamer"
-	id = "pwr_game"
-	results = list("pwr_game" = 5)
-	required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)
+	id = /datum/reagent/consumable/pwr_game
+	results = list(/datum/reagent/consumable/pwr_game = 5)
+	required_reagents = list(/datum/reagent/consumable/sodawater = 1, /datum/reagent/colorful_reagent/crayonpowder/black = 1, /datum/reagent/consumable/sodiumchloride = 1)
 
 /datum/chemical_reaction/pinkmilk
 	name = "Strawberry Milk"
-	id = "pinkmilk"
-	results = list("pinkmilk" = 5)
-	required_reagents = list("aphro+" = 1, "milk" = 1)
+	id = /datum/reagent/consumable/pinkmilk
+	results = list(/datum/reagent/consumable/pinkmilk = 5)
+	required_reagents = list(/datum/reagent/drug/aphrodisiacplus = 1, /datum/reagent/consumable/milk = 1)
 
 /datum/chemical_reaction/pinktea
 	name = "Strawberry Tea"
-	id = "pinktea"
-	results = list("pinktea" = 5)
-	required_reagents = list("aphro" = 1, "arnold_palmer" = 1, "sugar" = 1)
+	id = /datum/reagent/consumable/pinktea
+	results = list(/datum/reagent/consumable/pinktea = 5)
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/blank_paper
 	name = "Blank Paper"
-	id = "blank_paper"
-	results = list("blank_paper" = 3)
-	required_reagents = list("silencer" = 1, "nothing" = 1, "nuka_cola" = 1)
+	id = /datum/reagent/consumable/ethanol/blank_paper
+	results = list(/datum/reagent/consumable/ethanol/blank_paper = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nuka_cola = 1)
 
 /datum/chemical_reaction/wizz_fizz
 	name = "Wizz Fizz"
-	id = "wizz_fizz"
-	results = list("wizz_fizz" = 3)
-	required_reagents = list("triple_sec" = 1, "sodawater" = 1, "champagne" = 1)
+	id = /datum/reagent/consumable/ethanol/wizz_fizz
+	results = list(/datum/reagent/consumable/ethanol/wizz_fizz = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/ethanol/champagne = 1)
 	mix_message = "The beverage starts to froth with an almost mystical zeal!"
 	mix_sound = 'sound/effects/bubbles2.ogg'
 
 /datum/chemical_reaction/bug_spray
 	name = "Bug Spray"
-	id = "bug_spray"
-	results = list("bug_spray" = 5)
-	required_reagents = list("triple_sec" = 2, "lemon_lime" = 1, "rum" = 2, "vodka" = 1)
+	id = /datum/reagent/consumable/ethanol/bug_spray
+	results = list(/datum/reagent/consumable/ethanol/bug_spray = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 2, /datum/reagent/consumable/lemon_lime = 1, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/vodka = 1)
 	mix_message = "The faint aroma of summer camping trips wafts through the air; but what's that buzzing noise?"
 	mix_sound = 'sound/creatures/bee.ogg'
 
 /datum/chemical_reaction/jack_rose
 	name = "Jack Rose"
-	id = "jack_rose"
-	results = list("jack_rose" = 4)
-	required_reagents = list("grenadine" = 1, "applejack" = 2, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/jack_rose
+	results = list(/datum/reagent/consumable/ethanol/jack_rose = 4)
+	required_reagents = list(/datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/ethanol/applejack = 2, /datum/reagent/consumable/limejuice = 1)
 	mix_message = "As the grenadine incorporates, the beverage takes on a mellow, red-orange glow."
 
 /datum/chemical_reaction/turbo
 	name = "Turbo"
-	id = "turbo"
-	results = list("turbo" = 5)
-	required_reagents = list("moonshine" = 2, "nitrous_oxide" = 1, "sugar_rush" = 1, "pwr_game" = 1)
+	id = /datum/reagent/consumable/ethanol/turbo
+	results = list(/datum/reagent/consumable/ethanol/turbo = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/nitrous_oxide = 1, /datum/reagent/consumable/ethanol/sugar_rush = 1, /datum/reagent/consumable/pwr_game = 1)
 
 /datum/chemical_reaction/old_timer
 	name = "Old Timer"
-	id = "old_timer"
-	results = list("old_timer" = 6)
-	required_reagents = list("whiskeysoda" = 3, "parsnipjuice" = 2, "alexander" = 1)
+	id = /datum/reagent/consumable/ethanol/old_timer
+	results = list(/datum/reagent/consumable/ethanol/old_timer = 6)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskeysoda = 3, /datum/reagent/consumable/parsnipjuice = 2, /datum/reagent/consumable/ethanol/alexander = 1)
 
 /datum/chemical_reaction/rubberneck
 	name = "Rubberneck"
-	id = "rubberneck"
-	results = list("rubberneck" = 10)
-	required_reagents = list("ethanol" = 4, "grey_bull" = 5, "astrotame" = 1)
+	id = /datum/reagent/consumable/ethanol/rubberneck
+	results = list(/datum/reagent/consumable/ethanol/rubberneck = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/grey_bull = 5, /datum/reagent/consumable/astrotame = 1)
 
 /datum/chemical_reaction/duplex
 	name = "Duplex"
-	id = "duplex"
-	results = list("duplex" = 4)
-	required_reagents = list("hcider" = 2, "applejuice" = 1, "berryjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/duplex
+	results = list(/datum/reagent/consumable/ethanol/duplex = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/hcider = 2, /datum/reagent/consumable/applejuice = 1, /datum/reagent/consumable/berryjuice = 1)
 
 /datum/chemical_reaction/trappist
 	name = "Trappist"
-	id = "trappist"
-	results = list("trappist" = 5)
-	required_reagents = list("ale" = 2, "holywater" = 2, "sugar" = 1)
+	id = /datum/reagent/consumable/ethanol/trappist
+	results = list(/datum/reagent/consumable/ethanol/trappist = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/ale = 2, /datum/reagent/water/holywater = 2, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/cream_soda
 	name = "Cream Soda"
-	id = "cream_soda"
-	results = list("cream_soda" = 4)
-	required_reagents = list("sugar" = 2, "sodawater" = 2, "vanilla" = 1)
+	id = /datum/reagent/consumable/cream_soda
+	results = list(/datum/reagent/consumable/cream_soda = 4)
+	required_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/sodawater = 2, /datum/reagent/consumable/vanilla = 1)
 
 /datum/chemical_reaction/blazaam
 	name = "Blazaam"
-	id = "blazaam"
-	results = list("blazaam" = 3)
-	required_reagents = list("gin" = 2, "peachjuice" = 1, "bluespace" = 1)
+	id = /datum/reagent/consumable/ethanol/blazaam
+	results = list(/datum/reagent/consumable/ethanol/blazaam = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/peachjuice = 1, /datum/reagent/bluespace = 1)
 
 /datum/chemical_reaction/planet_cracker
 	name = "Planet Cracker"
-	id = "planet_cracker"
-	results = list("planet_cracker" = 4)
-	required_reagents = list("champagne" = 2, "lizardwine" = 2, "eggyolk" = 1, "gold" = 1)
+	id = /datum/reagent/consumable/ethanol/planet_cracker
+	results = list(/datum/reagent/consumable/ethanol/planet_cracker = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 2, /datum/reagent/consumable/ethanol/lizardwine = 2, /datum/reagent/consumable/eggyolk = 1, /datum/reagent/gold = 1)
 	mix_message = "The liquid's color starts shifting as the nanogold is alternately corroded and redeposited."
 
 /datum/chemical_reaction/red_queen
 	name = "Red Queen"
-	id = "red_queen"
-	results = list("red_queen" = 10)
-	required_reagents = list("tea" = 6, "mercury" = 2, "blackpepper" = 1, "growthserum" = 1)
+	id = /datum/reagent/consumable/red_queen
+	results = list(/datum/reagent/consumable/red_queen = 10)
+	required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1)
 
 /datum/chemical_reaction/catnip_tea
 	name = "Catnip Tea"
-	id = "catnip_tea"
-	results = list("catnip_tea" = 3)
-	required_reagents = list("tea" = 5, "catnip" = 2)
+	id = /datum/reagent/consumable/catnip_tea
+	results = list(/datum/reagent/consumable/catnip_tea = 3)
+	required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
 
 /datum/chemical_reaction/commander_and_chief
 	name = "Commander and Chief"
-	id = "commander_and_chief"
-	results = list("commander_and_chief" = 50)
-	required_reagents = list("alliescocktail" = 50, "champagne" = 20, "doctorsdelight" = 10, "quintuple_sec" = 10, "screwdrivercocktail" = 10)
+	id = /datum/reagent/consumable/ethanol/commander_and_chief
+	results = list(/datum/reagent/consumable/ethanol/commander_and_chief = 50)
+	required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10)
 	mix_message = "When your powers combine, I am Captain Pl-..."
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 404f3a6061..130640ee8a 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -11,8 +11,8 @@
 /datum/chemical_reaction/tofu
 	name = "Tofu"
 	id = "tofu"
-	required_reagents = list("soymilk" = 10)
-	required_catalysts = list("enzyme" = 5)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 10)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 	mob_react = FALSE
 
 /datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
@@ -24,7 +24,7 @@
 /datum/chemical_reaction/chocolate_bar
 	name = "Chocolate Bar"
 	id = "chocolate_bar"
-	required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/sugar = 2)
 
 /datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -35,8 +35,8 @@
 
 /datum/chemical_reaction/chocolate_bar2
 	name = "Chocolate Bar"
-	id = "chocolate_bar"
-	required_reagents = list("chocolate_milk" = 4, "sugar" = 2)
+	id = "chocolate_bar2"
+	required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 4, /datum/reagent/consumable/sugar = 2)
 	mob_react = FALSE
 
 /datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
@@ -47,56 +47,48 @@
 
 /datum/chemical_reaction/hot_coco
 	name = "Hot Coco"
-	id = "hot_coco"
-	results = list("hot_coco" = 5)
-	required_reagents = list("water" = 5, "cocoa" = 1)
+	id = /datum/reagent/consumable/hot_coco
+	results = list(/datum/reagent/consumable/hot_coco = 5)
+	required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/coco = 1)
 
 /datum/chemical_reaction/coffee
 	name = "Coffee"
-	id = "coffee"
-	results = list("coffee" = 5)
-	required_reagents = list("coffeepowder" = 1, "water" = 5)
+	id = /datum/reagent/consumable/coffee
+	results = list(/datum/reagent/consumable/coffee = 5)
+	required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)
 
 /datum/chemical_reaction/tea
 	name = "Tea"
-	id = "tea"
-	results = list("tea" = 5)
-	required_reagents = list("teapowder" = 1, "water" = 5)
+	id = /datum/reagent/consumable/tea
+	results = list(/datum/reagent/consumable/tea = 5)
+	required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5)
 
 /datum/chemical_reaction/soysauce
 	name = "Soy Sauce"
-	id = "soysauce"
-	results = list("soysauce" = 5)
-	required_reagents = list("soymilk" = 4, "sacid" = 1)
+	id = /datum/reagent/consumable/soysauce
+	results = list(/datum/reagent/consumable/soysauce = 5)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 4, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/corn_syrup
 	name = "corn_syrup"
-	id = "corn_syrup"
-	results = list("corn_syrup" = 5)
-	required_reagents = list("corn_starch" = 1, "sacid" = 1)
+	id = /datum/reagent/consumable/corn_syrup
+	results = list(/datum/reagent/consumable/corn_syrup = 5)
+	required_reagents = list(/datum/reagent/consumable/corn_starch = 1, /datum/reagent/toxin/acid = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/caramel
 	name = "Caramel"
-	id = "caramel"
-	results = list("caramel" = 1)
-	required_reagents = list("sugar" = 1)
+	id = /datum/reagent/consumable/caramel
+	results = list(/datum/reagent/consumable/caramel = 1)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1)
 	required_temp = 413
 	mob_react = FALSE
 
-/datum/chemical_reaction/caramel_burned
-	name = "Caramel burned"
-	id = "caramel_burned"
-	results = list("carbon" = 1)
-	required_reagents = list("caramel" = 1)
-	required_temp = 483
-	mob_react = FALSE
-
 /datum/chemical_reaction/cheesewheel
 	name = "Cheesewheel"
 	id = "cheesewheel"
-	required_reagents = list("milk" = 40)
-	required_catalysts = list("enzyme" = 5)
+	required_reagents = list(/datum/reagent/consumable/milk = 40)
+	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -106,7 +98,7 @@
 /datum/chemical_reaction/synthmeat
 	name = "synthmeat"
 	id = "synthmeat"
-	required_reagents = list("blood" = 5, "cryoxadone" = 1)
+	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/cryoxadone = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
@@ -116,20 +108,20 @@
 
 /datum/chemical_reaction/hot_ramen
 	name = "Hot Ramen"
-	id = "hot_ramen"
-	results = list("hot_ramen" = 3)
-	required_reagents = list("water" = 1, "dry_ramen" = 3)
+	id = /datum/reagent/consumable/hot_ramen
+	results = list(/datum/reagent/consumable/hot_ramen = 3)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/consumable/dry_ramen = 3)
 
 /datum/chemical_reaction/hell_ramen
 	name = "Hell Ramen"
-	id = "hell_ramen"
-	results = list("hell_ramen" = 6)
-	required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
+	id = /datum/reagent/consumable/hell_ramen
+	results = list(/datum/reagent/consumable/hell_ramen = 6)
+	required_reagents = list(/datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/hot_ramen = 6)
 
 /datum/chemical_reaction/imitationcarpmeat
 	name = "Imitation Carpmeat"
 	id = "imitationcarpmeat"
-	required_reagents = list("carpotoxin" = 5)
+	required_reagents = list(/datum/reagent/toxin/carpotoxin = 5)
 	required_container = /obj/item/reagent_containers/food/snacks/tofu
 	mix_message = "The mixture becomes similar to carp meat."
 
@@ -142,7 +134,7 @@
 /datum/chemical_reaction/dough
 	name = "Dough"
 	id = "dough"
-	required_reagents = list("water" = 10, "flour" = 15)
+	required_reagents = list(/datum/reagent/water = 10, /datum/reagent/consumable/flour = 15)
 	mix_message = "The ingredients form a dough."
 
 /datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
@@ -153,7 +145,7 @@
 /datum/chemical_reaction/cakebatter
 	name = "Cake Batter"
 	id = "cakebatter"
-	required_reagents = list("eggyolk" = 15, "flour" = 15, "sugar" = 5)
+	required_reagents = list(/datum/reagent/consumable/eggyolk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
 	mix_message = "The ingredients form a cake batter."
 
 /datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume)
@@ -163,12 +155,12 @@
 
 /datum/chemical_reaction/cakebatter/vegan
 	id = "vegancakebatter"
-	required_reagents = list("soymilk" = 15, "flour" = 15, "sugar" = 5)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
 
 /datum/chemical_reaction/ricebowl
 	name = "Rice Bowl"
 	id = "ricebowl"
-	required_reagents = list("rice" = 10, "water" = 10)
+	required_reagents = list(/datum/reagent/consumable/rice = 10, /datum/reagent/water = 10)
 	required_container = /obj/item/reagent_containers/glass/bowl
 	mix_message = "The rice absorbs the water."
 
@@ -180,6 +172,6 @@
 
 /datum/chemical_reaction/bbqsauce
 	name = "BBQ Sauce"
-	id = "bbqsauce"
-	results = list("bbqsauce" = 5)
-	required_reagents = list("ash" = 1, "tomatojuice" = 1, "salglu_solution" = 3, "blackpepper" = 1)
\ No newline at end of file
+	id = /datum/reagent/consumable/bbqsauce
+	results = list(/datum/reagent/consumable/bbqsauce = 5)
+	required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index 7977a715d8..f0fe936d05 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -108,7 +108,7 @@ datum/crafting_recipe/food/donut/meat
 /datum/crafting_recipe/food/donut/bungo
 	name = "Bungo Donut"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/datum/reagent/consumable/bungojuice = 3,
 		/obj/item/reagent_containers/food/snacks/donut/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/bungo
@@ -175,7 +175,7 @@ datum/crafting_recipe/food/donut/meat
 /datum/crafting_recipe/food/donut/jelly/bungo
 	name = "Bungo Jelly Donut"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/datum/reagent/consumable/bungojuice = 3,
 		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo
@@ -242,7 +242,7 @@ datum/crafting_recipe/food/donut/meat
 /datum/crafting_recipe/food/donut/slimejelly/bungo
 	name = "Bungo Slime Donut"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/datum/reagent/consumable/bungojuice = 3,
 		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo
diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm
index c273690571..6f1e19d5e0 100644
--- a/code/modules/goonchat/browserOutput.dm
+++ b/code/modules/goonchat/browserOutput.dm
@@ -8,6 +8,8 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of ico
 //On client, created on login
 /datum/chatOutput
 	var/client/owner	 //client ref
+	var/total_checks = 0
+	var/last_check = 0
 	var/loaded       = FALSE // Has the client loaded the browser output area?
 	var/list/messageQueue //If they haven't loaded chat, this is where messages will go until they do
 	var/cookieSent   = FALSE // Has the client sent a cookie for analysis
@@ -150,6 +152,18 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of ico
 
 //Called by client, sent data to investigate (cookie history so far)
 /datum/chatOutput/proc/analyzeClientData(cookie = "")
+	//Spam check
+	if(world.time  >  last_check + (3 SECONDS))
+		last_check = world.time
+		total_checks = 0
+
+	total_checks += 1
+
+	if(total_checks > SPAM_TRIGGER_AUTOMUTE)
+		message_admins("[key_name(owner)] kicked for goonchat topic spam")
+		qdel(owner)
+		return
+
 	if(!cookie)
 		return
 
@@ -158,13 +172,22 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of ico
 		if (connData && islist(connData) && connData.len > 0 && connData["connData"])
 			connectionHistory = connData["connData"] //lol fuck
 			var/list/found = new()
-			for(var/i in connectionHistory.len to 1 step -1)
+			if(connectionHistory.len > 5)
+				message_admins("[key_name(src.owner)] was kicked for an invalid ban cookie)")
+				qdel(owner)
+				return
+
+			for(var/i in min(connectionHistory.len, 5) to 1 step -1)
+				if(QDELETED(owner))
+					//he got cleaned up before we were done
+					return
 				var/list/row = src.connectionHistory[i]
 				if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object
 					return
 				if (world.IsBanned(row["ckey"], row["ip"], row["compid"], real_bans_only=TRUE))
 					found = row
 					break
+				CHECK_TICK
 
 			//Uh oh this fucker has a history of playing on a banned account!!
 			if (found.len > 0)
diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js
index abd05d29ed..823ad107d2 100644
--- a/code/modules/goonchat/browserassets/js/browserOutput.js
+++ b/code/modules/goonchat/browserassets/js/browserOutput.js
@@ -421,8 +421,8 @@ function handleClientData(ckey, ip, compid) {
 				return; //Record already exists
 			}
 		}
-
-		if (opts.clientData.length >= opts.clientDataLimit) {
+		//Lets make sure we obey our limit (can connect from server with higher limit)
+		while (opts.clientData.length >= opts.clientDataLimit) {
 			opts.clientData.shift();
 		}
 	} else {
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 3cb05a8f7e..1898fe4b01 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -163,7 +163,7 @@
 	icon_state = "briochecake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
 	slices_num = 6
-	bonus_reagents = list("nutriment" = 10, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
 
 /obj/item/reagent_containers/food/snacks/cakeslice/brioche
 	name = "brioche cake slice"
@@ -184,10 +184,10 @@
 	name = "scotch egg"
 	desc = "A boiled egg wrapped in a delicious, seasoned meatball."
 	icon_state = "scotchegg"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bitesize = 3
 	filling_color = "#FFFFF0"
-	list_reagents = list("nutriment" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
 
 /datum/crafting_recipe/food/scotchegg
 	name = "Scotch egg"
@@ -204,8 +204,8 @@
 	name = "Mammi"
 	desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
 	icon_state = "mammi"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 1)
-	list_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
 
 /datum/crafting_recipe/food/mammi
 	name = "Mammi"
@@ -221,8 +221,8 @@
 	name = "chocolate bunny"
 	desc = "Contains less than 10% real rabbit!"
 	icon_state = "chocolatebunny"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-	list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
 	filling_color = "#A0522D"
 
 /datum/crafting_recipe/food/chocolatebunny
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index d71e7c0f6a..bd4c26e0f2 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -95,7 +95,7 @@
 	last_poof = world.realtime
 	var/datum/reagents/R = new/datum/reagents(100)//Hey, just in case.
 	var/datum/effect_system/smoke_spread/chem/s = new()
-	R.add_reagent("secretcatchem", 10)
+	R.add_reagent(/datum/reagent/fermi/secretcatchem, 10)
 	s.set_up(R, 0, loc)
 	s.start()
 	visible_message("<b>[src]</b> disappears in a puff of smoke!")
@@ -181,7 +181,7 @@
 				visible_message("<b>[src]</b> raises an eyebrown, <span class='spooky'>\"It's 4 candies for that [gender]! Thems the rules!\"</span>")
 				return
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"Off comes your head, a pumpkin taking it's stead!\"</span>")
-			C.reagents.add_reagent("pumpkinmutationtoxin", 5)
+			C.reagents.add_reagent(/datum/reagent/mutationtoxin/pumpkinhead, 5)
 			sleep(20)
 			poof()
 			return
@@ -340,7 +340,7 @@
 			C.equip_to_slot(jaqc_latern, SLOT_HEAD, 1, 1)
 		if(4)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"In your body there's something amiss, you'll find it's a chem made by my sis!\"</span>")
-			C.reagents.add_reagent("eigenstate", 30)
+			C.reagents.add_reagent(/datum/reagent/fermi/eigenstate, 30)
 		if(5)
 			visible_message("<b>[src]</b> waves their arms around, <span class='spooky'>\"A new familiar for me, and you'll see it's thee!\"</span>")
 			C.reagents.add_reagent("secretcatchem", 30)
@@ -411,7 +411,6 @@
 
 /datum/reagent/mutationtoxin/pumpkinhead
 	name = "Pumpkin head mutation toxin"
-	id = "pumpkinmutationtoxin"
 	race = /datum/species/dullahan/pumpkin
 	mutationtext = "<span class='spooky'>The pain subsides. You feel your head roll off your shoulders... and you smell pumpkin."
 	//I couldn't get the replace head sprite with a pumpkin to work so, it is what it is.
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 889706744a..d551222836 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -59,9 +59,7 @@
 		return
 	var/area/AS = get_area(src)
 	if(istype(AS, /area/holodeck))
-		log_world("### MAPPING ERROR")
-		log_world("Holodeck computer cannot be in a holodeck.")
-		log_world("This would cause circular power dependency.")
+		log_mapping("Holodeck computer cannot be in a holodeck, This would cause circular power dependency.")
 		qdel(src)
 		return
 	else
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 3c4ed776b7..a058601c39 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -65,7 +65,7 @@
 	var/datum/reagent/R = null
 	if(random_reagent)
 		R = pick(subtypesof(/datum/reagent))
-		R = GLOB.chemical_reagents_list[initial(R.id)]
+		R = GLOB.chemical_reagents_list[R]
 
 	queen_bee = new(src)
 	queen_bee.beehome = src
@@ -95,7 +95,7 @@
 				bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
 				var/obj/item/reagent_containers/honeycomb/HC = new(src)
 				if(queen_bee.beegent)
-					HC.set_reagent(queen_bee.beegent.id)
+					HC.set_reagent(queen_bee.beegent.type)
 				honeycombs += HC
 
 		if(bees.len < get_max_bees())
diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
index e7faff0209..5bb2936c1e 100644
--- a/code/modules/hydroponics/beekeeping/honeycomb.dm
+++ b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -9,7 +9,7 @@
 	disease_amount = 0
 	volume = 10
 	amount_per_transfer_from_this = 0
-	list_reagents = list("honey" = 5)
+	list_reagents = list(/datum/reagent/consumable/honey = 5)
 	grind_results = list()
 	var/honey_color = ""
 
@@ -31,10 +31,10 @@
 
 /obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent)
 	var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
-	if(istype(R))
+	if(R)
 		name = "honeycomb ([R.name])"
 		honey_color = R.color
-		reagents.add_reagent(R.id,5)
+		reagents.add_reagent(reagent,5)
 	else
 		honey_color = ""
 	update_icon()
\ No newline at end of file
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index fb40e4eebd..ac750a0492 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -210,9 +210,9 @@
 	var/S = 0
 	for(var/obj/item/reagent_containers/food/snacks/grown/I in contents)
 		S += 5
-		if(I.reagents.get_reagent_amount("nutriment") < 0.1)
+		if(I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment) < 0.1)
 			points += 1*productivity
-		else points += I.reagents.get_reagent_amount("nutriment")*10*productivity
+		else points += I.reagents.get_reagent_amount(/datum/reagent/consumable/nutriment)*10*productivity
 		qdel(I)
 	if(S)
 		processing = TRUE
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index e9001322d3..ab6625b46d 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -33,7 +33,7 @@
 			data["tastes"] = list(fruit.wine_flavor = 1)
 		else
 			data["tastes"] = list(fruit.tastes[1] = 1)
-		reagents.add_reagent("fruit_wine", amount, data)
+		reagents.add_reagent(/datum/reagent/consumable/ethanol/fruit_wine, amount, data)
 	qdel(fruit)
 	playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
 
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index 3376bac1cc..77199b3496 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -240,7 +240,7 @@
 				dat += "</table>"
 			else
 				dat += "No trait-related genes detected in sample.<br>"
-			if(can_insert && istype(disk.gene, /datum/plant_gene/trait))
+			if(can_insert && istype(disk.gene, /datum/plant_gene/trait) && !seed.is_gene_forbidden(disk.gene.type))
 				dat += "<a href='?src=[REF(src)];op=insert'>Insert: [disk.gene.get_name()]</a>"
 			dat += "</div>"
 	else
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 660f1e17e4..91ccce7cfd 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -144,20 +144,20 @@
 	return TRUE
 
 /obj/item/reagent_containers/food/snacks/grown/on_grind()
-	var/nutriment = reagents.get_reagent_amount("nutriment")
+	var/nutriment = reagents.get_reagent_amount(/datum/reagent/consumable/nutriment)
 	if(grind_results&&grind_results.len)
 		for(var/i in 1 to grind_results.len)
 			grind_results[grind_results[i]] = nutriment
-		reagents.del_reagent("nutriment")
-		reagents.del_reagent("vitamin")
+		reagents.del_reagent(/datum/reagent/consumable/nutriment)
+		reagents.del_reagent(/datum/reagent/consumable/nutriment/vitamin)
 
 /obj/item/reagent_containers/food/snacks/grown/on_juice()
-	var/nutriment = reagents.get_reagent_amount("nutriment")
+	var/nutriment = reagents.get_reagent_amount(/datum/reagent/consumable/nutriment)
 	if(juice_results&&juice_results.len)
 		for(var/i in 1 to juice_results.len)
 			juice_results[juice_results[i]] = nutriment
-		reagents.del_reagent("nutriment")
-		reagents.del_reagent("vitamin")
+		reagents.del_reagent(/datum/reagent/consumable/nutriment)
+		reagents.del_reagent(/datum/reagent/consumable/nutriment/vitamin)
 
 // For item-containing growns such as eggy or gatfruit
 /obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index a3b93db1ea..e84025208a 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -25,7 +25,7 @@
 	icon_dead = "ambrosia-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/ambrosia/deus)
-	reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05, "toxin" = 0.1)
+	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/bicaridine = 0.1, /datum/reagent/medicine/kelotane = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
 	seed = /obj/item/seeds/ambrosia
@@ -42,7 +42,7 @@
 	plantname = "Ambrosia Deus"
 	product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
 	mutatelist = list(/obj/item/seeds/ambrosia/gaia)
-	reagents_add = list("omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 	rarity = 40
 
 /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
@@ -62,7 +62,7 @@
 	plantname = "Ambrosia Gaia"
 	product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
 	mutatelist = list(/obj/item/seeds/ambrosia/deus)
-	reagents_add = list("earthsblood" = 0.05, "nutriment" = 0.06, "vitamin" = 0.05)
+	reagents_add = list(/datum/reagent/medicine/earthsblood = 0.05, /datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/nutriment/vitamin = 0.05)
 	rarity = 30 //These are some pretty good plants right here
 	genes = list()
 	weed_rate = 4
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 007c0b2454..f8e58aee1b 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -14,7 +14,7 @@
 	icon_dead = "apple-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/apple/gold)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/apple
 	seed = /obj/item/seeds/apple
@@ -24,9 +24,9 @@
 	filling_color = "#FF4500"
 	bitesize = 100 // Always eat the apple in one bite
 	foodtype = FRUIT
-	juice_results = list("applejuice" = 0)
+	juice_results = list(/datum/reagent/consumable/applejuice = 0)
 	tastes = list("apple" = 1)
-	distill_reagent = "hcider"
+	distill_reagent = /datum/reagent/consumable/ethanol/hcider
 
 // Gold Apple
 /obj/item/seeds/apple/gold
@@ -39,7 +39,7 @@
 	maturation = 10
 	production = 10
 	mutatelist = list()
-	reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/gold = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 40 // Alchemy!
 
 /obj/item/reagent_containers/food/snacks/grown/apple/gold
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index b25f76c1c8..7668d17ac1 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -12,7 +12,7 @@
 	icon_dead = "banana-dead"
 	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace, /obj/item/seeds/banana/exotic_banana)
-	reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/consumable/banana = 0.1, /datum/reagent/potassium = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
 
 /obj/item/reagent_containers/food/snacks/grown/banana
 	seed = /obj/item/seeds/banana
@@ -24,8 +24,8 @@
 	filling_color = "#FFFF00"
 	bitesize = 5
 	foodtype = FRUIT
-	juice_results = list("banana" = 0)
-	distill_reagent = "bananahonk"
+	juice_results = list(/datum/reagent/consumable/banana = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
 
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -70,7 +70,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/banana/mime
 	growthstages = 4
 	mutatelist = list()
-	reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/toxin/mutetoxin = 0.1, /datum/reagent/consumable/nutriment = 0.02)
 	rarity = 15
 
 /obj/item/reagent_containers/food/snacks/grown/banana/mime
@@ -80,7 +80,7 @@
 	icon_state = "mimana"
 	trash = /obj/item/grown/bananapeel/mimanapeel
 	filling_color = "#FFFFEE"
-	distill_reagent = "silencer"
+	distill_reagent = /datum/reagent/consumable/ethanol/silencer
 
 /obj/item/grown/bananapeel/mimanapeel
 	seed = /obj/item/seeds/banana/mime
@@ -100,7 +100,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
 	mutatelist = list()
 	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("bluespace" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/bluespace = 0.2, /datum/reagent/consumable/banana = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
@@ -137,9 +137,9 @@
 	name = "banana spider"
 	desc = "You do not know what it is, but you can bet the clown would love it."
 	icon_state = "exoticbanana"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GROSS | MEAT | RAW | FRUIT
-	grind_results = list("blood" = 20, "liquidgibs" = 5)
+	grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
 	var/awakening = 0
 
 /obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable/attack_self(mob/user)
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index 4338e3b070..3e5fee411f 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -15,7 +15,7 @@
 	icon_dead = "soybean-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/soya/koi)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05, "cooking_oil" = 0.03) //Vegetable oil!
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/consumable/cooking_oil = 0.03) //Vegetable oil!
 
 /obj/item/reagent_containers/food/snacks/grown/soybeans
 	seed = /obj/item/seeds/soya
@@ -26,7 +26,7 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	grind_results = list("soymilk" = 0)
+	grind_results = list(/datum/reagent/consumable/soymilk = 0)
 	tastes = list("soy" = 1)
 	wine_power = 20
 
@@ -40,7 +40,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/koibeans
 	potency = 10
 	mutatelist = list()
-	reagents_add = list("carpotoxin" = 0.1, "vitamin" = 0.04, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/toxin/carpotoxin = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/koibeans
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 94dbc74499..0646ae1a8c 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -15,7 +15,7 @@
 	icon_dead = "berry-dead" // Same for the dead icon
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/berries
 	seed = /obj/item/seeds/berry
@@ -26,9 +26,9 @@
 	filling_color = "#FF00FF"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	juice_results = list("berryjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/berryjuice = 0)
 	tastes = list("berry" = 1)
-	distill_reagent = "gin"
+	distill_reagent = /datum/reagent/consumable/ethanol/gin
 
 // Poison Berries
 /obj/item/seeds/berry/poison
@@ -39,7 +39,7 @@
 	plantname = "Poison-Berry Bush"
 	product = /obj/item/reagent_containers/food/snacks/grown/berries/poison
 	mutatelist = list(/obj/item/seeds/berry/death)
-	reagents_add = list("cyanide" = 0.15, "tirizene" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/toxin/cyanide = 0.15, /datum/reagent/toxin/staminatoxin = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 10 // Mildly poisonous berries are common in reality
 
 /obj/item/reagent_containers/food/snacks/grown/berries/poison
@@ -49,7 +49,7 @@
 	icon_state = "poisonberrypile"
 	filling_color = "#C71585"
 	foodtype = FRUIT | TOXIC
-	juice_results = list("poisonberryjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
 	tastes = list("poison-berry" = 1)
 	distill_reagent = null
 	wine_power = 35
@@ -65,7 +65,7 @@
 	lifespan = 30
 	potency = 50
 	mutatelist = list()
-	reagents_add = list("coniine" = 0.08, "tirizene" = 0.1, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/toxin/coniine = 0.08, /datum/reagent/toxin/staminatoxin = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/berries/death
@@ -91,7 +91,7 @@
 	endurance = 25
 	mutatelist = list()
 	genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/noreact, /datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/uranium = 0.25, /datum/reagent/iodine = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/berries/glow
@@ -124,7 +124,7 @@
 	icon_harvest = "cherry-harvest"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/cherry/blue, /obj/item/seeds/cherry/bulb)
-	reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
 
 /obj/item/reagent_containers/food/snacks/grown/cherries
 	seed = /obj/item/seeds/cherry
@@ -135,7 +135,7 @@
 	filling_color = "#FF0000"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list("cherryjelly" = 0)
+	grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
 	tastes = list("cherry" = 1)
 	wine_power = 30
 
@@ -148,7 +148,7 @@
 	plantname = "Blue Cherry Tree"
 	product = /obj/item/reagent_containers/food/snacks/grown/bluecherries
 	mutatelist = list()
-	reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
 	rarity = 10
 
 /obj/item/reagent_containers/food/snacks/grown/bluecherries
@@ -159,7 +159,7 @@
 	filling_color = "#6495ED"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list("bluecherryjelly" = 0)
+	grind_results = list(/datum/reagent/consumable/bluecherryjelly = 0)
 	tastes = list("blue cherry" = 1)
 	wine_power = 50
 
@@ -173,7 +173,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/cherrybulbs
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/pink)
 	mutatelist = list()
-	reagents_add = list("nutriment" = 0.07, "sugar" = 0.07)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.07, /datum/reagent/consumable/sugar = 0.07)
 	rarity = 10
 
 /obj/item/reagent_containers/food/snacks/grown/cherrybulbs
@@ -184,7 +184,7 @@
 	filling_color = "#FF0000"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list("cherryjelly" = 0)
+	grind_results = list(/datum/reagent/consumable/cherryjelly = 0)
 	tastes = list("cherry" = 1)
 	wine_power = 50
 
@@ -207,7 +207,7 @@
 	icon_dead = "grape-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/grape/green)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/grapes
 	seed = /obj/item/seeds/grape
@@ -218,9 +218,9 @@
 	filling_color = "#FF1493"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	juice_results = list("grapejuice" = 0)
+	juice_results = list(/datum/reagent/consumable/grapejuice = 0)
 	tastes = list("grape" = 1)
-	distill_reagent = "wine"
+	distill_reagent = /datum/reagent/consumable/ethanol/wine
 
 // Green Grapes
 /obj/item/seeds/grape/green
@@ -230,7 +230,7 @@
 	species = "greengrape"
 	plantname = "Green-Grape Vine"
 	product = /obj/item/reagent_containers/food/snacks/grown/grapes/green
-	reagents_add = list("kelotane" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1, "sugar" = 0.1)
+	reagents_add = list(/datum/reagent/medicine/kelotane = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1)
 	// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
 	mutatelist = list()
 
@@ -240,7 +240,7 @@
 	icon_state = "greengrapes"
 	filling_color = "#7FFF00"
 	tastes = list("green grape" = 1)
-	distill_reagent = "cognac"
+	distill_reagent = /datum/reagent/consumable/ethanol/cognac
 
 // Strawberry
 /obj/item/seeds/strawberry
@@ -254,7 +254,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
 	icon_grow = "strawberry-grow"
 	icon_dead = "berry-dead"
-	reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.07, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.2)
 	mutatelist = list()
 
 /obj/item/reagent_containers/food/snacks/grown/strawberry
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 6ce3558bc3..621e79fb77 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -17,7 +17,7 @@
 						/obj/item/seeds/cannabis/death,
 						/obj/item/seeds/cannabis/white,
 						/obj/item/seeds/cannabis/ultimate)
-	reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies
+	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.35) // gives u the munchies
 
 
 /obj/item/seeds/cannabis/rainbow
@@ -28,7 +28,7 @@
 	plantname = "Rainbow Weed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
 	mutatelist = list()
-	reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35)
+	reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.15, /datum/reagent/toxin/lipolicide = 0.35)
 	rarity = 40
 
 /obj/item/seeds/cannabis/death
@@ -39,7 +39,7 @@
 	plantname = "Deathweed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death
 	mutatelist = list()
-	reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
+	reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 40
 
 /obj/item/seeds/cannabis/white
@@ -50,7 +50,7 @@
 	plantname = "Lifeweed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white
 	mutatelist = list()
-	reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
+	reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 40
 
 
@@ -63,21 +63,21 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green)
 	mutatelist = list()
-	reagents_add = list("space_drugs" = 0.3,
-						"mindbreaker" = 0.3,
-						"mercury" = 0.15,
-						"lithium" = 0.15,
-						"atropine" = 0.15,
-						"haloperidol" = 0.15,
-						"methamphetamine" = 0.15,
-						"capsaicin" = 0.15,
-						"barbers_aid" = 0.15,
-						"bath_salts" = 0.15,
-						"itching_powder" = 0.15,
-						"crank" = 0.15,
-						"krokodil" = 0.15,
-						"histamine" = 0.15,
-						"lipolicide" = 0.15)
+	reagents_add = list(/datum/reagent/drug/space_drugs = 0.3,
+						/datum/reagent/toxin/mindbreaker = 0.3,
+						/datum/reagent/mercury = 0.15,
+						/datum/reagent/lithium = 0.15,
+						/datum/reagent/medicine/atropine = 0.15,
+						/datum/reagent/medicine/haloperidol = 0.15,
+						/datum/reagent/drug/methamphetamine = 0.15,
+						/datum/reagent/consumable/capsaicin = 0.15,
+						/datum/reagent/barbers_aid = 0.15,
+						/datum/reagent/drug/bath_salts = 0.15,
+						/datum/reagent/toxin/itching_powder = 0.15,
+						/datum/reagent/drug/crank = 0.15,
+						/datum/reagent/drug/krokodil = 0.15,
+						/datum/reagent/toxin/histamine = 0.15,
+						/datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 69
 
 
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index c53cd6718a..c5a7e0797a 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -11,7 +11,7 @@
 	potency = 15
 	icon_dead = "wheat-dead"
 	mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat)
-	reagents_add = list("nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/wheat
 	seed = /obj/item/seeds/wheat
@@ -22,9 +22,9 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = GRAIN
-	grind_results = list("flour" = 0)
+	grind_results = list(/datum/reagent/consumable/flour = 0)
 	tastes = list("wheat" = 1)
-	distill_reagent = "beer"
+	distill_reagent = /datum/reagent/consumable/ethanol/beer
 
 // Oat
 /obj/item/seeds/wheat/oat
@@ -45,9 +45,9 @@
 	filling_color = "#556B2F"
 	bitesize_mod = 2
 	foodtype = GRAIN
-	grind_results = list("flour" = 0)
+	grind_results = list(/datum/reagent/consumable/flour = 0)
 	tastes = list("oat" = 1)
-	distill_reagent = "ale"
+	distill_reagent = /datum/reagent/consumable/ethanol/ale
 
 // Rice
 /obj/item/seeds/wheat/rice
@@ -69,9 +69,9 @@
 	filling_color = "#FAFAD2"
 	bitesize_mod = 2
 	foodtype = GRAIN
-	grind_results = list("rice" = 0)
+	grind_results = list(/datum/reagent/consumable/rice = 0)
 	tastes = list("rice" = 1)
-	distill_reagent = "sake"
+	distill_reagent = /datum/reagent/consumable/ethanol/sake
 
 //Meatwheat - grows into synthetic meat
 /obj/item/seeds/wheat/meat
@@ -92,7 +92,7 @@
 	bitesize_mod = 2
 	seed = /obj/item/seeds/wheat/meat
 	foodtype = MEAT | GRAIN
-	grind_results = list("flour" = 0, "blood" = 0)
+	grind_results = list(/datum/reagent/consumable/flour = 0, /datum/reagent/blood = 0)
 	tastes = list("meatwheat" = 1)
 	can_distill = FALSE
 
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 6325daacdc..0522b5fd45 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -16,7 +16,7 @@
 	icon_dead = "chili-dead" // Same for the dead icon
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
-	reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/consumable/capsaicin = 0.25, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/chili
 	seed = /obj/item/seeds/chili
@@ -41,7 +41,7 @@
 	production = 4
 	rarity = 20
 	mutatelist = list()
-	reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/consumable/frostoil = 0.25, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.02)
 
 /obj/item/reagent_containers/food/snacks/grown/icepepper
 	seed = /obj/item/seeds/chili/ice
@@ -67,7 +67,7 @@
 	yield = 3
 	rarity = 20
 	mutatelist = list()
-	reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/consumable/condensedcapsaicin = 0.3, /datum/reagent/consumable/capsaicin = 0.55, /datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/ghost_chili
 	seed = /obj/item/seeds/chili/ghost
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 66d03c777c..851753da46 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -23,7 +23,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/orange)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/citrus/lime
 	seed = /obj/item/seeds/lime
@@ -31,7 +31,7 @@
 	desc = "It's so sour, your face will twist."
 	icon_state = "lime"
 	filling_color = "#00FF00"
-	juice_results = list("limejuice" = 0)
+	juice_results = list(/datum/reagent/consumable/limejuice = 0)
 
 // Electric Lime
 /obj/item/seeds/lime/electric
@@ -70,7 +70,7 @@
 	icon_dead = "lime-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/lime, /obj/item/seeds/orange_3d)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/citrus/orange
 	seed = /obj/item/seeds/orange
@@ -78,8 +78,8 @@
 	desc = "It's a tangy fruit."
 	icon_state = "orange"
 	filling_color = "#FFA500"
-	juice_results = list("orangejuice" = 0)
-	distill_reagent = "triple_sec"
+	juice_results = list(/datum/reagent/consumable/orangejuice = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
 
 
 //3D Orange
@@ -98,7 +98,7 @@
 	icon_grow = "lime-grow"
 	icon_dead = "lime-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05, "haloperidol" = 0.15)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/haloperidol = 0.15)
 
 /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d
 	seed = /obj/item/seeds/orange_3d
@@ -106,8 +106,8 @@
 	desc = "You can hardly wrap your head around this thing."
 	icon_state = "orang"
 	filling_color = "#FFA500"
-	juice_results = list("orangejuice" = 0)
-	distill_reagent = "triple_sec"
+	juice_results = list(/datum/reagent/consumable/orangejuice = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
 	tastes = list("polygons" = 1, "oranges" = 1)
 
 /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d/pickup(mob/user)
@@ -134,7 +134,7 @@
 	icon_dead = "lime-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/firelemon)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
 	seed = /obj/item/seeds/lemon
@@ -142,7 +142,7 @@
 	desc = "When life gives you lemons, make lemonade."
 	icon_state = "lemon"
 	filling_color = "#FFD700"
-	juice_results = list("lemonjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/lemonjuice = 0)
 
 // Combustible lemon
 /obj/item/seeds/firelemon //combustible lemon is too long so firelemon
@@ -159,7 +159,7 @@
 	lifespan = 55
 	endurance = 45
 	yield = 4
-	reagents_add = list("nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/firelemon
 	seed = /obj/item/seeds/firelemon
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index 44373515c6..9ac705aa83 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -16,7 +16,7 @@
 	icon_dead = "cocoapod-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/cocoapod/vanillapod, /obj/item/seeds/cocoapod/bungotree)
-	reagents_add = list("cocoa" = 0.25, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/coco = 0.25, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/cocoapod
 	seed = /obj/item/seeds/cocoapod
@@ -27,7 +27,7 @@
 	bitesize_mod = 2
 	foodtype = FRUIT
 	tastes = list("cocoa" = 1)
-	distill_reagent = "creme_de_cacao"
+	distill_reagent = /datum/reagent/consumable/ethanol/creme_de_cacao
 
 // Vanilla Pod
 /obj/item/seeds/cocoapod/vanillapod
@@ -39,7 +39,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/vanillapod
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list()
-	reagents_add = list("vanilla" = 0.25, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/vanilla = 0.25, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/vanillapod
 	seed = /obj/item/seeds/cocoapod/vanillapod
@@ -49,7 +49,7 @@
 	filling_color = "#FFD700"
 	foodtype = FRUIT
 	tastes = list("vanilla" = 1)
-	distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
+	distill_reagent = /datum/reagent/consumable/vanilla //Takes longer, but you can get even more vanilla from it.
 
 /obj/item/seeds/cocoapod/bungotree
 	name = "pack of bungo tree seeds"
@@ -64,7 +64,7 @@
 	production = 7
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list()
-	reagents_add = list("enzyme" = 0.1, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/enzyme = 0.1, /datum/reagent/consumable/nutriment = 0.1)
 	growthstages = 4
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
 	icon_grow = "bungotree-grow"
@@ -79,6 +79,7 @@
 	trash = /obj/item/reagent_containers/food/snacks/grown/bungopit
 	filling_color = "#E8C22F"
 	foodtype = FRUIT
+	juice_results = list(/datum/reagent/consumable/bungojuice = 0)
 	tastes = list("bungo" = 2, "tropical fruitiness" = 1)
 	distill_reagent = null
 
@@ -97,7 +98,7 @@
 /obj/item/reagent_containers/food/snacks/grown/bungopit/Initialize()
 	. =..()
 	reagents.clear_reagents()
-	reagents.add_reagent("bungotoxin", seed.potency * 0.10) //More than this will kill at too low potency
-	reagents.add_reagent("nutriment", seed.potency * 0.04)
+	reagents.add_reagent(/datum/reagent/toxin/bungotoxin, seed.potency * 0.10) //More than this will kill at too low potency
+	reagents.add_reagent(/datum/reagent/consumable/nutriment, seed.potency * 0.04)
 
 
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index 0e5b5272ed..6c852c426d 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -13,7 +13,7 @@
 	icon_grow = "corn-grow" // Uses one growth icons set for all the subtypes
 	icon_dead = "corn-dead" // Same for the dead icon
 	mutatelist = list(/obj/item/seeds/corn/snapcorn)
-	reagents_add = list("cornoil" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/cornoil = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/corn
 	seed = /obj/item/seeds/corn
@@ -25,9 +25,9 @@
 	trash = /obj/item/grown/corncob
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	juice_results = list("corn_starch" = 0)
+	juice_results = list(/datum/reagent/consumable/corn_starch = 0)
 	tastes = list("corn" = 1)
-	distill_reagent = "whiskey"
+	distill_reagent = /datum/reagent/consumable/ethanol/whiskey
 
 /obj/item/grown/corncob
 	name = "corn cob"
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index 7c01a68f0a..f893ad9e57 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -13,7 +13,7 @@
 	icon_dead = "eggplant-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/eggplant/eggy)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/eggplant
 	seed = /obj/item/seeds/eggplant
@@ -36,7 +36,7 @@
 	lifespan = 75
 	production = 12
 	mutatelist = list()
-	reagents_add = list("nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/shell/eggy
 	seed = /obj/item/seeds/eggplant/eggy
@@ -47,4 +47,4 @@
 	filling_color = "#F8F8FF"
 	bitesize_mod = 2
 	foodtype = MEAT
-	distill_reagent = "eggnog"
+	distill_reagent = /datum/reagent/consumable/ethanol/eggnog
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index b7c9550bb9..8cdf403b00 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -15,7 +15,7 @@
 	icon_grow = "poppy-grow"
 	icon_dead = "poppy-dead"
 	mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
-	reagents_add = list("bicaridine" = 0.2, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/medicine/bicaridine = 0.2, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/poppy
 	seed = /obj/item/seeds/poppy
@@ -27,7 +27,7 @@
 	bitesize_mod = 3
 	tastes = list("sesame seeds" = 1)
 	foodtype = VEGETABLES | GROSS
-	distill_reagent = "vermouth"
+	distill_reagent = /datum/reagent/consumable/ethanol/vermouth
 
 // Lily
 /obj/item/seeds/poppy/lily
@@ -68,7 +68,7 @@
 	icon_dead = "spacemanstrumpet-dead"
 	mutatelist = list()
 	genes = list(/datum/plant_gene/reagent/polypyr)
-	reagents_add = list("nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
 	rarity = 30
 
 /obj/item/seeds/poppy/lily/trumpet/Initialize()
@@ -119,7 +119,7 @@
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
 	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
-	reagents_add = list("nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/harebell
 	seed = /obj/item/seeds/harebell
@@ -130,7 +130,7 @@
 	slot_flags = ITEM_SLOT_HEAD
 	filling_color = "#E6E6FA"
 	bitesize_mod = 3
-	distill_reagent = "vermouth"
+	distill_reagent = /datum/reagent/consumable/ethanol/vermouth
 
 // Sunflower
 /obj/item/seeds/sunflower
@@ -148,7 +148,7 @@
 	icon_grow = "sunflower-grow"
 	icon_dead = "sunflower-dead"
 	mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower)
-	reagents_add = list("cooking_oil" = 0.08, "nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/consumable/cooking_oil = 0.08, /datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/grown/sunflower // FLOWER POWER!
 	seed = /obj/item/seeds/sunflower
@@ -184,7 +184,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/moonflower
 	genes = list(/datum/plant_gene/trait/glow/purple)
 	mutatelist = list()
-	reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/consumable/ethanol/moonshine = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.02)
 	rarity = 15
 
 /obj/item/reagent_containers/food/snacks/grown/moonflower
@@ -195,7 +195,7 @@
 	slot_flags = ITEM_SLOT_HEAD
 	filling_color = "#E6E6FA"
 	bitesize_mod = 2
-	distill_reagent = "absinthe" //It's made from flowers.
+	distill_reagent = /datum/reagent/consumable/ethanol/absinthe //It's made from flowers.
 	tastes = list("glowbugs" = 1)
 
 // Novaflower
@@ -209,7 +209,7 @@
 	icon_dead = "sunflower-dead"
 	product = /obj/item/grown/novaflower
 	mutatelist = list()
-	reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0)
+	reagents_add = list(/datum/reagent/consumable/condensedcapsaicin = 0.25, /datum/reagent/consumable/capsaicin = 0.3, /datum/reagent/consumable/nutriment = 0)
 	rarity = 20
 
 /obj/item/grown/novaflower
@@ -227,7 +227,7 @@
 	throw_speed = 1
 	throw_range = 3
 	attack_verb = list("roasted", "scorched", "burned")
-	grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0)
+	grind_results = list(/datum/reagent/consumable/capsaicin = 0, /datum/reagent/consumable/condensedcapsaicin = 0)
 	tastes = list("cooked sunflower" = 1)
 
 /obj/item/grown/novaflower/add_juice()
@@ -277,7 +277,7 @@
 	icon_grow = "bee_balm-grow"
 	icon_dead = "bee_balm-dead"
 	mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/bee_balm/honey) //Lower odds of becoming honey
-	reagents_add = list("spaceacillin" = 0.1, "sterilizine" = 0.05)
+	reagents_add = list(/datum/reagent/medicine/spaceacillin = 0.1, /datum/reagent/space_cleaner/sterilizine = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/bee_balm
 	seed = /obj/item/seeds/bee_balm
@@ -305,7 +305,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
 	icon_grow = "bee_balmalt-grow"
 	icon_dead = "bee_balmalt-dead"
-	reagents_add = list("honey" = 0.1, "lye" = 0.3) //To make wax
+	reagents_add = list(/datum/reagent/consumable/honey = 0.1, /datum/reagent/lye = 0.3) //To make wax
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/bee_balm/honey
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index 02b36d6a3f..3b5159465c 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -16,7 +16,7 @@
 	icon_dead = "grass-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/grass/carpet, /obj/item/seeds/grass/fairy)
-	reagents_add = list("nutriment" = 0.02, "hydrogen" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/grass
 	seed = /obj/item/seeds/grass
@@ -51,7 +51,7 @@
 	icon_grow = "fairygrass-grow"
 	icon_dead = "fairygrass-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue)
-	reagents_add = list("nutriment" = 0.02, "hydrogen" = 0.05, "space_drugs" = 0.15)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05, /datum/reagent/drug/space_drugs = 0.15)
 
 /obj/item/reagent_containers/food/snacks/grown/grass/fairy
 	seed = /obj/item/seeds/grass/fairy
@@ -66,9 +66,9 @@
 	for(var/datum/plant_gene/trait/glow/gene in seed.genes)
 		G = gene
 		break
-	
+
 	stacktype = initial(stacktype)
-	
+
 	if(G)
 		switch(G.type)
 			if(/datum/plant_gene/trait/glow/white)
@@ -85,10 +85,10 @@
 				stacktype = /obj/item/stack/tile/fairygrass/purple
 			if(/datum/plant_gene/trait/glow/pink)
 				stacktype = /obj/item/stack/tile/fairygrass/pink
-	
+
 	. = ..()
 
-		
+
 
 
 // Carpet
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index 6ceb69536d..5f1fdcdaa9 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -14,7 +14,7 @@
 	growthstages = 4
 	rarity = 30
 	var/list/mutations = list()
-	reagents_add = list("charcoal" = 0.04, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/medicine/charcoal = 0.04, /datum/reagent/consumable/nutriment = 0.02)
 
 /obj/item/seeds/kudzu/Copy()
 	var/obj/item/seeds/kudzu/S = ..()
@@ -58,7 +58,7 @@
 /obj/item/seeds/kudzu/on_chem_reaction(datum/reagents/S)
 	var/list/temp_mut_list = list()
 
-	if(S.has_reagent("sterilizine", 5))
+	if(S.has_reagent(/datum/reagent/space_cleaner/sterilizine, 5))
 		for(var/datum/spacevine_mutation/SM in mutations)
 			if(SM.quality == NEGATIVE)
 				temp_mut_list += SM
@@ -66,7 +66,7 @@
 			mutations.Remove(pick(temp_mut_list))
 		temp_mut_list.Cut()
 
-	if(S.has_reagent("welding_fuel", 5))
+	if(S.has_reagent(/datum/reagent/fuel, 5))
 		for(var/datum/spacevine_mutation/SM in mutations)
 			if(SM.quality == POSITIVE)
 				temp_mut_list += SM
@@ -74,7 +74,7 @@
 			mutations.Remove(pick(temp_mut_list))
 		temp_mut_list.Cut()
 
-	if(S.has_reagent("phenol", 5))
+	if(S.has_reagent(/datum/reagent/phenol, 5))
 		for(var/datum/spacevine_mutation/SM in mutations)
 			if(SM.quality == MINOR_NEGATIVE)
 				temp_mut_list += SM
@@ -82,16 +82,16 @@
 			mutations.Remove(pick(temp_mut_list))
 		temp_mut_list.Cut()
 
-	if(S.has_reagent("blood", 15))
+	if(S.has_reagent(/datum/reagent/blood, 15))
 		adjust_production(rand(15, -5))
 
-	if(S.has_reagent("amatoxin", 5))
+	if(S.has_reagent(/datum/reagent/toxin/amatoxin, 5))
 		adjust_production(rand(5, -15))
 
-	if(S.has_reagent("plasma", 5))
+	if(S.has_reagent(/datum/reagent/toxin/plasma, 5))
 		adjust_potency(rand(5, -15))
 
-	if(S.has_reagent("holywater", 10))
+	if(S.has_reagent(/datum/reagent/water/holywater, 10))
 		adjust_potency(rand(15, -5))
 
 
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index e85a36f4b6..940508f66b 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -12,7 +12,7 @@
 	icon_dead = "watermelon-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/watermelon/holy)
-	reagents_add = list("water" = 0.2, "vitamin" = 0.04, "nutriment" = 0.2)
+	reagents_add = list(/datum/reagent/water = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2)
 
 /obj/item/seeds/watermelon/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is swallowing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -33,7 +33,7 @@
 	filling_color = "#008000"
 	bitesize_mod = 3
 	foodtype = FRUIT
-	juice_results = list("watermelonjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/watermelonjuice = 0)
 	wine_power = 40
 
 // Holymelon
@@ -46,7 +46,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/holymelon
 	genes = list(/datum/plant_gene/trait/glow/yellow)
 	mutatelist = list()
-	reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/water/holywater = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/holymelon
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index b37e494233..e0a2453353 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -12,7 +12,7 @@
 	yield = 6
 	potency = 10
 	growthstages = 3
-	grind_results = list("mustardgrind" = 1)
+	grind_results = list(/datum/reagent/mustardgrind = 1)
 	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
 	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
 	mutatelist = list(/obj/item/seeds/starthistle/corpse_flower, /obj/item/seeds/galaxythistle)
@@ -80,7 +80,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
 	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/invasive)
 	mutatelist = list()
-	reagents_add = list("nutriment" = 0.05, "silibinin" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/silibinin = 0.1)
 
 /obj/item/seeds/galaxythistle/Initialize()
 	..()
@@ -116,7 +116,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/replicapod)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/cabbage
 	seed = /obj/item/seeds/cabbage
@@ -142,7 +142,7 @@
 	maturation = 3
 	yield = 4
 	growthstages = 2
-	reagents_add = list("sugar" = 0.25)
+	reagents_add = list(/datum/reagent/consumable/sugar = 0.25)
 	mutatelist = list(/obj/item/seeds/bamboo)
 
 /obj/item/reagent_containers/food/snacks/grown/sugarcane
@@ -153,7 +153,7 @@
 	filling_color = "#FFD700"
 	bitesize_mod = 2
 	foodtype = VEGETABLES | SUGAR
-	distill_reagent = "rum"
+	distill_reagent = /datum/reagent/consumable/ethanol/rum
 
 // Gatfruit
 /obj/item/seeds/gatfruit
@@ -173,7 +173,7 @@
 	growthstages = 2
 	rarity = 60 // Obtainable only with xenobio+superluck.
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
-	reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
+	reagents_add = list(/datum/reagent/sulfur = 0.1, /datum/reagent/carbon = 0.1, /datum/reagent/nitrogen = 0.07, /datum/reagent/potassium = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/shell/gatfruit
 	seed = /obj/item/seeds/gatfruit
@@ -195,7 +195,7 @@
 	plantname = "Cherry Bomb Tree"
 	product = /obj/item/reagent_containers/food/snacks/grown/cherry_bomb
 	mutatelist = list()
-	reagents_add = list("nutriment" = 0.1, "sugar" = 0.1, "blackpowder" = 0.7)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/blackpowder = 0.7)
 	rarity = 60 //See above
 
 /obj/item/reagent_containers/food/snacks/grown/cherry_bomb
@@ -232,7 +232,7 @@
 /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate()
 	reagents.chem_temp = 1000 //Sets off the black powder
 	reagents.handle_reactions()
-	
+
 // Lavaland cactus
 
 /obj/item/seeds/lavaland/cactus
@@ -244,3 +244,279 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
 	growthstages = 2
+
+
+// Coconut
+/obj/item/seeds/coconut
+	name = "pack of coconut seeds"
+	desc = "They're seeds that grow into coconut palm trees."
+	icon_state = "seed-coconut"
+	species = "coconut"
+	plantname = "Coconut Palm Tree"
+	product = /obj/item/reagent_containers/food/snacks/grown/coconut
+	lifespan = 50
+	endurance = 30
+	potency = 35
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
+	icon_dead = "coconut-dead"
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	forbiddengenes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/stinging)
+	reagents_add = list(/datum/reagent/consumable/coconutmilk = 0.3)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut
+	seed = /obj/item/seeds/coconut
+	name = "coconut"
+	desc = "Hard shell of a nut containing delicious milk inside. Perhaps try using something sharp?"
+	icon_state = "coconut"
+	item_state = "coconut"
+	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
+	spillable = FALSE
+	resistance_flags = ACID_PROOF
+	volume = 150 //so it won't cut reagents despite having the capacity for them
+	w_class = WEIGHT_CLASS_SMALL
+	force = 5
+	throwforce = 5
+	hitsound = 'sound/weapons/klonk.ogg'
+	attack_verb = list("klonked", "donked", "bonked")
+	var/opened = FALSE
+	var/carved = FALSE
+	var/chopped = FALSE
+	var/straw = FALSE
+	var/fused = FALSE
+	var/fusedactive = FALSE
+	var/defused = FALSE
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/Initialize(mapload, obj/item/seeds/new_seed)
+	. = ..()
+	var/newvolume = 50 + round(seed.potency,10)
+	if (seed.get_gene(/datum/plant_gene/trait/maxchem))
+		newvolume = newvolume + 50
+	volume = newvolume
+	reagents.maximum_volume = newvolume
+	reagents.update_total()
+
+	transform *= TRANSFORM_USING_VARIABLE(40, 100) + 0.5 //temporary fix for size?
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/attack_self(mob/user)
+	if (!opened)
+		return
+
+	if(!possible_transfer_amounts.len)
+		return
+	var/i=0
+	for(var/A in possible_transfer_amounts)
+		i++
+		if(A != amount_per_transfer_from_this)
+			continue
+		if(i<possible_transfer_amounts.len)
+			amount_per_transfer_from_this = possible_transfer_amounts[i+1]
+		else
+			amount_per_transfer_from_this = possible_transfer_amounts[1]
+		to_chat(user, "<span class='notice'>[src]'s transfer amount is now [amount_per_transfer_from_this] units.</span>")
+		return
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/attackby(obj/item/W, mob/user, params)
+	//DEFUSING NADE LOGIC
+	if (W.tool_behaviour == TOOL_WIRECUTTER && fused)
+		user.show_message("<span class='notice'>You cut the fuse!</span>", MSG_VISUAL)
+		playsound(user, W.hitsound, 50, 1, -1)
+		icon_state = "coconut_carved"
+		desc = "A coconut. This one's got a hole in it."
+		name = "coconut"
+		defused = TRUE
+		fused = FALSE
+		fusedactive = FALSE
+		if(!seed.get_gene(/datum/plant_gene/trait/glow))
+			set_light(0, 0.0)
+		return
+	//IGNITING NADE LOGIC
+	if(!fusedactive && fused)
+		var/lighting_text = W.ignition_effect(src, user)
+		if(lighting_text)
+			user.visible_message("<span class='warning'>[user] ignites [src]'s fuse!</span>", "<span class='userdanger'>You ignite the [src]'s fuse!</span>")
+			fusedactive = TRUE
+			defused = FALSE
+			playsound(src, 'sound/effects/fuse.ogg', 100, 0)
+			message_admins("[ADMIN_LOOKUPFLW(user)] ignited a coconut bomb for detonation at [ADMIN_VERBOSEJMP(user)] [pretty_string_from_reagent_list(reagents.reagent_list)]")
+			log_game("[key_name(user)] primed a coconut grenade for detonation at [AREACOORD(user)].")
+			addtimer(CALLBACK(src, .proc/prime), 5 SECONDS)
+			icon_state = "coconut_grenade_active"
+			desc = "RUN!"
+			if(!seed.get_gene(/datum/plant_gene/trait/glow))
+				light_color = "#FFCC66" //for the fuse
+				set_light(3, 0.8)
+			return
+
+	//ADDING A FUSE, NADE LOGIC
+	if (istype(W,/obj/item/stack/sheet/cloth) || istype(W,/obj/item/stack/sheet/durathread))
+		if (carved && !straw && !fused)
+			user.show_message("<span class='notice'>You add a fuse to the coconut!</span>", 1)
+			W.use(1)
+			fused = TRUE
+			icon_state = "coconut_grenade"
+			desc = "A makeshift bomb made out of a coconut. You estimate the fuse is long enough for 5 seconds."
+			name = "coconut bomb"
+			return
+	//ADDING STRAW LOGIC
+	if (istype(W,/obj/item/stack/sheet/mineral/bamboo) && opened && !straw && fused)
+		user.show_message("<span class='notice'>You add a bamboo straw to the coconut!</span>", 1)
+		straw = TRUE
+		W.use(1)
+		icon_state += "_straw"
+		desc = "You can already feel like you're on a tropical vacation."
+		return
+	//OPENING THE NUT LOGIC
+	if (!carved && !chopped)
+		var/screwdrivered = W.tool_behaviour == TOOL_SCREWDRIVER
+		if(screwdrivered || W.sharpness)
+			user.show_message("<span class='notice'>You [screwdrivered ? "make a hole in the coconut" : "slice the coconut open"]!</span>", 1)
+			carved = TRUE
+			opened = TRUE
+			spillable = !screwdrivered
+			reagent_flags = OPENCONTAINER
+			ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+			icon_state = screwdrivered ? "coconut_carved" : "coconut_chopped"
+			desc = "A coconut. [screwdrivered ? "This one's got a hole in it" : "This one's sliced open, with all its delicious contents for your eyes to savour"]."
+			playsound(user, W.hitsound, 50, 1, -1)
+			return
+	return ..()
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/attack(mob/living/M, mob/user, obj/target)
+	if(M && user.a_intent == INTENT_HARM && !spillable)
+		var/obj/item/bodypart/affecting = user.zone_selected //Find what the player is aiming at
+		if (affecting == BODY_ZONE_HEAD && prob(15))
+			//smash the nut open
+			var/armor_block = min(90, M.run_armor_check(affecting, "melee", null, null,armour_penetration)) // For normal attack damage
+			M.apply_damage(force, BRUTE, affecting, armor_block)
+
+			//Sound
+			playsound(user, hitsound, 100, 1, -1)
+
+			//Attack logs
+			log_combat(user, M, "attacked", src)
+
+			//Display an attack message.
+			if(M != user)
+				M.visible_message("<span class='danger'>[user] has cracked open a [name] on [M]'s head!</span>", \
+						"<span class='userdanger'>[user] has cracked open a [name] on [M]'s head!</span>")
+			else
+				user.visible_message("<span class='danger'>[M] cracks open a [name] on their [M.p_them()] head!</span>", \
+						"<span class='userdanger'>[M] cracks open a [name] on [M.p_their()] head!</span>")
+
+			//The coconut breaks open so splash its reagents
+			spillable = TRUE
+			SplashReagents(M)
+
+			//Lastly we remove the nut
+			qdel(src)
+		else
+			. = ..()
+		return
+
+	if(fusedactive)
+		return
+
+	if(!opened)
+		return
+
+	if(!canconsume(M, user))
+		return
+
+	if(!reagents || !reagents.total_volume)
+		to_chat(user, "<span class='warning'>[src] is empty!</span>")
+		return
+
+	if(user.a_intent == INTENT_HARM && spillable)
+		var/R
+		M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
+						"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
+		if(reagents)
+			for(var/datum/reagent/A in reagents.reagent_list)
+				R += A.type + " ("
+				R += num2text(A.volume) + "),"
+		if(isturf(target) && reagents.reagent_list.len && thrownby)
+			log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+			message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+		reagents.reaction(M, TOUCH)
+		log_combat(user, M, "splashed", R)
+		reagents.clear_reagents()
+	else
+		if(M != user)
+			M.visible_message("<span class='danger'>[user] attempts to feed something to [M].</span>", \
+						"<span class='userdanger'>[user] attempts to feed something to you.</span>")
+			if(!do_mob(user, M))
+				return
+			if(!reagents || !reagents.total_volume)
+				return // The drink might be empty after the delay, such as by spam-feeding
+			M.visible_message("<span class='danger'>[user] feeds something to [M].</span>", "<span class='userdanger'>[user] feeds something to you.</span>")
+			log_combat(user, M, "fed", reagents.log_list())
+		else
+			to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
+		var/fraction = min(5/reagents.total_volume, 1)
+		reagents.reaction(M, INGEST, fraction)
+		addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
+		playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/afterattack(obj/target, mob/user, proximity)
+	. = ..()
+	if(fusedactive)
+		return
+
+	if((!proximity) || !check_allowed_items(target,target_self=1))
+		return
+
+	if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
+		if(!reagents.total_volume)
+			to_chat(user, "<span class='warning'>[src] is empty!</span>")
+			return
+
+		if(target.reagents.holder_full())
+			to_chat(user, "<span class='warning'>[target] is full.</span>")
+			return
+
+		var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+		to_chat(user, "<span class='notice'>You transfer [trans] unit\s of the solution to [target].</span>")
+
+	else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
+		if(!target.reagents.total_volume)
+			to_chat(user, "<span class='warning'>[target] is empty and can't be refilled!</span>")
+			return
+
+		if(reagents.holder_full())
+			to_chat(user, "<span class='warning'>[src] is full.</span>")
+			return
+
+		var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
+		to_chat(user, "<span class='notice'>You fill [src] with [trans] unit\s of the contents of [target].</span>")
+
+	else if(reagents.total_volume)
+		if(user.a_intent == INTENT_HARM && spillable == TRUE)
+			user.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
+								"<span class='notice'>You splash the contents of [src] onto [target].</span>")
+			reagents.reaction(target, TOUCH)
+			reagents.clear_reagents()
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/dropped(mob/user)
+	. = ..()
+	transform *= TRANSFORM_USING_VARIABLE(40, 100) + 0.5 //temporary fix for size?
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/proc/prime()
+	if (defused)
+		return
+	var/turf/T = get_turf(src)
+	reagents.chem_temp = 1000
+	//Disable seperated contents when the grenade primes
+	if (seed.get_gene(/datum/plant_gene/trait/noreact))
+		DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
+	reagents.handle_reactions()
+	log_game("Coconut bomb detonation at [AREACOORD(T)], location [loc]")
+	qdel(src)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/ex_act(severity)
+	qdel(src)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/deconstruct(disassembled = TRUE)
+	if(!disassembled && fused)
+		prime()
+	if(!QDELETED(src))
+		qdel(src)
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index c8e97c78de..7e43911c5c 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -21,7 +21,7 @@
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
+	reagents_add = list(/datum/reagent/medicine/morphine = 0.35, /datum/reagent/medicine/charcoal = 0.35, /datum/reagent/consumable/nutriment = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi
 	seed = /obj/item/seeds/reishi
@@ -47,7 +47,7 @@
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	mutatelist = list(/obj/item/seeds/angel)
-	reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
+	reagents_add = list(/datum/reagent/drug/mushroomhallucinogen = 0.04, /datum/reagent/toxin/amatoxin = 0.35, /datum/reagent/consumable/nutriment = 0, /datum/reagent/growthserum = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
 	seed = /obj/item/seeds/amanita
@@ -73,7 +73,7 @@
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.1, "nutriment" = 0, "amanitin" = 0.2)
+	reagents_add = list(/datum/reagent/drug/mushroomhallucinogen = 0.04, /datum/reagent/toxin/amatoxin = 0.1, /datum/reagent/consumable/nutriment = 0, /datum/reagent/toxin/amanitin = 0.2)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/angel
@@ -99,7 +99,7 @@
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	reagents_add = list("mushroomhallucinogen" = 0.25, "nutriment" = 0.02)
+	reagents_add = list(/datum/reagent/drug/mushroomhallucinogen = 0.25, /datum/reagent/consumable/nutriment = 0.02)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
 	seed = /obj/item/seeds/liberty
@@ -125,7 +125,7 @@
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	mutatelist = list(/obj/item/seeds/plump/walkingmushroom)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
 	seed = /obj/item/seeds/plump
@@ -133,7 +133,7 @@
 	desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
 	icon_state = "plumphelmet"
 	filling_color = "#9370DB"
-	distill_reagent = "manlydorf"
+	distill_reagent = /datum/reagent/consumable/ethanol/manly_dorf
 
 // Walking Mushroom
 /obj/item/seeds/plump/walkingmushroom
@@ -149,7 +149,7 @@
 	yield = 1
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	mutatelist = list()
-	reagents_add = list("vitamin" = 0.05, "nutriment" = 0.15)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.15)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
@@ -190,7 +190,7 @@
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	reagents_add = list("nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
 	mutatelist = list(/obj/item/seeds/chanterelle/jupitercup)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle
@@ -215,7 +215,7 @@
 	growthstages = 2
 	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/plant_type/carnivory)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	reagents_add = list("nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/seeds/chanterelle/jupitercup/Initialize()
 	..()
@@ -248,7 +248,7 @@
 	genes = list(/datum/plant_gene/trait/glow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	mutatelist = list(/obj/item/seeds/glowshroom/glowcap, /obj/item/seeds/glowshroom/shadowshroom)
-	reagents_add = list("radium" = 0.1, "phosphorus" = 0.1, "nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/radium = 0.1, /datum/reagent/phosphorus = 0.1, /datum/reagent/consumable/nutriment = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
 	seed = /obj/item/seeds/glowshroom
@@ -293,7 +293,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
 	genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
 	mutatelist = list()
-	reagents_add = list("teslium" = 0.1, "nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/teslium = 0.1, /datum/reagent/consumable/nutriment = 0.04)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
@@ -318,7 +318,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
 	genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
 	mutatelist = list()
-	reagents_add = list("radium" = 0.2, "nutriment" = 0.04)
+	reagents_add = list(/datum/reagent/radium = 0.2, /datum/reagent/consumable/nutriment = 0.04)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
@@ -350,7 +350,7 @@
 	potency = 15
 	growthstages = 3
 	rarity = 20
-	reagents_add = list("nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
 	resistance_flags = FIRE_PROOF
 
 /obj/item/seeds/lavaland/polypore
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index dbcce2830b..c3bd82c624 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -11,7 +11,7 @@
 	growthstages = 5
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
 	mutatelist = list(/obj/item/seeds/nettle/death)
-	reagents_add = list("sacid" = 0.5)
+	reagents_add = list(/datum/reagent/toxin/acid = 0.5)
 
 /obj/item/seeds/nettle/death
 	name = "pack of death-nettle seeds"
@@ -25,7 +25,7 @@
 	yield = 2
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging)
 	mutatelist = list()
-	reagents_add = list("facid" = 0.5, "sacid" = 0.5)
+	reagents_add = list(/datum/reagent/toxin/acid/fluacid = 0.5, /datum/reagent/toxin/acid = 0.5)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/nettle // "snack"
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index 9cb8d1a63c..2ebaa6d5e2 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -13,7 +13,7 @@
 	growthstages = 3
 	weed_chance = 3
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	mutatelist = list(/obj/item/seeds/onion/red)
 
 /obj/item/reagent_containers/food/snacks/grown/onion
@@ -36,7 +36,7 @@
 	plantname = "Red Onion Sprouts"
 	weed_chance = 1
 	product = /obj/item/reagent_containers/food/snacks/grown/onion/red
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1, "tearjuice" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1, /datum/reagent/consumable/tearjuice = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/onion/red
 	seed = /obj/item/seeds/onion/red
@@ -61,7 +61,7 @@
 	name = "onion slices"
 	desc = "Rings, not for wearing."
 	icon_state = "onionslice"
-	list_reagents = list("nutriment" = 5, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#C0C9A0"
 	gender = PLURAL
 	cooked_type = /obj/item/reagent_containers/food/snacks/onionrings
@@ -71,4 +71,4 @@
 	desc = "They shine like exceptionally low quality amethyst."
 	icon_state = "onionslice_red"
 	filling_color = "#C29ACF"
-	list_reagents = list("nutriment" = 5, "vitamin" = 2, "tearjuice" = 2.5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/tearjuice = 2.5)
diff --git a/code/modules/hydroponics/grown/peach.dm b/code/modules/hydroponics/grown/peach.dm
index 6fbf933bd1..1f48ab5512 100644
--- a/code/modules/hydroponics/grown/peach.dm
+++ b/code/modules/hydroponics/grown/peach.dm
@@ -13,7 +13,7 @@
 	icon_grow = "peach-grow"
 	icon_dead = "peach-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/peach
 	seed = /obj/item/seeds/peach
@@ -23,5 +23,5 @@
 	filling_color = "#FF4500"
 	bitesize = 25
 	foodtype = FRUIT
-	juice_results = list("peachjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/peachjuice = 0)
 	tastes = list("peach" = 1)
diff --git a/code/modules/hydroponics/grown/peanuts.dm b/code/modules/hydroponics/grown/peanuts.dm
index 2423300cc4..3ac1497148 100644
--- a/code/modules/hydroponics/grown/peanuts.dm
+++ b/code/modules/hydroponics/grown/peanuts.dm
@@ -8,7 +8,7 @@
 	yield = 6
 	growthstages = 4
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
-	reagents_add = list("vitamin" = 0.02, "nutriment" = 0.15, "cooking_oil" = 0.03)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.15, /datum/reagent/consumable/cooking_oil = 0.03)
 
 /obj/item/reagent_containers/food/snacks/grown/peanut
 	seed = /obj/item/seeds/peanutseed
@@ -26,5 +26,5 @@
 	desc = "A handful of roasted peanuts, with or without salt."
 	icon_state = "roasted_peanuts"
 	foodtype = VEGETABLES
-	list_reagents = list("nutriment" = 6, "vitamin" = 1)
-	juice_results = list("peanut_butter" = 3)
\ No newline at end of file
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
+	juice_results = list(/datum/reagent/consumable/peanut_butter = 3)
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index e52c261217..40b3a67573 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -12,7 +12,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/apple)
-	reagents_add = list("vitamin" = 0.02, "nutriment" = 0.2, "water" = 0.04)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/nutriment = 0.2, /datum/reagent/water = 0.04)
 
 /obj/item/reagent_containers/food/snacks/grown/pineapple
 	seed = /obj/item/seeds/pineapple
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 50341dfa3a..fad916030d 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -16,7 +16,7 @@
 	icon_dead = "potato-dead"
 	genes = list(/datum/plant_gene/trait/battery)
 	mutatelist = list(/obj/item/seeds/potato/sweet)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/potato
 	seed = /obj/item/seeds/potato
@@ -26,8 +26,8 @@
 	filling_color = "#E9967A"
 	bitesize = 100
 	foodtype = VEGETABLES
-	juice_results = list("potato" = 0)
-	distill_reagent = "vodka"
+	juice_results = list(/datum/reagent/consumable/potato_juice = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/vodka
 
 /obj/item/reagent_containers/food/snacks/grown/potato/wedges
 	name = "potato wedges"
@@ -57,11 +57,11 @@
 	plantname = "Sweet Potato Plants"
 	product = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
 	mutatelist = list()
-	reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/sugar = 0.1, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/potato/sweet
 	seed = /obj/item/seeds/potato/sweet
 	name = "sweet potato"
 	desc = "It's sweet."
 	icon_state = "sweetpotato"
-	distill_reagent = "sbiten"
+	distill_reagent = /datum/reagent/consumable/ethanol/sbiten
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 46dc49a169..6254fb5bcc 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -14,7 +14,7 @@
 	icon_dead = "pumpkin-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/pumpkin/blumpkin)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.2)
 
 /obj/item/reagent_containers/food/snacks/grown/pumpkin
 	seed = /obj/item/seeds/pumpkin
@@ -24,7 +24,7 @@
 	filling_color = "#FFA500"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	juice_results = list("pumpkinjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/pumpkinjuice = 0)
 	wine_power = 20
 
 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -45,7 +45,7 @@
 	plantname = "Blumpkin Vines"
 	product = /obj/item/reagent_containers/food/snacks/grown/blumpkin
 	mutatelist = list()
-	reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "nutriment" = 0.2)
+	reagents_add = list(/datum/reagent/ammonia = 0.2, /datum/reagent/chlorine = 0.1, /datum/reagent/consumable/nutriment = 0.2)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/blumpkin
@@ -56,5 +56,5 @@
 	filling_color = "#87CEFA"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	juice_results = list("blumpkinjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/blumpkinjuice = 0)
 	wine_power = 50
diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm
index bac480bee6..3769f9eacc 100644
--- a/code/modules/hydroponics/grown/replicapod.dm
+++ b/code/modules/hydroponics/grown/replicapod.dm
@@ -31,7 +31,7 @@
 
 /obj/item/seeds/replicapod/on_reagent_change(changetype)
 	if(changetype == ADD_REAGENT)
-		var/datum/reagent/blood/B = reagents.has_reagent("blood")
+		var/datum/reagent/blood/B = reagents.has_reagent(/datum/reagent/blood)
 		if(B)
 			if(B.data["mind"] && B.data["cloneable"])
 				mind = B.data["mind"]
@@ -47,7 +47,7 @@
 			else
 				visible_message("<span class='warning'>The [src] rejects the sample!</span>")
 
-	if(!reagents.has_reagent("blood"))
+	if(!reagents.has_reagent(/datum/reagent/blood))
 		mind = null
 		ckey = null
 		realName = null
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index e28043e4b1..ac171b4e45 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -12,7 +12,7 @@
 	growthstages = 3
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
 	mutatelist = list(/obj/item/seeds/carrot/parsnip)
-	reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/medicine/oculine = 0.25, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/carrot
 	seed = /obj/item/seeds/carrot
@@ -22,7 +22,7 @@
 	filling_color = "#FFA500"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	juice_results = list("carrotjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/carrotjuice = 0)
 	wine_power = 30
 
 /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
@@ -45,7 +45,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/parsnip
 	icon_dead = "carrot-dead"
 	mutatelist = list()
-	reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/parsnip
 	seed = /obj/item/seeds/carrot/parsnip
@@ -54,7 +54,7 @@
 	icon_state = "parsnip"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	juice_results = list("parsnipjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/parsnipjuice = 0)
 	wine_power = 35
 
 
@@ -72,7 +72,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
 	icon_dead = "whitebeet-dead"
 	mutatelist = list(/obj/item/seeds/redbeet)
-	reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/sugar = 0.2, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/whitebeet
 	seed = /obj/item/seeds/whitebeet
@@ -98,7 +98,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
 	icon_dead = "whitebeet-dead"
 	genes = list(/datum/plant_gene/trait/maxchem)
-	reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/reagent_containers/food/snacks/grown/redbeet
 	seed = /obj/item/seeds/redbeet
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index bdb5bdb3f9..44e11c372d 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -14,7 +14,7 @@
 	icon_dead = "tea-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/tea/astra)
-	reagents_add = list("teapowder" = 0.1)
+	reagents_add = list(/datum/reagent/toxin/teapowder = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/tea
 	seed = /obj/item/seeds/tea
@@ -22,7 +22,7 @@
 	desc = "These aromatic tips of the tea plant can be dried to make tea."
 	icon_state = "tea_aspera_leaves"
 	filling_color = "#008000"
-	grind_results = list("teapowder" = 0)
+	grind_results = list(/datum/reagent/toxin/teapowder = 0)
 	dry_grind = TRUE
 	can_distill = FALSE
 
@@ -34,7 +34,7 @@
 	plantname = "Tea Astra Plant"
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/astra
 	mutatelist = list(/obj/item/seeds/tea/catnip)
-	reagents_add = list("synaptizine" = 0.1, "vitamin" = 0.04, "teapowder" = 0.1)
+	reagents_add = list(/datum/reagent/medicine/synaptizine = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/toxin/teapowder = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/tea/astra
@@ -42,7 +42,7 @@
 	name = "Tea Astra tips"
 	icon_state = "tea_astra_leaves"
 	filling_color = "#4582B4"
-	grind_results = list("teapowder" = 0, "salglu_solution" = 0)
+	grind_results = list(/datum/reagent/toxin/teapowder = 0, /datum/reagent/medicine/salglu_solution = 0)
 
 // Kitty drugs
 /obj/item/seeds/tea/catnip
@@ -52,7 +52,7 @@
 	species = "catnip"
 	plantname = "Catnip Plant"
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip
-	reagents_add = list("catnip" = 0.1, "vitamin" = 0.06, "teapowder" = 0.3)
+	reagents_add = list(/datum/reagent/pax/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3)
 	rarity = 50
 
 /obj/item/reagent_containers/food/snacks/grown/tea/catnip
@@ -60,7 +60,7 @@
 	name = "Catnip buds"
 	icon_state = "catnip"
 	filling_color = "#4582B4"
-	grind_results = list("catnp" = 2, "water" = 1)
+	grind_results = list(/datum/reagent/pax/catnip = 2, /datum/reagent/water = 1)
 
 // Coffee
 /obj/item/seeds/coffee
@@ -79,7 +79,7 @@
 	icon_dead = "coffee-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/coffee/robusta)
-	reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/toxin/coffeepowder = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/coffee
 	seed = /obj/item/seeds/coffee
@@ -89,8 +89,8 @@
 	filling_color = "#DC143C"
 	bitesize_mod = 2
 	dry_grind = TRUE
-	grind_results = list("coffeepowder" = 0)
-	distill_reagent = "kahlua"
+	grind_results = list(/datum/reagent/toxin/coffeepowder = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/kahlua
 
 // Coffee Robusta
 /obj/item/seeds/coffee/robusta
@@ -101,7 +101,7 @@
 	plantname = "Coffee Robusta Bush"
 	product = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
 	mutatelist = list()
-	reagents_add = list("ephedrine" = 0.1, "vitamin" = 0.04, "coffeepowder" = 0.1)
+	reagents_add = list(/datum/reagent/medicine/ephedrine = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/toxin/coffeepowder = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
@@ -109,4 +109,4 @@
 	name = "coffee robusta beans"
 	desc = "Increases robustness by 37 percent!"
 	icon_state = "coffee_robusta"
-	grind_results = list("coffeepowder" = 0, "morphine" = 0)
+	grind_results = list(/datum/reagent/toxin/coffeepowder = 0, /datum/reagent/medicine/morphine = 0)
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 684271fa6b..1e2d25d825 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -13,7 +13,7 @@
 	growthstages = 3
 	icon_dead = "tobacco-dead"
 	mutatelist = list(/obj/item/seeds/tobacco/space)
-	reagents_add = list("nicotine" = 0.03, "nutriment" = 0.03)
+	reagents_add = list(/datum/reagent/drug/nicotine = 0.03, /datum/reagent/consumable/nutriment = 0.03)
 
 /obj/item/reagent_containers/food/snacks/grown/tobacco
 	seed = /obj/item/seeds/tobacco
@@ -21,7 +21,7 @@
 	desc = "Dry them out to make some smokes."
 	icon_state = "tobacco_leaves"
 	filling_color = "#008000"
-	distill_reagent = "creme_de_menthe" //Menthol, I guess.
+	distill_reagent = /datum/reagent/consumable/ethanol/creme_de_menthe //Menthol, I guess.
 
 // Space Tobacco
 /obj/item/seeds/tobacco/space
@@ -32,7 +32,7 @@
 	plantname = "Space Tobacco Plant"
 	product = /obj/item/reagent_containers/food/snacks/grown/tobacco/space
 	mutatelist = list()
-	reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "nutriment" = 0.03)
+	reagents_add = list(/datum/reagent/medicine/salbutamol = 0.05, /datum/reagent/drug/nicotine = 0.08, /datum/reagent/consumable/nutriment = 0.03)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/tobacco/space
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index d07f5d4d08..53c3389695 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -12,7 +12,7 @@
 	icon_dead = "tomato-dead"
 	genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood, /obj/item/seeds/tomato/killer)
-	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/tomato
 	seed = /obj/item/seeds/tomato
@@ -23,9 +23,9 @@
 	filling_color = "#FF6347"
 	bitesize_mod = 2
 	foodtype = FRUIT
-	grind_results = list("ketchup" = 0)
-	juice_results = list("tomatojuice" = 0)
-	distill_reagent = "enzyme"
+	grind_results = list(/datum/reagent/consumable/ketchup = 0)
+	juice_results = list(/datum/reagent/consumable/tomatojuice = 0)
+	distill_reagent = /datum/reagent/consumable/enzyme
 
 // Blood Tomato
 /obj/item/seeds/tomato/blood
@@ -36,7 +36,7 @@
 	plantname = "Blood-Tomato Plants"
 	product = /obj/item/reagent_containers/food/snacks/grown/tomato/blood
 	mutatelist = list()
-	reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/blood = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/tomato/blood
@@ -47,8 +47,8 @@
 	splat_type = /obj/effect/gibspawner/generic
 	filling_color = "#FF0000"
 	foodtype = FRUIT | GROSS
-	grind_results = list("ketchup" = 0, "blood" = 0)
-	distill_reagent = "bloodymary"
+	grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
 
 // Blue Tomato
 /obj/item/seeds/tomato/blue
@@ -62,7 +62,7 @@
 	icon_grow = "bluetomato-grow"
 	mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
 	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/lube = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/tomato/blue
@@ -72,7 +72,7 @@
 	icon_state = "bluetomato"
 	splat_type = /obj/effect/decal/cleanable/oil
 	filling_color = "#0000FF"
-	distill_reagent = "laughter"
+	distill_reagent = /datum/reagent/consumable/laughter
 
 // Bluespace Tomato
 /obj/item/seeds/tomato/blue/bluespace
@@ -85,7 +85,7 @@
 	yield = 2
 	mutatelist = list()
 	genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("lube" = 0.2, "bluespace" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
+	reagents_add = list(/datum/reagent/lube = 0.2, /datum/reagent/bluespace = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 50
 
 /obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace
@@ -120,7 +120,7 @@
 	icon_state = "killertomato"
 	var/awakening = 0
 	filling_color = "#FF0000"
-	distill_reagent = "demonsblood"
+	distill_reagent = /datum/reagent/consumable/ethanol/demonsblood
 
 /obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
 	if(awakening)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 1ea0068a1a..9655b13862 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -24,7 +24,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-	list_reagents = list("weedkiller" = 100)
+	list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 100)
 
 /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -39,7 +39,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-	list_reagents = list("pestkiller" = 100)
+	list_reagents = list(/datum/reagent/toxin/pestkiller = 100)
 
 /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -164,17 +164,17 @@
 /obj/item/reagent_containers/glass/bottle/nutrient/ez
 	name = "bottle of E-Z-Nutrient"
 	desc = "Contains a fertilizer that causes mild mutations with each harvest."
-	list_reagents = list("eznutriment" = 50)
+	list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/l4z
 	name = "bottle of Left 4 Zed"
 	desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
-	list_reagents = list("left4zednutriment" = 50)
+	list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/rh
 	name = "bottle of Robust Harvest"
 	desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
-	list_reagents = list("robustharvestnutriment" = 50)
+	list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/empty
 	name = "bottle"
@@ -187,9 +187,9 @@
 /obj/item/reagent_containers/glass/bottle/killer/weedkiller
 	name = "bottle of weed killer"
 	desc = "Contains a herbicide."
-	list_reagents = list("weedkiller" = 50)
+	list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 50)
 
 /obj/item/reagent_containers/glass/bottle/killer/pestkiller
 	name = "bottle of pest spray"
 	desc = "Contains a pesticide."
-	list_reagents = list("pestkiller" = 50)
\ No newline at end of file
+	list_reagents = list(/datum/reagent/toxin/pestkiller = 50)
\ No newline at end of file
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 59a9725383..0b6834c408 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -470,7 +470,7 @@
 		myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines
 
 	// Requires 5 mutagen to possibly change species.// Poor man's mutagen.
-	if(S.has_reagent("mutagen", 5) || S.has_reagent("radium", 10) || S.has_reagent("uranium", 10))
+	if(S.has_reagent(/datum/reagent/toxin/mutagen, 5) || S.has_reagent(/datum/reagent/radium, 10) || S.has_reagent(/datum/reagent/uranium, 10))
 		switch(rand(100))
 			if(91 to 100)
 				adjustHealth(-10)
@@ -491,214 +491,214 @@
 				to_chat(user, "<span class='notice'>Nothing happens...</span>")
 
 	// 2 or 1 units is enough to change the yield and other stats.// Can change the yield and other stats, but requires more than mutagen
-	else if(S.has_reagent("mutagen", 2) || S.has_reagent("radium", 5) || S.has_reagent("uranium", 5))
+	else if(S.has_reagent(/datum/reagent/toxin/mutagen, 2) || S.has_reagent(/datum/reagent/radium, 5) || S.has_reagent(/datum/reagent/uranium, 5))
 		hardmutate()
-	else if(S.has_reagent("mutagen", 1) || S.has_reagent("radium", 2) || S.has_reagent("uranium", 2))
+	else if(S.has_reagent(/datum/reagent/toxin/mutagen, 1) || S.has_reagent(/datum/reagent/radium, 2) || S.has_reagent(/datum/reagent/uranium, 2))
 		mutate()
 
 	// After handling the mutating, we now handle the damage from adding crude radioactives...
-	if(S.has_reagent("uranium", 1))
-		adjustHealth(-round(S.get_reagent_amount("uranium") * 1))
-		adjustToxic(round(S.get_reagent_amount("uranium") * 2))
-	if(S.has_reagent("radium", 1))
-		adjustHealth(-round(S.get_reagent_amount("radium") * 1))
-		adjustToxic(round(S.get_reagent_amount("radium") * 3)) // Radium is harsher (OOC: also easier to produce)
+	if(S.has_reagent(/datum/reagent/uranium, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/uranium) * 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/uranium) * 2))
+	if(S.has_reagent(/datum/reagent/radium, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/radium) * 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/radium) * 3)) // Radium is harsher (OOC: also easier to produce)
 
 	// Nutriments
-	if(S.has_reagent("eznutriment", 1))
+	if(S.has_reagent(/datum/reagent/plantnutriment/eznutriment, 1))
 		yieldmod = 1
 		mutmod = 1
-		adjustNutri(round(S.get_reagent_amount("eznutriment") * 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/plantnutriment/eznutriment) * 1))
 
-	if(S.has_reagent("left4zednutriment", 1))
+	if(S.has_reagent(/datum/reagent/plantnutriment/left4zednutriment, 1))
 		yieldmod = 0
 		mutmod = 2
-		adjustNutri(round(S.get_reagent_amount("left4zednutriment") * 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/plantnutriment/left4zednutriment) * 1))
 
-	if(S.has_reagent("robustharvestnutriment", 1))
+	if(S.has_reagent(/datum/reagent/plantnutriment/robustharvestnutriment, 1))
 		yieldmod = 1.3
 		mutmod = 0
-		adjustNutri(round(S.get_reagent_amount("robustharvestnutriment") *1 ))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/plantnutriment/robustharvestnutriment) *1 ))
 
 	// Ambrosia Gaia produces earthsblood.
-	if(S.has_reagent("earthsblood"))
-		self_sufficiency_progress += S.get_reagent_amount("earthsblood")
+	if(S.has_reagent(/datum/reagent/medicine/earthsblood))
+		self_sufficiency_progress += S.get_reagent_amount(/datum/reagent/medicine/earthsblood)
 		if(self_sufficiency_progress >= self_sufficiency_req)
 			become_self_sufficient()
 		else if(!self_sustaining)
 			to_chat(user, "<span class='notice'>[src] warms as it might on a spring day under a genuine Sun.</span>")
 
 	// Antitoxin binds shit pretty well. So the tox goes significantly down
-	if(S.has_reagent("charcoal", 1))
-		adjustToxic(-round(S.get_reagent_amount("charcoal") * 2))
+	if(S.has_reagent(/datum/reagent/medicine/charcoal, 1))
+		adjustToxic(-round(S.get_reagent_amount(/datum/reagent/medicine/charcoal) * 2))
 
 	// Toxins, not good for anything
-	if(S.has_reagent("toxin", 1))
-		adjustToxic(round(S.get_reagent_amount("toxin") * 2))
+	if(S.has_reagent(/datum/reagent/toxin, 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/toxin) * 2))
 
 	// Milk is good for humans, but bad for plants. The sugars canot be used by plants, and the milk fat fucks up growth. Not shrooms though. I can't deal with this now...
-	if(S.has_reagent("milk", 1))
-		adjustNutri(round(S.get_reagent_amount("milk") * 0.1))
-		adjustWater(round(S.get_reagent_amount("milk") * 0.9))
+	if(S.has_reagent(/datum/reagent/consumable/milk, 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/consumable/milk) * 0.1))
+		adjustWater(round(S.get_reagent_amount(/datum/reagent/consumable/milk) * 0.9))
 
 	// Beer is a chemical composition of alcohol and various other things. It's a shitty nutrient but hey, it's still one. Also alcohol is bad, mmmkay?
-	if(S.has_reagent("beer", 1))
-		adjustHealth(-round(S.get_reagent_amount("beer") * 0.05))
-		adjustNutri(round(S.get_reagent_amount("beer") * 0.25))
-		adjustWater(round(S.get_reagent_amount("beer") * 0.7))
+	if(S.has_reagent(/datum/reagent/consumable/ethanol/beer, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/consumable/ethanol/beer) * 0.05))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/consumable/ethanol/beer) * 0.25))
+		adjustWater(round(S.get_reagent_amount(/datum/reagent/consumable/ethanol/beer) * 0.7))
 
 	// Fluorine one of the most corrosive and deadly gasses
-	if(S.has_reagent("fluorine", 1))
-		adjustHealth(-round(S.get_reagent_amount("fluorine") * 2))
-		adjustToxic(round(S.get_reagent_amount("fluorine") * 2.5))
-		adjustWater(-round(S.get_reagent_amount("fluorine") * 0.5))
+	if(S.has_reagent(/datum/reagent/fluorine, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/fluorine) * 2))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/fluorine) * 2.5))
+		adjustWater(-round(S.get_reagent_amount(/datum/reagent/fluorine) * 0.5))
 		adjustWeeds(-rand(1,4))
 
 	// Chlorine one of the most corrosive and deadly gasses
-	if(S.has_reagent("chlorine", 1))
-		adjustHealth(-round(S.get_reagent_amount("chlorine") * 1))
-		adjustToxic(round(S.get_reagent_amount("chlorine") * 1.5))
-		adjustWater(-round(S.get_reagent_amount("chlorine") * 0.5))
+	if(S.has_reagent(/datum/reagent/chlorine, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/chlorine) * 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/chlorine) * 1.5))
+		adjustWater(-round(S.get_reagent_amount(/datum/reagent/chlorine) * 0.5))
 		adjustWeeds(-rand(1,3))
 
 	// White Phosphorous + water -> phosphoric acid. That's not a good thing really.
 	// Phosphoric salts are beneficial though. And even if the plant suffers, in the long run the tray gets some nutrients. The benefit isn't worth that much.
-	if(S.has_reagent("phosphorus", 1))
-		adjustHealth(-round(S.get_reagent_amount("phosphorus") * 0.75))
-		adjustNutri(round(S.get_reagent_amount("phosphorus") * 0.1))
-		adjustWater(-round(S.get_reagent_amount("phosphorus") * 0.5))
+	if(S.has_reagent(/datum/reagent/phosphorus, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/phosphorus) * 0.75))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/phosphorus) * 0.1))
+		adjustWater(-round(S.get_reagent_amount(/datum/reagent/phosphorus) * 0.5))
 		adjustWeeds(-rand(1,2))
 
 	// Plants should not have sugar, they can't use it and it prevents them getting water/nutients, it is good for mold though...
-	if(S.has_reagent("sugar", 1))
+	if(S.has_reagent(/datum/reagent/consumable/sugar, 1))
 		adjustWeeds(rand(1,2))
 		adjustPests(rand(1,2))
-		adjustNutri(round(S.get_reagent_amount("sugar") * 0.1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/consumable/sugar) * 0.1))
 
 	// It is water!
-	if(S.has_reagent("water", 1))
-		adjustWater(round(S.get_reagent_amount("water") * 1))
+	if(S.has_reagent(/datum/reagent/water, 1))
+		adjustWater(round(S.get_reagent_amount(/datum/reagent/water) * 1))
 
 	// Holy water. Mostly the same as water, it also heals the plant a little with the power of the spirits~
-	if(S.has_reagent("holywater", 1))
-		adjustWater(round(S.get_reagent_amount("holywater") * 1))
-		adjustHealth(round(S.get_reagent_amount("holywater") * 0.1))
+	if(S.has_reagent(/datum/reagent/water/holywater, 1))
+		adjustWater(round(S.get_reagent_amount(/datum/reagent/water/holywater) * 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/water/holywater) * 0.1))
 
 	// A variety of nutrients are dissolved in club soda, without sugar.
 	// These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth.
-	if(S.has_reagent("sodawater", 1))
-		adjustWater(round(S.get_reagent_amount("sodawater") * 1))
-		adjustHealth(round(S.get_reagent_amount("sodawater") * 0.1))
-		adjustNutri(round(S.get_reagent_amount("sodawater") * 0.1))
+	if(S.has_reagent(/datum/reagent/consumable/sodawater, 1))
+		adjustWater(round(S.get_reagent_amount(/datum/reagent/consumable/sodawater) * 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/consumable/sodawater) * 0.1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/consumable/sodawater) * 0.1))
 
 	// Sulphuric Acid
-	if(S.has_reagent("sacid", 1))
-		adjustHealth(-round(S.get_reagent_amount("sacid") * 1))
-		adjustToxic(round(S.get_reagent_amount("sacid") * 1.5))
+	if(S.has_reagent(/datum/reagent/toxin/acid, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/toxin/acid) * 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/toxin/acid) * 1.5))
 		adjustWeeds(-rand(1,2))
 
 	// Acid
-	if(S.has_reagent("facid", 1))
-		adjustHealth(-round(S.get_reagent_amount("facid") * 2))
-		adjustToxic(round(S.get_reagent_amount("facid") * 3))
+	if(S.has_reagent(/datum/reagent/toxin/acid/fluacid, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/toxin/acid/fluacid) * 2))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/toxin/acid/fluacid) * 3))
 		adjustWeeds(-rand(1,4))
 
 	// Plant-B-Gone is just as bad
-	if(S.has_reagent("plantbgone", 1))
-		adjustHealth(-round(S.get_reagent_amount("plantbgone") * 5))
-		adjustToxic(round(S.get_reagent_amount("plantbgone") * 6))
+	if(S.has_reagent(/datum/reagent/toxin/plantbgone, 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/toxin/plantbgone) * 5))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/toxin/plantbgone) * 6))
 		adjustWeeds(-rand(4,8))
 
 	// Napalm, not known for being good for anything organic
-	if(S.has_reagent("napalm", 1))
+	if(S.has_reagent(/datum/reagent/napalm, 1))
 		if(!(myseed.resistance_flags & FIRE_PROOF))
-			adjustHealth(-round(S.get_reagent_amount("napalm") * 6))
-			adjustToxic(round(S.get_reagent_amount("napalm") * 7))
+			adjustHealth(-round(S.get_reagent_amount(/datum/reagent/napalm) * 6))
+			adjustToxic(round(S.get_reagent_amount(/datum/reagent/napalm) * 7))
 			adjustWeeds(-rand(5,9))
 
 	//Weed Spray
-	if(S.has_reagent("weedkiller", 1))
-		adjustToxic(round(S.get_reagent_amount("weedkiller") * 0.5))
+	if(S.has_reagent(/datum/reagent/toxin/plantbgone/weedkiller, 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/toxin/plantbgone/weedkiller) * 0.5))
 		//old toxicity was 4, each spray is default 10 (minimal of 5) so 5 and 2.5 are the new ammounts
 		adjustWeeds(-rand(1,2))
 
 	//Pest Spray
-	if(S.has_reagent("pestkiller", 1))
-		adjustToxic(round(S.get_reagent_amount("pestkiller") * 0.5))
+	if(S.has_reagent(/datum/reagent/toxin/pestkiller, 1))
+		adjustToxic(round(S.get_reagent_amount(/datum/reagent/toxin/pestkiller) * 0.5))
 		adjustPests(-rand(1,2))
 
 	// Healing
-	if(S.has_reagent("cryoxadone", 1))
-		adjustHealth(round(S.get_reagent_amount("cryoxadone") * 3))
-		adjustToxic(-round(S.get_reagent_amount("cryoxadone") * 3))
+	if(S.has_reagent(/datum/reagent/medicine/cryoxadone, 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/medicine/cryoxadone) * 3))
+		adjustToxic(-round(S.get_reagent_amount(/datum/reagent/medicine/cryoxadone) * 3))
 
 	// Ammonia is bad ass.
-	if(S.has_reagent("ammonia", 1))
-		adjustHealth(round(S.get_reagent_amount("ammonia") * 0.5))
-		adjustNutri(round(S.get_reagent_amount("ammonia") * 1))
+	if(S.has_reagent(/datum/reagent/ammonia, 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/ammonia) * 0.5))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/ammonia) * 1))
 		if(myseed)
-			myseed.adjust_yield(round(S.get_reagent_amount("ammonia") * 0.01))
+			myseed.adjust_yield(round(S.get_reagent_amount(/datum/reagent/ammonia) * 0.01))
 
 	// Saltpetre is used for gardening IRL, to simplify highly, it speeds up growth and strengthens plants
-	if(S.has_reagent("saltpetre", 1))
-		var/salt = S.get_reagent_amount("saltpetre")
+	if(S.has_reagent(/datum/reagent/saltpetre, 1))
+		var/salt = S.get_reagent_amount(/datum/reagent/saltpetre)
 		adjustHealth(round(salt * 0.25))
 		if (myseed)
 			myseed.adjust_production(-round(salt/100)-prob(salt%100))
 			myseed.adjust_potency(round(salt*0.5))
 
 	// Ash is also used IRL in gardening, as a fertilizer enhancer and weed killer
-	if(S.has_reagent("ash", 1))
-		adjustHealth(round(S.get_reagent_amount("ash") * 0.25))
-		adjustNutri(round(S.get_reagent_amount("ash") * 0.5))
+	if(S.has_reagent(/datum/reagent/ash, 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/ash) * 0.25))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/ash) * 0.5))
 		adjustWeeds(-1)
 
 	// Diethylamine is more bad ass, and pests get hurt by the corrosive nature of it, not the plant.
-	if(S.has_reagent("diethylamine", 1))
-		adjustHealth(round(S.get_reagent_amount("diethylamine") * 1))
-		adjustNutri(round(S.get_reagent_amount("diethylamine") * 2))
+	if(S.has_reagent(/datum/reagent/diethylamine, 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 2))
 		if(myseed)
-			myseed.adjust_yield(round(S.get_reagent_amount("diethylamine") * 0.02))
+			myseed.adjust_yield(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 0.02))
 		adjustPests(-rand(1,2))
 
 	// Nutriment Compost, effectively
-	if(S.has_reagent("nutriment", 1))
-		adjustHealth(round(S.get_reagent_amount("nutriment") * 0.5))
-		adjustNutri(round(S.get_reagent_amount("nutriment") * 1))
+	if(S.has_reagent(/datum/reagent/consumable/nutriment, 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/consumable/nutriment) * 0.5))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/consumable/nutriment) * 1))
 
 	// Virusfood Compost for EVERYTHING
-	if(S.has_reagent("virusfood", 1))
-		adjustNutri(round(S.get_reagent_amount("virusfood") * 0.5))
-		adjustHealth(-round(S.get_reagent_amount("virusfood") * 0.5))
+	if(S.has_reagent(/datum/reagent/toxin/mutagen/mutagenvirusfood, 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/toxin/mutagen/mutagenvirusfood) * 0.5))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/toxin/mutagen/mutagenvirusfood) * 0.5))
 
 	// Blood
-	if(S.has_reagent("blood", 1))
-		adjustNutri(round(S.get_reagent_amount("blood") * 1))
+	if(S.has_reagent(/datum/reagent/blood, 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/blood) * 1))
 		adjustPests(rand(2,4))
 
 	// Strange reagent
-	if(S.has_reagent("strangereagent", 1))
+	if(S.has_reagent(/datum/reagent/medicine/strange_reagent, 1))
 		spawnplant()
 
 	// Honey, Pests are dieing of sugar, so is the plant
-	if(S.has_reagent("honey", 1))
+	if(S.has_reagent(/datum/reagent/consumable/honey, 1))
 		adjustPests(-rand(2,5))
-		adjustHealth(-round(S.get_reagent_amount("honey") * 1))
+		adjustHealth(-round(S.get_reagent_amount(/datum/reagent/consumable/honey) * 1))
 
 	// Buzz Fuzz, a drink seemingly made for plants...
-	if(S.has_reagent("buzz_fuzz", 1))
+	if(S.has_reagent(/datum/reagent/consumable/buzz_fuzz, 1))
 		adjustPests(-rand(2,5))
-		adjustHealth(round(S.get_reagent_amount("buzz_fuzz") * 0.1))
-		adjustNutri(round(S.get_reagent_amount("buzz_fuzz") * 0.5))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/consumable/buzz_fuzz) * 0.1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/consumable/buzz_fuzz) * 0.5))
 
 	// Adminordrazine the best stuff there is. For testing/debugging.
-	if(S.has_reagent("adminordrazine", 1))
-		adjustWater(round(S.get_reagent_amount("adminordrazine") * 1))
-		adjustHealth(round(S.get_reagent_amount("adminordrazine") * 1))
-		adjustNutri(round(S.get_reagent_amount("adminordrazine") * 1))
+	if(S.has_reagent(/datum/reagent/medicine/adminordrazine, 1))
+		adjustWater(round(S.get_reagent_amount(/datum/reagent/medicine/adminordrazine) * 1))
+		adjustHealth(round(S.get_reagent_amount(/datum/reagent/medicine/adminordrazine) * 1))
+		adjustNutri(round(S.get_reagent_amount(/datum/reagent/medicine/adminordrazine) * 1))
 		adjustPests(-rand(1,5))
 		adjustWeeds(-rand(1,5))
-	if(S.has_reagent("adminordrazine", 5))
+	if(S.has_reagent(/datum/reagent/medicine/adminordrazine, 5))
 		switch(rand(100))
 			if(66  to 100)
 				mutatespecie()
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 3597ed5be6..99fd873995 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -129,7 +129,7 @@
 	name = "UNKNOWN"
 
 	var/datum/reagent/R = GLOB.chemical_reagents_list[reag_id]
-	if(R && R.id == reagent_id)
+	if(R && R.type == reagent_id)
 		name = R.name
 
 /datum/plant_gene/reagent/New(reag_id = null, reag_rate = 0)
@@ -228,7 +228,7 @@
 	var/obj/item/seeds/seed = G.seed
 	var/stun_len = seed.potency * rate
 
-	if(!istype(G, /obj/item/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube")))
+	if(!istype(G, /obj/item/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent(/datum/reagent/lube)))
 		stun_len /= 3
 
 	G.AddComponent(/datum/component/slippery, min(stun_len,140), NONE, CALLBACK(src, .proc/handle_slip, G))
@@ -412,7 +412,7 @@
 			pocell.name = "[G.name] battery"
 			pocell.desc = "A rechargeable plant-based power cell. This one has a rating of [DisplayEnergy(pocell.maxcharge)], and you should not swallow it."
 
-			if(G.reagents.has_reagent("plasma", 2))
+			if(G.reagents.has_reagent(/datum/reagent/toxin/plasma, 2))
 				pocell.rigged = TRUE
 
 			qdel(G)
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 4132719389..b35665c8e6 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -27,6 +27,7 @@
 	var/rarity = 0					// How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
 	var/list/mutatelist = list()	// The type of plants that this plant can mutate into.
 	var/list/genes = list()			// Plant genes are stored here, see plant_genes.dm for more info.
+	var/list/forbiddengenes = list()
 	var/list/reagents_add = list()
 	// A list of reagents to add to product.
 	// Format: "reagent_id" = potency multiplier
@@ -96,6 +97,10 @@
 	S.reagents_add = reagents_add.Copy() // Faster than grabbing the list from genes.
 	return S
 
+obj/item/seeds/proc/is_gene_forbidden(typepath)
+	return (typepath in forbiddengenes)
+
+
 /obj/item/seeds/proc/get_gene(typepath)
 	return (locate(typepath) in genes)
 
@@ -195,7 +200,7 @@
 		var/list/data = null
 		if(rid == "blood") // Hack to make blood in plants always O-
 			data = list("blood_type" = "O-")
-		if(rid == "nutriment" || rid == "vitamin")
+		if(rid == /datum/reagent/consumable/nutriment || rid == /datum/reagent/consumable/nutriment/vitamin)
 			// apple tastes of apple.
 			data = T.tastes
 
@@ -448,7 +453,7 @@
 	for(var/i in 1 to amount_random_traits)
 		var/random_trait = pick((subtypesof(/datum/plant_gene/trait)-typesof(/datum/plant_gene/trait/plant_type)))
 		var/datum/plant_gene/trait/T = new random_trait
-		if(T.can_add(src))
+		if(T.can_add(src) && !is_gene_forbidden(random_trait))
 			genes += T
 		else
 			qdel(T)
diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm
index 40ed235863..4b6b8723dd 100644
--- a/code/modules/integrated_electronics/passive/power.dm
+++ b/code/modules/integrated_electronics/passive/power.dm
@@ -96,7 +96,8 @@
 	activators = list("push ref" = IC_PINTYPE_PULSE_IN)
 	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
 	var/volume = 60
-	var/list/fuel = list("plasma" = 50000, "welding_fuel" = 15000, "carbon" = 10000, "ethanol" = 10000, "nutriment" = 8000)
+	var/list/fuel = list(/datum/reagent/toxin/plasma = 50000, /datum/reagent/fuel = 15000, /datum/reagent/carbon = 10000,
+						/datum/reagent/consumable/ethanol = 10000, /datum/reagent/consumable/nutriment = 8000)
 	var/multi = 1
 	var/lfwb =TRUE
 
@@ -119,7 +120,7 @@
 	if(assembly)
 		if(assembly.battery)
 			var/bp = 5000
-			if(reagents.get_reagent_amount("blood")) //only blood is powerful enough to power the station(c)
+			if(reagents.get_reagent_amount(/datum/reagent/blood)) //only blood is powerful enough to power the station(c)
 				var/datum/reagent/blood/B = locate() in reagents.reagent_list
 				if(lfwb)
 					if(B && B.data["cloneable"])
@@ -127,7 +128,7 @@
 						if(M && (M.stat != DEAD) && (M.client))
 							bp = 500000
 				if((assembly.battery.maxcharge-assembly.battery.charge) / GLOB.CELLRATE > bp)
-					if(reagents.remove_reagent("blood", 1))
+					if(reagents.remove_reagent(/datum/reagent/blood, 1))
 						assembly.give_power(bp)
 			for(var/I in fuel)
 				if((assembly.battery.maxcharge-assembly.battery.charge) / GLOB.CELLRATE > fuel[I])
diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm
index 027a03650a..0fc9f58db8 100644
--- a/code/modules/integrated_electronics/subtypes/reagents.dm
+++ b/code/modules/integrated_electronics/subtypes/reagents.dm
@@ -424,7 +424,7 @@
 		if(1)
 			var/cont[0]
 			for(var/datum/reagent/RE in reagents.reagent_list)
-				cont += RE.id
+				cont += RE.type
 			set_pin_data(IC_OUTPUT, 3, cont)
 			push_data()
 		if(2)
@@ -492,11 +492,11 @@
 
 	for(var/datum/reagent/G in source.reagents.reagent_list)
 		if(!direction_mode)
-			if(G.id in demand)
-				source.reagents.trans_id_to(target, G.id, transfer_amount)
+			if(G.type in demand)
+				source.reagents.trans_id_to(target, G.type, transfer_amount)
 		else
-			if(!(G.id in demand))
-				source.reagents.trans_id_to(target, G.id, transfer_amount)
+			if(!(G.type in demand))
+				source.reagents.trans_id_to(target, G.type, transfer_amount)
 	activate_pin(2)
 	push_data()
 
diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm
index 29c4c3d833..f84bd0d8d6 100644
--- a/code/modules/jobs/job_types/cyborg.dm
+++ b/code/modules/jobs/job_types/cyborg.dm
@@ -5,7 +5,7 @@
 	department_flag = ENGSEC
 	faction = "Station"
 	total_positions = 0
-	spawn_positions = 1
+	spawn_positions = 3
 	supervisors = "your laws and the AI"	//Nodrak
 	selection_color = "#ddffdd"
 	minimal_player_age = 21
diff --git a/code/modules/keybindings/bindings_human.dm b/code/modules/keybindings/bindings_human.dm
index a9eafacef6..ed033935b2 100644
--- a/code/modules/keybindings/bindings_human.dm
+++ b/code/modules/keybindings/bindings_human.dm
@@ -58,13 +58,23 @@
 				return
 	switch(_key)
 		if("Shift")
-			sprint_hotkey(TRUE)
+			if(!user.prefs.sprint_spacebar)
+				user.prefs.sprint_toggle ? togglesprint() : sprint_hotkey(TRUE) //Yes, this looks hacky. Yes, this works.
+			return
+		if("Space")
+			if(user.prefs.sprint_spacebar)
+				user.prefs.sprint_toggle ? togglesprint() : sprint_hotkey(TRUE)
 			return
 	return ..()
 
 /mob/living/carbon/human/key_up(_key, client/user)
 	switch(_key)
 		if("Shift")
-			sprint_hotkey(FALSE)
+			if(!user.prefs.sprint_spacebar && !user.prefs.sprint_toggle)
+				sprint_hotkey(FALSE)
+			return
+		if("Space")
+			if(user.prefs.sprint_spacebar && !user.prefs.sprint_toggle)
+				sprint_hotkey(FALSE)
 			return
 	return ..()
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 295fc816e2..0d7ae7107b 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -117,6 +117,7 @@
 	anchored = TRUE
 	max_integrity = 30
 	layer = LATTICE_LAYER
+	light_power = 0.3
 
 	var/hidden_message
 	var/creator_key
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 1f55f18823..3e361179de 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -70,7 +70,7 @@
 	//initialize things that are normally initialized after map load
 	parsed.initTemplateBounds()
 	smooth_zlevel(world.maxz)
-	log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")
+	log_game("Z-level [name] loaded at [x],[y],[world.maxz]")
 
 	return level
 
@@ -84,6 +84,13 @@
 	if(T.y+height > world.maxy)
 		return
 
+	var/list/border = block(locate(max(T.x-1, 1),			max(T.y-1, 1),			 T.z),
+							locate(min(T.x+width+1, world.maxx),	min(T.y+height+1, world.maxy), T.z))
+	for(var/L in border)
+		var/turf/turf_to_disable = L
+		SSair.remove_from_active(turf_to_disable) //stop processing turfs along the border to prevent runtimes, we return it in initTemplateBounds()
+		turf_to_disable.atmos_adjacent_turfs?.Cut()
+
 	// Accept cached maps, but don't save them automatically - we don't want
 	// ruins clogging up memory for the whole round.
 	var/datum/parsed_map/parsed = cached_map || new(file(mappath))
@@ -100,7 +107,7 @@
 	//initialize things that are normally initialized after map load
 	parsed.initTemplateBounds()
 
-	log_game("[name] loaded at at [T.x],[T.y],[T.z]")
+	log_game("[name] loaded at [T.x],[T.y],[T.z]")
 	return bounds
 
 /datum/map_template/proc/get_affected_turfs(turf/T, centered = FALSE)
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index e2459d780a..a7f84fd71f 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -18,7 +18,7 @@
 
 /obj/effect/baseturf_helper/LateInitialize()
 	if(!baseturf_to_replace)
-		baseturf_to_replace = typecacheof(/turf/open/space)
+		baseturf_to_replace = typecacheof(list(/turf/open/space,/turf/baseturf_bottom))
 	else if(!length(baseturf_to_replace))
 		baseturf_to_replace = list(baseturf_to_replace = TRUE)
 	else if(baseturf_to_replace[baseturf_to_replace[1]] != TRUE) // It's not associative
@@ -45,7 +45,6 @@
 			thing.PlaceOnBottom(null, baseturf)
 	else if(baseturf_to_replace[thing.baseturfs])
 		thing.assemble_baseturfs(baseturf)
-		return
 	else
 		thing.PlaceOnBottom(null, baseturf)
 
@@ -107,16 +106,16 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper/Initialize(mapload)
 	. = ..()
 	if(!mapload)
-		log_world("### MAP WARNING, [src] spawned outside of mapload!")
+		log_mapping("[src] spawned outside of mapload!")
 		return
 	var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
 	if(airlock)
 		if(airlock.cyclelinkeddir)
-			log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!")
+			log_mapping("[src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!")
 		else
 			airlock.cyclelinkeddir = dir
 	else
-		log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
+		log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
 
 
 /obj/effect/mapping_helpers/airlock/locked
@@ -126,16 +125,16 @@
 /obj/effect/mapping_helpers/airlock/locked/Initialize(mapload)
 	. = ..()
 	if(!mapload)
-		log_world("### MAP WARNING, [src] spawned outside of mapload!")
+		log_mapping("[src] spawned outside of mapload!")
 		return
 	var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
 	if(airlock)
 		if(airlock.locked)
-			log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!")
+			log_mapping("[src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!")
 		else
 			airlock.locked = TRUE
 	else
-		log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
+		log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
 
 /obj/effect/mapping_helpers/airlock/unres
 	name = "airlock unresctricted side helper"
@@ -144,13 +143,13 @@
 /obj/effect/mapping_helpers/airlock/unres/Initialize(mapload)
 	. = ..()
 	if(!mapload)
-		log_world("### MAP WARNING, [src] spawned outside of mapload!")
+		log_mapping("[src] spawned outside of mapload!")
 		return
 	var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
 	if(airlock)
 		airlock.unres_sides ^= dir
 	else
-		log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
+		log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
 
 
 //needs to do its thing before spawn_rivers() is called
@@ -164,17 +163,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
 	var/turf/T = get_turf(src)
 	T.flags_1 |= NO_LAVA_GEN_1
 
-/// Adds the map it is on to the z_is_planet list
-/obj/effect/mapping_helpers/planet_z
-	name = "planet z helper"
-	layer = POINT_LAYER
-
-/obj/effect/mapping_helpers/planet_z/Initialize()
-	. = ..()
-	var/datum/space_level/S = SSmapping.get_level(z)
-	S.traits[ZTRAIT_PLANET] = TRUE
-
-
 //This helper applies components to things on the map directly.
 /obj/effect/mapping_helpers/component_injector
 	name = "Component Injector"
diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm
index e6fa2421a0..4b61663f66 100644
--- a/code/modules/mapping/preloader.dm
+++ b/code/modules/mapping/preloader.dm
@@ -8,18 +8,26 @@ GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new)
 	var/list/attributes
 	var/target_path
 
-/datum/map_preloader/proc/setup(list/the_attributes, path)
+/world/proc/preloader_setup(list/the_attributes, path)
 	if(the_attributes.len)
 		GLOB.use_preloader = TRUE
-		attributes = the_attributes
-		target_path = path
+		var/datum/map_preloader/preloader_local = GLOB._preloader
+		preloader_local.attributes = the_attributes
+		preloader_local.target_path = path
 
-/datum/map_preloader/proc/load(atom/what)
+/world/proc/preloader_load(atom/what)
 	GLOB.use_preloader = FALSE
-	for(var/attribute in attributes)
-		var/value = attributes[attribute]
+	var/datum/map_preloader/preloader_local = GLOB._preloader
+	for(var/attribute in preloader_local.attributes)
+		var/value = preloader_local.attributes[attribute]
 		if(islist(value))
 			value = deepCopyList(value)
+		#ifdef TESTING
+		if(what.vars[attribute] == value)
+			var/message = "<font color=green>[what.type]</font> at [AREACOORD(what)] - <b>VAR:</b> <font color=red>[attribute] = [isnull(value) ? "null" : (isnum(value) ? value : "\"[value]\"")]</font>"
+			log_mapping("DIRTY VAR: [message]")
+			GLOB.dirty_vars += message
+		#endif
 		what.vars[attribute] = value
 
 /area/template_noop
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 22be4aa246..9b27691dd3 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -306,8 +306,8 @@
 	//first instance the /area and remove it from the members list
 	index = members.len
 	if(members[index] != /area/template_noop)
-		GLOB._preloader.setup(members_attributes[index])//preloader for assigning  set variables on atom creation
 		var/atype = members[index]
+		world.preloader_setup(members_attributes[index], atype)//preloader for assigning  set variables on atom creation
 		var/atom/instance = areaCache[atype]
 		if (!instance)
 			instance = GLOB.areas_by_type[atype]
@@ -318,7 +318,7 @@
 			instance.contents.Add(crds)
 
 		if(GLOB.use_preloader && instance)
-			GLOB._preloader.load(instance)
+			world.preloader_load(instance)
 
 	//then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect
 
@@ -354,7 +354,7 @@
 
 //Instance an atom at (x,y,z) and gives it the variables in attributes
 /datum/parsed_map/proc/instance_atom(path,list/attributes, turf/crds, no_changeturf, placeOnTop)
-	GLOB._preloader.setup(attributes, path)
+	world.preloader_setup(attributes, path)
 
 	if(crds)
 		if(ispath(path, /turf))
@@ -368,7 +368,7 @@
 			. = create_atom(path, crds)//first preloader pass
 
 	if(GLOB.use_preloader && .)//second preloader pass, for those atoms that don't ..() in New()
-		GLOB._preloader.load(.)
+		world.preloader_load(.)
 
 	//custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize
 	if(TICK_CHECK)
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 559ffc0673..86889c5d00 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -14,7 +14,7 @@
 	flags_inv = HIDEJUMPSUIT|HIDETAUR
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
 	resistance_flags = FIRE_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 
 /obj/item/clothing/head/hooded/explorer
@@ -70,7 +70,7 @@
 	clothing_flags = THICKMATERIAL //not spaceproof
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | LAVA_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 	slowdown = 0
 	armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
@@ -116,7 +116,7 @@
 	glass_overlay.appearance_flags = RESET_COLOR
 	add_overlay(glass_overlay)
 
-/obj/item/clothing/head/helmet/space/hostile_environment/worn_overlays(isinhands)
+/obj/item/clothing/head/helmet/space/hostile_environment/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands)
 		var/mutable_appearance/M = mutable_appearance('icons/mob/head.dmi', "hostile_env_glass")
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index eb3e6a5b58..b2c0c1cc87 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -29,6 +29,15 @@
 	var/light_on = FALSE
 	var/brightness_on = 7
 
+/obj/item/twohanded/kinetic_crusher/cyborg //probably give this a unique sprite later
+	desc = "An integrated version of the standard kinetic crusher with a grinded down axe head to dissuade mis-use against crewmen. Deals damage equal to the standard crusher against creatures, however."
+	force = 10 //wouldn't want to give a borg a 20 brute melee weapon unemagged now would we
+	detonation_damage = 60
+	wielded = 1
+
+/obj/item/twohanded/kinetic_crusher/cyborg/unwield()
+	return
+
 /obj/item/twohanded/kinetic_crusher/Initialize()
 	. = ..()
 	AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index e02f38b7e3..d776628def 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -16,6 +16,20 @@
 	toolspeed = 1
 	usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
+	var/digrange = 1
+
+/obj/item/pickaxe/attack_self(mob/user)
+	if(initial(digrange) > 0)
+		if(digrange == 0)
+			digrange = initial(digrange)
+			toolspeed = initial(toolspeed)
+			to_chat(user, "<span class='notice'>You increase the tools dig range, decreasing its mining speed.</span>")
+		else
+			digrange = 0
+			toolspeed = toolspeed/2
+			to_chat(user, "<span class='notice'>You decrease the tools dig range, increasing its mining speed.</span>")
+	else
+		to_chat(user, "<span class='notice'>Tool does not have a configureable dig range.</span>")
 
 /obj/item/pickaxe/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] begins digging into [user.p_their()] chest!  It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -66,6 +80,7 @@
 	name = "cyborg mining drill"
 	desc = "An integrated electric mining drill."
 	flags_1 = NONE
+	toolspeed = 0.5
 
 /obj/item/pickaxe/drill/cyborg/Initialize()
 	. = ..()
@@ -74,23 +89,25 @@
 /obj/item/pickaxe/drill/diamonddrill
 	name = "diamond-tipped mining drill"
 	icon_state = "diamonddrill"
-	toolspeed = 0.2
+	toolspeed = 0.4
 	desc = "Yours is the drill that will pierce the heavens!"
 
 /obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
 	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP_1 flag, and easier to change borg specific drill mechanics.
 	icon_state = "diamonddrill"
-	toolspeed = 0.1
+	toolspeed = 0.4
+	digrange = 2
 
 /obj/item/pickaxe/drill/jackhammer
 	name = "sonic jackhammer"
 	icon_state = "jackhammer"
 	item_state = "jackhammer"
 	w_class = WEIGHT_CLASS_HUGE
-	toolspeed = 0.1 //the epitome of powertools. extremely fast mining, laughs at puny walls
+	toolspeed = 0.2 //the epitome of powertools. extremely fast mining, laughs at puny walls
 	usesound = 'sound/weapons/sonic_jackhammer.ogg'
 	hitsound = 'sound/weapons/sonic_jackhammer.ogg'
 	desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
+	digrange = 2
 
 /obj/item/shovel
 	name = "shovel"
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 4429c8426f..1e4244165f 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -1,144 +1,147 @@
-/*********************Hivelord stabilizer****************/
-/obj/item/hivelordstabilizer
-	name = "stabilizing serum"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle19"
-	desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user)
-	. = ..()
-	var/obj/item/organ/regenerative_core/C = M
-	if(!istype(C, /obj/item/organ/regenerative_core))
-		to_chat(user, "<span class='warning'>The stabilizer only works on certain types of monster organs, generally regenerative in nature.</span>")
-		return ..()
-
-	C.preserved()
-	to_chat(user, "<span class='notice'>You inject the [M] with the stabilizer. It will no longer go inert.</span>")
-	qdel(src)
-
-/************************Hivelord core*******************/
-/obj/item/organ/regenerative_core
-	name = "regenerative core"
-	desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
-	icon_state = "roro core 2"
-	item_flags = NOBLUDGEON
-	slot = "hivecore"
-	force = 0
-	actions_types = list(/datum/action/item_action/organ_action/use)
-	var/inert = 0
-	var/preserved = 0
-
-/obj/item/organ/regenerative_core/Initialize()
-	. = ..()
-	addtimer(CALLBACK(src, .proc/inert_check), 2400)
-
-/obj/item/organ/regenerative_core/proc/inert_check()
-	if(!preserved)
-		go_inert()
-
-/obj/item/organ/regenerative_core/proc/preserved(implanted = 0)
-	inert = FALSE
-	preserved = TRUE
-	update_icon()
-	desc = "All that remains of a hivelord. It is preserved, allowing you to use it to heal completely without danger of decay."
-	if(implanted)
-		SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "implanted"))
-	else
-		SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "stabilizer"))
-
-/obj/item/organ/regenerative_core/proc/go_inert()
-	inert = TRUE
-	name = "decayed regenerative core"
-	desc = "All that remains of a hivelord. It has decayed, and is completely useless."
-	SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "inert"))
-	update_icon()
-
-/obj/item/organ/regenerative_core/ui_action_click()
-	if(inert)
-		to_chat(owner, "<span class='notice'>[src] breaks down as it tries to activate.</span>")
-	else
-		owner.revive(full_heal = 1)
-		owner.log_message("[owner] used an implanted [src] to heal themselves! Keep fighting, it's just a flesh wound!", LOG_ATTACK, color="green") //Logging for implanted legion core use
-	qdel(src)
-
-/obj/item/organ/regenerative_core/on_life()
-	..()
-	if(owner.health < owner.crit_threshold)
-		ui_action_click()
-
-/obj/item/organ/regenerative_core/afterattack(atom/target, mob/user, proximity_flag)
-	. = ..()
-	if(proximity_flag && ishuman(target))
-		var/mob/living/carbon/human/H = target
-		if(inert)
-			to_chat(user, "<span class='notice'>[src] has decayed and can no longer be used to heal.</span>")
-			return
-		else
-			if(H.stat == DEAD)
-				to_chat(user, "<span class='notice'>[src] are useless on the dead.</span>")
-				return
-			if(H != user)
-				H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!")
-				SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
-			else
-				to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
-				SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
-			H.revive(full_heal = 1)
-			qdel(src)
-			user.log_message("[user] used [src] to heal [H]! Wake the fuck up, Samurai!", LOG_ATTACK, color="green") //Logging for 'old' style legion core use, when clicking on a sprite of yourself or another.
-
-/obj/item/organ/regenerative_core/attack_self(mob/user) //Knouli's first hack! Allows for the use of the core in hand rather than needing to click on the target, yourself, to selfheal. Its a rip of the proc just above - but skips on distance check and only uses 'user' rather than 'target'
-	if(ishuman(user)) //Check if user is human, no need for distance check as it's self heal
-		var/mob/living/carbon/human/H = user //Set H to user rather than target
-		if(inert) //Inert cores are useless
-			to_chat(user, "<span class='notice'>[src] has decayed and can no longer be used to heal.</span>")
-			return
-		else //Skip on check if the target to be healed is dead as, if you are dead, you're not going to be able to use it on yourself!
-			to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
-			SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
-		H.revive(full_heal = 1)
-		qdel(src)
-		H.log_message("[H] used [src] to heal themselves! Making use of Knouli's sexy and intelligent use-in-hand proc!", LOG_ATTACK, color="green") //Logging for 'new' style legion core use, when using the core in-hand.
-
-
-/obj/item/organ/regenerative_core/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
-	. = ..()
-	if(!preserved && !inert)
-		preserved(TRUE)
-		owner.visible_message("<span class='notice'>[src] stabilizes as it's inserted.</span>")
-
-/obj/item/organ/regenerative_core/Remove(mob/living/carbon/M, special = 0)
-	if(!inert && !special)
-		owner.visible_message("<span class='notice'>[src] rapidly decays as it's removed.</span>")
-		go_inert()
-	return ..()
-
-/obj/item/organ/regenerative_core/prepare_eat()
-	return null
-
-/*************************Legion core********************/
-/obj/item/organ/regenerative_core/legion
-	desc = "A strange rock that crackles with power. It can be used to heal completely, but it will rapidly decay into uselessness."
-	icon_state = "legion_soul"
-
-/obj/item/organ/regenerative_core/legion/Initialize()
-	. = ..()
-	update_icon()
-
-/obj/item/organ/regenerative_core/update_icon()
-	icon_state = inert ? "legion_soul_inert" : "legion_soul"
-	cut_overlays()
-	if(!inert && !preserved)
-		add_overlay("legion_soul_crackle")
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.UpdateButtonIcon()
-
-/obj/item/organ/regenerative_core/legion/go_inert()
-	..()
-	desc = "[src] has become inert. It has decayed, and is completely useless."
-
-/obj/item/organ/regenerative_core/legion/preserved(implanted = 0)
-	..()
-	desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay."
+/*********************Hivelord stabilizer****************/
+/obj/item/hivelordstabilizer
+	name = "stabilizing serum"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle19"
+	desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user)
+	. = ..()
+	var/obj/item/organ/regenerative_core/C = M
+	if(!istype(C, /obj/item/organ/regenerative_core))
+		to_chat(user, "<span class='warning'>The stabilizer only works on certain types of monster organs, generally regenerative in nature.</span>")
+		return ..()
+
+	C.preserved()
+	to_chat(user, "<span class='notice'>You inject the [M] with the stabilizer. It will no longer go inert.</span>")
+	qdel(src)
+
+/************************Hivelord core*******************/
+/obj/item/organ/regenerative_core
+	name = "regenerative core"
+	desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
+	icon_state = "roro core 2"
+	item_flags = NOBLUDGEON
+	slot = "hivecore"
+	force = 0
+	actions_types = list(/datum/action/item_action/organ_action/use)
+	var/inert = 0
+	var/preserved = 0
+
+/obj/item/organ/regenerative_core/Initialize()
+	. = ..()
+	addtimer(CALLBACK(src, .proc/inert_check), 2400)
+
+/obj/item/organ/regenerative_core/proc/inert_check()
+	if(!preserved)
+		go_inert()
+
+/obj/item/organ/regenerative_core/proc/preserved(implanted = 0)
+	inert = FALSE
+	preserved = TRUE
+	update_icon()
+	desc = "All that remains of a hivelord. It is preserved, allowing you to use it to heal completely without danger of decay."
+	if(implanted)
+		SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "implanted"))
+	else
+		SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "stabilizer"))
+
+/obj/item/organ/regenerative_core/proc/go_inert()
+	inert = TRUE
+	name = "decayed regenerative core"
+	desc = "All that remains of a hivelord. It has decayed, and is completely useless."
+	SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "inert"))
+	update_icon()
+
+/obj/item/organ/regenerative_core/ui_action_click()
+	if(inert)
+		to_chat(owner, "<span class='notice'>[src] breaks down as it tries to activate.</span>")
+	else
+		owner.revive(full_heal = 1)
+		owner.log_message("[owner] used an implanted [src] to heal themselves! Keep fighting, it's just a flesh wound!", LOG_ATTACK, color="green") //Logging for implanted legion core use
+	qdel(src)
+
+/obj/item/organ/regenerative_core/on_life()
+	..()
+	if(owner.health < owner.crit_threshold)
+		ui_action_click()
+
+/obj/item/organ/regenerative_core/afterattack(atom/target, mob/user, proximity_flag)
+	. = ..()
+	if(proximity_flag && ishuman(target))
+		var/mob/living/carbon/human/H = target
+		if(inert)
+			to_chat(user, "<span class='notice'>[src] has decayed and can no longer be used to heal.</span>")
+			return
+		if(isvamp(user))
+			to_chat(user, "<span class='notice'>[src] breaks down as it fails to heal your unholy self</span>")
+			return
+		else
+			if(H.stat == DEAD)
+				to_chat(user, "<span class='notice'>[src] are useless on the dead.</span>")
+				return
+			if(H != user)
+				H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!")
+				SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
+			else
+				to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
+				SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
+			H.revive(full_heal = 1)
+			qdel(src)
+			user.log_message("[user] used [src] to heal [H]! Wake the fuck up, Samurai!", LOG_ATTACK, color="green") //Logging for 'old' style legion core use, when clicking on a sprite of yourself or another.
+
+/obj/item/organ/regenerative_core/attack_self(mob/user) //Knouli's first hack! Allows for the use of the core in hand rather than needing to click on the target, yourself, to selfheal. Its a rip of the proc just above - but skips on distance check and only uses 'user' rather than 'target'
+	if(ishuman(user)) //Check if user is human, no need for distance check as it's self heal
+		var/mob/living/carbon/human/H = user //Set H to user rather than target
+		if(inert) //Inert cores are useless
+			to_chat(user, "<span class='notice'>[src] has decayed and can no longer be used to heal.</span>")
+			return
+		else //Skip on check if the target to be healed is dead as, if you are dead, you're not going to be able to use it on yourself!
+			to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
+			SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
+		H.revive(full_heal = 1)
+		qdel(src)
+		H.log_message("[H] used [src] to heal themselves! Making use of Knouli's sexy and intelligent use-in-hand proc!", LOG_ATTACK, color="green") //Logging for 'new' style legion core use, when using the core in-hand.
+
+
+/obj/item/organ/regenerative_core/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
+	. = ..()
+	if(!preserved && !inert)
+		preserved(TRUE)
+		owner.visible_message("<span class='notice'>[src] stabilizes as it's inserted.</span>")
+
+/obj/item/organ/regenerative_core/Remove(mob/living/carbon/M, special = 0)
+	if(!inert && !special)
+		owner.visible_message("<span class='notice'>[src] rapidly decays as it's removed.</span>")
+		go_inert()
+	return ..()
+
+/obj/item/organ/regenerative_core/prepare_eat()
+	return null
+
+/*************************Legion core********************/
+/obj/item/organ/regenerative_core/legion
+	desc = "A strange rock that crackles with power. It can be used to heal completely, but it will rapidly decay into uselessness."
+	icon_state = "legion_soul"
+
+/obj/item/organ/regenerative_core/legion/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/organ/regenerative_core/update_icon()
+	icon_state = inert ? "legion_soul_inert" : "legion_soul"
+	cut_overlays()
+	if(!inert && !preserved)
+		add_overlay("legion_soul_crackle")
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
+
+/obj/item/organ/regenerative_core/legion/go_inert()
+	..()
+	desc = "[src] has become inert. It has decayed, and is completely useless."
+
+/obj/item/organ/regenerative_core/legion/preserved(implanted = 0)
+	..()
+	desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay."
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 4077f21ea9..ea0174d2a5 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -148,7 +148,7 @@
 	desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
 	icon = 'icons/obj/lavaland/ash_flora.dmi'
 	icon_state = "mushroom_shavings"
-	list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
+	list_reagents = list(/datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/ethanol = 2, /datum/reagent/stabilizing_agent = 3, /datum/reagent/toxin/minttoxin = 2)
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
 	max_integrity = 100
@@ -166,7 +166,7 @@
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
 	name = "mushroom leaf"
 	desc = "A leaf, from a mushroom."
-	list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/vitfro = 2, /datum/reagent/drug/nicotine = 2)
 	icon_state = "mushroom_leaf"
 	seed = /obj/item/seeds/lavaland/porcini
 	wine_power = 40
@@ -174,7 +174,7 @@
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
 	name = "mushroom cap"
 	desc = "The cap of a large mushroom."
-	list_reagents = list("mindbreaker" = 2, "entpoly" = 4, "mushroomhallucinogen" = 2)
+	list_reagents = list(/datum/reagent/toxin/mindbreaker = 2, /datum/reagent/consumable/entpoly = 4, /datum/reagent/drug/mushroomhallucinogen = 2)
 	icon_state = "mushroom_cap"
 	seed = /obj/item/seeds/lavaland/inocybe
 	wine_power = 70
@@ -182,14 +182,14 @@
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
 	name = "mushroom stem"
 	desc = "A long mushroom stem. It's slightly glowing."
-	list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
+	list_reagents = list(/datum/reagent/consumable/tinlux = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/drug/space_drugs = 1)
 	icon_state = "mushroom_stem"
 	seed = /obj/item/seeds/lavaland/ember
 	wine_power = 60
 
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
 	name = "cactus fruit"
-	list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/vitfro = 6)
 	desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
 	icon_state = "cactus_fruit"
 	seed = /obj/item/seeds/lavaland/cactus
@@ -218,7 +218,7 @@
 		else if(contents.len >= 20)
 			to_chat(user, "<span class='warning'>You can't add more ingredients to [src]!</span>")
 		else
-			if(reagents.has_reagent("water", 10)) //are we starting a soup or a salad?
+			if(reagents.has_reagent(/datum/reagent/water, 10)) //are we starting a soup or a salad?
 				var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/soup/ashsoup(get_turf(src))
 				A.initialize_custom_food(src, S, user)
 			else
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index b79cbd846a..5dca9e0e3f 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -577,7 +577,7 @@
 /obj/item/reagent_containers/glass/bottle/potion/flight
 	name = "strange elixir"
 	desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
-	list_reagents = list("flightpotion" = 5)
+	list_reagents = list(/datum/reagent/flightpotion = 5)
 
 /obj/item/reagent_containers/glass/bottle/potion/update_icon()
 	if(reagents.total_volume)
@@ -587,7 +587,6 @@
 
 /datum/reagent/flightpotion
 	name = "Flight Potion"
-	id = "flightpotion"
 	description = "Strange mutagenic compound of unknown origins."
 	reagent_state = LIQUID
 	color = "#FFEBEB"
@@ -862,7 +861,7 @@
 	switch(random)
 		if(1)
 			to_chat(user, "<span class='danger'>Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.</span>")
-			H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "snout" = "Sharp", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs")
+			H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "snout" = "Sharp", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade")
 			H.eye_color = "fee5a3"
 			H.set_species(/datum/species/lizard)
 		if(2)
@@ -944,7 +943,7 @@
 			timer = world.time + create_delay + 1
 			if(do_after(user, create_delay, target = T))
 				var/old_name = T.name
-				if(T.TerraformTurf(turf_type))
+				if(T.TerraformTurf(turf_type, flags = CHANGETURF_INHERIT_AIR))
 					user.visible_message("<span class='danger'>[user] turns \the [old_name] into [transform_string]!</span>")
 					message_admins("[ADMIN_LOOKUPFLW(user)] fired the lava staff at [ADMIN_VERBOSEJMP(T)]")
 					log_game("[key_name(user)] fired the lava staff at [AREACOORD(T)].")
@@ -955,7 +954,7 @@
 			qdel(L)
 		else
 			var/old_name = T.name
-			if(T.TerraformTurf(reset_turf_type))
+			if(T.TerraformTurf(reset_turf_type, flags = CHANGETURF_INHERIT_AIR))
 				user.visible_message("<span class='danger'>[user] turns \the [old_name] into [reset_string]!</span>")
 				timer = world.time + reset_cooldown
 				playsound(T,'sound/magic/fireball.ogg', 200, 1)
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 79da476719..b5f7bbf8ab 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -50,7 +50,7 @@
 /obj/machinery/mineral/ore_redemption/examine(mob/user)
 	. = ..()
 	if(in_range(user, src) || isobserver(user))
-		. += "<span class='notice'>The status display reads: Smelting <b>[sheet_per_ore]</b> sheet(s) per piece of ore.<br>Ore pickup speed at <b>[ore_pickup_rate]</b>.</span>"
+		. += "<span class='notice'>The status display reads: Smelting <b>[sheet_per_ore]</b> sheet(s) per piece of ore.<br>Reward point generation at <b>[point_upgrade*100]%</b>.<br>Ore pickup speed at <b>[ore_pickup_rate]</b>.</span>"
 
 /obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/stack/ore/O)
 	var/datum/component/material_container/mat_container = materials.mat_container
@@ -63,7 +63,7 @@
 	ore_buffer -= O
 
 	if(O && O.refined_type)
-		points += O.points * O.amount
+		points += O.points * point_upgrade * O.amount
 
 	var/material_amount = mat_container.get_item_material_amount(O)
 
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index c3a33f36f5..291664ce3e 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -358,7 +358,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_gold_heads"
 	value = 50
 	materials = list(MAT_GOLD = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("gold" = 4)
+	grind_results = list(/datum/reagent/gold = 4)
 
 /obj/item/coin/silver
 	name = "silver coin"
@@ -366,7 +366,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_silver_heads"
 	value = 20
 	materials = list(MAT_SILVER = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("silver" = 4)
+	grind_results = list(/datum/reagent/silver = 4)
 
 /obj/item/coin/diamond
 	name = "diamond coin"
@@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_diamond_heads"
 	value = 500
 	materials = list(MAT_DIAMOND = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("carbon" = 4)
+	grind_results = list(/datum/reagent/carbon = 4)
 
 /obj/item/coin/iron
 	name = "iron coin"
@@ -382,7 +382,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_iron_heads"
 	value = 1
 	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("iron" = 4)
+	grind_results = list(/datum/reagent/iron = 4)
 
 /obj/item/coin/plasma
 	name = "plasma coin"
@@ -390,7 +390,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_plasma_heads"
 	value = 100
 	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("plasma" = 4)
+	grind_results = list(/datum/reagent/toxin/plasma = 4)
 
 /obj/item/coin/uranium
 	name = "uranium coin"
@@ -398,7 +398,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_uranium_heads"
 	value = 80
 	materials = list(MAT_URANIUM = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("uranium" = 4)
+	grind_results = list(/datum/reagent/uranium = 4)
 
 /obj/item/coin/bananium
 	name = "bananium coin"
@@ -406,7 +406,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	icon_state = "coin_bananium_heads"
 	value = 1000 //makes the clown cry
 	materials = list(MAT_BANANIUM = MINERAL_MATERIAL_AMOUNT*0.2)
-	grind_results = list("banana" = 4)
+	grind_results = list(/datum/reagent/consumable/banana = 4)
 
 /obj/item/coin/adamantine
 	name = "adamantine coin"
@@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	sideslist = list("heads")
 	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT*0.2)
 	value = 1
-	grind_results = list("iron" = 4)
+	grind_results = list(/datum/reagent/iron = 4)
 
 /obj/item/coin/antagtoken
 	name = "antag token"
@@ -436,7 +436,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	desc = "A novelty coin that helps the heart know what hard evidence cannot prove."
 	sideslist = list("valid", "salad")
 	value = 0
-	grind_results = list("sodiumchloride" = 4)
+	grind_results = list(/datum/reagent/consumable/sodiumchloride = 4)
 
 /obj/item/coin/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/cable_coil))
diff --git a/code/modules/mining/point_bank.dm b/code/modules/mining/point_bank.dm
new file mode 100644
index 0000000000..8d0bb4e1e4
--- /dev/null
+++ b/code/modules/mining/point_bank.dm
@@ -0,0 +1,49 @@
+/obj/machinery/point_bank
+	name = "mining point bank"
+	desc = "A wall mounted machine that can be used to store and transfer mining points. Sharing is caring!"
+	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon_state = "ore_redemption"
+	density = FALSE
+	req_access = list(ACCESS_MINERAL_STOREROOM)
+	circuit = null
+	layer = BELOW_OBJ_LAYER
+	var/points = 0
+
+/obj/machinery/point_bank/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "point_bank", "Point Bank", 200, 100, master_ui, state)
+		ui.open()
+
+/obj/machinery/point_bank/ui_data(mob/user)
+	var/list/data = list()
+	data["totalPoints"] = points
+	return data
+
+/obj/machinery/mineral/ore_redemption/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("Claim")
+			var/mob/M = usr
+			var/obj/item/card/id/I = M.get_idcard(TRUE)
+			if(points)
+				if(I)
+					I.mining_points += points
+					points = 0
+				else
+					to_chat(usr, "<span class='warning'>No ID detected.</span>")
+			else
+				to_chat(usr, "<span class='warning'>No points to claim.</span>")
+			return TRUE
+
+/obj/machinery/point_bank/power_change()
+	..()
+	update_icon()
+
+/obj/machinery/point_bank/update_icon()
+	if(powered())
+		icon_state = initial(icon_state)
+	else
+		icon_state = "[initial(icon_state)]-off"
+	return
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 7aae26526e..5b664dc01a 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -27,12 +27,7 @@
 
 /datum/preferences/proc/update_preview_icon(equip_job = TRUE)
 	// Determine what job is marked as 'High' priority, and dress them up as such.
-	var/datum/job/previewJob
-	var/highest_pref = 0
-	for(var/job in job_preferences)
-		if(job_preferences["[job]"] > highest_pref)
-			previewJob = SSjob.GetJob(job)
-			highest_pref = job_preferences["[job]"]
+	var/datum/job/previewJob = get_highest_job()
 
 	if(previewJob)
 		// Silicons only need a very basic preview since there is no customization for them.
@@ -57,3 +52,11 @@
 	parent.show_character_previews(new /mutable_appearance(mannequin))
 	unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
 
+/datum/preferences/proc/get_highest_job()
+	var/highest_pref = 0
+	var/datum/job/highest_job
+	for(var/job in job_preferences)
+		if(job_preferences["[job]"] > highest_pref)
+			highest_job = SSjob.GetJob(job)
+			highest_pref = job_preferences["[job]"]
+	return highest_job
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
index 15640a2699..b31a41bcc7 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm
@@ -27,28 +27,33 @@
 	extra2 = TRUE
 	center = TRUE
 	dimension_x = 64
-	var/taur_mode = NOT_TAURIC
+	var/taur_mode = NONE //Must be a single specific tauric suit variation bitflag. Don't do FLAG_1|FLAG_2
+	var/alt_taur_mode = NONE //Same as above.
 	color_src = MATRIXED
 
 /datum/sprite_accessory/taur/none
+	dimension_x = 32
+	center = FALSE
 	name = "None"
 	icon_state = "None"
 
 /datum/sprite_accessory/taur/cow
 	name = "Cow"
 	icon_state = "cow"
-	taur_mode = HOOF_TAURIC
+	taur_mode = STYLE_HOOF_TAURIC
+	alt_taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/deer
 	name = "Deer"
 	icon_state = "deer"
-	taur_mode = HOOF_TAURIC
+	taur_mode = STYLE_HOOF_TAURIC
+	alt_taur_mode = STYLE_PAW_TAURIC
 	color_src = MUTCOLORS
 
 /datum/sprite_accessory/taur/drake
 	name = "Drake"
 	icon_state = "drake"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/drider
 	name = "Drider"
@@ -58,67 +63,68 @@
 /datum/sprite_accessory/taur/eevee
 	name = "Eevee"
 	icon_state = "eevee"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 	color_src = MUTCOLORS
 
 /datum/sprite_accessory/taur/fox
 	name = "Fox"
 	icon_state = "fox"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/husky
 	name = "Husky"
 	icon_state = "husky"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/horse
 	name = "Horse"
 	icon_state = "horse"
-	taur_mode = HOOF_TAURIC
+	taur_mode = STYLE_HOOF_TAURIC
+	alt_taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/lab
 	name = "Lab"
 	icon_state = "lab"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/naga
 	name = "Naga"
 	icon_state = "naga"
-	taur_mode = SNEK_TAURIC
+	taur_mode = STYLE_SNEK_TAURIC
 
 /datum/sprite_accessory/taur/otie
 	name = "Otie"
 	icon_state = "otie"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/pede
 	name = "Scolipede"
 	icon_state = "pede"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 	color_src = MUTCOLORS
 
 /datum/sprite_accessory/taur/panther
 	name = "Panther"
 	icon_state = "panther"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/tentacle
 	name = "Tentacle"
 	icon_state = "tentacle"
-	taur_mode = SNEK_TAURIC
+	taur_mode = STYLE_SNEK_TAURIC
 	color_src = MUTCOLORS
 
 /datum/sprite_accessory/taur/tiger
 	name = "Tiger"
 	icon_state = "tiger"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
 
 /datum/sprite_accessory/taur/wolf
 	name = "Wolf"
 	icon_state = "wolf"
-	taur_mode = PAW_TAURIC
+	taur_mode = STYLE_PAW_TAURIC
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
index fb40563ccf..58c64dc7d0 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
@@ -310,4 +310,40 @@
 	name = "Tube Top"
 	icon_state = "tubetop"
 	has_color = TRUE
-	gender = FEMALE
\ No newline at end of file
+	gender = FEMALE
+
+/datum/sprite_accessory/underwear/top/cowboyshirt
+	name = "Cowboy Shirt Black"
+	icon_state = "cowboyshirt"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/s
+	name = "Cowboy Shirt Shortsleeved Black"
+	icon_state = "cowboyshirt_s"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/white
+	name = "Cowboy Shirt White"
+	icon_state = "cowboyshirt_white"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/white/s
+	name = "Cowboy Shirt Shortsleeved White"
+	icon_state = "cowboyshirt_whites"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/navy
+	name = "Cowboy Shirt Navy"
+	icon_state = "cowboyshirt_navy"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/navy/s
+	name = "Cowboy Shirt Shortsleeved Navy"
+	icon_state = "cowboyshirt_navys"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/red
+	name = "Cowboy Shirt Red"
+	icon_state = "cowboyshirt_red"
+
+/datum/sprite_accessory/underwear/top/cowboyshirt/red/s
+	name = "Cowboy Shirt Shortsleeved Red"
+	icon_state = "cowboyshirt_reds"
+
+
+
+
diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm
index bf86a97574..1b328dbc69 100644
--- a/code/modules/mob/dead/observer/login.dm
+++ b/code/modules/mob/dead/observer/login.dm
@@ -18,6 +18,3 @@
 
 	update_icon(preferred_form)
 	updateghostimages()
-
-	client.reenter_round_timeout = max(client.reenter_round_timeout, clientless_round_timeout)
-	clientless_round_timeout = client.reenter_round_timeout
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 0846cf1ea1..d234aafca6 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -19,7 +19,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	hud_type = /datum/hud/ghost
 	movement_type = GROUND | FLYING
 	var/can_reenter_corpse
-	var/clientless_round_timeout = 0 //mobs will lack a client as long as their player is disconnected. See client_defines.dm "reenter_round_timeout"
 	var/datum/hud/living/carbon/hud = null // hud
 	var/bootime = 0
 	var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
@@ -135,7 +134,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 		AA.onNewMob(src)
 
 	. = ..()
-
+	AddElement(/datum/element/ghost_role_eligibility)
 	grant_all_languages()
 
 /mob/dead/observer/get_photo_description(obj/item/camera/camera)
@@ -270,23 +269,12 @@ Works together with spawning an observer, noted above.
 	var/mob/dead/observer/ghost = new(src)	// Transfer safety to observer spawning proc.
 	SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
 	ghost.can_reenter_corpse = can_reenter_corpse
-	if(penalize) //penalizing them from making a ghost role / midround antag comeback right away.
-		var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES
-		var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
-		if(world.time < roundstart_quit_limit) //add up the time difference to their antag rolling penalty if they quit before half a (ingame) hour even passed.
-			penalty += roundstart_quit_limit - world.time
-		if(penalty)
-			penalty += world.realtime
-			if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
-				penalty = CANT_REENTER_ROUND
-			if(client)
-				client.reenter_round_timeout = penalty
-			else //A disconnected player (quite likely for cryopods)
-				ghost.clientless_round_timeout = penalty
 	if (client && client.prefs && client.prefs.auto_ooc)
 		if (!(client.prefs.chat_toggles & CHAT_OOC))
 			client.prefs.chat_toggles ^= CHAT_OOC
 	transfer_ckey(ghost, FALSE)
+	ghost.AddElement(/datum/element/ghost_role_eligibility,penalize) // technically already run earlier, but this adds the penalty
+	// needs to be done AFTER the ckey transfer, too
 	return ghost
 
 /*
@@ -343,15 +331,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return
 	ghostize(0, penalize = TRUE)
 
-/mob/dead/observer/proc/can_reenter_round(silent = FALSE)
-	var/timeout = clientless_round_timeout
-	if(client)
-		timeout = client.reenter_round_timeout
-	if(timeout != CANT_REENTER_ROUND && timeout <= world.realtime)
-		return TRUE
-	if(!silent && client)
-		to_chat(src, "<span class='warning'>You are unable to reenter the round[timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(timeout - world.realtime)]" : ""].</span>")
-	return FALSE
+
 
 /mob/dead/observer/Move(NewLoc, direct)
 	if(updatedir)
@@ -497,6 +477,32 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	pixel_y = 0
 	animate(src, pixel_y = 2, time = 10, loop = -1)
 
+/mob/dead/observer/verb/observe()
+	set name = "Observe"
+	set category = "Ghost"
+
+	var/list/creatures = getpois()
+
+	reset_perspective(null)
+
+	var/eye_name = null
+
+	eye_name = input("Please, select a player!", "Observe", null, null) as null|anything in creatures
+
+	if (!eye_name)
+		return
+
+	var/mob/mob_eye = creatures[eye_name]
+	//Istype so we filter out points of interest that are not mobs
+	if(client && mob_eye && istype(mob_eye))
+		client.eye = mob_eye
+		if(mob_eye.hud_used)
+			client.screen = list()
+			LAZYINITLIST(mob_eye.observers)
+			mob_eye.observers |= src
+			mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)
+			observetarget = mob_eye
+
 /mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
 	set category = "Ghost"
 	set name = "Jump to Mob"
@@ -827,32 +833,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			client.screen = list()
 			hud_used.show_hud(hud_used.hud_version)
 
-/mob/dead/observer/verb/observe()
-	set name = "Observe"
-	set category = "OOC"
-
-	var/list/creatures = getpois()
-
-	reset_perspective(null)
-
-	var/eye_name = null
-
-	eye_name = input("Please, select a player!", "Observe", null, null) as null|anything in creatures
-
-	if (!eye_name)
-		return
-
-	var/mob/mob_eye = creatures[eye_name]
-	//Istype so we filter out points of interest that are not mobs
-	if(client && mob_eye && istype(mob_eye))
-		client.eye = mob_eye
-		if(mob_eye.hud_used)
-			client.screen = list()
-			LAZYINITLIST(mob_eye.observers)
-			mob_eye.observers |= src
-			mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)
-			observetarget = mob_eye
-
 /mob/dead/observer/verb/register_pai_candidate()
 	set category = "Ghost"
 	set name = "pAI Setup"
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 8195b3d84b..ade8158e02 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -155,7 +155,7 @@
 	if(iscarbon(AM))
 		var/mob/living/carbon/C = AM
 		if(blood_id == C.get_blood_id())//both mobs have the same blood substance
-			if(blood_id == "blood" || blood_id == "jellyblood") //normal blood
+			if(blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood) //normal blood
 				if(blood_data["viruses"])
 					for(var/thing in blood_data["viruses"])
 						var/datum/disease/D = thing
@@ -175,7 +175,7 @@
 	return
 
 /mob/living/carbon/get_blood_data(blood_id)
-	if(blood_id == "blood" || blood_id == "jellyblood") //actual blood reagent
+	if(blood_id == /datum/reagent/blood || /datum/reagent/blood/jellyblood) //actual blood reagent
 		var/blood_data = list()
 		//set the blood data
 		blood_data["donor"] = src
@@ -191,7 +191,7 @@
 			blood_data["resistances"] = disease_resistances.Copy()
 		var/list/temp_chem = list()
 		for(var/datum/reagent/R in reagents.reagent_list)
-			temp_chem[R.id] = R.volume
+			temp_chem[R.type] = R.volume
 		blood_data["trace_chem"] = list2params(temp_chem)
 		if(mind)
 			blood_data["mind"] = mind
@@ -226,21 +226,21 @@
 
 /mob/living/simple_animal/get_blood_id()
 	if(blood_volume)
-		return "blood"
+		return /datum/reagent/blood
 
 /mob/living/carbon/monkey/get_blood_id()
 	if(!(HAS_TRAIT(src, TRAIT_NOCLONE)))
-		return "blood"
+		return /datum/reagent/blood
 
 /mob/living/carbon/get_blood_id()
 	if(isjellyperson(src))
-		return "jellyblood"
+		return /datum/reagent/blood/jellyblood
 	if(dna?.species?.exotic_blood)
 		return dna.species.exotic_blood
 	else if((NOBLOOD in dna.species.species_traits) || (HAS_TRAIT(src, TRAIT_NOCLONE)))
 		return
 	else
-		return "blood"
+		return /datum/reagent/blood
 
 // This is has more potential uses, and is probably faster than the old proc.
 /proc/get_safe_blood(bloodtype)
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index d1ace36b8c..4ed539adc2 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -73,7 +73,7 @@
 
 	if(victim.stat == CONSCIOUS)
 		src.visible_message("<span class='warning'>[victim] kicks free of the blood pool just before entering it!</span>", null, "<span class='notice'>You hear splashing and struggling.</span>")
-	else if(victim.reagents && victim.reagents.has_reagent("demonsblood"))
+	else if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/demonsblood))
 		visible_message("<span class='warning'>Something prevents [victim] from entering the pool!</span>", "<span class='warning'>A strange force is blocking [victim] from entering!</span>", "<span class='notice'>You hear a splash and a thud.</span>")
 	else
 		victim.forceMove(src)
@@ -104,7 +104,7 @@
 	if(!victim)
 		return FALSE
 
-	if(victim.reagents && victim.reagents.has_reagent("devilskiss"))
+	if(victim.reagents && victim.reagents.has_reagent(/datum/reagent/consumable/ethanol/devilskiss))
 		to_chat(src, "<span class='warning'><b>AAH! THEIR FLESH! IT BURNS!</b></span>")
 		adjustBruteLoss(25) //I can't use adjustHealth() here because bloodcrawl affects /mob/living and adjustHealth() only affects simple mobs
 		var/found_bloodpool = FALSE
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 48e79a9050..f2ea4f2b01 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -102,16 +102,16 @@
 	if(istype(O, /obj/item/organ_storage)) //BUG_PROBABLE_CAUSE
 		return //Borg organ bags shouldn't be killing brains
 
-	if((organ_flags & ORGAN_FAILING) && O.is_drainable() && O.reagents.has_reagent("neurine")) //Neurine fixes dead brains
+	if((organ_flags & ORGAN_FAILING) && O.is_drainable() && O.reagents.has_reagent(/datum/reagent/medicine/neurine)) //Neurine fixes dead brains
 		. = TRUE //don't do attack animation.
 		var/cached_Bdamage = brainmob?.health
-		var/datum/reagent/medicine/neurine/N = reagents.has_reagent("neurine")
-		var/datum/reagent/medicine/mannitol/M1 = reagents.has_reagent("mannitol")
+		var/datum/reagent/medicine/neurine/N = reagents.has_reagent(/datum/reagent/medicine/neurine)
+		var/datum/reagent/medicine/mannitol/M1 = reagents.has_reagent(/datum/reagent/medicine/mannitol)
 
-		if(O.reagents.has_reagent("mannitol"))//Just a quick way to bolster the effects if someone mixes up a batch.
+		if(O.reagents.has_reagent(/datum/reagent/medicine/mannitol))//Just a quick way to bolster the effects if someone mixes up a batch.
 			N.volume *= (M1.volume*0.5)
 
-		if(!O.reagents.has_reagent("neurine", 10))
+		if(!O.reagents.has_reagent(/datum/reagent/medicine/neurine, 10))
 			to_chat(user, "<span class='warning'>There's not enough neurine in [O] to restore [src]!</span>")
 			return
 
@@ -134,14 +134,14 @@
 					gain_trauma_type(BRAIN_TRAUMA_SPECIAL)
 		return
 
-	if((organ_flags & ORGAN_FAILING) && O.is_drainable() && O.reagents.has_reagent("mannitol")) //attempt to heal the brain
+	if((organ_flags & ORGAN_FAILING) && O.is_drainable() && O.reagents.has_reagent(/datum/reagent/medicine/mannitol)) //attempt to heal the brain
 		. = TRUE //don't do attack animation.
-		var/datum/reagent/medicine/mannitol/M = reagents.has_reagent("mannitol")
+		var/datum/reagent/medicine/mannitol/M = reagents.has_reagent(/datum/reagent/medicine/mannitol)
 		if(brain_death || brainmob?.health <= HEALTH_THRESHOLD_DEAD) //if the brain is fucked anyway, do nothing
 			to_chat(user, "<span class='warning'>[src] is far too damaged, you'll have to use neurine on it!</span>")
 			return
 
-		if(!O.reagents.has_reagent("mannitol", 10))
+		if(!O.reagents.has_reagent(/datum/reagent/medicine/mannitol, 10))
 			to_chat(user, "<span class='warning'>There's not enough mannitol in [O] to restore [src]!</span>")
 			return
 
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index b9e27c0637..bdc691ce49 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -6,21 +6,21 @@
 	return 2 //no ears
 
 /mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush)
-	..(AM, skipcatch = TRUE, hitpush = FALSE)
+	return ..(AM, skipcatch = TRUE, hitpush = FALSE)
 
+/mob/living/carbon/alien/can_embed(obj/item/I)
+	return FALSE
 
 /*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other.
 As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble.
 In all, this is a lot like the monkey code. /N
 */
 /mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M)
-	if(isturf(loc) && istype(loc.loc, /area/start))
-		to_chat(M, "No attacking people at spawn, you jackass.")
+	. = ..()
+	if(!.) // the attack was blocked or was help/grab intent
 		return
-
 	switch(M.a_intent)
-
-		if ("help")
+		if (INTENT_HELP)
 			if(!recoveringstam)
 				resting = 0
 			AdjustStun(-60)
@@ -28,11 +28,7 @@ In all, this is a lot like the monkey code. /N
 			AdjustUnconscious(-60)
 			AdjustSleeping(-100)
 			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake [p_them()] up!</span>")
-
-		if ("grab")
-			grabbedby(M)
-
-		else
+		if(INTENT_DISARM, INTENT_HARM)
 			if(health > 0)
 				M.do_attack_animation(src, ATTACK_EFFECT_BITE)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
@@ -50,28 +46,31 @@ In all, this is a lot like the monkey code. /N
 
 
 /mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M)
-	if(..())	//to allow surgery to return properly.
-		return 0
-
+	. = ..()
+	if(.) //To allow surgery to return properly.
+		return
 	switch(M.a_intent)
-		if("help")
+		if(INTENT_HELP)
 			help_shake_act(M)
-		if("grab")
+		if(INTENT_GRAB)
 			grabbedby(M)
-		if ("harm")
+		if (INTENT_HARM)
+			if(HAS_TRAIT(M, TRAIT_PACIFISM))
+				to_chat(M, "<span class='notice'>You don't want to hurt [src]!</span>")
+				return TRUE
 			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
-			return 1
-		if("disarm")
+		if(INTENT_DISARM)
+			if(HAS_TRAIT(M, TRAIT_PACIFISM))
+				to_chat(M, "<span class='notice'>You don't want to hurt [src]!</span>")
+				return TRUE
 			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
-			return 1
-	return 0
 
 
 /mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M)
-	if(..())
-		if (stat != DEAD)
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-			apply_damage(rand(1, 3), BRUTE, affecting)
+	. = ..()
+	if(.) //successful monkey bite.
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+		apply_damage(rand(1, 3), BRUTE, affecting)
 
 
 /mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
@@ -93,13 +92,15 @@ In all, this is a lot like the monkey code. /N
 				adjustStaminaLoss(damage)
 
 /mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		var/damage = rand(5, 35)
-		if(M.is_adult)
-			damage = rand(10, 40)
-		adjustBruteLoss(damage)
-		log_combat(M, src, "attacked")
-		updatehealth()
+	. = ..()
+	if(!.) //unsuccessful slime attack
+		return
+	var/damage = rand(5, 35)
+	if(M.is_adult)
+		damage = rand(10, 40)
+	adjustBruteLoss(damage)
+	log_combat(M, src, "attacked")
+	updatehealth()
 
 /mob/living/carbon/alien/ex_act(severity, target, origin)
 	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index fe682b5c99..d1ed09665b 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -63,12 +63,7 @@
 	if(A)
 		if(isliving(A))
 			var/mob/living/L = A
-			var/blocked = FALSE
-			if(ishuman(A))
-				var/mob/living/carbon/human/H = A
-				if(H.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK))
-					blocked = TRUE
-			if(!blocked)
+			if(!L.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK))
 				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
 				L.Knockdown(100)
 				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index b3839a6033..1d613db07a 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -5,9 +5,11 @@
 	else
 		..()
 
-/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
 	if(user.a_intent == INTENT_HARM)
-		..(user, 1)
+		. = ..(user, TRUE)
+		if(.)
+			return
 		adjustBruteLoss(15)
 		var/hitverb = "punched"
 		if(mob_size < MOB_SIZE_LARGE)
@@ -21,46 +23,46 @@
 		return 1
 
 /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M)
-	if(..())
-		switch(M.a_intent)
-			if ("harm")
-				var/damage = rand(1, 9)
-				if (prob(90))
-					playsound(loc, "punch", 25, 1, -1)
-					visible_message("<span class='danger'>[M] has punched [src]!</span>", \
-							"<span class='userdanger'>[M] has punched [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-					if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down.
-						Unconscious(40)
-						visible_message("<span class='danger'>[M] has knocked [src] down!</span>", \
-								"<span class='userdanger'>[M] has knocked [src] down!</span>")
-					var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-					apply_damage(damage, BRUTE, affecting)
-					log_combat(M, src, "attacked")
+	. = ..()
+	if(.) //To allow surgery to return properly.
+		return
+	switch(M.a_intent)
+		if (INTENT_HARM)
+			var/damage = rand(1, 9)
+			if (prob(90))
+				playsound(loc, "punch", 25, 1, -1)
+				visible_message("<span class='danger'>[M] has punched [src]!</span>", \
+						"<span class='userdanger'>[M] has punched [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+				if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down.
+					Unconscious(40)
+					visible_message("<span class='danger'>[M] has knocked [src] down!</span>", \
+							"<span class='userdanger'>[M] has knocked [src] down!</span>")
+				var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+				apply_damage(damage, BRUTE, affecting)
+				log_combat(M, src, "attacked")
+			else
+				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+				visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>", \
+					"<span class='userdanger'>[M] has attempted to punch [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+
+		if (INTENT_DISARM)
+			if (!lying)
+				if (prob(5))
+					Unconscious(40)
+					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+					log_combat(M, src, "pushed")
+					visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
+						"<span class='userdanger'>[M] has pushed down [src]!</span>")
 				else
-					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-					visible_message("<span class='userdanger'>[M] has attempted to punch [src]!</span>", \
-						"<span class='userdanger'>[M] has attempted to punch [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-			if ("disarm")
-				if (!lying)
-					if (prob(5))
-						Unconscious(40)
+					if (prob(50))
+						dropItemToGround(get_active_held_item())
 						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-						log_combat(M, src, "pushed")
-						visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
-							"<span class='userdanger'>[M] has pushed down [src]!</span>")
+						visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
+						"<span class='userdanger'>[M] has disarmed [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 					else
-						if (prob(50))
-							dropItemToGround(get_active_held_item())
-							playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-							visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
-							"<span class='userdanger'>[M] has disarmed [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-						else
-							playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-							visible_message("<span class='userdanger'>[M] has attempted to disarm [src]!</span>",\
-								"<span class='userdanger'>[M] has attempted to disarm [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-
+						playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+						visible_message("<span class='danger'>[M] has attempted to disarm [src]!</span>",\
+							"<span class='userdanger'>[M] has attempted to disarm [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 
 /mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
 	if(!no_effect && !visual_effect_icon)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index e1e079cbae..8e1e5aab8d 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -14,10 +14,9 @@
 	var/max_grown = 100
 	var/time_of_birth
 
-	rotate_on_lying = 0
+	rotate_on_lying = FALSE
 	bodyparts = list(/obj/item/bodypart/chest/larva, /obj/item/bodypart/head/larva)
 
-
 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/larva/Initialize()
 
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
index 69c1be707d..7dabcf5abf 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
@@ -1,26 +1,33 @@
 
 
 /mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M)
-	if(..())
-		var/damage = rand(1, 9)
-		if (prob(90))
-			playsound(loc, "punch", 25, 1, -1)
-			log_combat(M, src, "attacked")
-			visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
-					"<span class='userdanger'>[M] has kicked [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-			if ((stat != DEAD) && (damage > 4.9))
-				Unconscious(rand(100,200))
+	. = ..()
+	if(. || M.a_intent == INTENT_HELP || M.a_intent == INTENT_GRAB)
+		return
+	var/damage = rand(1, 9)
+	if (prob(90))
+		playsound(loc, "punch", 25, 1, -1)
+		log_combat(M, src, "attacked")
+		visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
+				"<span class='userdanger'>[M] has kicked [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+		if ((stat != DEAD) && (damage > 4.9))
+			Unconscious(rand(100,200))
 
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-			apply_damage(damage, BRUTE, affecting)
-		else
-			playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-			visible_message("<span class='danger'>[M] has attempted to kick [src]!</span>", \
-					"<span class='userdanger'>[M] has attempted to kick [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+		apply_damage(damage, BRUTE, affecting)
+	else
+		playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+		visible_message("<span class='danger'>[M] has attempted to kick [src]!</span>", \
+				"<span class='userdanger'>[M] has attempted to kick [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 
-/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
 	if(user.a_intent == INTENT_HARM)
-		..(user, 1)
+		. = ..(user, TRUE)
+		if(.)
+			return
+		playsound(loc, "punch", 25, 1, -1)
+		visible_message("<span class='danger'>[user] has pummeled [src]!</span>", \
+		"<span class='userdanger'>[user] has pummeled [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 		adjustBruteLoss(5 + rand(1,9))
 		new /datum/forced_movement(src, get_step_away(user,src, 30), 1)
 		return 1
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index e4e8f06cfa..35751e4b86 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -27,7 +27,7 @@
 
 /obj/item/organ/alien/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("sacid", 10)
+	S.reagents.add_reagent(/datum/reagent/toxin/acid, 10)
 	return S
 
 
@@ -46,7 +46,7 @@
 
 /obj/item/organ/alien/plasmavessel/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("plasma", storedPlasma/10)
+	S.reagents.add_reagent(/datum/reagent/toxin/plasma, storedPlasma/10)
 	return S
 
 /obj/item/organ/alien/plasmavessel/large
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index c08fe4f582..e74f2e54a9 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -18,7 +18,7 @@
 
 /obj/item/organ/body_egg/alien_embryo/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("sacid", 10)
+	S.reagents.add_reagent(/datum/reagent/toxin/acid, 10)
 	return S
 
 /obj/item/organ/body_egg/alien_embryo/on_life()
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 1cea4a6e82..8baeb93195 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -21,7 +21,7 @@
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
 	layer = MOB_LAYER
 	max_integrity = 100
-	mutantrace_variation = MUTANTRACE_VARIATION
+	mutantrace_variation = STYLE_MUZZLE
 
 	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
 
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 016fec5499..e4f29688c3 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -518,7 +518,7 @@
 				add_splatter_floor(T)
 			if(stun)
 				adjustBruteLoss(3)
-			else if(src.reagents.has_reagent("blazaam"))
+			else if(src.reagents.has_reagent(/datum/reagent/consumable/ethanol/blazaam))
 				if(T)
 					T.add_vomit_floor(src, VOMIT_PURPLE)
 		else
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 06575aa802..161b5875b1 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -48,41 +48,42 @@
 	if(affecting && affecting.dismemberable && affecting.get_damage() >= (affecting.max_damage - P.dismemberment))
 		affecting.dismember(P.damtype)
 
-/mob/living/carbon/proc/can_catch_item(skip_throw_mode_check)
-	. = FALSE
-	if(mind)
-		if(mind.martial_art && mind.martial_art.dodge_chance == 100)
-			return TRUE
-	if(!skip_throw_mode_check && !in_throw_mode)
+/mob/living/carbon/catch_item(obj/item/I, skip_throw_mode_check = FALSE)
+	. = ..()
+	if(!HAS_TRAIT(src, TRAIT_AUTO_CATCH_ITEM) && !skip_throw_mode_check && !in_throw_mode)
 		return
-	if(get_active_held_item())
+	if(get_active_held_item() || restrained())
 		return
-	if(restrained())
-		return
-	return TRUE
-
-/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE)
-	if(!skipcatch)	//ugly, but easy
-		if(can_catch_item())
-			if(istype(AM, /obj/item))
-				var/obj/item/I = AM
-				if (mind)
-					if (mind.martial_art && mind.martial_art.dodge_chance == 100) //autocatch for rising bass
-						if (get_active_held_item())
-							visible_message("<span class='warning'>[I] falls to the ground as [src] chops it out of the air!</span>")
-							return 1
-						if(!in_throw_mode)
-							throw_mode_on()
-				if(isturf(I.loc))
-					I.attack_hand(src)
-					if(get_active_held_item() == I) //if our attack_hand() picks up the item...
-						visible_message("<span class='warning'>[src] catches [I]!</span>") //catch that sucker!
-						throw_mode_off()
-						return 1
-	..()
+	I.attack_hand(src)
+	if(get_active_held_item() == I) //if our attack_hand() picks up the item...
+		visible_message("<span class='warning'>[src] catches [I]!</span>") //catch that sucker!
+		throw_mode_off()
+		return TRUE
 
+/mob/living/carbon/embed_item(obj/item/I)
+	throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
+	var/obj/item/bodypart/L = pick(bodyparts)
+	L.embedded_objects |= I
+	I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
+	I.forceMove(src)
+	L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier)
+	visible_message("<span class='danger'>[I] embeds itself in [src]'s [L.name]!</span>","<span class='userdanger'>[I] embeds itself in your [L.name]!</span>")
+	SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
 
 /mob/living/carbon/attacked_by(obj/item/I, mob/living/user)
+	//CIT CHANGES START HERE - combatmode and resting checks
+	var/totitemdamage = I.force
+	if(iscarbon(user))
+		var/mob/living/carbon/tempcarb = user
+		if(!tempcarb.combatmode)
+			totitemdamage *= 0.5
+	if(user.resting)
+		totitemdamage *= 0.5
+	if(!combatmode)
+		totitemdamage *= 1.5
+	//CIT CHANGES END HERE
+	if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration))
+		return FALSE
 	var/obj/item/bodypart/affecting
 	if(user == src)
 		affecting = get_bodypart(check_zone(user.zone_selected)) //we're self-mutilating! yay!
@@ -93,17 +94,6 @@
 	SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
 	send_item_attack_message(I, user, affecting.name)
 	if(I.force)
-		//CIT CHANGES START HERE - combatmode and resting checks
-		var/totitemdamage = I.force
-		if(iscarbon(user))
-			var/mob/living/carbon/tempcarb = user
-			if(!tempcarb.combatmode)
-				totitemdamage *= 0.5
-		if(user.resting)
-			totitemdamage *= 0.5
-		if(!combatmode)
-			totitemdamage *= 1.5
-	//CIT CHANGES END HERE
 		apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage
 		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
 			var/basebloodychance = affecting.brute_dam + totitemdamage
@@ -137,7 +127,9 @@
 
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /mob/living/carbon/attack_hand(mob/living/carbon/human/user)
-
+	. = ..()
+	if(.) //was the attack blocked?
+		return
 	for(var/thing in diseases)
 		var/datum/disease/D = thing
 		if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
@@ -152,8 +144,7 @@
 		if(user.a_intent == INTENT_HELP || user.a_intent == INTENT_DISARM)
 			for(var/datum/surgery/S in surgeries)
 				if(S.next_step(user, user.a_intent))
-					return 1
-	return 0
+					return TRUE
 
 
 /mob/living/carbon/attack_paw(mob/living/carbon/monkey/M)
@@ -173,7 +164,8 @@
 		help_shake_act(M)
 		return 0
 
-	if(..()) //successful monkey bite.
+	. = ..()
+	if(.) //successful monkey bite.
 		for(var/thing in M.diseases)
 			var/datum/disease/D = thing
 			ForceContractDisease(D)
@@ -181,26 +173,27 @@
 
 
 /mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		if(M.powerlevel > 0)
-			var/stunprob = M.powerlevel * 7 + 10  // 17 at level 1, 80 at level 10
-			if(prob(stunprob))
-				M.powerlevel -= 3
-				if(M.powerlevel < 0)
-					M.powerlevel = 0
+	. = ..()
+	if(!.)
+		return
+	if(M.powerlevel > 0)
+		var/stunprob = M.powerlevel * 7 + 10  // 17 at level 1, 80 at level 10
+		if(prob(stunprob))
+			M.powerlevel -= 3
+			if(M.powerlevel < 0)
+				M.powerlevel = 0
 
-				visible_message("<span class='danger'>The [M.name] has shocked [src]!</span>", \
-				"<span class='userdanger'>The [M.name] has shocked [src]!</span>")
+			visible_message("<span class='danger'>The [M.name] has shocked [src]!</span>", \
+			"<span class='userdanger'>The [M.name] has shocked [src]!</span>")
 
-				do_sparks(5, TRUE, src)
-				var/power = M.powerlevel + rand(0,3)
-				Knockdown(power*20)
-				if(stuttering < power)
-					stuttering = power
-				if (prob(stunprob) && M.powerlevel >= 8)
-					adjustFireLoss(M.powerlevel * rand(6,10))
-					updatehealth()
-		return 1
+			do_sparks(5, TRUE, src)
+			var/power = M.powerlevel + rand(0,3)
+			Knockdown(power*20)
+			if(stuttering < power)
+				stuttering = power
+			if (prob(stunprob) && M.powerlevel >= 8)
+				adjustFireLoss(M.powerlevel * rand(6,10))
+				updatehealth()
 
 /mob/living/carbon/proc/dismembering_strike(mob/living/attacker, dam_zone)
 	if(!attacker.limb_destroyer)
@@ -250,7 +243,7 @@
 		shock_damage *= dna.species.siemens_coeff
 	if(shock_damage<1 && !override)
 		return 0
-	if(reagents.has_reagent("teslium"))
+	if(reagents.has_reagent(/datum/reagent/teslium))
 		shock_damage *= 1.5 //If the mob has teslium in their body, shocks are 50% more damaging!
 	if(illusion)
 		adjustStaminaLoss(shock_damage)
@@ -332,12 +325,12 @@
 
 			else
 				return
-		
+
 		else if(check_zone(M.zone_selected) == "r_arm" || check_zone(M.zone_selected) == "l_arm")
 			M.visible_message( \
 				"<span class='notice'>[M] shakes [src]'s hand.</span>", \
 				"<span class='notice'>You shake [src]'s hand.</span>", )
-		
+
 		else
 			M.visible_message("<span class='notice'>[M] hugs [src] to make [p_them()] feel better!</span>", \
 						"<span class='notice'>You hug [src] to make [p_them()] feel better!</span>")
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index a1184613fe..9629dc3484 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -40,7 +40,7 @@
 
 	var/gib_type = /obj/effect/decal/cleanable/blood/gibs
 
-	var/rotate_on_lying = 1
+	rotate_on_lying = TRUE
 
 	var/tinttotal = 0	// Total level of visualy impairing items
 
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 345279df29..559c2ebcdd 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -22,6 +22,7 @@
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
 	emote_type = EMOTE_AUDIBLE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
 	. = ..()
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 3a6f0e6724..eca3a81c4b 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -255,7 +255,7 @@
 		else
 			msg += "<B>[t_He] [t_is] bleeding!</B>\n"
 
-	if(reagents.has_reagent("teslium"))
+	if(reagents.has_reagent(/datum/reagent/teslium))
 		msg += "[t_He] [t_is] emitting a gentle blue glow!\n"
 
 	if(islist(stun_absorption))
@@ -278,7 +278,7 @@
 			if(91.01 to INFINITY)
 				msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n"
 
-	if(reagents.has_reagent("astral"))
+	if(reagents.has_reagent(/datum/reagent/fermi/astral))
 		if(mind)
 			msg += "[t_He] has wild, spacey eyes and they have a strange, abnormal look to them.\n"
 		else
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 165e1fdd31..9cbb5b1a0a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -67,66 +67,36 @@
 						P.setAngle(rand(0, 360))//SHING
 						return FALSE
 
-	if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
-		if(P.is_reflectable)
-			if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
-				visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", \
-								"<span class='userdanger'>The [P.name] gets reflected by [src]!</span>")
-				// Find a turf near or on the original location to bounce to
-				if(P.starting)
-					var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
-					var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
-					var/turf/curloc = get_turf(src)
+	return ..()
 
-					// redirect the projectile
-					P.original = locate(new_x, new_y, P.z)
-					P.starting = curloc
-					P.firer = src
-					P.yo = new_y - curloc.y
-					P.xo = new_x - curloc.x
-					var/new_angle_s = P.Angle + rand(120,240)
-					while(new_angle_s > 180)	// Translate to regular projectile degrees
-						new_angle_s -= 360
-					P.setAngle(new_angle_s)
+/mob/living/carbon/human/check_reflect(def_zone)
+	if(wear_suit?.IsReflect(def_zone))
+		return TRUE
+	return ..()
 
-				return -1 // complete projectile permutation
-
-		if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
-			P.on_hit(src, 100, def_zone)
-			return 2
-
-	return (..(P , def_zone))
-
-/mob/living/carbon/human/proc/check_reflect(def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object
-	if(wear_suit)
-		if(wear_suit.IsReflect(def_zone) == 1)
-			return 1
-	for(var/obj/item/I in held_items)
-		if(I.IsReflect(def_zone) == 1)
-			return 1
-	return 0
-
-/mob/living/carbon/human/proc/check_shields(atom/AM, var/damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+/mob/living/carbon/human/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+	. = ..()
+	if(.)
+		return
 	var/block_chance_modifier = round(damage / -3)
-
-	for(var/obj/item/I in held_items)
-		if(!istype(I, /obj/item/clothing))
-			var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
-			if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
-				return 1
 	if(wear_suit)
 		var/final_block_chance = wear_suit.block_chance - (CLAMP((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
-			return 1
+			return TRUE
 	if(w_uniform)
 		var/final_block_chance = w_uniform.block_chance - (CLAMP((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
-			return 1
+			return TRUE
 	if(wear_neck)
 		var/final_block_chance = wear_neck.block_chance - (CLAMP((armour_penetration-wear_neck.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(wear_neck.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
-			return 1
-	return 0
+			return TRUE
+	return FALSE
+
+/mob/living/carbon/human/can_embed(obj/item/I)
+	if(I.get_sharpness() || is_pointed(I) || is_type_in_typecache(I, GLOB.can_embed_types))
+		return TRUE
+	return FALSE
 
 /mob/living/carbon/human/proc/check_block()
 	if(mind)
@@ -135,39 +105,7 @@
 	return FALSE
 
 /mob/living/carbon/human/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE)
-	if(dna && dna.species)
-		var/spec_return = dna.species.spec_hitby(AM, src)
-		if(spec_return)
-			return spec_return
-	var/obj/item/I
-	var/throwpower = 30
-	if(istype(AM, /obj/item))
-		I = AM
-		throwpower = I.throwforce
-		if(I.thrownby == src) //No throwing stuff at yourself to trigger hit reactions
-			return ..()
-	if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
-		hitpush = FALSE
-		skipcatch = TRUE
-		blocked = TRUE
-	else if(I)
-		if(I.throw_speed >= EMBED_THROWSPEED_THRESHOLD && !(mind.martial_art && mind.martial_art.dodge_chance == 100))
-			if(can_embed(I))
-				if(prob(I.embedding.embed_chance) && !HAS_TRAIT(src, TRAIT_PIERCEIMMUNE))
-					throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
-					var/obj/item/bodypart/L = pick(bodyparts)
-					L.embedded_objects |= I
-					I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
-					I.forceMove(src)
-					L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier)
-					visible_message("<span class='danger'>[I] embeds itself in [src]'s [L.name]!</span>","<span class='userdanger'>[I] embeds itself in your [L.name]!</span>")
-					SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
-					hitpush = FALSE
-					skipcatch = TRUE //can't catch the now embedded item
-	if (mind)
-		if (mind.martial_art && mind.martial_art.dodge_chance == 100)
-			skipcatch = FALSE
-	return ..()
+	return dna?.species?.spec_hitby(AM, src) || ..()
 
 /mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
 	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (HAS_TRAIT(src, TRAIT_FAT)) && ismonkey(pulling))
@@ -201,12 +139,12 @@
 	return dna.species.spec_attacked_by(I, user, affecting, a_intent, src)
 
 
-/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
 	if(user.a_intent == INTENT_HARM)
-		var/hulk_verb = pick("smash","pummel")
-		if(check_shields(user, 15, "the [hulk_verb]ing"))
+		. = ..(user, TRUE)
+		if(.)
 			return
-		..(user, 1)
+		var/hulk_verb = pick("smash","pummel")
 		playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
 		var/message = "[user] has [hulk_verb]ed [src]!"
 		visible_message("<span class='danger'>[message]</span>", \
@@ -215,7 +153,8 @@
 		return 1
 
 /mob/living/carbon/human/attack_hand(mob/user)
-	if(..())	//to allow surgery to return properly.
+	. = ..()
+	if(.) //To allow surgery to return properly.
 		return
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
@@ -227,8 +166,7 @@
 	if(!affecting)
 		affecting = get_bodypart(BODY_ZONE_CHEST)
 	if(M.a_intent == INTENT_HELP)
-		..() //shaking
-		return 0
+		return ..() //shaking
 
 	if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stunned instead.
 		var/obj/item/I = get_active_held_item()
@@ -249,78 +187,69 @@
 	if(can_inject(M, 1, affecting))//Thick suits can stop monkey bites.
 		if(..()) //successful monkey bite, this handles disease contraction.
 			var/damage = rand(1, 3)
-			if(check_shields(M, damage, "the [M.name]"))
-				return 0
-			if(stat != DEAD)
-				apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
+			apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
 		return 1
 
 /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(check_shields(M, 0, "the M.name"))
-		visible_message("<span class='danger'>[M] attempted to touch [src]!</span>")
-		return 0
+	. = ..()
+	if(!.)
+		return
+	if(M.a_intent == INTENT_HARM)
+		if (w_uniform)
+			w_uniform.add_fingerprint(M)
+		var/damage = prob(90) ? 20 : 0
+		if(!damage)
+			playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+			visible_message("<span class='danger'>[M] has lunged at [src]!</span>", \
+				"<span class='userdanger'>[M] has lunged at [src]!</span>")
+			return 0
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+		if(!affecting)
+			affecting = get_bodypart(BODY_ZONE_CHEST)
+		var/armor_block = run_armor_check(affecting, "melee", null, null,10)
 
-	if(..())
-		if(M.a_intent == INTENT_HARM)
-			if (w_uniform)
-				w_uniform.add_fingerprint(M)
-			var/damage = prob(90) ? 20 : 0
-			if(!damage)
-				playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
-				visible_message("<span class='danger'>[M] has lunged at [src]!</span>", \
-					"<span class='userdanger'>[M] has lunged at [src]!</span>")
-				return 0
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-			if(!affecting)
-				affecting = get_bodypart(BODY_ZONE_CHEST)
-			var/armor_block = run_armor_check(affecting, "melee", null, null,10)
+		playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+		visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
+			"<span class='userdanger'>[M] has slashed at [src]!</span>")
+		log_combat(M, src, "attacked")
+		if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful
+			return 1
+		apply_damage(damage, BRUTE, affecting, armor_block)
 
-			playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
-				"<span class='userdanger'>[M] has slashed at [src]!</span>")
-			log_combat(M, src, "attacked")
-			if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful
-				return 1
-			apply_damage(damage, BRUTE, affecting, armor_block)
-
-		if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stun instead.
-			var/obj/item/I = get_active_held_item()
-			if(I && dropItemToGround(I))
-				playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
-				visible_message("<span class='danger'>[M] disarmed [src]!</span>", \
-						"<span class='userdanger'>[M] disarmed [src]!</span>")
+	if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stun instead.
+		var/obj/item/I = get_active_held_item()
+		if(I && dropItemToGround(I))
+			playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
+			visible_message("<span class='danger'>[M] disarmed [src]!</span>", \
+					"<span class='userdanger'>[M] disarmed [src]!</span>")
+		else
+			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+			if(!lying)				//CITADEL EDIT
+				Knockdown(100, TRUE, FALSE, 30, 25)
 			else
-				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-				if(!lying)				//CITADEL EDIT
-					Knockdown(100, TRUE, FALSE, 30, 25)
-				else
-					Knockdown(100)
-				log_combat(M, src, "tackled")
-				visible_message("<span class='danger'>[M] has tackled down [src]!</span>", \
-					"<span class='userdanger'>[M] has tackled down [src]!</span>")
-
+				Knockdown(100)
+			log_combat(M, src, "tackled")
+			visible_message("<span class='danger'>[M] has tackled down [src]!</span>", \
+				"<span class='userdanger'>[M] has tackled down [src]!</span>")
 
 /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L)
-
-	if(..()) //successful larva bite.
-		var/damage = rand(1, 3)
-		if(check_shields(L, damage, "the [L.name]"))
-			return 0
-		if(stat != DEAD)
-			L.amount_grown = min(L.amount_grown + damage, L.max_grown)
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
-			if(!affecting)
-				affecting = get_bodypart(BODY_ZONE_CHEST)
-			var/armor_block = run_armor_check(affecting, "melee")
-			apply_damage(damage, BRUTE, affecting, armor_block)
+	. = ..()
+	if(!.) //unsuccessful larva bite.
+		return
+	var/damage = rand(1, 3)
+	if(stat != DEAD)
+		L.amount_grown = min(L.amount_grown + damage, L.max_grown)
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
+		if(!affecting)
+			affecting = get_bodypart(BODY_ZONE_CHEST)
+		var/armor_block = run_armor_check(affecting, "melee")
+		apply_damage(damage, BRUTE, affecting, armor_block)
 
 
 /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
 	. = ..()
 	if(.)
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
-		if(check_shields(M, damage, "the [M.name]", MELEE_ATTACK, M.armour_penetration))
-			return FALSE
 		var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
 		if(!dam_zone) //Dismemberment successful
 			return TRUE
@@ -332,23 +261,22 @@
 
 
 /mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		var/damage = rand(5, 25)
-		if(M.is_adult)
-			damage = rand(10, 35)
+	. = ..()
+	if(!.) //unsuccessful slime attack
+		return
+	var/damage = rand(5, 25)
+	if(M.is_adult)
+		damage = rand(10, 35)
 
-		if(check_shields(M, damage, "the [M.name]"))
-			return 0
+	var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+	if(!dam_zone) //Dismemberment successful
+		return 1
 
-		var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
-		if(!dam_zone) //Dismemberment successful
-			return 1
-
-		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
-		if(!affecting)
-			affecting = get_bodypart(BODY_ZONE_CHEST)
-		var/armor_block = run_armor_check(affecting, "melee")
-		apply_damage(damage, BRUTE, affecting, armor_block)
+	var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+	if(!affecting)
+		affecting = get_bodypart(BODY_ZONE_CHEST)
+	var/armor_block = run_armor_check(affecting, "melee")
+	apply_damage(damage, BRUTE, affecting, armor_block)
 
 /mob/living/carbon/human/mech_melee_attack(obj/mecha/M)
 	if(M.occupant.a_intent == INTENT_HARM)
@@ -405,7 +333,7 @@
 	switch (severity)
 		if (1)
 			if(bomb_armor)
-				b_loss = 500*bomb_armor
+				b_loss = (350*bomb_armor)+150
 				var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
 				throw_at(throw_target, 200, 4)
 				damage_clothes(400*bomb_armor, BRUTE, "bomb")
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 0564f175bd..d76896cb6b 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -291,7 +291,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 	// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
 	if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian"))
-		species_traits += DIGITIGRADE
+		species_traits |= DIGITIGRADE
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(FALSE)
 
@@ -620,34 +620,34 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		return
 
 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
+	var/tauric = H.dna.features["taur"] && H.dna.features["taur"] != "None"
 
 	if("tail_lizard" in mutant_bodyparts)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
 			bodyparts_to_add -= "tail_lizard"
 
 	if("waggingtail_lizard" in mutant_bodyparts)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
 			bodyparts_to_add -= "waggingtail_lizard"
 		else if ("tail_lizard" in mutant_bodyparts)
 			bodyparts_to_add -= "waggingtail_lizard"
 
 	if("tail_human" in mutant_bodyparts)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
 			bodyparts_to_add -= "tail_human"
 
-
 	if("waggingtail_human" in mutant_bodyparts)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
 			bodyparts_to_add -= "waggingtail_human"
 		else if ("tail_human" in mutant_bodyparts)
 			bodyparts_to_add -= "waggingtail_human"
 
 	if("spines" in mutant_bodyparts)
-		if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+		if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR))
 			bodyparts_to_add -= "spines"
 
 	if("waggingspines" in mutant_bodyparts)
-		if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
+		if(!H.dna.features["spines"] || H.dna.features["spines"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR))
 			bodyparts_to_add -= "waggingspines"
 		else if ("tail" in mutant_bodyparts)
 			bodyparts_to_add -= "waggingspines"
@@ -697,11 +697,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 	//Other Races
 	if("mam_tail" in mutant_bodyparts)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
 			bodyparts_to_add -= "mam_tail"
 
 	if("mam_waggingtail" in mutant_bodyparts)
-		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
+		if((H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)) || tauric)
 			bodyparts_to_add -= "mam_waggingtail"
 		else if ("mam_tail" in mutant_bodyparts)
 			bodyparts_to_add -= "mam_waggingtail"
@@ -715,7 +715,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			bodyparts_to_add -= "mam_snouts"
 
 	if("taur" in mutant_bodyparts)
-		if(!H.dna.features["taur"] || H.dna.features["taur"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)))
+		if(!tauric || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)))
 			bodyparts_to_add -= "taur"
 
 //END EDIT
@@ -732,10 +732,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			species_traits += DIGITIGRADE
 		var/should_be_squished = FALSE
 		if(H.wear_suit)
-			if(H.wear_suit.mutantrace_variation == NO_MUTANTRACE_VARIATION) //we got digitigrade suits now fam
+			if(!(H.wear_suit.mutantrace_variation & STYLE_DIGITIGRADE) || (tauric && (H.wear_suit.mutantrace_variation & STYLE_ALL_TAURIC))) //digitigrade/taur suits
 				should_be_squished = TRUE
 		if(H.w_uniform && !H.wear_suit)
-			if(H.w_uniform.mutantrace_variation == NO_MUTANTRACE_VARIATION)
+			if(!(H.w_uniform.mutantrace_variation & STYLE_DIGITIGRADE))
 				should_be_squished = TRUE
 		if(O.use_digitigrade == FULL_DIGITIGRADE && should_be_squished)
 			O.use_digitigrade = SQUISHED_DIGITIGRADE
@@ -1279,9 +1279,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	H.update_mutant_bodyparts()
 
 /datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == exotic_blood)
+	if(chem.type == exotic_blood)
 		H.blood_volume = min(H.blood_volume + round(chem.volume, 0.1), BLOOD_VOLUME_MAXIMUM)
-		H.reagents.del_reagent(chem.id)
+		H.reagents.del_reagent(chem.type)
 		return 1
 	return FALSE
 
@@ -1694,11 +1694,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		attacker_style = M.mind.martial_art
 		if(attacker_style?.pacifism_check && HAS_TRAIT(M, TRAIT_PACIFISM)) // most martial arts are quite harmful, alas.
 			attacker_style = null
-	if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK))
-		log_combat(M, H, "attempted to touch")
-		H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
-		return 0
-	SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style)
 	switch(M.a_intent)
 		if("help")
 			help(M, H, attacker_style)
diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
index 946bffbdbc..9c28b8a0b7 100644
--- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -7,18 +7,18 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	id = "dwarf" //Also called Homo sapiens pumilionis
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR)
-	inherent_traits = list() 
+	inherent_traits = list()
 	default_features = list("mcolor" = "FFF", "wings" = "None")
 	limbs_id = "human"
 	use_skintones = 1
 	say_mod = "bellows" //high energy, EXTRA BIOLOGICAL FUEL
-	damage_overlay_type = "human" 
+	damage_overlay_type = "human"
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	liked_food = ALCOHOL | MEAT | DAIRY //Dwarves like alcohol, meat, and dairy products.
 	disliked_food = JUNKFOOD | FRIED //Dwarves hate foods that have no nutrition other than alcohol.
 	mutant_organs = list(/obj/item/organ/dwarfgland) //Dwarven alcohol gland, literal gland warrior
 	mutantliver = /obj/item/organ/liver/dwarf //Dwarven super liver (Otherwise they r doomed)
-	
+
 /mob/living/carbon/human/species/dwarf //species admin spawn path
 	race = /datum/species/dwarf //and the race the path is set to.
 
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 /datum/species/dwarf/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
 	var/dwarf_hair = pick("Beard (Dwarf)", "Beard (Very Long)", "Beard (Long)") //beard roullette
-	var/mob/living/carbon/human/H = C 
+	var/mob/living/carbon/human/H = C
 	H.facial_hair_style = dwarf_hair
 	H.update_hair()
 	H.transform = H.transform.Scale(1, 0.8) //We use scale, and yeah. Dwarves can become gnomes with DWARFISM.
@@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 
 /obj/item/organ/dwarfgland/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("ethanol", stored_alcohol/10)
+	S.reagents.add_reagent(/datum/reagent/consumable/ethanol, stored_alcohol/10)
 	return S
 
 /obj/item/organ/dwarfgland/on_life() //Primary loop to hook into to start delayed loops for other loops..
@@ -108,8 +108,8 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 		return //We make sure they are not dead, so they don't increment any tickers.
 	dwarf_eth_ticker++
 	dwarf_filth_ticker++
-	
-	if(dwarf_filth_ticker >= 4) //Should be around 4-8 seconds since a tick is around 2 seconds. 
+
+	if(dwarf_filth_ticker >= 4) //Should be around 4-8 seconds since a tick is around 2 seconds.
 		dwarf_filth_cycle()		//On_life will adjust regarding other factors, so we are along for the ride.
 		dwarf_filth_ticker = 0 //We set the ticker back to 0 to go again.
 	if(dwarf_eth_ticker >= 1) //Alcohol reagent check should be around 2 seconds, since a tick is around 2 seconds.
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index 0c3bcc2b00..426213161e 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -13,9 +13,9 @@
 	exotic_bloodtype = "BUG"
 
 /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "pestkiller")
+	if(chem.type == /datum/reagent/toxin/pestkiller)
 		H.adjustToxLoss(3)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 		return 1
 
 
diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index 1e4b3e9fae..e2adb2acd9 100644
--- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -70,20 +70,6 @@
 	damage_overlay_type = "xeno"
 	liked_food = MEAT
 
-/datum/species/xeno/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian"))
-		species_traits += DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(FALSE)
-	. = ..()
-
-/datum/species/xeno/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Plantigrade")
-		species_traits -= DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(TRUE)
-	. = ..()
-
 //Praise the Omnissiah, A challange worthy of my skills - HS
 
 //EXOTIC//
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 3d6c5092e1..c247d14589 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -305,9 +305,9 @@
 		H.take_overall_damage(2,0)
 
 /datum/species/golem/wood/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "plantbgone")
+	if(chem.type == /datum/reagent/toxin/plantbgone)
 		H.adjustToxLoss(3)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 		return 1
 
 //Radioactive
@@ -619,14 +619,14 @@
 		C.RemoveSpell(dominate)
 
 /datum/species/golem/runic/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "holywater")
+	if(chem.type == /datum/reagent/water/holywater)
 		H.adjustFireLoss(4)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 
-	if(chem.id == "unholywater")
+	if(chem.type == /datum/reagent/fuel/unholywater)
 		H.adjustBruteLoss(-4)
 		H.adjustFireLoss(-4)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 
 
 /datum/species/golem/clockwork
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 5f91e3ae66..b63cd59173 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -12,7 +12,7 @@
 	inherent_traits = list(TRAIT_TOXINLOVER)
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless)
-	exotic_blood = "jellyblood"
+	exotic_blood = /datum/reagent/blood/jellyblood
 	exotic_bloodtype = "GEL"
 	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 23fcf2648b..7b124c1474 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -74,19 +74,6 @@
 		mutant_bodyparts |= "spines"
 	H.update_body()
 
-/datum/species/lizard/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && (C.dna.features["legs"] == "Digitigrade" || C.dna.features["legs"] == "Avian"))
-		species_traits += DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(FALSE)
-	return ..()
-
-/datum/species/lizard/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Plantigrade")
-		species_traits -= DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(TRUE)
-
 /*
  Lizard subspecies: ASHWALKERS
 */
diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
index ceadb28115..ab0962cf12 100644
--- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
@@ -37,19 +37,24 @@
 			H.dna.features["caps"] = "Round"
 			handle_mutant_bodyparts(H)
 		H.faction |= "mushroom"
-		mush = new(null)
-		mush.teach(H)
+		mush = new()
+		mush.teach(H, TRUE)
+	RegisterSignal(C, COMSIG_MOB_ON_NEW_MIND, .proc/on_new_mind)
+
+/datum/species/mush/proc/on_new_mind(mob/owner)
+	mush.teach(owner, TRUE) //make_temporary TRUE as it shouldn't carry over to other mobs on mind transfer_to.
 
 /datum/species/mush/on_species_loss(mob/living/carbon/C)
 	. = ..()
+	UnregisterSignal(C, COMSIG_MOB_ON_NEW_MIND)
 	C.faction -= "mushroom"
 	mush.remove(C)
 	QDEL_NULL(mush)
 
 /datum/species/mush/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "weedkiller")
+	if(chem.type == /datum/reagent/toxin/plantbgone/weedkiller)
 		H.adjustToxLoss(3)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 		return TRUE
 
 /datum/species/mush/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 172fa5a6c3..02c7f0cbda 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -47,9 +47,9 @@
 		H.take_overall_damage(2,0)
 
 /datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "plantbgone")
+	if(chem.type == /datum/reagent/toxin/plantbgone)
 		H.adjustToxLoss(3)
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 		return 1
 
 /datum/species/pod/on_hit(obj/item/projectile/P, mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm
index 5cd1a599ad..0335e08922 100644
--- a/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -36,9 +36,9 @@
 	UnregisterSignal(H, COMSIG_MOB_SAY)
 
 /datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == "synthflesh")
+	if(chem.type == /datum/reagent/medicine/synthflesh)
 		chem.reaction_mob(H, TOUCH, 2 ,0) //heal a little
-		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 		return 1
 	else
 		return ..()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index ae69d5dc90..c4088317b1 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -119,24 +119,25 @@ There are several things that need to be remembered:
 		var/t_color = U.item_color
 		if(!t_color)
 			t_color = U.icon_state
-		if(U.suit_style == NORMAL_SUIT_STYLE)
-			if(U.adjusted == ALT_STYLE)
-				t_color = "[t_color]_d"
+		if(U.adjusted == ALT_STYLE)
+			t_color = "[t_color]_d"
 
-		var/alt_worn = U.alternate_worn_icon
+		var/alt_worn = U.alternate_worn_icon || 'icons/mob/uniform.dmi'
+		var/variant_flag = NONE
 
-		if(!U.force_alternate_icon && U.mutantrace_variation && U.suit_style == DIGITIGRADE_SUIT_STYLE)
+		if((DIGITIGRADE in dna.species.species_traits) && U.mutantrace_variation & STYLE_DIGITIGRADE)
 			alt_worn = 'icons/mob/uniform_digi.dmi'
+			variant_flag |= STYLE_DIGITIGRADE
 
 		var/mutable_appearance/uniform_overlay
 
 		if(dna && dna.species.sexes)
 			var/G = (gender == FEMALE) ? "f" : "m"
 			if(G == "f" && U.fitted != NO_FEMALE_UNIFORM)
-				uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = (alt_worn ? alt_worn : 'icons/mob/uniform.dmi'), isinhands = FALSE, femaleuniform = U.fitted)
+				uniform_overlay = U.build_worn_icon(t_color, UNIFORM_LAYER, alt_worn, FALSE, U.fitted, variant_flag, FALSE)
 
 		if(!uniform_overlay)
-			uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = (alt_worn ? alt_worn : 'icons/mob/uniform.dmi'), isinhands = FALSE)
+			uniform_overlay = U.build_worn_icon(t_color, UNIFORM_LAYER, alt_worn, FALSE, NO_FEMALE_UNIFORM, variant_flag, FALSE)
 
 
 		if(OFFSET_UNIFORM in dna.species.offset_features)
@@ -164,7 +165,7 @@ There are several things that need to be remembered:
 		update_observer_view(wear_id)
 
 		//TODO: add an icon file for ID slot stuff, so it's less snowflakey
-		id_overlay = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = ((wear_id.alternate_worn_icon) ? wear_id.alternate_worn_icon : 'icons/mob/mob.dmi'))
+		id_overlay = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = 'icons/mob/mob.dmi')
 		if(OFFSET_ID in dna.species.offset_features)
 			id_overlay.pixel_x += dna.species.offset_features[OFFSET_ID][1]
 			id_overlay.pixel_y += dna.species.offset_features[OFFSET_ID][2]
@@ -199,7 +200,7 @@ There are several things that need to be remembered:
 		var/t_state = gloves.item_state
 		if(!t_state)
 			t_state = gloves.icon_state
-		overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = ((gloves.alternate_worn_icon) ? gloves.alternate_worn_icon : 'icons/mob/hands.dmi'))
+		overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = 'icons/mob/hands.dmi')
 		gloves_overlay = overlays_standing[GLOVES_LAYER]
 		if(OFFSET_GLOVES in dna.species.offset_features)
 			gloves_overlay.pixel_x += dna.species.offset_features[OFFSET_GLOVES][1]
@@ -225,7 +226,7 @@ There are several things that need to be remembered:
 				client.screen += glasses				//Either way, add the item to the HUD
 		update_observer_view(glasses,1)
 		if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES)))
-			overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = ((glasses.alternate_worn_icon) ? glasses.alternate_worn_icon : 'icons/mob/eyes.dmi'))
+			overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/eyes.dmi')
 		var/mutable_appearance/glasses_overlay = overlays_standing[GLASSES_LAYER]
 		if(glasses_overlay)
 			if(OFFSET_GLASSES in dna.species.offset_features)
@@ -252,7 +253,7 @@ There are several things that need to be remembered:
 				client.screen += ears					//add it to the client's screen
 		update_observer_view(ears,1)
 
-		overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.alternate_worn_icon) ? ears.alternate_worn_icon : 'icons/mob/ears.dmi'))
+		overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = 'icons/mob/ears.dmi')
 		var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER]
 		if(OFFSET_EARS in dna.species.offset_features)
 			ears_overlay.pixel_x += dna.species.offset_features[OFFSET_EARS][1]
@@ -270,32 +271,6 @@ There are several things that need to be remembered:
 	if(client && hud_used)
 		var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_SHOES]
 		inv.update_icon()
-/*
-	if(!shoes && bloody_feet)
-		var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyfeet", -SHOES_LAYER, color = blood_DNA_to_color())
-		if(dna.features["taur"] != "None")
-			if(dna.features["taur"] in GLOB.noodle_taurs)
-				bloody_overlay = mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "snekbloodyfeet", -SHOES_LAYER, color = blood_DNA_to_color())
-				if(get_num_legs() < 2)
-					if(has_left_leg())
-						bloody_overlay.icon_state = "snekbloodyfeet_left"
-					else if(has_right_leg())
-						bloody_overlay.icon_state = "snekbloodyfeet_right"
-			else if(dna.features["taur"] in GLOB.paw_taurs)
-				bloody_overlay = mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "pawbloodyfeet", -SHOES_LAYER, color = blood_DNA_to_color())
-				if(get_num_legs() < 2)
-					if(has_left_leg())
-						bloody_overlay.icon_state = "pawbloodyfeet_left"
-					else if(has_right_leg())
-						bloody_overlay.icon_state = "pawbloodyfeet_right"
-		else
-			if(get_num_legs() < 2)
-				if(has_left_leg())
-					bloody_overlay.icon_state = "bloodyfeet_left"
-				else if(has_right_leg())
-					bloody_overlay.icon_state = "bloodyfeet_right"
-
-		overlays_standing[GLOVES_LAYER] = bloody_overlay*/
 
 	if(shoes)
 		var/obj/item/clothing/shoes/S = shoes
@@ -304,15 +279,17 @@ There are several things that need to be remembered:
 			if(hud_used.inventory_shown)			//if the inventory is open
 				client.screen += shoes					//add it to client's screen
 		update_observer_view(shoes,1)
-		if(S.mutantrace_variation)
-			if(S.adjusted == ALT_STYLE)
-				S.alternate_worn_icon = 'icons/mob/feet_digi.dmi'
-			else
-				S.alternate_worn_icon = null
+
+		var/alt_icon = S.alternate_worn_icon || 'icons/mob/feet.dmi'
+		var/variation_flag = NONE
+		if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE)
+			alt_icon = 'icons/mob/feet_digi.dmi'
+			variation_flag |= STYLE_DIGITIGRADE
+
 		var/t_state = shoes.item_state
 		if (!t_state)
 			t_state = shoes.icon_state
-		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = t_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.alternate_worn_icon) ? shoes.alternate_worn_icon : 'icons/mob/feet.dmi'))
+		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(t_state, SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE)
 		var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER]
 		if(OFFSET_SHOES in dna.species.offset_features)
 			shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1]
@@ -350,13 +327,18 @@ There are several things that need to be remembered:
 	if(head)
 		remove_overlay(HEAD_LAYER)
 		var/obj/item/clothing/head/H = head
-		if(H.mutantrace_variation)
-			if(H.muzzle_var == ALT_STYLE)
-				H.alternate_worn_icon = 'icons/mob/head_muzzled.dmi'
-			else
-				H.alternate_worn_icon = null
+		var/alt_icon = H.alternate_worn_icon || 'icons/mob/head.dmi'
+		var/muzzled = FALSE
+		var/variation_flag = NONE
+		if(("mam_snouts" in dna.species.default_features) && dna.features["mam_snouts"] != "None")
+			muzzled = TRUE
+		if(!muzzled && ("snout" in dna.species.default_features) && dna.features["snout"] != "None")
+			muzzled = TRUE
+		if(muzzled && H.mutantrace_variation & STYLE_MUZZLE)
+			alt_icon = 'icons/mob/head_muzzled.dmi'
+			variation_flag |= STYLE_MUZZLE
 
-		overlays_standing[HEAD_LAYER] = H.build_worn_icon(state = H.icon_state, default_layer = HEAD_LAYER, default_icon_file = ((head.alternate_worn_icon) ? H.alternate_worn_icon : 'icons/mob/head.dmi'))
+		overlays_standing[HEAD_LAYER] = H.build_worn_icon(H.icon_state, HEAD_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE)
 		var/mutable_appearance/head_overlay = overlays_standing[HEAD_LAYER]
 
 		if(OFFSET_HEAD in dna.species.offset_features)
@@ -382,7 +364,7 @@ There are several things that need to be remembered:
 		if(!t_state)
 			t_state = belt.icon_state
 
-		overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.alternate_worn_icon) ? belt.alternate_worn_icon : 'icons/mob/belt.dmi'))
+		overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = 'icons/mob/belt.dmi')
 		var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER]
 		if(OFFSET_BELT in dna.species.offset_features)
 			belt_overlay.pixel_x += dna.species.offset_features[OFFSET_BELT][1]
@@ -409,30 +391,41 @@ There are several things that need to be remembered:
 				client.screen += wear_suit
 		update_observer_view(wear_suit,1)
 
-		if(!item_level_support && !S.force_alternate_icon)
-			if(S.mutantrace_variation) //Just make sure we've got this checked too
-				if(S.taurmode == NOT_TAURIC && S.adjusted == ALT_STYLE) //are we not a taur, but we have Digitigrade legs? Run this check first, then.
-					S.alternate_worn_icon = 'icons/mob/suit_digi.dmi'
-				else
-					S.alternate_worn_icon = null
+		var/worn_icon = wear_suit.alternate_worn_icon || 'icons/mob/suit.dmi'
+		var/center = FALSE
+		var/dimension_x = 32
+		var/dimension_y = 32
+		var/variation_flag = NONE
+		var/datum/sprite_accessory/taur/T
+		if("taur" in dna.species.mutant_bodyparts)
+			T = GLOB.taur_list[dna.features["taur"]]
 
-				if(S.tauric == TRUE) //Are we a suit with tauric mode possible?
-					if(S.taurmode == SNEK_TAURIC)
-						S.alternate_worn_icon = 'icons/mob/taur_naga.dmi'
-					if(S.taurmode == PAW_TAURIC)
-						S.alternate_worn_icon = 'icons/mob/taur_canine.dmi'
-					if(S.taurmode == NOT_TAURIC && S.adjusted == ALT_STYLE)
-						S.alternate_worn_icon = 'icons/mob/suit_digi.dmi'
-					else if(S.taurmode == NOT_TAURIC && S.adjusted == NORMAL_STYLE)
-						S.alternate_worn_icon = null
+		if(!item_level_support && S.mutantrace_variation)
+			if(T?.taur_mode)
+				var/init_worn_icon = worn_icon
+				variation_flag |= S.mutantrace_variation & T.taur_mode || S.mutantrace_variation & T.alt_taur_mode
+				switch(variation_flag)
+					if(STYLE_HOOF_TAURIC)
+						worn_icon = 'icons/mob/taur_hooved.dmi'
+					if(STYLE_SNEK_TAURIC)
+						worn_icon = 'icons/mob/taur_naga.dmi'
+					if(STYLE_PAW_TAURIC)
+						worn_icon = 'icons/mob/taur_canine.dmi'
+				if(worn_icon != init_worn_icon) //worn icon sprite was changed, taur offsets will have to be applied.
+					center = T.center
+					dimension_x = T.dimension_x
+					dimension_y = T.dimension_y
+			else if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE) //not a taur, but digitigrade legs.
+				worn_icon = 'icons/mob/suit_digi.dmi'
+				variation_flag |= STYLE_DIGITIGRADE
 
-		overlays_standing[SUIT_LAYER] = S.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.alternate_worn_icon) ? S.alternate_worn_icon : 'icons/mob/suit.dmi'))
+		overlays_standing[SUIT_LAYER] = S.build_worn_icon(wear_suit.icon_state, SUIT_LAYER, worn_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE)
 		var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER]
 		if(OFFSET_SUIT in dna.species.offset_features)
 			suit_overlay.pixel_x += dna.species.offset_features[OFFSET_SUIT][1]
 			suit_overlay.pixel_y += dna.species.offset_features[OFFSET_SUIT][2]
-		if(!item_level_support && S.center)
-			suit_overlay = center_image(suit_overlay, S.dimension_x, S.dimension_y)
+		if(center)
+			suit_overlay = center_image(suit_overlay, dimension_x, dimension_y)
 		overlays_standing[SUIT_LAYER] = suit_overlay
 	update_hair()
 	update_mutant_bodyparts()
@@ -468,13 +461,18 @@ There are several things that need to be remembered:
 	if(wear_mask)
 		var/obj/item/clothing/mask/M = wear_mask
 		remove_overlay(FACEMASK_LAYER)
-		if(M.mutantrace_variation)
-			if(M.muzzle_var == ALT_STYLE)
-				M.alternate_worn_icon = 'icons/mob/mask_muzzled.dmi'
-			else
-				M.alternate_worn_icon = null
+		var/alt_icon = M.alternate_worn_icon || 'icons/mob/mask.dmi'
+		var/muzzled = FALSE
+		var/variation_flag = NONE
+		if(("mam_snouts" in dna.species.default_features) && dna.features["mam_snouts"] != "None")
+			muzzled = TRUE
+		if(!muzzled && ("snout" in dna.species.default_features) && dna.features["snout"] != "None")
+			muzzled = TRUE
+		if(muzzled && M.mutantrace_variation & STYLE_MUZZLE)
+			alt_icon = 'icons/mob/mask_muzzled.dmi'
+			variation_flag |= STYLE_MUZZLE
 
-		overlays_standing[FACEMASK_LAYER] = M.build_worn_icon(state = wear_mask.icon_state, default_layer = FACEMASK_LAYER, default_icon_file = ((wear_mask.alternate_worn_icon) ? M.alternate_worn_icon : 'icons/mob/mask.dmi'))
+		overlays_standing[FACEMASK_LAYER] = M.build_worn_icon(wear_mask.icon_state, FACEMASK_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE)
 		var/mutable_appearance/mask_overlay = overlays_standing[FACEMASK_LAYER]
 
 		if(OFFSET_FACEMASK in dna.species.offset_features)
@@ -496,11 +494,11 @@ There are several things that need to be remembered:
 		apply_overlay(BACK_LAYER)
 
 /proc/wear_female_version(t_color, icon, layer, type)
-	var/index = t_color
+	var/index = "[t_color]-[icon]"
 	var/icon/female_clothing_icon = GLOB.female_clothing_icons[index]
 	if(!female_clothing_icon) 	//Create standing/laying icons if they don't exist
 		generate_female_clothing(index,t_color,icon,type)
-	return mutable_appearance(GLOB.female_clothing_icons[t_color], layer = -layer)
+	return mutable_appearance(GLOB.female_clothing_icons[index], layer = -layer)
 
 /mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers)
 	var/list/out = new
@@ -572,11 +570,11 @@ generate/load female uniform sprites matching all previously decided variables
 
 
 */
-/obj/item/proc/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM)
+/obj/item/proc/build_worn_icon(state = "", default_layer = 0, default_icon_file = null, isinhands = FALSE, femaleuniform = NO_FEMALE_UNIFORM, style_flags = NONE, use_alt_icon = TRUE)
 
 	//Find a valid icon file from variables+arguments
 	var/file2use
-	if(!isinhands && alternate_worn_icon)
+	if(!isinhands && alternate_worn_icon && use_alt_icon)
 		file2use = alternate_worn_icon
 	if(!file2use)
 		file2use = default_icon_file
@@ -596,7 +594,7 @@ generate/load female uniform sprites matching all previously decided variables
 
 	//Get the overlays for this item when it's being worn
 	//eg: ammo counters, primed grenade flashes, etc.
-	var/list/worn_overlays = worn_overlays(isinhands, file2use)
+	var/list/worn_overlays = worn_overlays(isinhands, file2use, style_flags)
 	if(worn_overlays && worn_overlays.len)
 		standing.overlays.Add(worn_overlays)
 
@@ -675,6 +673,8 @@ generate/load female uniform sprites matching all previously decided variables
 			. += "-robotic"
 		if(BP.use_digitigrade)
 			. += "-digitigrade[BP.use_digitigrade]"
+			if(BP.digitigrade_type)
+				. += "-[BP.digitigrade_type]"
 		if(BP.dmg_overlay_type)
 			. += "-[BP.dmg_overlay_type]"
 		if(BP.body_markings)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index ec4e45a084..4eabf4224d 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -80,7 +80,7 @@
 //Second link in a breath chain, calls check_breath()
 /mob/living/carbon/proc/breathe()
 	var/obj/item/organ/lungs = getorganslot(ORGAN_SLOT_LUNGS)
-	if(reagents.has_reagent("lexorin"))
+	if(reagents.has_reagent(/datum/reagent/toxin/lexorin))
 		return
 	if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
 		return
@@ -156,7 +156,7 @@
 
 	//CRIT
 	if(!breath || (breath.total_moles() == 0) || !lungs)
-		if(reagents.has_reagent("epinephrine") && lungs)
+		if(reagents.has_reagent(/datum/reagent/medicine/epinephrine) && lungs)
 			return
 		adjustOxyLoss(1)
 
@@ -357,7 +357,7 @@
 		return
 
 	// No decay if formaldehyde in corpse or when the corpse is charred
-	if(reagents.has_reagent("formaldehyde", 15) || HAS_TRAIT(src, TRAIT_HUSK))
+	if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 15) || HAS_TRAIT(src, TRAIT_HUSK))
 		return
 
 	// Also no decay if corpse chilled or not organic/undead
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 92ad87f6b5..56ef4fe24a 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -369,6 +369,23 @@
 		retaliate(L)
 	return ..()
 
+/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
+	if(M.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
+		retaliate(M)
+	else if(M.a_intent == INTENT_DISARM && prob(MONKEY_RETALIATE_DISARM_PROB))
+		retaliate(M)
+	return ..()
+
+/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
+	if(L.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
+		retaliate(L)
+	return ..()
+
+/mob/living/carbon/monkey/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+	if(user.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
+		retaliate(user)
+	return ..()
+
 /mob/living/carbon/monkey/attack_paw(mob/living/L)
 	if(L.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
 		retaliate(L)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index fe041dd0a6..14c3a76307 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -66,7 +66,7 @@
 	. = ..()
 	remove_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE)
 	var/amount
-	if(reagents.has_reagent("morphine"))
+	if(reagents.has_reagent(/datum/reagent/medicine/morphine))
 		amount = -1
 	if(amount)
 		add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
index df90dd56fd..32e3d21ee2 100644
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
@@ -6,37 +6,55 @@
 		..()
 
 /mob/living/carbon/monkey/attack_paw(mob/living/M)
-	if(..()) //successful monkey bite.
-		var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
-		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
-		if(!affecting)
-			affecting = get_bodypart(BODY_ZONE_CHEST)
-		if(M.limb_destroyer)
-			dismembering_strike(M, affecting.body_zone)
-		if(stat != DEAD)
-			var/dmg = rand(1, 5)
-			apply_damage(dmg, BRUTE, affecting)
+	. = ..()
+	if(!.) //unsuccessful monkey bite.
+		return
+	var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
+	var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+	if(!affecting)
+		affecting = get_bodypart(BODY_ZONE_CHEST)
+	if(M.limb_destroyer)
+		dismembering_strike(M, affecting.body_zone)
+	var/dmg = rand(1, 5)
+	apply_damage(dmg, BRUTE, affecting)
 
 /mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
-	if(..()) //successful larva bite.
-		var/damage = rand(1, 3)
-		if(stat != DEAD)
-			L.amount_grown = min(L.amount_grown + damage, L.max_grown)
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
-			if(!affecting)
-				affecting = get_bodypart(BODY_ZONE_CHEST)
-			apply_damage(damage, BRUTE, affecting)
+	. = ..()
+	if(!.) //unsuccessful larva bite
+		return
+	var/damage = rand(1, 3)
+	if(stat != DEAD)
+		L.amount_grown = min(L.amount_grown + damage, L.max_grown)
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
+		if(!affecting)
+			affecting = get_bodypart(BODY_ZONE_CHEST)
+		apply_damage(damage, BRUTE, affecting)
+
+/mob/living/carbon/monkey/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+	. = ..(user, TRUE)
+	if(.)
+		return
+	var/hulk_verb = pick("smash","pummel")
+	playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
+	var/message = "[user] has [hulk_verb]ed [src]!"
+	visible_message("<span class='danger'>[message]</span>", \
+							"<span class='userdanger'>[message]</span>")
+	adjustBruteLoss(15)
+	return TRUE
 
 /mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M)
-	if(..())	//To allow surgery to return properly.
+	. = ..()
+	if(.) //To allow surgery to return properly.
 		return
-
 	switch(M.a_intent)
-		if("help")
+		if(INTENT_HELP)
 			help_shake_act(M)
-		if("grab")
+		if(INTENT_GRAB)
 			grabbedby(M)
-		if("harm")
+		if(INTENT_HARM)
+			if(HAS_TRAIT(M, TRAIT_PACIFISM))
+				to_chat(M, "<span class='notice'>You don't want to hurt [src]!</span>")
+				return
 			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 			if (prob(75))
 				visible_message("<span class='danger'>[M] has punched [name]!</span>", \
@@ -60,7 +78,7 @@
 				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 				visible_message("<span class='danger'>[M] has attempted to punch [name]!</span>", \
 					"<span class='userdanger'>[M] has attempted to punch [name]!</span>", null, COMBAT_MESSAGE_RANGE)
-		if("disarm")
+		if(INTENT_DISARM)
 			if(!IsUnconscious())
 				M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
 				if (prob(25))
@@ -74,50 +92,51 @@
 					visible_message("<span class='danger'>[M] has disarmed [src]!</span>", "<span class='userdanger'>[M] has disarmed [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 
 /mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(..()) //if harm or disarm intent.
-		if (M.a_intent == INTENT_HARM)
-			if ((prob(95) && health > 0))
-				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-				var/damage = rand(15, 30)
-				if (damage >= 25)
-					damage = rand(20, 40)
-					if(AmountUnconscious() < 300)
-						Unconscious(rand(200, 300))
-					visible_message("<span class='danger'>[M] has wounded [name]!</span>", \
-							"<span class='userdanger'>[M] has wounded [name]!</span>", null, COMBAT_MESSAGE_RANGE)
-				else
-					visible_message("<span class='danger'>[M] has slashed [name]!</span>", \
-							"<span class='userdanger'>[M] has slashed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-				var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-				log_combat(M, src, "attacked")
-				if(!affecting)
-					affecting = get_bodypart(BODY_ZONE_CHEST)
-				if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
-					return 1
-				apply_damage(damage, BRUTE, affecting)
-
+	. = ..()
+	if(!.) // the attack was blocked or was help/grab intent
+		return
+	if (M.a_intent == INTENT_HARM)
+		if ((prob(95) && health > 0))
+			playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+			var/damage = rand(15, 30)
+			if (damage >= 25)
+				damage = rand(20, 40)
+				if(AmountUnconscious() < 300)
+					Unconscious(rand(200, 300))
+				visible_message("<span class='danger'>[M] has wounded [name]!</span>", \
+						"<span class='userdanger'>[M] has wounded [name]!</span>", null, COMBAT_MESSAGE_RANGE)
 			else
-				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
-						"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+				visible_message("<span class='danger'>[M] has slashed [name]!</span>", \
+						"<span class='userdanger'>[M] has slashed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
 
-		if (M.a_intent == INTENT_DISARM)
-			var/obj/item/I = null
-			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-			if(prob(95))
-				Knockdown(20)
-				visible_message("<span class='danger'>[M] has tackled down [name]!</span>", \
-						"<span class='userdanger'>[M] has tackled down [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+			log_combat(M, src, "attacked")
+			if(!affecting)
+				affecting = get_bodypart(BODY_ZONE_CHEST)
+			if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
+				return 1
+			apply_damage(damage, BRUTE, affecting)
+
+		else
+			playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
+			visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
+					"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+
+	else
+		var/obj/item/I = null
+		playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+		if(prob(95))
+			Knockdown(20)
+			visible_message("<span class='danger'>[M] has tackled down [name]!</span>", \
+					"<span class='userdanger'>[M] has tackled down [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+		else
+			I = get_active_held_item()
+			if(dropItemToGround(I))
+				visible_message("<span class='danger'>[M] has disarmed [name]!</span>", "<span class='userdanger'>[M] has disarmed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
 			else
-				I = get_active_held_item()
-				if(dropItemToGround(I))
-					visible_message("<span class='danger'>[M] has disarmed [name]!</span>", "<span class='userdanger'>[M] has disarmed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
-				else
-					I = null
-			log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]")
-			updatehealth()
-
+				I = null
+		log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]")
+		updatehealth()
 
 /mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
 	. = ..()
@@ -132,17 +151,19 @@
 		apply_damage(damage, M.melee_damage_type, affecting)
 
 /mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		var/damage = rand(5, 35)
-		if(M.is_adult)
-			damage = rand(20, 40)
-		var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
-		if(!dam_zone) //Dismemberment successful
-			return 1
-		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
-		if(!affecting)
-			affecting = get_bodypart(BODY_ZONE_CHEST)
-		apply_damage(damage, BRUTE, affecting)
+	. = ..()
+	if(!.) //unsuccessful slime attack
+		return
+	var/damage = rand(5, 35)
+	if(M.is_adult)
+		damage = rand(20, 40)
+	var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+	if(!dam_zone) //Dismemberment successful
+		return 1
+	var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+	if(!affecting)
+		affecting = get_bodypart(BODY_ZONE_CHEST)
+	apply_damage(damage, BRUTE, affecting)
 
 /mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit)
 	. = 1
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 66be8058f1..ca1a946e10 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -1,31 +1,3 @@
-//IMPORTANT: Multiple animate() calls do not stack well, so try to do them all at once if you can.
-/mob/living/carbon/update_transform()
-	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
-	var/final_pixel_y = pixel_y
-	var/final_dir = dir
-	var/changed = 0
-	if(lying != lying_prev && rotate_on_lying)
-		changed++
-		ntransform.TurnTo(lying_prev,lying)
-		if(lying == 0) //Lying to standing
-			final_pixel_y = get_standard_pixel_y_offset()
-		else //if(lying != 0)
-			if(lying_prev == 0) //Standing to lying
-				pixel_y = get_standard_pixel_y_offset()
-				final_pixel_y = get_standard_pixel_y_offset(lying)
-				if(dir & (EAST|WEST)) //Facing east or west
-					final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
-
-	if(resize != RESIZE_DEFAULT_SIZE)
-		changed++
-		ntransform.Scale(resize)
-		resize = RESIZE_DEFAULT_SIZE
-
-	if(changed)
-		animate(src, transform = ntransform, time = 2, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
-		setMovetype(movement_type & ~FLOATING)  // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life().
-
-
 /mob/living/carbon
 	var/list/overlays_standing[TOTAL_LAYERS]
 
@@ -228,7 +200,7 @@
 //Overlays for the worn overlay so you can overlay while you overlay
 //eg: ammo counters, primed grenade flashing, etc.
 //"icon_file" is used automatically for inhands etc. to make sure it gets the right inhand file
-/obj/item/proc/worn_overlays(isinhands = FALSE, icon_file)
+/obj/item/proc/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
 
 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 78542ab052..c2a307950c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1225,7 +1225,7 @@
 			clamp_unconscious_to = 0,
 			clamp_immobility_to = 0,
 			reset_misc = TRUE,
-			healing_chems = list("inaprovaline" = 3, "synaptizine" = 10, "regen_jelly" = 10, "stimulants" = 10),
+			healing_chems = list(/datum/reagent/medicine/inaprovaline = 3, /datum/reagent/medicine/synaptizine = 10, /datum/reagent/medicine/regen_jelly = 10, /datum/reagent/medicine/stimulants = 10),
 			message = "<span class='boldnotice'>You feel a surge of energy!</span>",
 			stamina_buffer_boost = 0,				//restores stamina buffer rather than just health
 			scale_stamina_loss_recovery,			//defaults to null. if this is set, restores loss * this stamina. make sure it's a fraction.
@@ -1252,5 +1252,5 @@
 	updatehealth()
 	update_stamina()
 	update_canmove()
-	for(var/chem in healing_chems)
-		reagents.add_reagent(chem, healing_chems[chem])
+	if(healing_chems)
+		reagents.add_reagent_list(healing_chems)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 722c984309..e398dad65b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -36,7 +36,50 @@
 /mob/living/proc/on_hit(obj/item/projectile/P)
 	return
 
+/mob/living/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+	var/block_chance_modifier = round(damage / -3)
+	for(var/obj/item/I in held_items)
+		if(!istype(I, /obj/item/clothing))
+			var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
+			if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
+				return TRUE
+	return FALSE
+
+/mob/living/proc/check_reflect(def_zone) //Reflection checks for anything in your hands, based on the reflection chance of the object(s)
+	for(var/obj/item/I in held_items)
+		if(I.IsReflect(def_zone))
+			return TRUE
+	return FALSE
+
+/mob/living/proc/reflect_bullet_check(obj/item/projectile/P, def_zone)
+	if(P.is_reflectable && check_reflect(def_zone)) // Checks if you've passed a reflection% check
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", \
+						"<span class='userdanger'>The [P.name] gets reflected by [src]!</span>")
+		// Find a turf near or on the original location to bounce to
+		if(P.starting)
+			var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
+			var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
+			var/turf/curloc = get_turf(src)
+			// redirect the projectile
+			P.original = locate(new_x, new_y, P.z)
+			P.starting = curloc
+			P.firer = src
+			P.yo = new_y - curloc.y
+			P.xo = new_x - curloc.x
+			var/new_angle_s = P.Angle + rand(120,240)
+			while(new_angle_s > 180)	// Translate to regular projectile degrees
+				new_angle_s -= 360
+			P.setAngle(new_angle_s)
+		return TRUE
+	return FALSE
+
 /mob/living/bullet_act(obj/item/projectile/P, def_zone)
+	if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself
+		if(reflect_bullet_check(P, def_zone))
+			return -1 // complete projectile permutation
+		if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
+			P.on_hit(src, 100, def_zone)
+			return 2
 	var/armor = run_armor_check(def_zone, P.flag, null, null, P.armour_penetration, null)
 	if(!P.nodamage)
 		apply_damage(P.damage, P.damage_type, def_zone, armor)
@@ -55,9 +98,32 @@
 		else
 				return 0
 
+/mob/living/proc/catch_item(obj/item/I, skip_throw_mode_check = FALSE)
+	return FALSE
+
+/mob/living/proc/embed_item(obj/item/I)
+	return
+
+/mob/living/proc/can_embed(obj/item/I)
+	return FALSE
+
 /mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE)
-	if(istype(AM, /obj/item))
-		var/obj/item/I = AM
+	var/obj/item/I
+	var/throwpower = 30
+	if(isitem(AM))
+		I = AM
+		throwpower = I.throwforce
+	if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
+		hitpush = FALSE
+		skipcatch = TRUE
+		blocked = TRUE
+	else if(I && I.throw_speed >= EMBED_THROWSPEED_THRESHOLD && can_embed(I, src) && prob(I.embedding.embed_chance) && !HAS_TRAIT(src, TRAIT_PIERCEIMMUNE) && (!HAS_TRAIT(src, TRAIT_AUTO_CATCH_ITEM) || incapacitated() || get_active_held_item()))
+		embed_item(I)
+		hitpush = FALSE
+		skipcatch = TRUE //can't catch the now embedded item
+	if(I)
+		if(!skipcatch && isturf(I.loc) && catch_item(I))
+			return TRUE
 		var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
 		var/dtype = BRUTE
 		var/volume = I.get_volume_by_throwforce_and_or_w_class()
@@ -214,6 +280,24 @@
 					Move(user.loc)
 		return 1
 
+/mob/living/attack_hand(mob/user)
+	..() //Ignoring parent return value here.
+	SEND_SIGNAL(src, COMSIG_MOB_ATTACK_HAND, user)
+	if((user != src) && user.a_intent != INTENT_HELP && check_shields(user, 0, user.name, attack_type = UNARMED_ATTACK))
+		log_combat(user, src, "attempted to touch")
+		visible_message("<span class='warning'>[user] attempted to touch [src]!</span>")
+		return TRUE
+
+/mob/living/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+	if(user.a_intent == INTENT_HARM)
+		if(HAS_TRAIT(user, TRAIT_PACIFISM))
+			to_chat(user, "<span class='notice'>You don't want to hurt [src]!</span>")
+			return TRUE
+		var/hulk_verb = pick("smash","pummel")
+		if(user != src && check_shields(user, 15, "the [hulk_verb]ing"))
+			return TRUE
+		..()
+	return FALSE
 
 /mob/living/attack_slime(mob/living/simple_animal/slime/M)
 	if(!SSticker.HasRoundStarted())
@@ -229,6 +313,12 @@
 		to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 		return FALSE
 
+	var/damage = rand(5, 35)
+	if(M.is_adult)
+		damage = rand(20, 40)
+	if(check_shields(M, damage, "the [M.name]"))
+		return FALSE
+
 	if (stat != DEAD)
 		log_combat(M, src, "attacked")
 		M.do_attack_animation(src)
@@ -245,7 +335,8 @@
 		if(HAS_TRAIT(M, TRAIT_PACIFISM))
 			to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 			return FALSE
-
+		if(check_shields(M, rand(M.melee_damage_lower, M.melee_damage_upper), "the [M.name]", MELEE_ATTACK, M.armour_penetration))
+			return FALSE
 		if(M.attack_sound)
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		M.do_attack_animation(src)
@@ -256,10 +347,6 @@
 
 
 /mob/living/attack_paw(mob/living/carbon/monkey/M)
-	if(isturf(loc) && istype(loc.loc, /area/start))
-		to_chat(M, "No attacking people at spawn, you jackass.")
-		return FALSE
-
 	if (M.a_intent == INTENT_HARM)
 		if(HAS_TRAIT(M, TRAIT_PACIFISM))
 			to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
@@ -268,6 +355,8 @@
 		if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH))
 			to_chat(M, "<span class='warning'>You can't bite with your mouth covered!</span>")
 			return FALSE
+		if(check_shields(M, 0, "the [M.name]"))
+			return FALSE
 		M.do_attack_animation(src, ATTACK_EFFECT_BITE)
 		if (prob(75))
 			log_combat(M, src, "attacked")
@@ -282,15 +371,16 @@
 
 /mob/living/attack_larva(mob/living/carbon/alien/larva/L)
 	switch(L.a_intent)
-		if("help")
+		if(INTENT_HELP)
 			visible_message("<span class='notice'>[L.name] rubs its head against [src].</span>")
 			return FALSE
 
 		else
 			if(HAS_TRAIT(L, TRAIT_PACIFISM))
 				to_chat(L, "<span class='notice'>You don't want to hurt anyone!</span>")
-				return
-
+				return FALSE
+			if(L != src && check_shields(L, rand(1, 3), "the [L.name]"))
+				return FALSE
 			L.do_attack_animation(src)
 			if(prob(90))
 				log_combat(L, src, "attacked")
@@ -301,24 +391,29 @@
 			else
 				visible_message("<span class='danger'>[L.name] has attempted to bite [src]!</span>", \
 					"<span class='userdanger'>[L.name] has attempted to bite [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-	return FALSE
 
 /mob/living/attack_alien(mob/living/carbon/alien/humanoid/M)
+	if((M != src) && M.a_intent != INTENT_HELP && check_shields(M, 0, "the [M.name]"))
+		visible_message("<span class='danger'>[M] attempted to touch [src]!</span>")
+		return FALSE
 	switch(M.a_intent)
-		if ("help")
-			visible_message("<span class='notice'>[M] caresses [src] with its scythe like arm.</span>")
+		if (INTENT_HELP)
+			if(!isalien(src)) //I know it's ugly, but the alien vs alien attack_alien behaviour is a bit different.
+				visible_message("<span class='notice'>[M] caresses [src] with its scythe like arm.</span>")
 			return FALSE
-		if ("grab")
+		if (INTENT_GRAB)
 			grabbedby(M)
 			return FALSE
-		if("harm")
+		if(INTENT_HARM)
 			if(HAS_TRAIT(M, TRAIT_PACIFISM))
 				to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 				return FALSE
-			M.do_attack_animation(src)
+			if(!isalien(src))
+				M.do_attack_animation(src)
 			return TRUE
-		if("disarm")
-			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+		if(INTENT_DISARM)
+			if(!isalien(src))
+				M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
 			return TRUE
 
 /mob/living/ex_act(severity, target, origin)
@@ -369,7 +464,7 @@
 		to_chat(src, "<span class='userdanger'>You resist Nar'Sie's influence... but not all of it. <i>Run!</i></span>")
 		adjustBruteLoss(35)
 		if(src && reagents)
-			reagents.add_reagent("heparin", 5)
+			reagents.add_reagent(/datum/reagent/toxin/heparin, 5)
 		return FALSE
 	if(GLOB.cult_narsie && GLOB.cult_narsie.souls_needed[src])
 		GLOB.cult_narsie.souls_needed -= src
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 4d2a36907d..783e044492 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -111,4 +111,6 @@
 	var/list/diseases = list() // list of all diseases in a mob
 	var/list/disease_resistances = list()
 
-	var/drag_slowdown = TRUE //Whether the mob is slowed down when dragging another prone mob
\ No newline at end of file
+	var/drag_slowdown = TRUE //Whether the mob is slowed down when dragging another prone mob
+
+	var/rotate_on_lying = FALSE
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 0444458841..1694d04b82 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -260,15 +260,6 @@
 	viewalerts = 1
 	src << browse(dat, "window=aialerts&can_close=0")
 
-/mob/living/silicon/ai/proc/ai_roster()
-	var/dat = "<html><head><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
-
-	dat += GLOB.data_core.get_manifest()
-	dat += "</body></html>"
-
-	src << browse(dat, "window=airoster")
-	onclose(src, "airoster")
-
 /mob/living/silicon/ai/proc/ai_call_shuttle()
 	if(control_disabled)
 		to_chat(usr, "<span class='warning'>Wireless control is disabled!</span>")
@@ -681,18 +672,23 @@
 				"green face" = 'icons/mob/ai.dmi',
 				"xeno queen" = 'icons/mob/alien.dmi',
 				"horror" = 'icons/mob/ai.dmi',
-				"creature" = 'icons/mob/ai.dmi'
+				"creature" = 'icons/mob/ai.dmi',
+				"custom"
 				)
 
 			input = input("Please select a hologram:") as null|anything in icon_list
 			if(input)
 				qdel(holo_icon)
 				switch(input)
-					if("xeno queen")
+					if("custom")
+						if(client?.prefs?.custom_holoform_icon)
+							holo_icon = client.prefs.get_filtered_holoform(HOLOFORM_FILTER_AI)
+						else
+							holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "female"))
+					else if("xeno queen")
 						holo_icon = getHologramIcon(icon(icon_list[input],"alienq"))
 					else
 						holo_icon = getHologramIcon(icon(icon_list[input], input))
-	return
 
 /mob/living/silicon/ai/proc/corereturn()
 	set category = "Malfunction"
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index 7c59c2b791..97d26f672a 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -1,15 +1,9 @@
-
 /mob/living/silicon/ai/attacked_by(obj/item/I, mob/living/user, def_zone)
+	. = ..()
+	if(!.)
+		return FALSE
 	if(I.force && I.damtype != STAMINA && stat != DEAD) //only sparks if real damage is dealt.
 		spark_system.start()
-	return ..()
-
-
-/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(!SSticker.HasRoundStarted())
-		to_chat(M, "You cannot attack people before the game has started.")
-		return
-	..()
 
 /mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user)
 	return //immune to slimes
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 7477ba7713..38afaf8313 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -68,7 +68,7 @@
 // Use this when setting the aiEye's location.
 // It will also stream the chunk that the new loc is in.
 
-/mob/camera/aiEye/proc/setLoc(T, force_update = FALSE)
+/mob/camera/aiEye/proc/setLoc(T, force_update = FALSE, dir)
 	if(ai)
 		if(!isturf(ai.loc))
 			return
@@ -88,7 +88,7 @@
 		//Holopad
 		if(istype(ai.current, /obj/machinery/holopad))
 			var/obj/machinery/holopad/H = ai.current
-			H.move_hologram(ai, T)
+			H.move_hologram(ai, T, dir)
 		if(ai.camera_light_on)
 			ai.light_cameras()
 		if(ai.master_multicam)
@@ -139,7 +139,7 @@
 	for(var/i = 0; i < max(user.sprint, initial); i += 20)
 		var/turf/step = get_turf(get_step(user.eyeobj, direct))
 		if(step)
-			user.eyeobj.setLoc(step)
+			user.eyeobj.setLoc(step, null, direct)
 
 	user.cooldown = world.timeofday + 5
 	if(user.acceleration)
diff --git a/code/modules/mob/living/silicon/custom_holoform.dm b/code/modules/mob/living/silicon/custom_holoform.dm
new file mode 100644
index 0000000000..8ce6e9a29a
--- /dev/null
+++ b/code/modules/mob/living/silicon/custom_holoform.dm
@@ -0,0 +1,28 @@
+/mob/living/silicon/verb/clear_custom_holoform()
+	set name = "Clear Custom Holoform"
+	set desc = "Clear your current custom holoform"
+	set category = "OOC"
+
+	if(!client.prefs)
+		to_chat(src, "<span class='boldwarning'>No preferences datum on your client, contact an admin/coder!</span>")
+		return
+	client.prefs.custom_holoform_icon = null
+	client.prefs.cached_holoform_icons = null
+	to_chat(src, "<span class='boldnotice'>Holoform removed.</span>")
+
+/mob/living/silicon/verb/set_custom_holoform()
+	set name = "Set Custom Holoform"
+	set desc = "Set your custom holoform using your current preferences slot and a specified set of gear."
+	set category = "OOC"
+
+	if(!client.prefs)
+		to_chat(src, "<span class='boldwarning'>No preferences datum on your client, contact an admin/coder!</span>")
+		return
+	if(client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+		to_chat(src, "<span class='warning'>You are attempting to change custom holoforms too fast!</span>")
+	var/icon/new_holoform = user_interface_custom_holoform(client)
+	if(new_holoform)
+		client.prefs.custom_holoform_icon = new_holoform
+		client.prefs.cached_holoform_icons = null
+		client.prefs.last_custom_holoform = world.time
+		to_chat(src, "<span class='boldnotice'>Holoform set.</span>")
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 7ec63cf415..7055838039 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -58,10 +58,12 @@
 	var/canholo = TRUE
 	var/obj/item/card/id/access_card = null
 	var/chassis = "repairbot"
-	var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE,
-									"fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "borgi" = FALSE ,
-									"parrot" = FALSE, "bear" = FALSE , "mushroom" = FALSE, "crow" = FALSE ,
-									"fairy" = FALSE , "spiderbot" = FALSE)		//assoc value is whether it can be picked up.
+	var/dynamic_chassis
+	var/dynamic_chassis_sit = FALSE			//whether we're sitting instead of resting spritewise
+	var/dynamic_chassis_bellyup = FALSE		//whether we're lying down bellyup
+	var/list/possible_chassis			//initialized in initialize.
+	var/list/dynamic_chassis_icons		//ditto.
+	var/list/chassis_pixel_offsets_x	//stupid dogborgs
 	var/static/item_head_icon = 'icons/mob/pai_item_head.dmi'
 	var/static/item_lh_icon = 'icons/mob/pai_item_lh.dmi'
 	var/static/item_rh_icon = 'icons/mob/pai_item_rh.dmi'
@@ -69,22 +71,20 @@
 	var/emitterhealth = 20
 	var/emittermaxhealth = 20
 	var/emitterregen = 0.25
+	var/emitter_next_use = 0
+	var/emitter_emp_cd = 300
 	var/emittercd = 50
 	var/emitteroverloadcd = 100
-	var/emittersemicd = FALSE
 
-	var/overload_ventcrawl = 0
-	var/overload_bulletblock = 0	//Why is this a good idea?
-	var/overload_maxhealth = 0
+	var/radio_short = FALSE
+	var/radio_short_cooldown = 5 MINUTES
+	var/radio_short_timerid
+
 	canmove = FALSE
 	var/silent = FALSE
 	var/brightness_power = 5
 
-/mob/living/silicon/pai/can_unbuckle()
-	return FALSE
-
-/mob/living/silicon/pai/can_buckle()
-	return FALSE
+	var/icon/custom_holoform_icon
 
 /mob/living/silicon/pai/Destroy()
 	if (loc != card)
@@ -118,6 +118,13 @@
 		pda.owner = text("[]", src)
 		pda.name = pda.owner + " (" + pda.ownjob + ")"
 
+	possible_chassis = typelist(NAMEOF(src, possible_chassis), list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE,
+									"fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "borgi" = FALSE ,
+									"parrot" = FALSE, "bear" = FALSE , "mushroom" = FALSE, "crow" = FALSE ,
+									"fairy" = FALSE , "spiderbot" = FALSE))		//assoc value is whether it can be picked up.
+	dynamic_chassis_icons = typelist(NAMEOF(src, dynamic_chassis_icons), initialize_dynamic_chassis_icons())
+	chassis_pixel_offsets_x = typelist(NAMEOF(src, chassis_pixel_offsets_x), default_chassis_pixel_offsets_x())
+
 	. = ..()
 
 	var/datum/action/innate/pai/software/SW = new
@@ -133,8 +140,7 @@
 	AR.Grant(src)
 	AL.Grant(src)
 	ALM.Grant(src)
-	emittersemicd = TRUE
-	addtimer(CALLBACK(src, .proc/emittercool), 600)
+	emitter_next_use = world.time + 10 SECONDS
 
 /mob/living/silicon/pai/Life()
 	if(hacking)
@@ -228,7 +234,7 @@
 /datum/action/innate/pai/shell/Trigger()
 	..()
 	if(P.holoform)
-		P.fold_in(0)
+		P.fold_in(FALSE)
 	else
 		P.fold_out()
 
@@ -292,3 +298,132 @@
 
 /mob/living/silicon/pai/process()
 	emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth)
+
+/mob/living/silicon/pai/proc/short_radio()
+	if(radio_short_timerid)
+		deltimer(radio_short_timerid)
+	radio_short = TRUE
+	to_chat(src, "<span class='danger'>Your radio shorts out!</span>")
+	radio_short_timerid = addtimer(CALLBACK(src, .proc/unshort_radio), radio_short_cooldown, flags = TIMER_STOPPABLE)
+
+/mob/living/silicon/pai/proc/unshort_radio()
+	radio_short = FALSE
+	to_chat(src, "<span class='danger'>You feel your radio is operational once more.</span>")
+	if(radio_short_timerid)
+		deltimer(radio_short_timerid)
+
+/mob/living/silicon/pai/proc/initialize_dynamic_chassis_icons()
+	. = list()
+	var/icon/curr		//for inserts
+
+	//This is a horrible system and I wish I was not as lazy and did something smarter, like just generating a new icon in memory which is probably more efficient.
+
+	//Basic /tg/ cyborgs
+	.["Cyborg - Engineering (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "engineer"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Engineering (loaderborg)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "loaderborg"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Engineering (handyeng)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "handyeng"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Engineering (sleekeng)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "sleekeng"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Engineering (marinaeng)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "marinaeng"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Medical (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "medical"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Medical (marinamed)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "marinamed"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Medical (eyebotmed)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "eyebotmed"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Security (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "sec"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Security (sleeksec)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "sleeksec"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Security (marinasec)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "marinasec"), HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Clown (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "clown"), HOLOFORM_FILTER_PAI, FALSE)
+
+	//Citadel dogborgs
+	//Engi
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Engineering (dog - valeeng)"] = curr
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Engineering (dog - pupdozer)"] = curr
+	//Med
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "medihound")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihound-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihound-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihound-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Medical (dog - medihound)"] = curr
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Medical (dog - medihounddark)"] = curr
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valemed")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valemed-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valemed-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valemed-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Medical (dog - valemed)"] = curr
+	//Sec
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "k9")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Security (dog - k9)"] = curr
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Security (dog - k9dark)"] = curr
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valesec")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesec-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesec-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesec-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Security (dog - valesec)"] = curr
+	//Service
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Service (dog - valeserv)"] = curr
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Service (dog - valeservdark)"] = curr
+	//Sci
+	curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valesci")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesci-rest"), "rest")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesci-sit"), "sit")
+	curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesci-bellyup"), "bellyup")
+	process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+	.["Cyborg - Science (dog - valesci)"] = curr
+	//Misc
+	.["Cyborg - Misc (dog - blade)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/widerobot.dmi', "blade"), HOLOFORM_FILTER_PAI, FALSE)
+
+/mob/living/silicon/pai/proc/default_chassis_pixel_offsets_x()
+	. = list()
+	//Engi
+	.["Cyborg - Engineering (dog - valeeng)"] = -16
+	.["Cyborg - Engineering (dog - pupdozer)"] = -16
+	//Med
+	.["Cyborg - Medical (dog - medihound)"] = -16
+	.["Cyborg - Medical (dog - medihounddark)"] = -16
+	.["Cyborg - Medical (dog - valemed)"] = -16
+	//Sec
+	.["Cyborg - Security (dog - k9)"] = -16
+	.["Cyborg - Security (dog - valesec)"] = -16
+	.["Cyborg - Security (dog - k9dark)"] = -16
+	//Service
+	.["Cyborg - Service (dog - valeserv)"] = -16
+	.["Cyborg - Service (dog - valeservdark)"] = -16
+	//Sci
+	.["Cyborg - Security (dog - valesci)"] = -16
+	//Misc
+	.["Cyborg - Misc (dog - blade)"] = -16
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index dfc718f1ab..c727e100d8 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -8,9 +8,10 @@
 		return
 	take_holo_damage(50/severity)
 	Knockdown(400/severity)
-	silent = max(30/severity, silent)
+	silent = max((3 MINUTES)/severity, silent)
 	if(holoform)
 		fold_in(force = TRUE)
+	emitter_next_use = world.time + emitter_emp_cd
 	//Need more effects that aren't instadeath or permanent law corruption.
 
 /mob/living/silicon/pai/ex_act(severity, target)
@@ -26,13 +27,14 @@
 			fold_in(force = 1)
 			Knockdown(200)
 
+//ATTACK HAND IGNORING PARENT RETURN VALUE
 /mob/living/silicon/pai/attack_hand(mob/living/carbon/human/user)
 	switch(user.a_intent)
-		if("help")
+		if(INTENT_HELP)
 			visible_message("<span class='notice'>[user] gently pats [src] on the head, eliciting an off-putting buzzing from its holographic field.</span>")
-		if("disarm")
+		if(INTENT_DISARM)
 			visible_message("<span class='notice'>[user] boops [src] on the head!</span>")
-		if("harm")
+		if(INTENT_HARM)
 			user.do_attack_animation(src)
 			if (user.name == master)
 				visible_message("<span class='notice'>Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.</span>")
@@ -41,14 +43,19 @@
 					if(user.put_in_hands(card))
 						user.visible_message("<span class='notice'>[user] promptly scoops up [user.p_their()] pAI's card.</span>")
 			else
+				if(HAS_TRAIT(user, TRAIT_PACIFISM))
+					to_chat(user, "<span class='notice'>You don't want to hurt [src]!</span>")
+					return
 				visible_message("<span class='danger'>[user] stomps on [src]!.</span>")
 				take_holo_damage(2)
+		else
+			grabbedby(user)
 
-/mob/living/silicon/pai/bullet_act(obj/item/projectile/Proj)
-	if(Proj.stun)
+/mob/living/silicon/pai/bullet_act(obj/item/projectile/P, def_zone)
+	if(P.stun)
 		fold_in(force = TRUE)
-		src.visible_message("<span class='warning'>The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!</span>")
-	. = ..(Proj)
+		visible_message("<span class='warning'>The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!</span>")
+	. = ..()
 
 /mob/living/silicon/pai/stripPanelUnequip(obj/item/what, mob/who, where) //prevents stripping
 	to_chat(src, "<span class='warning'>Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.</span>")
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index 164a3e7389..6577c26402 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -12,12 +12,11 @@
 		. = fold_in(force)
 		return
 
-	if(emittersemicd)
+	if(world.time < emitter_next_use)
 		to_chat(src, "<span class='warning'>Error: Holochassis emitters recycling. Please try again later.</span>")
 		return FALSE
 
-	emittersemicd = TRUE
-	addtimer(CALLBACK(src, .proc/emittercool), emittercd)
+	emitter_next_use = world.time + emittercd
 	canmove = TRUE
 	density = TRUE
 	if(istype(card.loc, /obj/item/pda))
@@ -46,20 +45,17 @@
 	visible_message("<span class='boldnotice'>[src] folds out its holochassis emitter and forms a holoshell around itself!</span>")
 	holoform = TRUE
 
-/mob/living/silicon/pai/proc/emittercool()
-	emittersemicd = FALSE
-
 /mob/living/silicon/pai/proc/fold_in(force = FALSE)
-	emittersemicd = TRUE
-	if(!force)
-		addtimer(CALLBACK(src, .proc/emittercool), emittercd)
-	else
-		addtimer(CALLBACK(src, .proc/emittercool), emitteroverloadcd)
+	emitter_next_use = world.time + (force? emitteroverloadcd : emittercd)
 	icon_state = "[chassis]"
 	if(!holoform)
 		. = fold_out(force)
 		return
-	visible_message("<span class='notice'>[src] deactivates its holochassis emitter and folds back into a compact card!</span>")
+	if(force)
+		short_radio()
+		visible_message("<span class='warning'>[src] shorts out, collapsing back into their storage card, sparks emitted from their radio antenna!</span>")
+	else
+		visible_message("<span class='notice'>[src] deactivates its holochassis emitter and folds back into a compact card!</span>")
 	stop_pulling()
 	if(client)
 		client.perspective = EYE_PERSPECTIVE
@@ -78,28 +74,39 @@
 	if(!isturf(loc) && loc != card)
 		to_chat(src, "<span class='boldwarning'>You can not change your holochassis composite while not on the ground or in your card!</span>")
 		return FALSE
-	var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in possible_chassis
-	if(!choice)
+	var/list/choices = list("Preset - Basic", "Preset - Dynamic")
+	if(CONFIG_GET(flag/pai_custom_holoforms))
+		choices += "Custom"
+	var/choicetype = input(src, "What type of chassis do you want to use?") as null|anything in choices
+	if(!choicetype)
 		return FALSE
-	chassis = choice
-	icon_state = "[chassis]"
-	if(resting)
-		icon_state = "[chassis]_rest"
+	switch(choicetype)
+		if("Custom")
+			chassis = "custom"
+		if("Preset - Basic")
+			var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in possible_chassis
+			if(!choice)
+				return FALSE
+			chassis = choice
+		if("Preset - Dynamic")
+			var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in dynamic_chassis_icons
+			if(!choice)
+				return FALSE
+			chassis = "dynamic"
+			dynamic_chassis = choice
+	resist_a_rest(FALSE, TRUE)
+	update_icon()
 	to_chat(src, "<span class='boldnotice'>You switch your holochassis projection composite to [chassis]</span>")
 
 /mob/living/silicon/pai/lay_down()
-	..()
-	update_resting_icon(resting)
-
-/mob/living/silicon/pai/proc/update_resting_icon(rest)
-	if(rest)
-		icon_state = "[chassis]_rest"
-	else
-		icon_state = "[chassis]"
+	. = ..()
 	if(loc != card)
-		visible_message("<span class='notice'>[src] [rest? "lays down for a moment..." : "perks up from the ground"]</span>")
+		visible_message("<span class='notice'>[src] [resting? "lays down for a moment..." : "perks up from the ground"]</span>")
+	update_icon()
 
-/mob/living/silicon/pai/start_pulling(atom/movable/AM)
+/mob/living/silicon/pai/start_pulling(atom/movable/AM, gs)
+	if(ispAI(AM))
+		return ..()
 	return FALSE
 
 /mob/living/silicon/pai/proc/toggle_integrated_light()
@@ -122,3 +129,22 @@
 		to_chat(user, "<span class='warning'>[src]'s current form isn't able to be carried!</span>")
 		return FALSE
 	return ..()
+
+/mob/living/silicon/pai/verb/toggle_chassis_sit()
+	set name = "Toggle Chassis Sit"
+	set category = "IC"
+	set desc = "Whether or not to try to use a sitting icon versus a resting icon. Takes priority over belly-up resting."
+	dynamic_chassis_sit = !dynamic_chassis_sit
+	to_chat(usr, "<span class='boldnotice'>You are now [dynamic_chassis_sit? "sitting" : "lying down"].</span>")
+	update_icon()
+
+/mob/living/silicon/pai/verb/toggle_chassis_bellyup()
+	set name = "Toggle Chassis Belly Up"
+	set category = "IC"
+	set desc = "Whether or not to try to use a belly up icon while resting. Overridden by sitting."
+	dynamic_chassis_bellyup = !dynamic_chassis_bellyup
+	to_chat(usr, "<span class='boldnotice'>You are now lying on your [dynamic_chassis_bellyup? "back" : "front"].</span>")
+	update_icon()
+
+/mob/living/silicon/pai/can_buckle_others(mob/living/target, atom/buckle_to)
+	return ispAI(target) && ..()
diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm
index 9f07900a25..deedaa1382 100644
--- a/code/modules/mob/living/silicon/pai/say.dm
+++ b/code/modules/mob/living/silicon/pai/say.dm
@@ -5,4 +5,11 @@
 		..(message)
 
 /mob/living/silicon/pai/binarycheck()
-	return 0
+	return FALSE
+
+/mob/living/silicon/pai/radio(message, message_mode, list/spans, language)
+	if((message_mode == "robot") || (message_mode in GLOB.radiochannels))
+		if(radio_short)
+			to_chat(src, "<span class='warning'>Your radio is shorted out!</span>")
+			return ITALICS | REDUCE_RANGE
+	return ..()
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 9882d028d1..3ea018ccf6 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -283,7 +283,10 @@
 	dat += "<A href='byond://?src=[REF(src)];software=refresh'>Refresh</A><br>"
 	// Built-in
 	dat += "<A href='byond://?src=[REF(src)];software=directives'>Directives</A><br>"
-	dat += "<A href='byond://?src=[REF(src)];software=radio;sub=0'>Radio Configuration</A><br>"
+	if(radio_short)
+		dat += "\[RADIO SHORTED - Recalibrating!\]"
+	else
+		dat += "<A href='byond://?src=[REF(src)];software=radio;sub=0'>Radio Configuration</A><br>"
 	dat += "<A href='byond://?src=[REF(src)];software=image'>Screen Display</A><br>"
 	//dat += "Text Messaging <br>"
 	dat += "<br>"
diff --git a/code/modules/mob/living/silicon/pai/update_icon.dm b/code/modules/mob/living/silicon/pai/update_icon.dm
new file mode 100644
index 0000000000..9e40b71c5d
--- /dev/null
+++ b/code/modules/mob/living/silicon/pai/update_icon.dm
@@ -0,0 +1,27 @@
+/mob/living/silicon/pai/update_icon()
+	if(chassis == "custom")			//Make sure custom exists if it's set to custom
+		custom_holoform_icon = client?.prefs?.get_filtered_holoform(HOLOFORM_FILTER_PAI)
+		if(!custom_holoform_icon)
+			chassis = pick(possible_chassis - "custom")
+	if(chassis == "dynamic")		//handle dynamic generated icons
+		icon = dynamic_chassis_icons[dynamic_chassis]
+		var/list/states = icon_states(icon)
+		icon_state = ""
+		if(resting)		//The next line is some bullshit but I can make it worse if you want and make it a single line instead of four.. :)
+			if(dynamic_chassis_sit && ("sit") in states)
+				icon_state = "sit"
+			else if(dynamic_chassis_bellyup && ("bellyup") in states)
+				icon_state = "bellyup"
+			else if("rest" in states)
+				icon_state = "rest"
+		rotate_on_lying = FALSE
+	else if(chassis == "custom")
+		icon = custom_holoform_icon
+		icon_state = ""
+		rotate_on_lying = TRUE
+	else
+		icon = initial(icon)
+		icon_state = "[chassis][resting? "_rest" : (stat == DEAD? "_dead" : "")]"
+		rotate_on_lying = FALSE
+	pixel_x = ((chassis == "dynamic") && chassis_pixel_offsets_x[dynamic_chassis]) || 0
+	update_transform()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 5df24406c5..86e3ccad24 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -114,6 +114,10 @@
 
 	var/cansprint = 1
 
+	var/orebox = null
+
+/mob/living/silicon/robot
+
 /mob/living/silicon/robot/get_cell()
 	return cell
 
@@ -1298,4 +1302,12 @@
 
 /mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_health = 1)
 	if(istype(cell))
-		cell.charge -= amount*5
\ No newline at end of file
+		cell.charge -= amount*5
+
+/mob/living/silicon/robot/verb/viewmanifest()
+	set category = "Robot Commands"
+	set name = "View Crew Manifest"
+
+	if(usr.stat == DEAD)
+		return //won't work if dead
+	ai_roster()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 0f09b6f62a..7e06c66eff 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -13,7 +13,19 @@
 		spark_system.start()
 	return ..()
 
+/mob/living/silicon/robot/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+	. = ..()
+	if(.)
+		spark_system.start()
+		spawn(0)
+			step_away(src,user,15)
+			sleep(3)
+			step_away(src,user,15)
+
 /mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M)
+	. = ..()
+	if(!.) // the attack was blocked or was help/grab intent
+		return
 	if (M.a_intent == INTENT_DISARM)
 		if(!(lying))
 			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
@@ -30,24 +42,19 @@
 				visible_message("<span class='danger'>[M] has forced back [src]!</span>", \
 					"<span class='userdanger'>[M] has forced back [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 			playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
-	else
-		..()
-	return
 
 /mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime shock
-		flash_act()
-		var/stunprob = M.powerlevel * 7 + 10
-		if(prob(stunprob) && M.powerlevel >= 8)
-			adjustBruteLoss(M.powerlevel * rand(6,10))
-
-	var/damage = rand(1, 3)
-
+	. = ..()
+	if(!.) //unsuccessful slime shock
+		return
+	var/stunprob = M.powerlevel * 7 + 10
+	var/damage = M.powerlevel * rand(6,10)
+	if(prob(stunprob) && M.powerlevel >= 8)
+		flash_act(affect_silicon = TRUE) //my borg eyes!
 	if(M.is_adult)
-		damage = rand(20, 40)
+		damage += rand(10, 20)
 	else
-		damage = rand(5, 35)
-	damage = round(damage / 2) // borgs receive half damage
+		damage += rand(2, 17)
 	adjustBruteLoss(damage)
 	updatehealth()
 
@@ -56,23 +63,17 @@
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /mob/living/silicon/robot/attack_hand(mob/living/carbon/human/user)
 	add_fingerprint(user)
-	if(opened && !wiresexposed && !issilicon(user))
-		if(cell)
-			cell.update_icon()
-			cell.add_fingerprint(user)
-			user.put_in_active_hand(cell)
-			to_chat(user, "<span class='notice'>You remove \the [cell].</span>")
-			cell = null
-			update_icons()
-			diag_hud_set_borgcell()
+	if(opened && !wiresexposed && cell && !issilicon(user))
+		cell.update_icon()
+		cell.add_fingerprint(user)
+		user.put_in_active_hand(cell)
+		to_chat(user, "<span class='notice'>You remove \the [cell].</span>")
+		cell = null
+		update_icons()
+		diag_hud_set_borgcell()
 
 	if(!opened)
-		if(..()) // hulk attack
-			spark_system.start()
-			spawn(0)
-				step_away(src,user,15)
-				sleep(3)
-				step_away(src,user,15)
+		return ..()
 
 /mob/living/silicon/robot/fire_act()
 	if(!on_fire) //Silicons don't gain stacks from hotspots, but hotspots can ignite them
@@ -182,9 +183,9 @@
 			if (stat != DEAD)
 				adjustBruteLoss(30)
 
-/mob/living/silicon/robot/bullet_act(var/obj/item/projectile/Proj)
-	..(Proj)
+/mob/living/silicon/robot/bullet_act(obj/item/projectile/P, def_zone)
+	..()
 	updatehealth()
-	if(prob(75) && Proj.damage > 0)
+	if(prob(75) && P.damage > 0)
 		spark_system.start()
 	return 2
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index ece7fe9ecb..48e6f8c288 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -121,6 +121,10 @@
 		else if(istype(S, /obj/item/stack/marker_beacon))
 			S.cost = 1
 			S.source = get_or_create_estorage(/datum/robot_energy_storage/beacon)
+		
+		else if(istype(S, /obj/item/stack/packageWrap))
+			S.cost = 1
+			S.source = get_or_create_estorage(/datum/robot_energy_storage/wrapping_paper)
 
 		if(S && S.source)
 			S.materials = list()
@@ -139,6 +143,9 @@
 
 //Adds flavoursome dogborg items to dogborg variants without mechanical benefits
 /obj/item/robot_module/proc/dogborg_equip()
+	has_snowflake_deadsprite = TRUE
+	cyborg_pixel_offset = -16
+	hat_offset = INFINITY
 	var/obj/item/I = new /obj/item/analyzer/nose/flavour(src)
 	basic_modules += I
 	I = new /obj/item/soap/tongue/flavour(src)
@@ -362,30 +369,21 @@
 			sleeper_overlay = "msleeper"
 			moduleselect_icon = "medihound"
 			moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
-			hat_offset = INFINITY
 		if("Medihound Dark")
 			cyborg_base_icon = "medihounddark"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			sleeper_overlay = "mdsleeper"
 			moduleselect_icon = "medihound"
 			moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
-			hat_offset = INFINITY
 		if("Vale")
 			cyborg_base_icon = "valemed"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			sleeper_overlay = "valemedsleeper"
 			moduleselect_icon = "medihound"
 			moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
-			hat_offset = INFINITY
 		if("Alina")
 			cyborg_base_icon = "alina-med"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
@@ -393,10 +391,7 @@
 			sleeper_overlay = "alinasleeper"
 			moduleselect_icon = "medihound"
 			moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
-			hat_offset = INFINITY
 	return ..()
 
 /obj/item/robot_module/engineering
@@ -477,29 +472,20 @@
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
 		if("Pup Dozer")
 			cyborg_base_icon = "pupdozer"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			dogborg = TRUE
-			cyborg_pixel_offset = -16
 			sleeper_overlay = "dozersleeper"
+			dogborg = TRUE
 		if("Vale")
 			cyborg_base_icon = "valeeng"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			dogborg = TRUE
-			cyborg_pixel_offset = -16
 			sleeper_overlay = "valeengsleeper"
+			dogborg = TRUE
 		if("Alina")
 			cyborg_base_icon = "alina-eng"
 			special_light_key = "alina"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			dogborg = TRUE
-			cyborg_pixel_offset = -16
 			sleeper_overlay = "alinasleeper"
+			dogborg = TRUE
 	return ..()
 
 /obj/item/robot_module/security
@@ -558,36 +544,24 @@
 		if("K9")
 			cyborg_base_icon = "k9"
 			sleeper_overlay = "ksleeper"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
 		if("Alina")
 			cyborg_base_icon = "alina-sec"
 			special_light_key = "alina"
 			sleeper_overlay = "alinasleeper"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
 		if("K9 Dark")
 			cyborg_base_icon = "k9dark"
 			sleeper_overlay = "k9darksleeper"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
 		if("Vale")
 			cyborg_base_icon = "valesec"
 			sleeper_overlay = "valesecsleeper"
-			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
 	return ..()
 
 /obj/item/robot_module/security/Initialize()
@@ -673,11 +647,11 @@
 /obj/item/reagent_containers/spray/cyborg_drying
 	name = "drying agent spray"
 	color = "#A000A0"
-	list_reagents = list("drying_agent" = 250)
+	list_reagents = list(/datum/reagent/drying_agent = 250)
 
 /obj/item/reagent_containers/spray/cyborg_lube
 	name = "lube spray"
-	list_reagents = list("lube" = 250)
+	list_reagents = list(/datum/reagent/lube = 250)
 
 /obj/item/robot_module/clown
 	name = "Clown"
@@ -751,17 +725,17 @@
 	var/obj/item/reagent_containers/O = locate(/obj/item/reagent_containers/food/condiment/enzyme) in basic_modules
 	var/obj/item/lightreplacer/LR = locate(/obj/item/lightreplacer) in basic_modules
 	if(O)
-		O.reagents.add_reagent("enzyme", 2 * coeff)
+		O.reagents.add_reagent(/datum/reagent/consumable/enzyme, 2 * coeff)
 	if(LR)
 		for(var/i in 1 to coeff)
 			LR.Charge(R)
 	var/obj/item/reagent_containers/spray/cyborg_drying/CD = locate(/obj/item/reagent_containers/spray/cyborg_drying) in basic_modules
 	if(CD)
-		CD.reagents.add_reagent("drying_agent", 5 * coeff)
+		CD.reagents.add_reagent(/datum/reagent/drying_agent, 5 * coeff)
 
 	var/obj/item/reagent_containers/spray/cyborg_lube/CL = locate(/obj/item/reagent_containers/spray/cyborg_lube) in emag_modules
 	if(CL)
-		CL.reagents.add_reagent("lube", 2 * coeff)
+		CL.reagents.add_reagent(/datum/reagent/lube, 2 * coeff)
 
 /obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
@@ -795,24 +769,18 @@
 		if("(Service) DarkK9")
 			cyborg_base_icon = "k50"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			dogborg = TRUE
-			cyborg_pixel_offset = -16
 			sleeper_overlay = "ksleeper"
+			dogborg = TRUE
 		if("(Service) Vale")
 			cyborg_base_icon = "valeserv"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			dogborg = TRUE
-			cyborg_pixel_offset = -16
 			sleeper_overlay = "valeservsleeper"
+			dogborg = TRUE
 		if("(Service) ValeDark")
 			cyborg_base_icon = "valeservdark"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			dogborg = TRUE
-			cyborg_pixel_offset = -16
 			sleeper_overlay = "valeservsleeper"
+			dogborg = TRUE
 		if("(Janitor) Default")
 			cyborg_base_icon = "janitor"
 		if("(Janitor) Marina")
@@ -830,10 +798,8 @@
 		if("(Janitor) Scrubpuppy")
 			cyborg_base_icon = "scrubpup"
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
-			has_snowflake_deadsprite = TRUE
-			cyborg_pixel_offset = -16
-			dogborg = TRUE
 			sleeper_overlay = "jsleeper"
+			dogborg = TRUE
 	return ..()
 
 /obj/item/robot_module/miner
@@ -845,13 +811,19 @@
 		/obj/item/borg/sight/meson,
 		/obj/item/storage/bag/ore/cyborg,
 		/obj/item/pickaxe/drill/cyborg,
-		/obj/item/shovel,
+		/obj/item/twohanded/kinetic_crusher/cyborg,
 		/obj/item/weldingtool/mini,
 		/obj/item/storage/bag/sheetsnatcher/borg,
 		/obj/item/t_scanner/adv_mining_scanner,
 		/obj/item/gun/energy/kinetic_accelerator/cyborg,
+		/obj/item/gun/energy/plasmacutter/cyborg,
 		/obj/item/gps/cyborg,
-		/obj/item/stack/marker_beacon)
+		/obj/item/weapon/gripper/mining,
+		/obj/item/cyborg_clamp,
+		/obj/item/card/id/miningborg,
+		/obj/item/stack/marker_beacon,
+		/obj/item/destTagger,
+		/obj/item/stack/packageWrap)
 	emag_modules = list(/obj/item/borg/stun)
 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/miner,
@@ -863,7 +835,7 @@
 
 /obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
-	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid")
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid", "Blade")
 	if(!borg_icon)
 		return FALSE
 	switch(borg_icon)
@@ -891,6 +863,11 @@
 		if("Heavy")
 			cyborg_base_icon = "heavymin"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Blade")
+			cyborg_base_icon = "blade"
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			sleeper_overlay = "bladesleeper"
+			dogborg = TRUE
 	return ..()
 
 /obj/item/robot_module/syndicate
@@ -1036,3 +1013,8 @@
 	max_energy = 30
 	recharge_rate = 1
 	name = "Marker Beacon Storage"
+
+/datum/robot_energy_storage/wrapping_paper
+	max_energy = 30
+	recharge_rate = 1
+	name = "Wrapping Paper Storage"
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index b9cee43138..699105ac4c 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -389,6 +389,15 @@
 	if (aicamera)
 		return aicamera.selectpicture(user)
 
+/mob/living/silicon/proc/ai_roster()
+	var/dat = "<html><head><title>Crew Roster</title></head><body><b>Crew Roster:</b><br><br>"
+
+	dat += GLOB.data_core.get_manifest()
+	dat += "</body></html>"
+
+	src << browse(dat, "window=airoster")
+	onclose(src, "airoster")
+
 /mob/living/silicon/update_transform()
 	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
 	var/changed = 0
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 073a2eec2b..ca8ad25713 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -6,7 +6,10 @@
 	return 2
 
 /mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(..()) //if harm or disarm intent
+	. = ..()
+	if(!.) // the attack was blocked or was help/grab intent
+		return
+	if(M.a_intent == INTENT_HARM)
 		var/damage = 20
 		if (prob(90))
 			log_combat(M, src, "attacked")
@@ -49,34 +52,33 @@
 /mob/living/silicon/attack_paw(mob/living/user)
 	return attack_hand(user)
 
-/mob/living/silicon/attack_larva(mob/living/carbon/alien/larva/L)
-	if(L.a_intent == INTENT_HELP)
-		visible_message("[L.name] rubs its head against [src].")
-
-/mob/living/silicon/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/silicon/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
 	if(user.a_intent == INTENT_HARM)
-		..(user, 1)
+		. = ..(user, TRUE)
+		if(.)
+			return
 		adjustBruteLoss(rand(10, 15))
 		playsound(loc, "punch", 25, 1, -1)
 		visible_message("<span class='danger'>[user] has punched [src]!</span>", \
 				"<span class='userdanger'>[user] has punched [src]!</span>")
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
-//ATTACK HAND IGNORING PARENT RETURN VALUE
 /mob/living/silicon/attack_hand(mob/living/carbon/human/M)
+	. = ..()
+	if(.) //the attack was blocked
+		return
 	switch(M.a_intent)
-		if ("help")
+		if (INTENT_HELP)
 			M.visible_message("[M] pets [src].", \
 							"<span class='notice'>You pet [src].</span>")
-		if("grab")
+		if(INTENT_GRAB)
 			grabbedby(M)
 		else
 			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 			playsound(src.loc, 'sound/effects/bang.ogg', 10, 1)
 			visible_message("<span class='danger'>[M] punches [src], but doesn't leave a dent.</span>", \
 				"<span class='warning'>[M] punches [src], but doesn't leave a dent.</span>", null, COMBAT_MESSAGE_RANGE)
-	return 0
 
 /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)
 	if(M.a_intent == INTENT_HARM)
@@ -108,19 +110,25 @@
 			M.visible_message("<span class='boldwarning'>[M] is thrown off of [src]!</span>")
 	flash_act(affect_silicon = 1)
 
-/mob/living/silicon/bullet_act(obj/item/projectile/Proj)
-	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
-		adjustBruteLoss(Proj.damage)
-		if(prob(Proj.damage*1.5))
+/mob/living/silicon/bullet_act(obj/item/projectile/P, def_zone)
+	if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself
+		if(reflect_bullet_check(P, def_zone))
+			return -1 // complete projectile permutation
+		if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
+			P.on_hit(src, 100, def_zone)
+			return 2
+	if((P.damage_type == BRUTE || P.damage_type == BURN))
+		adjustBruteLoss(P.damage)
+		if(prob(P.damage*1.5))
 			for(var/mob/living/M in buckled_mobs)
 				M.visible_message("<span class='boldwarning'>[M] is knocked off of [src]!</span>")
 				unbuckle_mob(M)
 				M.Knockdown(40)
-	if(Proj.stun || Proj.knockdown)
+	if(P.stun || P.knockdown)
 		for(var/mob/living/M in buckled_mobs)
 			unbuckle_mob(M)
-			M.visible_message("<span class='boldwarning'>[M] is knocked off of [src] by the [Proj]!</span>")
-	Proj.on_hit(src)
+			M.visible_message("<span class='boldwarning'>[M] is knocked off of [src] by the [P]!</span>")
+	P.on_hit(src)
 	return 2
 
 /mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/static)
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 793df63c87..0dfa126e79 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -1,20 +1,22 @@
 
 
 /mob/living/simple_animal/attack_hand(mob/living/carbon/human/M)
-	..()
+	. = ..()
+	if(.) //the attack was blocked
+		return
 	switch(M.a_intent)
-		if("help")
+		if(INTENT_HELP)
 			if (health > 0)
 				visible_message("<span class='notice'>[M] [response_help] [src].</span>")
 				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
-		if("grab")
+		if(INTENT_GRAB)
 			if(grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
 				vore_attack(M, pulling)
 			else
 				grabbedby(M)
 
-		if("harm", "disarm")
+		if(INTENT_HARM, INTENT_DISARM)
 			if(HAS_TRAIT(M, TRAIT_PACIFISM))
 				to_chat(M, "<span class='notice'>You don't want to hurt [src]!</span>")
 				return
@@ -27,12 +29,11 @@
 			updatehealth()
 			return TRUE
 
-/mob/living/simple_animal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/simple_animal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
 	if(user.a_intent == INTENT_HARM)
-		if(HAS_TRAIT(user, TRAIT_PACIFISM))
-			to_chat(user, "<span class='notice'>You don't want to hurt [src]!</span>")
-			return FALSE
-		..(user, 1)
+		. = ..(user, TRUE)
+		if(.)
+			return
 		playsound(loc, "punch", 25, 1, -1)
 		visible_message("<span class='danger'>[user] has punched [src]!</span>", \
 			"<span class='userdanger'>[user] has punched [src]!</span>", null, COMBAT_MESSAGE_RANGE)
@@ -40,32 +41,32 @@
 		return TRUE
 
 /mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M)
-	if(..()) //successful monkey bite.
-		if(stat != DEAD)
-			var/damage = rand(1, 3)
-			attack_threshold_check(damage)
-			return 1
+	. = ..()
+	if(.) //successful larva bite
+		var/damage = rand(1, 3)
+		attack_threshold_check(damage)
+		return 1
 	if (M.a_intent == INTENT_HELP)
 		if (health > 0)
 			visible_message("<span class='notice'>[M.name] [response_help] [src].</span>")
 			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
-
 /mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(..()) //if harm or disarm intent.
-		if(M.a_intent == INTENT_DISARM)
-			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-			visible_message("<span class='danger'>[M] [response_disarm] [name]!</span>", \
-					"<span class='userdanger'>[M] [response_disarm] [name]!</span>", null, COMBAT_MESSAGE_RANGE)
-			log_combat(M, src, "disarmed")
-		else
-			var/damage = rand(15, 30)
-			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
-					"<span class='userdanger'>[M] has slashed at [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-			playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-			attack_threshold_check(damage)
-			log_combat(M, src, "attacked")
-		return 1
+	. = ..()
+	if(!.) // the attack was blocked or was help/grab intent
+		return
+	if(M.a_intent == INTENT_DISARM)
+		playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+		visible_message("<span class='danger'>[M] [response_disarm] [name]!</span>", \
+				"<span class='userdanger'>[M] [response_disarm] [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+		log_combat(M, src, "disarmed")
+	else
+		var/damage = rand(15, 30)
+		visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
+				"<span class='userdanger'>[M] has slashed at [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+		playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+		attack_threshold_check(damage)
+		log_combat(M, src, "attacked")
 
 /mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L)
 	. = ..()
@@ -82,7 +83,8 @@
 		return attack_threshold_check(damage, M.melee_damage_type)
 
 /mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
+	. = ..()
+	if(.) //successful slime shock
 		var/damage = rand(15, 25)
 		if(M.is_adult)
 			damage = rand(20, 35)
diff --git a/code/modules/mob/living/simple_animal/astral.dm b/code/modules/mob/living/simple_animal/astral.dm
index 3d0c335989..472cbd7414 100644
--- a/code/modules/mob/living/simple_animal/astral.dm
+++ b/code/modules/mob/living/simple_animal/astral.dm
@@ -44,7 +44,7 @@
 		if(isliving(A))
 			if(ishuman(A))
 				var/mob/living/carbon/human/H = A
-				if(H.reagents.has_reagent("astral") && !H.mind)
+				if(H.reagents.has_reagent(/datum/reagent/fermi/astral) && !H.mind)
 					var/datum/reagent/fermi/astral/As = locate(/datum/reagent/fermi/astral) in H.reagents.reagent_list
 					if(As.originalmind == src.mind && As.current_cycle < 10 && H.stat != DEAD) //So you can return to your body.
 						to_chat(src, "<span class='warning'><b><i>The intensity of the astrogen in your body is too much allow you to return to yourself yet!</b></i></span>")
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 396c6de166..cae707ce46 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -318,9 +318,9 @@
 		sleep(50)
 		if(mode == BOT_REPAIRING && src.loc == target_turf)
 			if(autotile) //Build the floor and include a tile.
-				target_turf.PlaceOnTop(/turf/open/floor/plasteel)
+				target_turf.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
 			else //Build a hull plating without a floor tile.
-				target_turf.PlaceOnTop(/turf/open/floor/plating)
+				target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 
 	else
 		var/turf/open/floor/F = target_turf
@@ -334,7 +334,7 @@
 			if(mode == BOT_REPAIRING && F && src.loc == F)
 				F.broken = 0
 				F.burnt = 0
-				F.PlaceOnTop(/turf/open/floor/plasteel)
+				F.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
 
 		if(replacetiles && F.type != initial(tiletype.turf_type) && specialtiles && !isplatingturf(F))
 			anchored = TRUE
@@ -345,7 +345,7 @@
 			if(mode == BOT_REPAIRING && F && src.loc == F)
 				F.broken = 0
 				F.burnt = 0
-				F.PlaceOnTop(initial(tiletype.turf_type))
+				F.PlaceOnTop(initial(tiletype.turf_type), flags = CHANGETURF_INHERIT_AIR)
 				specialtiles -= 1
 				if(specialtiles == 0)
 					speak("Requesting refill of custom floortiles to continue replacing.")
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 2de4ca39fd..109c7b4636 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -113,7 +113,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"},
 		mode = BOT_HUNT
 
 /mob/living/simple_animal/bot/honkbot/attack_hand(mob/living/carbon/human/H)
-	if(H.a_intent == "harm")
+	if(H.a_intent == INTENT_HARM)
 		retaliate(H)
 		addtimer(CALLBACK(src, .proc/react_buzz), 5)
 	return ..()
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index fed770d0b0..13e9299b1d 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -43,17 +43,17 @@
 	var/declare_cooldown = 0 //Prevents spam of critical patient alerts.
 	var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
 	//Setting which reagents to use to treat what by default. By id.
-	var/treatment_brute_avoid = "tricordrazine"
-	var/treatment_brute = "bicaridine"
+	var/treatment_brute_avoid = /datum/reagent/medicine/tricordrazine
+	var/treatment_brute = /datum/reagent/medicine/bicaridine
 	var/treatment_oxy_avoid = null
-	var/treatment_oxy = "dexalin"
-	var/treatment_fire_avoid = "tricordrazine"
-	var/treatment_fire = "kelotane"
-	var/treatment_tox_avoid = "tricordrazine"
-	var/treatment_tox = "charcoal"
-	var/treatment_tox_toxlover = "toxin"
+	var/treatment_oxy = /datum/reagent/medicine/dexalin
+	var/treatment_fire_avoid = /datum/reagent/medicine/tricordrazine
+	var/treatment_fire = /datum/reagent/medicine/kelotane
+	var/treatment_tox_avoid = /datum/reagent/medicine/tricordrazine
+	var/treatment_tox = /datum/reagent/medicine/charcoal
+	var/treatment_tox_toxlover = /datum/reagent/toxin
 	var/treatment_virus_avoid = null
-	var/treatment_virus = "spaceacillin"
+	var/treatment_virus = /datum/reagent/medicine/spaceacillin
 	var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
 	var/shut_up = 0 //self explanatory :)
 
@@ -61,9 +61,9 @@
 	name = "\improper Mysterious Medibot"
 	desc = "International Medibot of mystery."
 	skin = "bezerk"
-	treatment_brute = "tricordrazine"
-	treatment_fire = "tricordrazine"
-	treatment_tox = "tricordrazine"
+	treatment_brute = /datum/reagent/medicine/tricordrazine
+	treatment_fire = /datum/reagent/medicine/tricordrazine
+	treatment_tox = /datum/reagent/medicine/tricordrazine
 
 /mob/living/simple_animal/bot/medbot/derelict
 	name = "\improper Old Medibot"
@@ -71,13 +71,13 @@
 	skin = "bezerk"
 	heal_threshold = 0
 	declare_crit = 0
-	treatment_oxy = "pancuronium"
+	treatment_oxy = /datum/reagent/toxin/pancuronium
 	treatment_brute_avoid = null
-	treatment_brute = "pancuronium"
+	treatment_brute = /datum/reagent/toxin/pancuronium
 	treatment_fire_avoid = null
-	treatment_fire = "sodium_thiopental"
+	treatment_fire = /datum/reagent/toxin/sodium_thiopental
 	treatment_tox_avoid = null
-	treatment_tox = "sodium_thiopental"
+	treatment_tox = /datum/reagent/toxin/sodium_thiopental
 
 /mob/living/simple_animal/bot/medbot/update_icon()
 	cut_overlays()
@@ -369,8 +369,9 @@
 
 	//If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
 	if((reagent_glass) && (use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
-		for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
-			if(!C.reagents.has_reagent(R.id))
+		for(var/A in reagent_glass.reagents.reagent_list)
+			var/datum/reagent/R = A
+			if(!C.reagents.has_reagent(R.type))
 				return TRUE
 
 	//They're injured enough for it!
@@ -477,8 +478,9 @@
 
 		//If the patient is injured but doesn't have our special reagent in them then we should give it to them first
 		if(reagent_id && use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
-			for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
-				if(!C.reagents.has_reagent(R.id))
+			for(var/A in reagent_glass.reagents.reagent_list)
+				var/datum/reagent/R = A
+				if(!C.reagents.has_reagent(R.type))
 					reagent_id = "internal_beaker"
 					break
 
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 426de81da0..43963b4eef 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -151,7 +151,8 @@
 	return
 
 /mob/living/simple_animal/bot/mulebot/bullet_act(obj/item/projectile/Proj)
-	if(..())
+	. = ..()
+	if(. && !QDELETED(src)) //Got hit and not blown up yet.
 		if(prob(50) && !isnull(load))
 			unload(0)
 		if(prob(25))
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index ee770fc2ca..bfe7b2cde0 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -54,7 +54,7 @@
 	var/atom/Tsec = drop_location()
 	new /obj/item/stock_parts/cell/potato(Tsec)
 	var/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/S = new(Tsec)
-	S.reagents.add_reagent("whiskey", 15)
+	S.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15)
 	S.on_reagent_change(ADD_REAGENT)
 	..()
 
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 02e171e4c4..dacf8c4833 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -38,6 +38,10 @@
 	. = ..()
 	verbs += /mob/living/proc/lay_down
 
+/mob/living/simple_animal/pet/cat/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/wuv, "purrs!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "hisses!", EMOTE_AUDIBLE)
+
 /mob/living/simple_animal/pet/cat/update_canmove()
 	..()
 	if(client && stat != DEAD)
@@ -229,24 +233,6 @@
 				stop_automated_movement = 1
 				walk_to(src,movement_target,0,3)
 
-/mob/living/simple_animal/pet/cat/attack_hand(mob/living/carbon/human/M)
-	. = ..()
-	switch(M.a_intent)
-		if("help")
-			wuv(1, M)
-		if("harm")
-			wuv(-1, M)
-
-/mob/living/simple_animal/pet/cat/proc/wuv(change, mob/M)
-	if(change)
-		if(change > 0)
-			if(M && stat != DEAD)
-				new /obj/effect/temp_visual/heart(loc)
-				emote("me", EMOTE_VISIBLE, "purrs!")
-		else
-			if(M && stat != DEAD)
-				emote("me", EMOTE_VISIBLE, "hisses!")
-
 /mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie
 	name = "Keeki"
 	desc = "It's a cat made out of cake."
@@ -290,10 +276,12 @@
 			D.decorate_donut()
 
 /mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
-	..()
+	. = ..()
+	if(.) //the attack was blocked
+		return
 	if(L.a_intent == INTENT_HARM && L.reagents && !stat)
-		L.reagents.add_reagent("nutriment", 0.4)
-		L.reagents.add_reagent("vitamin", 0.4)
+		L.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4)
+		L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4)
 
 //Cat made
 /mob/living/simple_animal/pet/cat/custom_cat
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 0d933d171b..2371cfd7f1 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -16,6 +16,11 @@
 
 	do_footstep = TRUE
 	can_be_held = TRUE
+
+/mob/living/simple_animal/pet/dog/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/wuv, "yaps_happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE)
+
 //Corgis and pugs are now under one dog subtype
 
 /mob/living/simple_animal/pet/dog/corgi
@@ -268,7 +273,7 @@
 		return
 	if(!item_to_add)
 		user.visible_message("[user] pets [src].","<span class='notice'>You rest your hand on [src]'s head for a moment.</span>")
-		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, src, /datum/mood_event/pet_animal, src)
 		return
 
 	if(user && !user.temporarilyRemoveItemFromInventory(item_to_add))
@@ -639,22 +644,3 @@
 				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 					setDir(i)
 					sleep(1)
-
-/mob/living/simple_animal/pet/dog/attack_hand(mob/living/carbon/human/M)
-	. = ..()
-	switch(M.a_intent)
-		if("help")
-			wuv(1,M)
-		if("harm")
-			wuv(-1,M)
-
-/mob/living/simple_animal/pet/dog/proc/wuv(change, mob/M)
-	if(change)
-		if(change > 0)
-			if(M && stat != DEAD) // Added check to see if this mob (the dog) is dead to fix issue 2454
-				new /obj/effect/temp_visual/heart(loc)
-				emote("me", EMOTE_VISIBLE, "yaps happily!")
-				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
-		else
-			if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
-				emote("me", EMOTE_VISIBLE, "growls!")
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 521f458e2f..0f7b534d4f 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -130,6 +130,7 @@
 	hacked = TRUE
 	visualAppearence = CLOCKDRONE
 	can_be_held = FALSE
+	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	flavortext = "<b><span class='nezbere'>You are a cogscarab,</span> a tiny building construct of Ratvar. While you're weak and can't recite scripture, \
 	you have a set of quick tools, as well as a replica fabricator that can create brass and convert objects.<br><br>Work with the servants of Ratvar \
 	to construct and maintain defenses at the City of Cogs. If there are no servants, use this time to experiment with base designs!"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index e40eb585e8..c9207fcf89 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -31,9 +31,9 @@
 
 //picky up the drone c:
 /mob/living/simple_animal/drone/attack_hand(mob/user)
-	..()
-	if(user.a_intent == INTENT_HELP)
-		mob_try_pickup(user)
+	if(user.a_intent != INTENT_HELP)
+		return ..() // TODO: convert picking up mobs into an element or component.
+	mob_try_pickup(user)
 
 /mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user)
 	var/mob/dead/observer/G = get_ghost()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 2679c68b52..6754f94b01 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -455,12 +455,12 @@
 
 /obj/item/udder/Initialize()
 	create_reagents(50)
-	reagents.add_reagent("milk", 20)
+	reagents.add_reagent(/datum/reagent/consumable/milk, 20)
 	. = ..()
 
 /obj/item/udder/proc/generateMilk()
 	if(prob(5))
-		reagents.add_reagent("milk", rand(5, 10))
+		reagents.add_reagent(/datum/reagent/consumable/milk, rand(5, 10))
 
 /obj/item/udder/proc/milkAnimal(obj/O, mob/user)
 	var/obj/item/reagent_containers/glass/G = O
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index fec75e4a36..69d9a0eef3 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -117,9 +117,9 @@
 	icon_state = "mouse_gray_dead"
 	bitesize = 3
 	eatverb = "devour"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GROSS | MEAT | RAW
-	grind_results = list("blood" = 20, "liquidgibs" = 5)
+	grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
 
 /obj/item/reagent_containers/food/snacks/deadmouse/on_grind()
 	reagents.clear_reagents()
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index 2f37857902..95838c9acb 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -1,6 +1,6 @@
 /mob/living/simple_animal/hostile/retaliate/poison
 	var/poison_per_bite = 0
-	var/poison_type = "toxin"
+	var/poison_type = /datum/reagent/toxin
 
 /mob/living/simple_animal/hostile/retaliate/poison/AttackingTarget()
 	. = ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 1bd434b233..62c8588ac8 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -424,9 +424,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in guardians
 		if(G)
 			to_chat(src, "<span class='holoparasite'>You attempt to reset <font color=\"[G.namedatum.colour]\"><b>[G.real_name]</b></font>'s personality...</span>")
-			var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
+			var/list/mob/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
 			if(LAZYLEN(candidates))
-				var/mob/dead/observer/C = pick(candidates)
+				var/mob/C = pick(candidates)
 				to_chat(G, "<span class='holoparasite'>Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.</span>")
 				to_chat(src, "<span class='holoparasite bold'>Your <font color=\"[G.namedatum.colour]\">[G.real_name]</font> has been successfully reset.</span>")
 				message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(G)])")
@@ -498,10 +498,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		return
 	used = TRUE
 	to_chat(user, "[use_message]")
-	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
+	var/list/mob/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
 
 	if(LAZYLEN(candidates))
-		var/mob/dead/observer/C = pick(candidates)
+		var/mob/C = pick(candidates)
 		spawn_guardian(user, C.key)
 	else
 		to_chat(user, "[failure_message]")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
index 49514d0d12..914d38022f 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
@@ -54,10 +54,8 @@
 			var/blocked = FALSE
 			if(hasmatchingsummoner(A)) //if the summoner matches don't hurt them
 				blocked = TRUE
-			if(ishuman(A))
-				var/mob/living/carbon/human/H = A
-				if(H.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
-					blocked = TRUE
+			if(L.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
+				blocked = TRUE
 			if(!blocked)
 				L.drop_all_held_items()
 				L.visible_message("<span class='danger'>[src] slams into [L]!</span>", "<span class='userdanger'>[src] slams into you!</span>")
diff --git a/code/modules/mob/living/simple_animal/hostile/banana_spider.dm b/code/modules/mob/living/simple_animal/hostile/banana_spider.dm
index 81dc9d3e24..f3ce343bfd 100644
--- a/code/modules/mob/living/simple_animal/hostile/banana_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/banana_spider.dm
@@ -96,10 +96,10 @@
 	icon_state = "bananaspider"
 	bitesize = 3
 	eatverb = "devours"
-	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GROSS | MEAT | RAW
-	grind_results = list("blood" = 20, "liquidgibs" = 5)
-	juice_results = list("banana" = 0)
+	grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
+	juice_results = list(/datum/reagent/consumable/banana = 0)
 
 
 /obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize()
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 89c4f70f69..bb1f1284b5 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -140,7 +140,7 @@
 			var/mob/living/L = target
 			if(L.reagents)
 				beegent.reaction_mob(L, INJECT)
-				L.reagents.add_reagent(beegent.id, rand(1,5))
+				L.reagents.add_reagent(beegent.type, rand(1,5))
 
 
 /mob/living/simple_animal/hostile/poison/bees/proc/assign_reagent(datum/reagent/R)
@@ -205,7 +205,7 @@
 /mob/living/simple_animal/hostile/poison/bees/toxin/Initialize()
 	. = ..()
 	var/datum/reagent/R = pick(typesof(/datum/reagent/toxin))
-	assign_reagent(GLOB.chemical_reagents_list[initial(R.id)])
+	assign_reagent(GLOB.chemical_reagents_list[R])
 
 /mob/living/simple_animal/hostile/poison/bees/queen
 	name = "queen bee"
@@ -225,7 +225,7 @@
 	if(. && beegent && isliving(target))
 		var/mob/living/L = target
 		beegent.reaction_mob(L, TOUCH)
-		L.reagents.add_reagent(beegent.id, rand(1,5))
+		L.reagents.add_reagent(beegent.type, rand(1,5))
 
 
 //PEASENT BEES
@@ -236,7 +236,7 @@
 /mob/living/simple_animal/hostile/poison/bees/proc/reagent_incompatible(mob/living/simple_animal/hostile/poison/bees/B)
 	if(!B)
 		return FALSE
-	if(B.beegent && beegent && B.beegent.id != beegent.id || B.beegent && !beegent || !B.beegent && beegent)
+	if(B.beegent && beegent && B.beegent.type != beegent.type || B.beegent && !beegent || !B.beegent && beegent)
 		return TRUE
 	return FALSE
 
@@ -253,9 +253,10 @@
 /obj/item/queen_bee/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers/syringe))
 		var/obj/item/reagent_containers/syringe/S = I
-		if(S.reagents.has_reagent("royal_bee_jelly")) //checked twice, because I really don't want royal bee jelly to be duped
-			if(S.reagents.has_reagent("royal_bee_jelly",5))
-				S.reagents.remove_reagent("royal_bee_jelly", 5)
+		var/jelly_amount = S.reagents.get_reagent_amount(/datum/reagent/royal_bee_jelly)
+		if(jelly_amount)
+			if(jelly_amount >= 5)
+				S.reagents.remove_reagent(/datum/reagent/royal_bee_jelly, 5)
 				var/obj/item/queen_bee/qb = new(user.drop_location())
 				qb.queen = new(qb)
 				if(queen && queen.beegent)
@@ -266,8 +267,8 @@
 				to_chat(user, "<span class='warning'>You don't have enough royal bee jelly to split a bee in two!</span>")
 		else
 			var/datum/reagent/R = GLOB.chemical_reagents_list[S.reagents.get_master_reagent_id()]
-			if(R && S.reagents.has_reagent(R.id, 5))
-				S.reagents.remove_reagent(R.id,5)
+			if(R && S.reagents.has_reagent(R.type, 5))
+				S.reagents.remove_reagent(R.type,5)
 				queen.assign_reagent(R)
 				user.visible_message("<span class='warning'>[user] injects [src]'s genome with [R.name], mutating it's DNA!</span>","<span class='warning'>You inject [src]'s genome with [R.name], mutating it's DNA!</span>")
 				name = queen.name
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 69209f7266..2e7c0ff455 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -6,7 +6,7 @@
 
 /mob/living/simple_animal/hostile/poison
 	var/poison_per_bite = 5
-	var/poison_type = "toxin"
+	var/poison_type = /datum/reagent/toxin
 
 /mob/living/simple_animal/hostile/poison/AttackingTarget()
 	. = ..()
@@ -158,7 +158,7 @@
 	melee_damage_upper = 1
 	poison_per_bite = 12
 	move_to_delay = 4
-	poison_type = "venom" //all in venom, glass cannon. you bite 5 times and they are DEFINITELY dead, but 40 health and you are extremely obvious. Ambush, maybe?
+	poison_type = /datum/reagent/toxin/venom //all in venom, glass cannon. you bite 5 times and they are DEFINITELY dead, but 40 health and you are extremely obvious. Ambush, maybe?
 	speed = 1
 	gold_core_spawnable = NO_SPAWN
 
@@ -217,7 +217,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 1500
-	poison_type = "frostoil"
+	poison_type = /datum/reagent/consumable/frostoil
 	color = rgb(114,228,250)
 	gold_core_spawnable = NO_SPAWN
 
@@ -226,7 +226,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 1500
-	poison_type = "frostoil"
+	poison_type = /datum/reagent/consumable/frostoil
 	color = rgb(114,228,250)
 	gold_core_spawnable = NO_SPAWN
 
@@ -235,7 +235,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 1500
-	poison_type = "frostoil"
+	poison_type = /datum/reagent/consumable/frostoil
 	color = rgb(114,228,250)
 	gold_core_spawnable = NO_SPAWN
 
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
index d1e8f1f49e..34903a477b 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
@@ -42,7 +42,7 @@
 	..()
 	if(iscarbon(target))
 		var/mob/living/carbon/C = target
-		C.reagents.add_reagent("leaper_venom", 5)
+		C.reagents.add_reagent(/datum/reagent/toxin/leaper_venom, 5)
 		return
 	if(isanimal(target))
 		var/mob/living/simple_animal/L = target
@@ -96,7 +96,7 @@
 			L.Knockdown(50)
 			if(iscarbon(L))
 				var/mob/living/carbon/C = L
-				C.reagents.add_reagent("leaper_venom", 5)
+				C.reagents.add_reagent(/datum/reagent/toxin/leaper_venom, 5)
 			if(isanimal(L))
 				var/mob/living/simple_animal/A = L
 				A.adjustHealth(25)
@@ -105,7 +105,6 @@
 
 /datum/reagent/toxin/leaper_venom
 	name = "Leaper venom"
-	id = "leaper_venom"
 	description = "A toxin spat out by leapers that, while harmless in small doses, quickly creates a toxic reaction if too much is in the body."
 	color = "#801E28" // rgb: 128, 30, 40
 	toxpwr = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 51a9d8d62b..c2c9f5a71f 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -486,10 +486,7 @@ Difficulty: Very Hard
 				if(isturf(Stuff))
 					var/turf/T = Stuff
 					if((isspaceturf(T) || isfloorturf(T)) && NewTerrainFloors)
-						var/turf/open/O = T.ChangeTurf(NewTerrainFloors)
-						if(O.air)
-							var/datum/gas_mixture/G = O.air
-							G.copy_from_turf(O)
+						var/turf/open/O = T.ChangeTurf(NewTerrainFloors, flags = CHANGETURF_INHERIT_AIR)
 						if(prob(florachance) && NewFlora.len && !is_blocked_turf(O, TRUE))
 							var/atom/Picked = pick(NewFlora)
 							new Picked(O)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 8c2fbef15e..c6386540f7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -25,7 +25,7 @@
 	mob_size = MOB_SIZE_LARGE
 	layer = LARGE_MOB_LAYER //Looks weird with them slipping under mineral walls and cameras and shit otherwise
 	mouse_opacity = MOUSE_OPACITY_OPAQUE // Easier to click on in melee, they're giant targets anyway
-	flags_1 = PREVENT_CONTENTS_EXPLOSION_1
+	flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1
 	var/list/crusher_loot
 	var/medal_type
 	var/score_type = BOSS_SCORE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 0a8320788e..199def430e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -240,7 +240,8 @@ obj/structure/elite_tumor/proc/return_elite()
 	INVOKE_ASYNC(src, .proc/fighters_check)  //Checks to see if our fighters died.
 	INVOKE_ASYNC(src, .proc/arena_trap)  //Gets another arena trap queued up for when this one runs out.
 	INVOKE_ASYNC(src, .proc/border_check)  //Checks to see if our fighters got out of the arena somehow.
-	addtimer(CALLBACK(src, .proc/arena_checks), 50)
+	if(!QDELETED(src))
+		addtimer(CALLBACK(src, .proc/arena_checks), 50)
 
 /obj/structure/elite_tumor/proc/fighters_check()
 	if(activator != null && activator.stat == DEAD || activity == TUMOR_ACTIVE && QDELETED(activator))
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
index 910e9c3c4a..9e9fbaeab8 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
@@ -131,7 +131,7 @@
 
 /obj/item/udder/gutlunch/generateMilk()
 	if(prob(60))
-		reagents.add_reagent("cream", rand(2, 5))
+		reagents.add_reagent(/datum/reagent/consumable/cream, rand(2, 5))
 	if(prob(45))
-		reagents.add_reagent("salglu_solution", rand(2,5))
+		reagents.add_reagent(/datum/reagent/medicine/salglu_solution, rand(2,5))
 
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index 05dec578bd..03d2365016 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -20,7 +20,7 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	mob_size = MOB_SIZE_LARGE
 	var/icon_aggro = null
-	var/crusher_drop_mod = 5
+	var/crusher_drop_mod = 25
 
 /mob/living/simple_animal/hostile/asteroid/Initialize(mapload)
 	. = ..()
@@ -58,7 +58,7 @@
 /mob/living/simple_animal/hostile/asteroid/death(gibbed)
 	SSblackbox.record_feedback("tally", "mobs_killed_mining", 1, type)
 	var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
-	if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 20 creatures before getting the item
+	if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 4 creatures before getting the item
 		spawn_crusher_loot()
 	..(gibbed)
 
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
index e3c81b2639..27ebb71c0e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
@@ -91,5 +91,5 @@
 	visible_message("<span class='boldannounce'>The tendril falls inward, the ground around it widening into a yawning chasm!</span>")
 	for(var/turf/T in range(2,src))
 		if(!T.density)
-			T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland)
+			T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR)
 	qdel(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 514edf896b..8301489e8c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -166,7 +166,9 @@
 	..()
 
 /mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M)
-	..()
+	. = ..()
+	if(.) // the attack was blocked
+		return
 	if(M.a_intent == INTENT_HARM)
 		Bruise()
 
@@ -185,6 +187,6 @@
 	var/counter
 	for(counter=0, counter<=powerlevel, counter++)
 		var/obj/item/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/reagent_containers/food/snacks/hugemushroomslice(src.loc)
-		S.reagents.add_reagent("mushroomhallucinogen", powerlevel)
-		S.reagents.add_reagent("omnizine", powerlevel)
-		S.reagents.add_reagent("synaptizine", powerlevel)
+		S.reagents.add_reagent(/datum/reagent/drug/mushroomhallucinogen, powerlevel)
+		S.reagents.add_reagent(/datum/reagent/medicine/omnizine, powerlevel)
+		S.reagents.add_reagent(/datum/reagent/medicine/synaptizine, powerlevel)
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index d1e10ea693..107a6eed38 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -141,9 +141,9 @@
 	. = ..()
 	remove_movespeed_modifier(MOVESPEED_ID_SLIME_REAGENTMOD, TRUE)
 	var/amount = 0
-	if(reagents.has_reagent("morphine")) // morphine slows slimes down
+	if(reagents.has_reagent(/datum/reagent/medicine/morphine)) // morphine slows slimes down
 		amount = 2
-	if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow
+	if(reagents.has_reagent(/datum/reagent/consumable/frostoil)) // Frostoil also makes them move VEEERRYYYYY slow
 		amount = 5
 	if(amount)
 		add_movespeed_modifier(MOVESPEED_ID_SLIME_REAGENTMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount)
@@ -253,33 +253,34 @@
 	return
 
 /mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		if(M == src)
-			return
-		if(buckled)
-			Feedstop(silent = TRUE)
-			visible_message("<span class='danger'>[M] pulls [src] off!</span>")
-			return
-		attacked += 5
-		if(nutrition >= 100) //steal some nutrition. negval handled in life()
-			nutrition -= (50 + (40 * M.is_adult))
-			M.add_nutrition(50 + (40 * M.is_adult))
-		if(health > 0)
-			M.adjustBruteLoss(-10 + (-10 * M.is_adult))
-			M.updatehealth()
+	. = ..()
+	if(!. || M == src) //unsuccessful slime shock
+		return
+	if(buckled)
+		Feedstop(silent = TRUE)
+		visible_message("<span class='danger'>[M] pulls [src] off!</span>")
+		return
+	attacked += 5
+	if(nutrition >= 100) //steal some nutrition. negval handled in life()
+		nutrition -= (50 + (40 * M.is_adult))
+		M.add_nutrition(50 + (40 * M.is_adult))
+	if(health > 0)
+		M.adjustBruteLoss(-10 + (-10 * M.is_adult))
+		M.updatehealth()
 
 /mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M)
 	. = ..()
 	if(.)
 		attacked += 10
 
-
 /mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M)
-	if(..()) //successful monkey bite.
+	. = ..()
+	if(.)//successful monkey bite.
 		attacked += 10
 
 /mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L)
-	if(..()) //successful larva bite.
+	. = ..()
+	if(.) //successful larva bite.
 		attacked += 10
 
 /mob/living/simple_animal/slime/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
@@ -321,9 +322,11 @@
 			attacked += 10
 
 /mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(..()) //if harm or disarm intent.
-		attacked += 10
-		discipline_slime(M)
+	. = ..()
+	if(!.) // the attack was blocked or was help/grab intent
+		return
+	attacked += 10
+	discipline_slime(M)
 
 
 /mob/living/simple_animal/slime/attackby(obj/item/W, mob/living/user, params)
diff --git a/code/modules/mob/living/update_icons.dm b/code/modules/mob/living/update_icons.dm
new file mode 100644
index 0000000000..8bf0dc98a9
--- /dev/null
+++ b/code/modules/mob/living/update_icons.dm
@@ -0,0 +1,26 @@
+//IMPORTANT: Multiple animate() calls do not stack well, so try to do them all at once if you can.
+/mob/living/update_transform()
+	var/matrix/ntransform = matrix(transform) //aka transform.Copy()
+	var/final_pixel_y = pixel_y
+	var/final_dir = dir
+	var/changed = 0
+	if(lying != lying_prev && rotate_on_lying)
+		changed++
+		ntransform.TurnTo(lying_prev,lying)
+		if(lying == 0) //Lying to standing
+			final_pixel_y = get_standard_pixel_y_offset()
+		else //if(lying != 0)
+			if(lying_prev == 0) //Standing to lying
+				pixel_y = get_standard_pixel_y_offset()
+				final_pixel_y = get_standard_pixel_y_offset(lying)
+				if(dir & (EAST|WEST)) //Facing east or west
+					final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
+
+	if(resize != RESIZE_DEFAULT_SIZE)
+		changed++
+		ntransform.Scale(resize)
+		resize = RESIZE_DEFAULT_SIZE
+
+	if(changed)
+		animate(src, transform = ntransform, time = 2, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
+		setMovetype(movement_type & ~FLOATING)  // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life().
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 427e30f2e2..b4c3c93824 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -567,9 +567,9 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 /mob/proc/is_muzzled()
 	return 0
 
-/mob/Stat(delayoverride)
-	. = ..()
-	var/statdelay = delayoverride || 10
+/mob/Stat()
+	..()
+
 	if(statpanel("Status"))
 		if (client)
 			stat(null, "Ping: [round(client.lastping, 1)]ms (Average: [round(client.avgping, 1)]ms)")
@@ -577,7 +577,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 		var/datum/map_config/cached = SSmapping.next_map_config
 		if(cached)
 			stat(null, "Next Map: [cached.map_name]")
-		stat(null, "Round ID: [GLOB.round_id || "NULL"]")
+		stat(null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]")
 		stat(null, "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]")
 		stat(null, "Round Time: [WORLDTIME2TEXT("hh:mm:ss")]")
 		stat(null, "Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]")
@@ -587,9 +587,8 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 			if(ETA)
 				stat(null, "[ETA] [SSshuttle.emergency.getTimerStr()]")
 
-	if(client?.holder)
+	if(client && client.holder)
 		if(statpanel("MC"))
-			statdelay = 0		//It's assumed that if you're doing this you are doing debug stuff, don't do ioditic things.
 			var/turf/T = get_turf(client.eye)
 			stat("Location:", COORD(T))
 			stat("CPU:", "[world.cpu]")
@@ -615,7 +614,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 			GLOB.ahelp_tickets.stat_entry()
 		if(length(GLOB.sdql2_queries))
 			if(statpanel("SDQL2"))
-				statdelay = 0		//It's assumed that if you're doing this you are doing debug stuff, don't do ioditic things.
 				stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
 				for(var/i in GLOB.sdql2_queries)
 					var/datum/SDQL2_query/Q = i
@@ -639,13 +637,14 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 				if(A.IsObscured())
 					continue
 				statpanel(listed_turf.name, null, A)
+
+
 	if(mind)
 		add_spells_to_statpanel(mind.spell_list)
 		var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
 		if(changeling)
 			add_stings_to_statpanel(changeling.purchasedpowers)
 	add_spells_to_statpanel(mob_spell_list)
-	sleep(statdelay)
 
 /mob/proc/add_spells_to_statpanel(list/spells)
 	for(var/obj/effect/proc_holder/spell/S in spells)
@@ -802,11 +801,14 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 
 //can the mob be buckled to something by default?
 /mob/proc/can_buckle()
-	return 1
+	return TRUE
 
 //can the mob be unbuckled from something by default?
 /mob/proc/can_unbuckle()
-	return 1
+	return TRUE
+
+/mob/proc/can_buckle_others(mob/living/target, atom/buckle_to)
+	return TRUE
 
 //Can the mob interact() with an atom?
 /mob/proc/can_interact_with(atom/A)
@@ -958,4 +960,4 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 
 /mob/setMovetype(newval)
 	. = ..()
-	update_movespeed(FALSE)
+	update_movespeed(FALSE)
\ No newline at end of file
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index c7365210ab..695084a794 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -29,6 +29,7 @@
 	var/obj/machinery/machine = null
 
 	var/next_move = null
+	var/create_area_cooldown
 	var/notransform = null	//Carbon
 	var/eye_blind = 0		//Carbon
 	var/eye_blurry = 0		//Carbon
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
index 816ae58749..89f5d20e70 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm
@@ -4,7 +4,7 @@
 
 	if(!ninjacost(0,N_ADRENALINE))
 		var/mob/living/carbon/human/H = affecting
-		H.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "omnizine" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
+		H.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/medicine/inaprovaline = 3, /datum/reagent/medicine/synaptizine = 10, /datum/reagent/medicine/omnizine = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
 
 		H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
 
@@ -15,5 +15,5 @@
 
 /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost_after()
 	var/mob/living/carbon/human/H = affecting
-	H.reagents.add_reagent("radium", a_transfer)
+	H.reagents.add_reagent(/datum/reagent/radium, a_transfer)
 	to_chat(H, "<span class='danger'>You are beginning to feel the after-effect of the injection.</span>")
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
index 8c304d8a2b..56c50078c1 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
@@ -26,10 +26,9 @@ Contents:
 /obj/item/clothing/suit/space/space_ninja/proc/enable_signals()
 	if(!affecting)
 		return
-	RegisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE), .proc/reduce_stealth)
+	RegisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE), .proc/reduce_stealth)
 	RegisterSignal(affecting, COMSIG_MOVABLE_BUMP, .proc/bumping_stealth)
 
-
 /obj/item/clothing/suit/space/space_ninja/proc/reduce_stealth(datum/source)
 	affecting.alpha = min(affecting.alpha + 40, 100)
 
@@ -42,7 +41,7 @@ Contents:
 		return FALSE
 	stealth = !stealth
 	stealth_cooldown = world.time + 5 SECONDS
-	UnregisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE))
+	UnregisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE))
 	animate(affecting, alpha = 255, time = 3 SECONDS)
 	affecting.visible_message("<span class='warning'>[affecting.name] appears from thin air!</span>", \
 					"<span class='notice'>You are now visible.</span>")
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index 0496a2f1c3..ed920a57d1 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -5,13 +5,13 @@
 		return ..()
 
 	if(istype(I, /obj/item/reagent_containers/glass))//If it's a glass beaker.
-		if(I.reagents.has_reagent("radium", a_transfer) && a_boost < a_maxamount)
-			I.reagents.remove_reagent("radium", a_transfer)
+		if(I.reagents.has_reagent(/datum/reagent/radium, a_transfer) && a_boost < a_maxamount)
+			I.reagents.remove_reagent(/datum/reagent/radium, a_transfer)
 			a_boost++;
 			to_chat(U, "<span class='notice'>There are now [a_boost] adrenaline boosts remaining.</span>")
 			return
-		if(I.reagents.has_reagent("smoke_powder", a_transfer) && s_bombs < s_maxamount)
-			I.reagents.remove_reagent("smoke_powder", a_transfer)
+		if(I.reagents.has_reagent(/datum/reagent/smoke_powder, a_transfer) && s_bombs < s_maxamount)
+			I.reagents.remove_reagent(/datum/reagent/smoke_powder, a_transfer)
 			s_bombs++;
 			to_chat(U, "<span class='notice'>There are now [s_bombs] smoke bombs remaining.</span>")
 			return
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 2ca6ce2611..f3f7e45378 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -102,7 +102,7 @@
 /obj/item/paperplane/throw_impact(atom/hit_atom)
 	if(iscarbon(hit_atom))
 		var/mob/living/carbon/C = hit_atom
-		if(C.can_catch_item(TRUE))
+		if(!C.get_active_held_item() && !C.restrained())
 			var/datum/action/innate/origami/origami_action = locate() in C.actions
 			if(origami_action?.active) //if they're a master of origami and have the ability turned on, force throwmode on so they'll automatically catch the plane.
 				C.throw_mode_on()
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 7567fc1a52..8172a57399 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -23,7 +23,7 @@
 	throw_range = 7
 	materials = list(MAT_METAL=10)
 	pressure_resistance = 2
-	grind_results = list("iron" = 2, "iodine" = 1)
+	grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
 	var/colour = "black"	//what colour the ink is!
 	var/degrees = 0
 	var/font = PEN_FONT
@@ -165,9 +165,9 @@
 /obj/item/pen/sleepy/Initialize()
 	. = ..()
 	create_reagents(45, OPENCONTAINER)
-	reagents.add_reagent("chloralhydrate", 20)
-	reagents.add_reagent("mutetoxin", 15)
-	reagents.add_reagent("tirizene", 10)
+	reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 20)
+	reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 15)
+	reagents.add_reagent(/datum/reagent/toxin/staminatoxin, 10)
 
 /*
  * (Alan) Edaggers
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 4e74ccc44b..e8d318697c 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -335,6 +335,6 @@
 	name = "toner cartridge"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "tonercartridge"
-	grind_results = list("iodine" = 40, "iron" = 10)
+	grind_results = list(/datum/reagent/iodine = 40, /datum/reagent/iron = 10)
 	var/charges = 5
 	var/max_charges = 5
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 5682c333c7..49f315d998 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -9,7 +9,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
 	max_integrity = 50
-	grind_results = list("iodine" = 4)
+	grind_results = list(/datum/reagent/iodine = 4)
 	var/datum/picture/picture
 	var/scribble		//Scribble on the back.
 
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index cc03976f79..fde2ce4178 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -490,7 +490,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	attack_verb = list("whipped", "lashed", "disciplined", "flogged")
 	singular_name = "cable piece"
 	full_w_class = WEIGHT_CLASS_SMALL
-	grind_results = list("copper" = 2) //2 copper per cable in the coil
+	grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil
 	usesound = 'sound/items/deconstruct.ogg'
 
 /obj/item/stack/cable_coil/cyborg
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index ded99d6fa6..5f9e7038f3 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -14,7 +14,7 @@
 	var/charge = 0	// note %age conveted to actual charge in New
 	var/maxcharge = 1000
 	materials = list(MAT_METAL=700, MAT_GLASS=50)
-	grind_results = list("lithium" = 15, "iron" = 5, "silicon" = 5)
+	grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
 	var/rigged = FALSE	// true if rigged to explode
 	var/chargerate = 100 //how much power is given every tick in a recharger
 	var/self_recharge = 0 //does it self recharge, over time, or not?
@@ -106,7 +106,7 @@
 
 /obj/item/stock_parts/cell/on_reagent_change(changetype)
 	..()
-	rigged = reagents?.has_reagent("plasma", 5) ? TRUE : FALSE //has_reagent returns the reagent datum
+	rigged = reagents?.has_reagent(/datum/reagent/toxin/plasma, 5) ? TRUE : FALSE //has_reagent returns the reagent datum
 
 /obj/item/stock_parts/cell/proc/explode()
 	var/turf/T = get_turf(src.loc)
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index fcc2c6c144..8e121dc809 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -65,7 +65,7 @@
 
 
 			if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
-				var/efficiency = 0.00025 + (hot_air.reaction_results["fire"]*0.01)
+				var/efficiency = 0.45
 
 				var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
 
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index cdbaa29a3b..e50b11ea35 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -719,7 +719,7 @@
 	var/base_state
 	var/switchcount = 0	// number of times switched
 	materials = list(MAT_GLASS=100)
-	grind_results = list("silicon" = 5, "nitrogen" = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs
+	grind_results = list(/datum/reagent/silicon = 5, /datum/reagent/nitrogen = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs
 	var/rigged = 0		// true if rigged to explode
 	var/brightness = 2 //how much light it gives off
 
@@ -789,7 +789,7 @@
 
 		to_chat(user, "<span class='notice'>You inject the solution into \the [src].</span>")
 
-		if(S.reagents.has_reagent("plasma", 5))
+		if(S.reagents.has_reagent(/datum/reagent/toxin/plasma, 5))
 
 			rigged = 1
 
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 054b91f273..91a2bc515f 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -45,8 +45,8 @@
 			eject()
 		else
 			var/gasdrained = min(powerproduction_drain*drainratio,loaded_tank.air_contents.gases[/datum/gas/plasma])
-			loaded_tank.air_contents.gases[/datum/gas/plasma] -= gasdrained
-			loaded_tank.air_contents.gases[/datum/gas/tritium] += gasdrained
+			loaded_tank.air_contents.gases[/datum/gas/plasma] -= 2.7 * gasdrained
+			loaded_tank.air_contents.gases[/datum/gas/tritium] += 	2.7 * gasdrained
 			GAS_GARBAGE_COLLECT(loaded_tank.air_contents.gases)
 
 			var/power_produced = RAD_COLLECTOR_OUTPUT
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index ab463163f0..a8d3934208 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -134,8 +134,8 @@
 
 /obj/item/ammo_casing/shotgun/dart/bioterror/Initialize()
 	. = ..()
-	reagents.add_reagent("neurotoxin", 6)
-	reagents.add_reagent("spore", 6)
-	reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
-	reagents.add_reagent("coniine", 6)
-	reagents.add_reagent("sodium_thiopental", 6)
+	reagents.add_reagent(/datum/reagent/toxin/fentanyl, 6)
+	reagents.add_reagent(/datum/reagent/toxin/spore, 6)
+	reagents.add_reagent(/datum/reagent/toxin/mutetoxin, 6) //;HELP OPS IN MAINT
+	reagents.add_reagent(/datum/reagent/toxin/coniine, 6)
+	reagents.add_reagent(/datum/reagent/toxin/sodium_thiopental, 6)
diff --git a/code/modules/projectiles/ammunition/energy/plasma.dm b/code/modules/projectiles/ammunition/energy/plasma.dm
index d02abf9c88..3a71254508 100644
--- a/code/modules/projectiles/ammunition/energy/plasma.dm
+++ b/code/modules/projectiles/ammunition/energy/plasma.dm
@@ -9,3 +9,7 @@
 	projectile_type = /obj/item/projectile/plasma/adv
 	delay = 10
 	e_cost = 10
+
+/obj/item/ammo_casing/energy/plasma/weak
+	projectile_type = /obj/item/projectile/plasma/weak
+	e_cost = 100
\ No newline at end of file
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 531c6082b0..19fdfd2b7e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -37,6 +37,7 @@
 	var/burst_spread = 0				//Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0.
 	var/randomspread = 1				//Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
 	var/inaccuracy_modifier = 1
+	var/pb_knockback = 0
 
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -125,6 +126,10 @@
 		if(message)
 			if(pointblank)
 				user.visible_message("<span class='danger'>[user] fires [src] point blank at [pbtarget]!</span>", null, null, COMBAT_MESSAGE_RANGE)
+				if(pb_knockback > 0)
+					var/atom/throw_target = get_edge_target_turf(pbtarget, user.dir)
+					pbtarget.throw_at(throw_target, pb_knockback, 2)
+
 			else
 				user.visible_message("<span class='danger'>[user] fires [src]!</span>", null, null, COMBAT_MESSAGE_RANGE)
 
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index bcb212a031..7fb4a8232e 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -267,6 +267,7 @@
 	fire_delay = 0
 	pin = /obj/item/firing_pin/implant/pindicate
 	actions_types = list()
+	pb_knockback = 2
 
 /obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted
 	pin = /obj/item/firing_pin
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index c2206fcea8..31a5131804 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -273,6 +273,7 @@
 						"Maple" = "dshotgun-l",
 						"Rosewood" = "dshotgun-p"
 						)
+	pb_knockback = 3 // it's a super shotgun!
 
 /obj/item/gun/ballistic/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
 	..()
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 571525d8f0..deec187f88 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -12,6 +12,8 @@
 	var/recentpump = 0 // to prevent spammage
 	weapon_weight = WEAPON_MEDIUM
 
+	pb_knockback = 2
+
 /obj/item/gun/ballistic/shotgun/attackby(obj/item/A, mob/user, params)
 	. = ..()
 	if(.)
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 8b358832b0..8f9bc13583 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -56,6 +56,7 @@
 	item_flags = NONE
 	casing_ejector = FALSE
 	can_suppress = FALSE
+	pb_knockback = 0
 
 /obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0)
 	..()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index b216d8d536..ecd906f2a9 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -112,7 +112,10 @@
 /obj/item/gun/energy/kinetic_accelerator/cyborg
 	holds_charge = TRUE
 	unique_frequency = TRUE
-	max_mod_capacity = 80
+
+/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg
+	holds_charge = TRUE
+	unique_frequency = TRUE
 
 /obj/item/gun/energy/kinetic_accelerator/minebot
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL
@@ -280,7 +283,7 @@
 	. += "<span class='notice'>Occupies <b>[cost]%</b> of mod capacity.</span>"
 
 /obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user)
-	if(istype(A, /obj/item/gun/energy/kinetic_accelerator) && !issilicon(user))
+	if(istype(A, /obj/item/gun/energy/kinetic_accelerator))
 		install(A, user)
 	else
 		..()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 9141a6d299..04fffaf431 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -210,7 +210,7 @@
 	if(reagents && reagents.reagent_list)
 		reagent_note = " REAGENTS:"
 		for(var/datum/reagent/R in reagents.reagent_list)
-			reagent_note += R.id + " ("
+			reagent_note += R.type + " ("
 			reagent_note += num2text(R.volume) + ") "
 
 	if(ismob(firer))
diff --git a/code/modules/projectiles/projectile/bullets/dart_syringe.dm b/code/modules/projectiles/projectile/bullets/dart_syringe.dm
index bdbf706448..29e6c39c31 100644
--- a/code/modules/projectiles/projectile/bullets/dart_syringe.dm
+++ b/code/modules/projectiles/projectile/bullets/dart_syringe.dm
@@ -31,9 +31,9 @@
 
 /obj/item/projectile/bullet/dart/metalfoam/Initialize()
 	. = ..()
-	reagents.add_reagent("aluminium", 15)
-	reagents.add_reagent("foaming_agent", 5)
-	reagents.add_reagent("facid", 5)
+	reagents.add_reagent(/datum/reagent/aluminium, 15)
+	reagents.add_reagent(/datum/reagent/foaming_agent, 5)
+	reagents.add_reagent(/datum/reagent/toxin/acid, 5)
 
 /obj/item/projectile/bullet/dart/syringe
 	name = "syringe"
@@ -52,20 +52,19 @@
 		if(blocked != 100)
 			if(M.can_inject(null, FALSE, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
 				..(target, blocked, TRUE)
-				for(var/datum/reagent/R in reagents.reagent_list) //OD prevention time!
-					if(istype(R, /datum/reagent/medicine)) //Is this a medicine?
-						if(M.reagents.has_reagent(R.id))
-							if(R.overdose_threshold == 0 || emptrig == TRUE) //Is there a possible OD?
-								M.reagents.add_reagent(R.id, R.volume)
-							else
-								var/transVol = CLAMP(R.volume, 0, (R.overdose_threshold - M.reagents.get_reagent_amount(R.id)) -1)
-								M.reagents.add_reagent(R.id, transVol)
+				for(var/datum/reagent/medicine/R in reagents.reagent_list) //OD prevention time!
+					if(M.reagents.has_reagent(R.type))
+						if(R.overdose_threshold == 0 || emptrig == TRUE) //Is there a possible OD?
+							M.reagents.add_reagent(R.type, R.volume)
 						else
-							if(!R.overdose_threshold == 0)
-								var/transVol = CLAMP(R.volume, 0, R.overdose_threshold-1)
-								M.reagents.add_reagent(R.id, transVol)
-							else
-								M.reagents.add_reagent(R.id, R.volume)
+							var/transVol = CLAMP(R.volume, 0, (R.overdose_threshold - M.reagents.get_reagent_amount(R.type)) -1)
+							M.reagents.add_reagent(R.type, transVol)
+					else
+						if(!R.overdose_threshold == 0)
+							var/transVol = CLAMP(R.volume, 0, R.overdose_threshold-1)
+							M.reagents.add_reagent(R.type, transVol)
+						else
+							M.reagents.add_reagent(R.type, R.volume)
 
 
 
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 173d9721a9..791db320a2 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -93,7 +93,7 @@
 /obj/item/projectile/magic/door/proc/CreateDoor(turf/T)
 	var/door_type = pick(door_types)
 	var/obj/structure/mineral_door/D = new door_type(T)
-	T.ChangeTurf(/turf/open/floor/plating)
+	T.ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 	D.Open()
 
 /obj/item/projectile/magic/door/proc/OpenDoor(var/obj/machinery/door/D)
diff --git a/code/modules/projectiles/projectile/special/plasma.dm b/code/modules/projectiles/projectile/special/plasma.dm
index aeafb6157a..4c05c42fb3 100644
--- a/code/modules/projectiles/projectile/special/plasma.dm
+++ b/code/modules/projectiles/projectile/special/plasma.dm
@@ -47,3 +47,9 @@
 	damage = 24
 	range = 7
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+
+/obj/item/projectile/plasma/weak
+	dismemberment = 0
+	damage = 10
+	range = 4
+	mine_range = 0
\ No newline at end of file
diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm
index efb6bdecfd..e24da70d47 100644
--- a/code/modules/reagents/chem_wiki_render.dm
+++ b/code/modules/reagents/chem_wiki_render.dm
@@ -1,18 +1,11 @@
 //Generates a markdown txt file for use with the wiki
 
 /proc/find_reagent(input)
-	. = FALSE
-	if(GLOB.chemical_reagents_list[input]) //prefer IDs!
-		var/datum/reagent/R = GLOB.chemical_reagents_list[input]
-		return R
-	else
-		for(var/X in GLOB.chemical_reagents_list)
-			var/datum/reagent/R = GLOB.chemical_reagents_list[X]
-			if(input == replacetext(lowertext(R.name), " ", ""))
-				return R
-			if(input == replacetext(lowertext(R.id), " ", ""))
-				return R
-
+	//prefer types!
+	. = GLOB.chemical_reagents_list[text2path(input)]
+	if(.)
+		return
+	. = GLOB.name2reagent[ckey(input)]
 
 
 
@@ -24,7 +17,7 @@
 
 
 	var/prefix = "|Name | Reagents | Reaction vars | Description | Chem properties |\n|---|---|---|-----------|---|\n"
-	var/input_reagent = replacetext(lowertext(input("Input the name/id of a reagent to get it's description on it's own, or leave blank to parse every chem.", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name
+	var/input_reagent = replacetext(lowertext(input("Input the name/type of a reagent to get it's description on it's own, or leave blank to parse every chem.", "Input") as text), " ", "") //95% of the time, the reagent type is a lowercase, no spaces / underscored version of the name
 	if(input_reagent)
 		var/input_reagent2 = find_reagent(input_reagent)
 		if(!input_reagent2)
@@ -68,98 +61,23 @@
 	var/impure = ""
 
 	//Chem_dispencer
-	var/list/dispensable_reagents = list(
-		"hydrogen",
-		"lithium",
-		"carbon",
-		"nitrogen",
-		"oxygen",
-		"fluorine",
-		"sodium",
-		"aluminium",
-		"silicon",
-		"phosphorus",
-		"sulfur",
-		"chlorine",
-		"potassium",
-		"iron",
-		"copper",
-		"mercury",
-		"radium",
-		"water",
-		"ethanol",
-		"sugar",
-		"sacid",
-		"welding_fuel",
-		"silver",
-		"iodine",
-		"bromine",
-		"stable_plasma"
-	)
-	var/list/components = list(
-		"oil",
-		"ammonia",
-		"ash",
-		"acetone",
-		"phenol",
-		"diethylamine",
-		"saltpetre",
-		"sodiumchloride",
-		"lye"
-	)
+	var/obj/machinery/chem_dispenser/C
+	var/list/dispensable_reagents = initial(C.dispensable_reagents)
+	var/list/components = initial(C.upgrade_reagents) + initial(C.upgrade_reagents2) + initial(C.upgrade_reagents3)
 
 	var/list/grind = list(
-		"bluespace",
-		"gold",
-		"plasma",
-		"uranium"
+		/datum/reagent/bluespace,
+		/datum/reagent/gold,
+		/datum/reagent/toxin/plasma,
+		/datum/reagent/uranium
 	)
 
 	//Bartender
-	var/dispence_drinks = list(
-		"water",
-		"ice",
-		"coffee",
-		"cream",
-		"tea",
-		"icetea",
-		"cola",
-		"spacemountainwind",
-		"dr_gibb",
-		"space_up",
-		"tonic",
-		"sodawater",
-		"lemon_lime",
-		"pwr_game",
-		"shamblers",
-		"sugar",
-		"orangejuice",
-		"grenadine",
-		"limejuice",
-		"tomatojuice",
-		"lemonjuice",
-		"menthol"
-	)
-	var/dispence_alco = list(
-		"beer",
-		"kahlua",
-		"whiskey",
-		"wine",
-		"vodka",
-		"gin",
-		"rum",
-		"tequila",
-		"vermouth",
-		"cognac",
-		"ale",
-		"absinthe",
-		"hcider",
-		"creme_de_menthe",
-		"creme_de_cacao",
-		"triple_sec",
-		"sake",
-		"applejack"
-	)
+	var/obj/machinery/chem_dispenser/drinks/D
+	var/dispence_drinks = initial(D.dispensable_reagents)
+
+	var/obj/machinery/chem_dispenser/drinks/beer/B
+	var/dispence_alco = initial(B.dispensable_reagents)
 
 	var/breakout = FALSE
 	for(var/i = 1, i <= 2, i+=1)
@@ -169,31 +87,31 @@
 				continue
 
 			for(var/Y in dispensable_reagents) //Why do you have to do this
-				if(R.id == Y)
+				if(R.type == Y)
 					basic += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in components)
-				if(R.id == Y)
+				if(R.type == Y)
 					upgraded += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in dispence_drinks)
-				if(R.id == Y)
+				if(R.type == Y)
 					drinks += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in dispence_alco)
-				if(R.id == Y)
+				if(R.type == Y)
 					alco += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in grind)
-				if(R.id == Y)
+				if(R.type == Y)
 					grinded += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
@@ -273,7 +191,7 @@
 /proc/generate_chemwiki_line(datum/reagent/R, X, processCR)
 	//name | Reagent pH | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | Addiction level | Metabolism rate | impure chem | inverse chem
 
-	var/datum/chemical_reaction/CR = get_chemical_reaction(R.id)
+	var/datum/chemical_reaction/CR = get_chemical_reaction(R.type)
 	if((!CR && processCR) || (CR && !processCR)) // Do reactions first.
 		return ""
 
@@ -284,11 +202,11 @@
 		outstring += "<ul>"
 		for(var/R2 in CR.required_reagents)
 			R3 = GLOB.chemical_reagents_list[R2]//What a convoluted mess
-			outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.id]]u</li>"
+			outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.type]]u</li>"
 		if(CR.required_catalysts)
 			for(var/R2 in CR.required_catalysts)
 				R3 = GLOB.chemical_reagents_list[R2]
-				outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.id]]u</li>"
+				outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.type]]u</li>"
 		outstring += "</ul> | "
 	else
 		outstring += "N/A | "
@@ -332,11 +250,11 @@
 	//Description, OD, Addict, Meta
 	outstring += "[R.description] | <ul><li>Metabolism rate: [R.metabolization_rate/2]u/s</li> [(R.overdose_threshold?"<li>Overdose: [R.overdose_threshold]u</li>":"")] [(R.addiction_threshold?"<li>Addiction: [R.addiction_threshold]u</li>":"")] "
 
-	if(R.impure_chem && R.impure_chem != "fermiTox")
+	if(R.impure_chem && R.impure_chem != /datum/reagent/impure/fermiTox)
 		R3 = GLOB.chemical_reagents_list[R.impure_chem]
 		outstring += "<li>Impure chem:<a href=\"#[R3.name]\">[R3.name]</a></li>"
 
-	if(R.inverse_chem && R.impure_chem != "fermiTox")
+	if(R.inverse_chem && R.impure_chem != /datum/reagent/impure/fermiTox)
 		R3 = GLOB.chemical_reagents_list[R.inverse_chem]
 		outstring += "<li>Inverse chem:<a href=\"#[R3.name]\">[R3.name]</a></li> [(R3.inverse_chem_val?"<li>Inverse purity: [R3.inverse_chem_val]</li>":"")] "
 
@@ -361,11 +279,11 @@
 	var/datum/reagent/R3
 	for(var/R2 in CR.required_reagents)
 		R3 = GLOB.chemical_reagents_list[R2]
-		outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.id]]u</li>"
+		outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.type]]u</li>"
 	if(CR.required_catalysts)
 		for(var/R2 in CR.required_catalysts)
 			R3 = GLOB.chemical_reagents_list[R2]
-			outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.id]]u</li>"
+			outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.type]]u</li>"
 	outstring += "</ul> | <ul>"
 
 	//Reaction vars
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index d540cd02fe..bf3c4220b4 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -11,13 +11,13 @@
 
 	for(var/path in paths)
 		var/datum/reagent/D = new path()
-		GLOB.chemical_reagents_list[D.id] = D
+		GLOB.chemical_reagents_list[path] = D
 
 /proc/build_chemical_reactions_list()
 	//Chemical Reactions - Initialises all /datum/chemical_reaction into a list
 	// It is filtered into multiple lists within a list.
 	// For example:
-	// chemical_reaction_list["plasma"] is a list of all reactions relating to plasma
+	// chemical_reaction_list[/datum/reagent/toxin/plasma] is a list of all reactions relating to plasma
 
 	if(GLOB.chemical_reactions_list)
 		return
@@ -32,14 +32,11 @@
 		var/datum/chemical_reaction/D = new path()
 		var/list/reaction_ids = list()
 
-		if(!D.id)
-			continue
-
 		if(D.required_reagents && D.required_reagents.len)
 			for(var/reaction in D.required_reagents)
 				reaction_ids += reaction
 
-		// Create filters based on each reagent id in the required reagents list
+		// Create filters based on each reagent type in the required reagents list
 		for(var/id in reaction_ids)
 			if(!GLOB.chemical_reactions_list[id])
 				GLOB.chemical_reactions_list[id] = list()
@@ -63,7 +60,7 @@
 	var/targetVol = 0 //the target volume, i.e. the total amount that can be created during a fermichem reaction.
 	var/reactedVol = 0 //how much of the reagent is reacted during a fermireaction
 	var/fermiIsReacting = FALSE //that prevents multiple reactions from occurring (i.e. add_reagent calls to process_reactions(), this stops any extra reactions.)
-	var/fermiReactID //ID of the chem being made during a fermireaction, kept here so it's cache isn't lost between loops/procs.
+	var/fermiReactID //instance of the chem reaction used during a fermireaction, kept here so it's cache isn't lost between loops/procs.
 
 /datum/reagents/New(maximum=100, new_flags)
 	maximum_volume = maximum
@@ -96,7 +93,7 @@
 	var/list/data = list()
 	for(var/r in reagent_list) //no reagents will be left behind
 		var/datum/reagent/R = r
-		data += "[R.id] ([round(R.volume, CHEMICAL_QUANTISATION_LEVEL)]u)"
+		data += "[R.type] ([round(R.volume, CHEMICAL_QUANTISATION_LEVEL)]u)"
 		//Using IDs because SOME chemicals (I'm looking at you, chlorhydrate-beer) have the same names as other chemicals.
 	return english_list(data)
 
@@ -117,7 +114,7 @@
 			current_list_element = 1
 
 		var/datum/reagent/R = cached_reagents[current_list_element]
-		remove_reagent(R.id, 1)
+		remove_reagent(R.type, 1)
 
 		current_list_element++
 		total_transfered++
@@ -132,7 +129,7 @@
 		var/part = amount / total_volume
 		for(var/reagent in cached_reagents)
 			var/datum/reagent/R = reagent
-			remove_reagent(R.id, R.volume * part, ignore_pH = TRUE)
+			remove_reagent(R.type, R.volume * part, ignore_pH = TRUE)
 		pH = REAGENT_NORMAL_PH
 		update_total()
 		handle_reactions()
@@ -152,15 +149,15 @@
 
 /datum/reagents/proc/get_master_reagent_id()
 	var/list/cached_reagents = reagent_list
-	var/id
+	var/max_type
 	var/max_volume = 0
 	for(var/reagent in cached_reagents)
 		var/datum/reagent/R = reagent
 		if(R.volume > max_volume)
 			max_volume = R.volume
-			id = R.id
+			max_type = R.type
 
-	return id
+	return max_type
 
 /datum/reagents/proc/get_master_reagent()
 	var/list/cached_reagents = reagent_list
@@ -198,9 +195,9 @@
 			trans_data = copy_data(T)
 
 
-		R.add_reagent(T.id, transfer_amount * multiplier, trans_data, chem_temp, T.purity, pH, no_react = TRUE, ignore_pH = TRUE) //we only handle reaction after every reagent has been transfered.
+		R.add_reagent(T.type, transfer_amount * multiplier, trans_data, chem_temp, T.purity, pH, no_react = TRUE, ignore_pH = TRUE) //we only handle reaction after every reagent has been transfered.
 
-		remove_reagent(T.id, transfer_amount, ignore_pH = TRUE)
+		remove_reagent(T.type, transfer_amount, ignore_pH = TRUE)
 
 	update_total()
 	R.update_total()
@@ -232,7 +229,7 @@
 		var/copy_amount = T.volume * part
 		if(preserve_data)
 			trans_data = T.data
-		R.add_reagent(T.id, copy_amount * multiplier, trans_data)
+		R.add_reagent(T.type, copy_amount * multiplier, trans_data)
 
 	src.update_total()
 	R.update_total()
@@ -256,12 +253,12 @@
 	var/trans_data = null
 	for (var/CR in cached_reagents)
 		var/datum/reagent/current_reagent = CR
-		if(current_reagent.id == reagent)
+		if(current_reagent.type == reagent)
 			if(preserve_data)
 				trans_data = current_reagent.data
-			R.add_reagent(current_reagent.id, amount, trans_data, chem_temp, current_reagent.purity, pH, no_react = TRUE)
+			R.add_reagent(current_reagent.type, amount, trans_data, chem_temp, current_reagent.purity, pH, no_react = TRUE)
 
-			remove_reagent(current_reagent.id, amount, 1)
+			remove_reagent(current_reagent.type, amount, 1)
 			break
 
 	src.update_total()
@@ -313,18 +310,21 @@
 				var/datum/reagent/R = addiction
 				if(C && R)
 					R.addiction_stage++
-					if(1 <= R.addiction_stage && R.addiction_stage <= R.addiction_stage1_end)
-						need_mob_update += R.addiction_act_stage1(C)
-					else if(R.addiction_stage1_end <= R.addiction_stage && R.addiction_stage <= R.addiction_stage2_end)
-						need_mob_update += R.addiction_act_stage2(C)
-					else if(R.addiction_stage2_end <= R.addiction_stage && R.addiction_stage <= R.addiction_stage3_end)
-						need_mob_update += R.addiction_act_stage3(C)
-					else if(R.addiction_stage3_end <= R.addiction_stage && R.addiction_stage <= R.addiction_stage4_end)
-						need_mob_update += R.addiction_act_stage4(C)
-					else if(R.addiction_stage4_end <= R.addiction_stage)
-						to_chat(C, "<span class='notice'>You feel like you've gotten over your need for [R.name].</span>")
-						SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.id]_addiction")
-						cached_addictions.Remove(R)
+					switch(R.addiction_stage)
+						if(1 to R.addiction_stage1_end)
+							need_mob_update += R.addiction_act_stage1(C)
+						if(R.addiction_stage1_end to R.addiction_stage2_end)
+							need_mob_update += R.addiction_act_stage2(C)
+						if(R.addiction_stage2_end to R.addiction_stage3_end)
+							need_mob_update += R.addiction_act_stage3(C)
+						if(R.addiction_stage3_end to R.addiction_stage4_end)
+							need_mob_update += R.addiction_act_stage4(C)
+						if(R.addiction_stage4_end to INFINITY)
+							to_chat(C, "<span class='notice'>You feel like you've gotten over your need for [R.name].</span>")
+							SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_addiction")
+							cached_addictions.Remove(R)
+						else
+							SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
 		addiction_tick++
 	if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
 		C.updatehealth()
@@ -381,7 +381,7 @@
 		reaction_occurred = 0
 		for(var/reagent in cached_reagents)
 			var/datum/reagent/R = reagent
-			for(var/reaction in cached_reactions[R.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id
+			for(var/reaction in cached_reactions[R.type]) // Was a big list but now it should be smaller since we filtered it with our reagent type
 				if(!reaction)
 					continue
 
@@ -630,7 +630,7 @@
 		deltapH = 1
 	//This should never proc:
 	else
-		WARNING("[my_atom] attempted to determine FermiChem pH for '[C.id]' which broke for some reason! ([usr])")
+		WARNING("[my_atom] attempted to determine FermiChem pH for '[C.type]' which broke for some reason! ([usr])")
 
 	//Calculate DeltaT (Deviation of T from optimal)
 	if (cached_temp < C.OptimalTempMax && cached_temp >= C.OptimalTempMin)
@@ -679,7 +679,7 @@
 		//Above should reduce yeild based on holder purity.
 		//Purity Check
 		for(var/datum/reagent/R in my_atom.reagents.reagent_list)
-			if(P == R.id)
+			if(P == R.type)
 				if (R.purity < C.PurityMin)//If purity is below the min, blow it up.
 					fermiIsReacting = FALSE
 					SSblackbox.record_feedback("tally", "fermi_chem", 1, ("[P] explosion"))
@@ -724,7 +724,7 @@
 	return cachedPurity/i
 
 /datum/reagents/proc/uncache_purity(id)
-	var/datum/reagent/R = has_reagent("[id]")
+	var/datum/reagent/R = has_reagent(id)
 	if(!R)
 		return
 	if(R.cached_purity == 1)
@@ -735,15 +735,15 @@
 	var/list/cached_reagents = reagent_list
 	for(var/_reagent in cached_reagents)
 		var/datum/reagent/R = _reagent
-		if(R.id != reagent)
-			del_reagent(R.id)
+		if(R.type != reagent)
+			del_reagent(R.type)
 			update_total()
 
 /datum/reagents/proc/del_reagent(reagent)
 	var/list/cached_reagents = reagent_list
 	for(var/_reagent in cached_reagents)
 		var/datum/reagent/R = _reagent
-		if(R.id == reagent)
+		if(R.type == reagent)
 			if(my_atom && isliving(my_atom))
 				var/mob/living/M = my_atom
 				if(R.metabolizing)
@@ -763,9 +763,9 @@
 	for(var/reagent in cached_reagents)
 		var/datum/reagent/R = reagent
 		if(R.volume <= 0)//For clarity
-			del_reagent(R.id)
+			del_reagent(R.type)
 		if((R.volume < 0.01) && !fermiIsReacting)
-			del_reagent(R.id)
+			del_reagent(R.type)
 		else
 			total_volume += R.volume
 	if(!reagent_list || !total_volume)
@@ -776,7 +776,7 @@
 	var/list/cached_reagents = reagent_list
 	for(var/reagent in cached_reagents)
 		var/datum/reagent/R = reagent
-		del_reagent(R.id)
+		del_reagent(R.type)
 	pH = REAGENT_NORMAL_PH
 	return 0
 
@@ -842,13 +842,13 @@
 		WARNING("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])")
 		return FALSE
 
-	if (D.id == "water" && !no_react && !istype(my_atom, /obj/item/reagent_containers/food)) //Do like an otter, add acid to water, but also don't blow up botany.
+	if (D.type == /datum/reagent/water && !no_react && !istype(my_atom, /obj/item/reagent_containers/food)) //Do like an otter, add acid to water, but also don't blow up botany.
 		if (pH < 2)
 			SSblackbox.record_feedback("tally", "fermi_chem", 1, "water-acid explosions")
 			var/datum/effect_system/smoke_spread/chem/s = new
 			var/turf/T = get_turf(my_atom)
 			var/datum/reagents/R = new/datum/reagents(3000)
-			R.add_reagent("fermiAcid", amount)
+			R.add_reagent(/datum/reagent/fermi/fermiAcid, amount)
 			for (var/datum/reagent/reagentgas in reagent_list)
 				R.add_reagent(reagentgas, amount/5)
 				remove_reagent(reagentgas, amount/5)
@@ -895,7 +895,7 @@
 	//add the reagent to the existing if it exists
 	for(var/A in cached_reagents)
 		var/datum/reagent/R = A
-		if (R.id == reagent) //IF MERGING
+		if (R.type == reagent) //IF MERGING
 			//Add amount and equalize purity
 			R.volume += round(amount, CHEMICAL_QUANTISATION_LEVEL)
 			R.purity = ((R.purity * R.volume) + (other_purity * amount)) /((R.volume + amount)) //This should add the purity to the product
@@ -937,7 +937,7 @@
 	return TRUE
 
 
-/datum/reagents/proc/add_reagent_list(list/list_reagents, list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15)
+/datum/reagents/proc/add_reagent_list(list/list_reagents, list/data=null) // Like add_reagent but you can enter a list. Format it like this: list(/datum/reagent/toxin = 10, /datum/reagent/consumable/ethanol/beer = 15)
 	for(var/r_id in list_reagents)
 		var/amt = list_reagents[r_id]
 		add_reagent(r_id, amt, data)
@@ -959,7 +959,7 @@
 
 	for(var/A in cached_reagents)
 		var/datum/reagent/R = A
-		if (R.id == reagent)
+		if (R.type == reagent)
 			if((total_volume - amount) <= 0)//Because this can result in 0, I don't want it to crash.
 				pH = REAGENT_NORMAL_PH
 			//In practice this is really confusing and players feel like it randomly melts their beakers, but I'm not sure how else to handle it. We'll see how it goes and I can remove this if it confuses people.
@@ -986,7 +986,7 @@
 	var/list/cached_reagents = reagent_list
 	for(var/_reagent in cached_reagents)
 		var/datum/reagent/R = _reagent
-		if (R.id == reagent)
+		if (R.type == reagent)
 			if(!amount)
 				return R
 			else
@@ -1001,7 +1001,7 @@
 	var/list/cached_reagents = reagent_list
 	for(var/_reagent in cached_reagents)
 		var/datum/reagent/R = _reagent
-		if (R.id == reagent)
+		if (R.type == reagent)
 			return round(R.volume, CHEMICAL_QUANTISATION_LEVEL)
 
 	return 0
@@ -1034,7 +1034,7 @@
 		// We found a match, proceed to remove the reagent.	Keep looping, we might find other reagents of the same type.
 		if(matches)
 			// Have our other proc handle removement
-			has_removed_reagent = remove_reagent(R.id, amount, safety)
+			has_removed_reagent = remove_reagent(R.type, amount, safety)
 
 	return has_removed_reagent
 
@@ -1043,14 +1043,14 @@
 	var/list/cached_reagents = reagent_list
 	for(var/reagent in cached_reagents)
 		var/datum/reagent/R = reagent
-		if(R.id == reagent_id)
+		if(R.type == reagent_id)
 			return R.data
 
 /datum/reagents/proc/set_data(reagent_id, new_data)
 	var/list/cached_reagents = reagent_list
 	for(var/reagent in cached_reagents)
 		var/datum/reagent/R = reagent
-		if(R.id == reagent_id)
+		if(R.type == reagent_id)
 			R.data = new_data
 
 /datum/reagents/proc/copy_data(datum/reagent/current_reagent)
@@ -1143,12 +1143,12 @@
 	reagents = new/datum/reagents(max_vol, flags)
 	reagents.my_atom = src
 
-/proc/get_random_reagent_id()	// Returns a random reagent ID minus blacklisted reagents
+/proc/get_random_reagent_id()	// Returns a random reagent type minus blacklisted reagents
 	var/static/list/random_reagents = list()
 	if(!random_reagents.len)
 		for(var/thing  in subtypesof(/datum/reagent))
 			var/datum/reagent/R = thing
 			if(initial(R.can_synth))
-				random_reagents += initial(R.id)
+				random_reagents += R
 	var/picked_reagent = pick(random_reagents)
 	return picked_reagent
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 2c5d7aa3e2..217c915a9e 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -1,3 +1,16 @@
+/proc/translate_legacy_chem_id(id)
+	switch (id)
+		if ("sacid")
+			return "sulphuricacid"
+		if ("facid")
+			return "fluorosulfuricacid"
+		if ("co2")
+			return "carbondioxide"
+		if ("mine_salve")
+			return "minerssalve"
+		else
+			return ckey(id)
+
 /obj/machinery/chem_dispenser
 	name = "chem dispenser"
 	desc = "Creates and dispenses chemicals."
@@ -21,65 +34,66 @@
 	var/macrotier = 1
 	var/obj/item/reagent_containers/beaker = null
 	var/list/dispensable_reagents = list(
-		"hydrogen",
-		"lithium",
-		"carbon",
-		"nitrogen",
-		"oxygen",
-		"fluorine",
-		"sodium",
-		"aluminium",
-		"silicon",
-		"phosphorus",
-		"sulfur",
-		"chlorine",
-		"potassium",
-		"iron",
-		"copper",
-		"mercury",
-		"radium",
-		"water",
-		"ethanol",
-		"sugar",
-		"sacid",
-		"welding_fuel",
-		"silver",
-		"iodine",
-		"bromine",
-		"stable_plasma"
+		/datum/reagent/hydrogen,
+		/datum/reagent/lithium,
+		/datum/reagent/carbon,
+		/datum/reagent/nitrogen,
+		/datum/reagent/oxygen,
+		/datum/reagent/fluorine,
+		/datum/reagent/sodium,
+		/datum/reagent/aluminium,
+		/datum/reagent/silicon,
+		/datum/reagent/phosphorus,
+		/datum/reagent/sulfur,
+		/datum/reagent/chlorine,
+		/datum/reagent/potassium,
+		/datum/reagent/iron,
+		/datum/reagent/copper,
+		/datum/reagent/mercury,
+		/datum/reagent/radium,
+		/datum/reagent/water,
+		/datum/reagent/consumable/ethanol,
+		/datum/reagent/consumable/sugar,
+		/datum/reagent/toxin/acid,
+		/datum/reagent/fuel,
+		/datum/reagent/silver,
+		/datum/reagent/iodine,
+		/datum/reagent/bromine,
+		/datum/reagent/stable_plasma
 	)
 //these become available once upgraded.
 	var/list/upgrade_reagents = list(
-		"oil",
-		"ammonia",
-		"ash"
+		/datum/reagent/oil,
+		/datum/reagent/ammonia,
+		/datum/reagent/ash
 	)
 
 	var/list/upgrade_reagents2 = list(
-		"acetone",
-		"phenol",
-		"diethylamine"
+		/datum/reagent/acetone,
+		/datum/reagent/phenol,
+		/datum/reagent/diethylamine
 	)
 
 	var/list/upgrade_reagents3 = list(
-		"mine_salve",
-		"toxin"
+		/datum/reagent/medicine/mine_salve,
+		/datum/reagent/toxin
 	)
 
 	var/list/emagged_reagents = list(
-		"space_drugs",
-		"plasma",
-		"frostoil",
-		"carpotoxin",
-		"histamine",
-		"morphine"
+		/datum/reagent/drug/space_drugs,
+		/datum/reagent/toxin/plasma,
+		/datum/reagent/consumable/frostoil,
+		/datum/reagent/toxin/carpotoxin,
+		/datum/reagent/toxin/histamine,
+		/datum/reagent/medicine/morphine
 	)
 
 	var/list/saved_recipes = list()
 
 /obj/machinery/chem_dispenser/Initialize()
 	. = ..()
-	dispensable_reagents = sortList(dispensable_reagents)
+	for(var/list/L in list(dispensable_reagents, emagged_reagents, upgrade_reagents, upgrade_reagents2, upgrade_reagents3))
+		L = sortList(L, /proc/cmp_reagents_asc)
 	update_icon()
 
 /obj/machinery/chem_dispenser/Destroy()
@@ -213,7 +227,7 @@
 			var/chemname = temp.name
 			if(is_hallucinating && prob(5))
 				chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
-			chemicals.Add(list(list("title" = chemname, "id" = temp.id)))
+			chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name))))
 	for(var/recipe in saved_recipes)
 		recipes.Add(list(recipe))
 	data["chemicals"] = chemicals
@@ -235,7 +249,7 @@
 		if("dispense")
 			if(!is_operational() || QDELETED(cell))
 				return
-			var/reagent = params["reagent"]
+			var/reagent = GLOB.name2reagent[params["reagent"]]
 			if(beaker && dispensable_reagents.Find(reagent))
 				var/datum/reagents/R = beaker.reagents
 				var/free = R.maximum_volume - R.total_volume
@@ -267,7 +281,7 @@
 			var/res = get_macro_resolution()
 			for(var/key in chemicals_to_dispense) // i suppose you could edit the list locally before passing it
 				var/list/keysplit = splittext(key," ")
-				var/r_id = keysplit[1]
+				var/r_id = GLOB.name2reagent[translate_legacy_chem_id(keysplit[1])]
 				if(beaker && dispensable_reagents.Find(r_id)) // but since we verify we have the reagent, it'll be fine
 					var/datum/reagents/R = beaker.reagents
 					var/free = R.maximum_volume - R.total_volume
@@ -299,7 +313,8 @@
 				var/resmismatch = FALSE
 				for(var/reagents in first_process)
 					var/list/reagent = splittext(reagents, "=")
-					if(dispensable_reagents.Find(reagent[1]))
+					var/reagent_id = GLOB.name2reagent[translate_legacy_chem_id(reagent[1])]
+					if(dispensable_reagents.Find(reagent_id))
 						if (!resmismatch && !check_macro_part(reagents, res))
 							resmismatch = TRUE
 						continue
@@ -475,45 +490,45 @@
 	nopower_state = null
 	pass_flags = PASSTABLE
 	dispensable_reagents = list(
-		"water",
-		"ice",
-		"coffee",
-		"cream",
-		"tea",
-		"icetea",
-		"cola",
-		"spacemountainwind",
-		"dr_gibb",
-		"space_up",
-		"tonic",
-		"sodawater",
-		"lemon_lime",
-		"pwr_game",
-		"shamblers",
-		"sugar",
-		"orangejuice",
-		"grenadine",
-		"limejuice",
-		"tomatojuice",
-		"lemonjuice",
-		"menthol"
+		/datum/reagent/water,
+		/datum/reagent/consumable/ice,
+		/datum/reagent/consumable/coffee,
+		/datum/reagent/consumable/cream,
+		/datum/reagent/consumable/tea,
+		/datum/reagent/consumable/icetea,
+		/datum/reagent/consumable/space_cola,
+		/datum/reagent/consumable/spacemountainwind,
+		/datum/reagent/consumable/dr_gibb,
+		/datum/reagent/consumable/space_up,
+		/datum/reagent/consumable/tonic,
+		/datum/reagent/consumable/sodawater,
+		/datum/reagent/consumable/lemon_lime,
+		/datum/reagent/consumable/pwr_game,
+		/datum/reagent/consumable/shamblers,
+		/datum/reagent/consumable/sugar,
+		/datum/reagent/consumable/orangejuice,
+		/datum/reagent/consumable/grenadine,
+		/datum/reagent/consumable/limejuice,
+		/datum/reagent/consumable/tomatojuice,
+		/datum/reagent/consumable/lemonjuice,
+		/datum/reagent/consumable/menthol
 	)
 	upgrade_reagents = list(
-		"mushroomhallucinogen",
-		"nothing",
-		"cryoxadone"
+		/datum/reagent/drug/mushroomhallucinogen,
+		/datum/reagent/consumable/nothing,
+		/datum/reagent/medicine/cryoxadone
 	)
 	upgrade_reagents2 = list(
-		"banana",
-		"berryjuice"
+		/datum/reagent/consumable/banana,
+		/datum/reagent/consumable/berryjuice
 	)
 	upgrade_reagents3 = null
 	emagged_reagents = list(
-		"thirteenloko",
-		"changelingsting",
-		"whiskeycola",
-		"mindbreaker",
-		"tirizene"
+		/datum/reagent/consumable/ethanol/thirteenloko,
+		/datum/reagent/consumable/ethanol/changelingsting,
+		/datum/reagent/consumable/ethanol/whiskey_cola,
+		/datum/reagent/toxin/mindbreaker,
+		/datum/reagent/toxin/staminatoxin
 	)
 
 
@@ -542,39 +557,39 @@
 	icon_state = "booze_dispenser"
 	circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer
 	dispensable_reagents = list(
-		"beer",
-		"kahlua",
-		"whiskey",
-		"wine",
-		"vodka",
-		"gin",
-		"rum",
-		"tequila",
-		"vermouth",
-		"cognac",
-		"ale",
-		"absinthe",
-		"hcider",
-		"creme_de_menthe",
-		"creme_de_cacao",
-		"triple_sec",
-		"sake",
-		"applejack"
+		/datum/reagent/consumable/ethanol/beer,
+		/datum/reagent/consumable/ethanol/kahlua,
+		/datum/reagent/consumable/ethanol/whiskey,
+		/datum/reagent/consumable/ethanol/wine,
+		/datum/reagent/consumable/ethanol/vodka,
+		/datum/reagent/consumable/ethanol/gin,
+		/datum/reagent/consumable/ethanol/rum,
+		/datum/reagent/consumable/ethanol/tequila,
+		/datum/reagent/consumable/ethanol/vermouth,
+		/datum/reagent/consumable/ethanol/cognac,
+		/datum/reagent/consumable/ethanol/ale,
+		/datum/reagent/consumable/ethanol/absinthe,
+		/datum/reagent/consumable/ethanol/hcider,
+		/datum/reagent/consumable/ethanol/creme_de_menthe,
+		/datum/reagent/consumable/ethanol/creme_de_cacao,
+		/datum/reagent/consumable/ethanol/triple_sec,
+		/datum/reagent/consumable/ethanol/sake,
+		/datum/reagent/consumable/ethanol/applejack
 	)
 	upgrade_reagents = list(
-		"ethanol",
-		"fernet"
+		/datum/reagent/consumable/ethanol,
+		/datum/reagent/consumable/ethanol/fernet
 	)
 	upgrade_reagents2 = null
 	upgrade_reagents3 = null
 	emagged_reagents = list(
-		"iron",
-		"alexander",
-		"clownstears",
-		"minttoxin",
-		"atomicbomb",
-		"aphro",
-		"aphro+"
+		/datum/reagent/iron,
+		/datum/reagent/consumable/ethanol/alexander,
+		/datum/reagent/consumable/clownstears,
+		/datum/reagent/toxin/minttoxin,
+		/datum/reagent/consumable/ethanol/atomicbomb,
+		/datum/reagent/drug/aphrodisiac,
+		/datum/reagent/drug/aphrodisiacplus
 	)
 
 /obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged
@@ -598,9 +613,9 @@
 /obj/machinery/chem_dispenser/mutagen
 	name = "mutagen dispenser"
 	desc = "Creates and dispenses mutagen."
-	dispensable_reagents = list("mutagen")
+	dispensable_reagents = list(/datum/reagent/toxin/mutagen)
 	upgrade_reagents = null
-	emagged_reagents = list("plasma")
+	emagged_reagents = list(/datum/reagent/toxin/plasma)
 
 
 /obj/machinery/chem_dispenser/mutagensaltpeter
@@ -609,19 +624,19 @@
 	flags_1 = NODECONSTRUCT_1
 
 	dispensable_reagents = list(
-		"mutagen",
-		"saltpetre",
-		"eznutriment",
-		"left4zednutriment",
-		"robustharvestnutriment",
-		"water",
-		"plantbgone",
-		"weedkiller",
-		"pestkiller",
-		"cryoxadone",
-		"ammonia",
-		"ash",
-		"diethylamine")
+		/datum/reagent/toxin/mutagen,
+		/datum/reagent/saltpetre,
+		/datum/reagent/plantnutriment/eznutriment,
+		/datum/reagent/plantnutriment/left4zednutriment,
+		/datum/reagent/plantnutriment/robustharvestnutriment,
+		/datum/reagent/water,
+		/datum/reagent/toxin/plantbgone,
+		/datum/reagent/toxin/plantbgone/weedkiller,
+		/datum/reagent/toxin/pestkiller,
+		/datum/reagent/medicine/cryoxadone,
+		/datum/reagent/ammonia,
+		/datum/reagent/ash,
+		/datum/reagent/diethylamine)
 	//same as above.
 	upgrade_reagents = null
 	upgrade_reagents2 = null
@@ -667,46 +682,46 @@
 	working_state = null
 	nopower_state = null
 	dispensable_reagents = list(
-		"hydrogen",
-		"lithium",
-		"carbon",
-		"nitrogen",
-		"oxygen",
-		"fluorine",
-		"sodium",
-		"aluminium",
-		"silicon",
-		"phosphorus",
-		"sulfur",
-		"chlorine",
-		"potassium",
-		"iron",
-		"copper",
-		"mercury",
-		"radium",
-		"water",
-		"ethanol",
-		"sugar",
-		"sacid",
-		"welding_fuel",
-		"silver",
-		"iodine",
-		"bromine",
-		"stable_plasma",
-		"oil",
-		"ammonia",
-		"ash",
-		"acetone",
-		"phenol",
-		"diethylamine",
-		"mine_salve",
-		"toxin",
-		"space_drugs",
-		"plasma",
-		"frostoil",
-		"uranium",
-		"histamine",
-		"morphine"
+		/datum/reagent/hydrogen,
+		/datum/reagent/lithium,
+		/datum/reagent/carbon,
+		/datum/reagent/nitrogen,
+		/datum/reagent/oxygen,
+		/datum/reagent/fluorine,
+		/datum/reagent/sodium,
+		/datum/reagent/aluminium,
+		/datum/reagent/silicon,
+		/datum/reagent/phosphorus,
+		/datum/reagent/sulfur,
+		/datum/reagent/chlorine,
+		/datum/reagent/potassium,
+		/datum/reagent/iron,
+		/datum/reagent/copper,
+		/datum/reagent/mercury,
+		/datum/reagent/radium,
+		/datum/reagent/water,
+		/datum/reagent/consumable/ethanol,
+		/datum/reagent/consumable/sugar,
+		/datum/reagent/toxin/acid,
+		/datum/reagent/fuel,
+		/datum/reagent/silver,
+		/datum/reagent/iodine,
+		/datum/reagent/bromine,
+		/datum/reagent/stable_plasma,
+		/datum/reagent/oil,
+		/datum/reagent/ammonia,
+		/datum/reagent/ash,
+		/datum/reagent/acetone,
+		/datum/reagent/phenol,
+		/datum/reagent/diethylamine,
+		/datum/reagent/medicine/mine_salve,
+		/datum/reagent/toxin,
+		/datum/reagent/drug/space_drugs,
+		/datum/reagent/toxin/plasma,
+		/datum/reagent/consumable/frostoil,
+		/datum/reagent/uranium,
+		/datum/reagent/toxin/histamine,
+		/datum/reagent/medicine/morphine
 	)
 
 /obj/machinery/chem_dispenser/abductor/Initialize()
@@ -719,4 +734,4 @@
 	component_parts += new /obj/item/stock_parts/manipulator/femto(null)
 	component_parts += new /obj/item/stack/sheet/glass(null)
 	component_parts += new /obj/item/stock_parts/cell/bluespace(null)
-	RefreshParts()
\ No newline at end of file
+	RefreshParts()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 1ac62ba651..e6b19417d8 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -186,13 +186,13 @@
 	var/beakerContents[0]
 	if(beaker)
 		for(var/datum/reagent/R in beaker.reagents.reagent_list)
-			beakerContents.Add(list(list("name" = R.name, "id" = R.id, "volume" = R.volume))) // list in a list because Byond merges the first list...
+			beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
 		data["beakerContents"] = beakerContents
 
 	var/bufferContents[0]
 	if(reagents.total_volume)
 		for(var/datum/reagent/N in reagents.reagent_list)
-			bufferContents.Add(list(list("name" = N.name, "id" = N.id, "volume" = N.volume))) // ^
+			bufferContents.Add(list(list("name" = N.name, "id" = ckey(N.name), "volume" = N.volume))) // ^
 		data["bufferContents"] = bufferContents
 
 	//Calculated at init time as it never changes
@@ -214,34 +214,34 @@
 
 		if("transferToBuffer")
 			if(beaker)
-				var/id = params["id"]
+				var/reagent = GLOB.name2reagent[params["id"]]
 				var/amount = text2num(params["amount"])
 				if (amount > 0)
 					end_fermi_reaction()
-					beaker.reagents.trans_id_to(src, id, amount)
+					beaker.reagents.trans_id_to(src, reagent, amount)
 					. = TRUE
 				else if (amount == -1) // -1 means custom amount
 					useramount = input("Enter the Amount you want to transfer:", name, useramount) as num|null
 					if (useramount > 0)
 						end_fermi_reaction()
-						beaker.reagents.trans_id_to(src, id, useramount)
+						beaker.reagents.trans_id_to(src, reagent, useramount)
 						. = TRUE
 
 		if("transferFromBuffer")
-			var/id = params["id"]
+			var/reagent = GLOB.name2reagent[params["id"]]
 			var/amount = text2num(params["amount"])
 			if (amount > 0)
 				if(mode)
-					reagents.trans_id_to(beaker, id, amount)
+					reagents.trans_id_to(beaker, reagent, amount)
 					. = TRUE
 				else
-					reagents.remove_reagent(id, amount)
+					reagents.remove_reagent(reagent, amount)
 					. = TRUE
 			else if (amount == -1) // -1 means custom amount
 				useramount = input("Enter the Amount you want to transfer:", name, useramount) as num|null
 				if (useramount > 0)
 					end_fermi_reaction()
-					reagents.trans_id_to(beaker, id, useramount)
+					reagents.trans_id_to(beaker, reagent, useramount)
 					. = TRUE
 
 		if("toggleMode")
@@ -260,7 +260,7 @@
 					if(!amount)
 						return
 					vol_each = min(reagents.total_volume / amount, 50)
-				var/name = stripped_input(usr,"Name:","Name your pill!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+				var/name = html_decode(stripped_input(usr,"Name:","Name your pill!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 					return
 				var/obj/item/reagent_containers/pill/P
@@ -287,7 +287,7 @@
 					adjust_item_drop_location(P)
 					reagents.trans_to(P,vol_each)
 			else
-				var/name = stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN)
+				var/name = html_decode(stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN))
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 					return
 				var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
@@ -313,7 +313,7 @@
 				if(!amount)
 					return
 				vol_each = min(reagents.total_volume / amount, 40)
-			var/name = stripped_input(usr,"Name:","Name your patch!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+			var/name = html_decode(stripped_input(usr,"Name:","Name your patch!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
 			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 				return
 			var/obj/item/reagent_containers/pill/P
@@ -331,7 +331,7 @@
 				return
 
 			if(condi)
-				var/name = stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+				var/name = html_decode(stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 					return
 				var/obj/item/reagent_containers/food/condiment/P = new(drop_location())
@@ -344,7 +344,7 @@
 				if(text2num(many))
 					amount_full = round(reagents.total_volume / 30)
 					vol_part = ((reagents.total_volume*1000) % 30000) / 1000 //% operator doesn't support decimals.
-				var/name = stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+				var/name = html_decode(stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 					return
 
@@ -372,7 +372,7 @@
 			if(text2num(many))
 				amount_full = round(reagents.total_volume / 60)
 				vol_part = reagents.total_volume % 60
-			var/name = stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+			var/name = html_decode(stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
 			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 				return
 
@@ -407,7 +407,7 @@
 					return
 				vol_each = min(reagents.total_volume / amount, 20)
 
-			var/name = stripped_input(usr,"Name:","Name your SmartDart!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+			var/name = html_decode(stripped_input(usr,"Name:","Name your SmartDart!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
 			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
 				return
 
@@ -423,7 +423,7 @@
 
 		//END CITADEL ADDITIONS
 		if("analyzeBeak")
-			var/datum/reagent/R = GLOB.chemical_reagents_list[params["id"]]
+			var/datum/reagent/R = GLOB.name2reagent[params["id"]]
 			if(R)
 				var/state = "Unknown"
 				if(initial(R.reagent_state) == 1)
@@ -434,11 +434,11 @@
 					state = "Gas"
 				var/const/P = 3 //The number of seconds between life ticks
 				var/T = initial(R.metabolization_rate) * (60 / P)
-				var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.id)
+				var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.type)
 				if(Rcr && Rcr.FermiChem)
 					fermianalyze = TRUE
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = beaker.reagents.has_reagent("[R.id]")
+					var/datum/reagent/targetReagent = beaker.reagents.has_reagent(R.type)
 
 					if(!targetReagent)
 						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
@@ -450,7 +450,7 @@
 				return
 
 		if("analyzeBuff")
-			var/datum/reagent/R = GLOB.chemical_reagents_list[params["id"]]
+			var/datum/reagent/R = GLOB.name2reagent[params["id"]]
 			if(R)
 				var/state = "Unknown"
 				if(initial(R.reagent_state) == 1)
@@ -463,9 +463,9 @@
 				var/T = initial(R.metabolization_rate) * (60 / P)
 				if(istype(R, /datum/reagent/fermi))
 					fermianalyze = TRUE
-					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.id)
+					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.type)
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = reagents.has_reagent("[R.id]")
+					var/datum/reagent/targetReagent = reagents.has_reagent(R.type)
 
 					if(!targetReagent)
 						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index daac5a5d1c..ed23e7c75c 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -8,8 +8,8 @@
 	flags_1 = NODECONSTRUCT_1
 	use_power = NO_POWER_USE
 	var/static/list/shortcuts = list(
-		"meth" = "methamphetamine",
-		"tricord" = "tricordrazine"
+		"meth" = /datum/reagent/drug/methamphetamine,
+		"tricord" = /datum/reagent/medicine/tricordrazine
 	)
 
 /obj/machinery/chem_dispenser/chem_synthesizer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
@@ -31,13 +31,13 @@
 				beaker = null
 				. = TRUE
 		if("input")
-			var/input_reagent = replacetext(lowertext(input("Enter the name of any liquid", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name
+			var/input_reagent = replacetext(lowertext(input("Enter the name of any reagent", "Input") as text), " ", "") //95% of the time, the reagent types is a lowercase, no spaces / underscored version of the name
 			if(shortcuts[input_reagent])
 				input_reagent = shortcuts[input_reagent]
 			else
 				input_reagent = find_reagent(input_reagent)
-			if(!input_reagent || !GLOB.chemical_reagents_list[input_reagent])
-				say("OUT OF RANGE")
+			if(!input_reagent)
+				say("REAGENT NOT FOUND")
 				return
 			else
 				if(!beaker)
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 6ae0a682d8..68ce6e490f 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -144,9 +144,9 @@
 				var/datum/reagent/blood/B = locate() in beaker.reagents.reagent_list
 				if(B)
 					data["has_blood"] = TRUE
-					data["blood"] = list()
-					data["blood"]["dna"] = B.data["blood_DNA"] || "none"
-					data["blood"]["type"] = B.data["blood_type"] || "none"
+					data[/datum/reagent/blood] = list()
+					data[/datum/reagent/blood]["dna"] = B.data["blood_DNA"] || "none"
+					data[/datum/reagent/blood]["type"] = B.data["blood_type"] || "none"
 					data["viruses"] = get_viruses_data(B)
 					data["resistances"] = get_resistance_data(B)
 		if(SYMPTOM_DETAILS)
@@ -192,7 +192,7 @@
 			var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
 			B.name = "[A.name] culture bottle"
 			B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."
-			B.reagents.add_reagent("blood", 20, data)
+			B.reagents.add_reagent(/datum/reagent/blood, 20, data)
 			wait = TRUE
 			update_icon()
 			var/turf/source_turf = get_turf(src)
@@ -204,7 +204,7 @@
 			var/datum/disease/D = SSdisease.archive_diseases[id]
 			var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
 			B.name = "[D.name] vaccine bottle"
-			B.reagents.add_reagent("vaccine", 15, list(id))
+			B.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id))
 			wait = TRUE
 			update_icon()
 			addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 200)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 98cfd877b2..7e1b7ec018 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -299,18 +299,18 @@
 /obj/machinery/reagentgrinder/proc/mix_complete()
 	if(beaker?.reagents.total_volume)
 		//Recipe to make Butter
-		var/butter_amt = FLOOR(beaker.reagents.get_reagent_amount("milk") / MILK_TO_BUTTER_COEFF, 1)
-		beaker.reagents.remove_reagent("milk", MILK_TO_BUTTER_COEFF * butter_amt)
+		var/butter_amt = FLOOR(beaker.reagents.get_reagent_amount(/datum/reagent/consumable/milk) / MILK_TO_BUTTER_COEFF, 1)
+		beaker.reagents.remove_reagent(/datum/reagent/consumable/milk, MILK_TO_BUTTER_COEFF * butter_amt)
 		for(var/i in 1 to butter_amt)
 			new /obj/item/reagent_containers/food/snacks/butter(drop_location())
 		//Recipe to make Mayonnaise
-		if (beaker.reagents.has_reagent("eggyolk"))
-			var/amount = beaker.reagents.get_reagent_amount("eggyolk")
-			beaker.reagents.remove_reagent("eggyolk", amount)
-			beaker.reagents.add_reagent("mayonnaise", amount)
+		if (beaker.reagents.has_reagent(/datum/reagent/consumable/eggyolk))
+			var/amount = beaker.reagents.get_reagent_amount(/datum/reagent/consumable/eggyolk)
+			beaker.reagents.remove_reagent(/datum/reagent/consumable/eggyolk, amount)
+			beaker.reagents.add_reagent(/datum/reagent/consumable/mayonnaise, amount)
 		//Moonsugar for skooma
-		if(beaker.reagents.has_reagent("sugar") && beaker.reagents.has_reagent("moonshine"))
-			var/amount = min(beaker.reagents.get_reagent_amount("sugar"), beaker.reagents.get_reagent_amount("moonshine"))
-			beaker.reagents.remove_reagent("sugar", amount)
-			beaker.reagents.remove_reagent("moonshine", amount)
-			beaker.reagents.add_reagent("moonsugar", amount*2)
+		if(beaker.reagents.has_reagent(/datum/reagent/consumable/sugar) && beaker.reagents.has_reagent(/datum/reagent/consumable/ethanol/moonshine))
+			var/amount = min(beaker.reagents.get_reagent_amount(/datum/reagent/consumable/sugar), beaker.reagents.get_reagent_amount(/datum/reagent/consumable/ethanol/moonshine))
+			beaker.reagents.remove_reagent(/datum/reagent/consumable/sugar, amount)
+			beaker.reagents.remove_reagent(/datum/reagent/consumable/ethanol/moonshine, amount)
+			beaker.reagents.add_reagent(/datum/reagent/moonsugar, amount*2)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index da41ac9dc4..5eb2c135a8 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -1,12 +1,20 @@
 #define REM REAGENTS_EFFECT_MULTIPLIER
 
+GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
+
+/proc/build_name2reagent()
+	. = list()
+	for (var/t in subtypesof(/datum/reagent))
+		var/datum/reagent/R = t
+		if (length(initial(R.name)))
+			.[ckey(initial(R.name))] = t
+
 //Various reagents
 //Toxin & acid reagents
 //Hydroponics stuff
 
 /datum/reagent
 	var/name = "Reagent"
-	var/id = "reagent"
 	var/description = ""
 	var/specific_heat = SPECIFIC_HEAT_DEFAULT		//J/(K*mol)
 	var/taste_description = "metaphorical salt"
@@ -58,7 +66,7 @@
 			var/modifier = CLAMP((1 - touch_protection), 0, 1)
 			var/amount = round(reac_volume*modifier, 0.1)
 			if(amount >= 0.5)
-				M.reagents.add_reagent(id, amount)
+				M.reagents.add_reagent(type, amount)
 	return 1
 
 /datum/reagent/proc/reaction_obj(obj/O, volume)
@@ -70,7 +78,7 @@
 /datum/reagent/proc/on_mob_life(mob/living/carbon/M)
 	current_cycle++
 	if(holder)
-		holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
+		holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
 	return
 
 //called when a mob processes chems when dead.
@@ -79,7 +87,7 @@
 		return
 	current_cycle++
 	if(holder)
-		holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
+		holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
 	return
 
 // Called when this reagent is first added to a mob
@@ -88,19 +96,19 @@
 		return
 	var/mob/living/carbon/M = L
 	if (purity == 1)
-		log_game("CHEM: [L] ckey: [L.key] has ingested [volume]u of [id]")
+		log_game("CHEM: [L] ckey: [L.key] has ingested [volume]u of [type]")
 		return
 	if(cached_purity == 1)
 		cached_purity = purity
 	else if(purity < 0)
-		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
+		CRASH("Purity below 0 for chem: [type], Please let Fermis Know!")
 	if(chemical_flags & REAGENT_DONOTSPLIT)
 		return
 
 	if ((inverse_chem_val > purity) && (inverse_chem))//Turns all of a added reagent into the inverse chem
-		M.reagents.remove_reagent(id, amount, FALSE)
+		M.reagents.remove_reagent(type, amount, FALSE)
 		M.reagents.add_reagent(inverse_chem, amount, FALSE, other_purity = 1-cached_purity)
-		var/datum/reagent/R = M.reagents.has_reagent("[inverse_chem]")
+		var/datum/reagent/R = M.reagents.has_reagent(inverse_chem)
 		if(R.chemical_flags & REAGENT_SNEAKYNAME)
 			R.name = name//Negative effects are hidden
 			if(R.chemical_flags & REAGENT_INVISIBLE)
@@ -110,9 +118,9 @@
 	else if (impure_chem)
 		var/impureVol = amount * (1 - purity) //turns impure ratio into impure chem
 		if(!(chemical_flags & REAGENT_SPLITRETAINVOL))
-			M.reagents.remove_reagent(id, (impureVol), FALSE)
+			M.reagents.remove_reagent(type, (impureVol), FALSE)
 		M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity)
-		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume - impureVol]u of [id]")
+		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume - impureVol]u of [type]")
 		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [impure_chem]")
 	return
 
@@ -140,18 +148,18 @@
 	if(!iscarbon(M))
 		return
 	if (purity == 1)
-		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [id]")
+		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [type]")
 		return
 	cached_purity = purity //purity SHOULD be precalculated from the add_reagent, update cache.
 	if (purity < 0)
-		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
+		CRASH("Purity below 0 for chem: [type], Please let Fermis Know!")
 	if(chemical_flags & REAGENT_DONOTSPLIT)
 		return
 
 	if ((inverse_chem_val > purity) && (inverse_chem)) //INVERT
-		M.reagents.remove_reagent(id, amount, FALSE)
+		M.reagents.remove_reagent(type, amount, FALSE)
 		M.reagents.add_reagent(inverse_chem, amount, FALSE, other_purity = 1-cached_purity)
-		var/datum/reagent/R = M.reagents.has_reagent("[inverse_chem]")
+		var/datum/reagent/R = M.reagents.has_reagent(inverse_chem)
 		if(R.chemical_flags & REAGENT_SNEAKYNAME)
 			R.name = name//Negative effects are hidden
 			if(R.chemical_flags & REAGENT_INVISIBLE)
@@ -161,9 +169,9 @@
 	else if (impure_chem) //SPLIT
 		var/impureVol = amount * (1 - purity)
 		if(!(chemical_flags & REAGENT_SPLITRETAINVOL))
-			M.reagents.remove_reagent(id, impureVol, FALSE)
+			M.reagents.remove_reagent(type, impureVol, FALSE)
 		M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity)
-		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume - impureVol]u of [id]")
+		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume - impureVol]u of [type]")
 		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume]u of [impure_chem]")
 	return
 
@@ -180,29 +188,29 @@
 
 /datum/reagent/proc/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You feel like you took too much of [name]!</span>")
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/overdose, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
 	return
 
 /datum/reagent/proc/addiction_act_stage1(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_light, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_light, name)
 	if(prob(30))
 		to_chat(M, "<span class='notice'>You feel like having some [name] right about now.</span>")
 	return
 
 /datum/reagent/proc/addiction_act_stage2(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_medium, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_medium, name)
 	if(prob(30))
 		to_chat(M, "<span class='notice'>You feel like you need [name]. You just can't get enough.</span>")
 	return
 
 /datum/reagent/proc/addiction_act_stage3(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_severe, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_severe, name)
 	if(prob(30))
 		to_chat(M, "<span class='danger'>You have an intense craving for [name].</span>")
 	return
 
 /datum/reagent/proc/addiction_act_stage4(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_critical, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_critical, name)
 	if(prob(30))
 		to_chat(M, "<span class='boldannounce'>You're not feeling good at all! You really need some [name].</span>")
 	return
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index fd28ff9c47..62a8d97b2d 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -8,7 +8,6 @@
 
 /datum/reagent/consumable/ethanol
 	name = "Ethanol"
-	id = "ethanol"
 	description = "A well-known alcohol with a variety of applications."
 	color = "#404030" // rgb: 64, 64, 48
 	nutriment_factor = 0
@@ -36,7 +35,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 */
 
 /datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
-	if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
+	if(HAS_TRAIT(C, TRAIT_NO_ALCOHOL))
+		C.adjustToxLoss((boozepwr/25)*REM,forced = TRUE)
+	else if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
 		var/booze_power = boozepwr
 		if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
 			booze_power *= 0.7
@@ -79,7 +80,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer
 	name = "Beer"
-	id = "beer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -92,7 +92,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer/light
 	name = "Light Beer"
-	id = "light_beer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content."
 	boozepwr = 5 //Space Europeans hate it
 	taste_description = "dish water"
@@ -103,7 +102,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer/green
 	name = "Green Beer"
-	id = "greenbeer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is dyed a festive green."
 	color = "#A8E61D"
 	taste_description = "green piss water"
@@ -123,7 +121,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/kahlua
 	name = "Kahlua"
-	id = "kahlua"
 	description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -146,7 +143,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey
 	name = "Whiskey"
-	id = "whiskey"
 	description = "A superb and well-aged single-malt whiskey. Damn."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 75
@@ -160,7 +156,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/thirteenloko
 	name = "Thirteen Loko"
-	id = "thirteenloko"
 	description = "A potent mixture of caffeine and alcohol."
 	color = "#102000" // rgb: 16, 32, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -225,7 +220,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vodka
 	name = "Vodka"
-	id = "vodka"
 	description = "Number one drink AND fueling choice for Russians worldwide."
 	color = "#0064C8" // rgb: 0, 100, 200
 	boozepwr = 65
@@ -243,7 +237,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bilk
 	name = "Bilk"
-	id = "bilk"
 	description = "This appears to be beer mixed with milk. Disgusting."
 	color = "#895C4C" // rgb: 137, 92, 76
 	nutriment_factor = 2 * REAGENTS_METABOLISM
@@ -262,7 +255,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/threemileisland
 	name = "Three Mile Island Iced Tea"
-	id = "threemileisland"
 	description = "Made for a woman, strong enough for a man."
 	color = "#666340" // rgb: 102, 99, 64
 	boozepwr = 10
@@ -280,7 +272,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gin
 	name = "Gin"
-	id = "gin"
 	description = "It's gin. In space. I say, good sir."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -293,7 +284,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/rum
 	name = "Rum"
-	id = "rum"
 	description = "Yohoho and all that."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60
@@ -307,7 +297,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/tequila
 	name = "Tequila"
-	id = "tequila"
 	description = "A strong and mildly flavoured, Mexican produced spirit. Feeling thirsty, hombre?"
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 70
@@ -321,7 +310,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vermouth
 	name = "Vermouth"
-	id = "vermouth"
 	description = "You suddenly feel a craving for a martini..."
 	color = "#91FF91" // rgb: 145, 255, 145
 	boozepwr = 45
@@ -335,7 +323,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/wine
 	name = "Wine"
-	id = "wine"
 	description = "A premium alcoholic beverage made from distilled grape juice."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 35
@@ -349,7 +336,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/lizardwine
 	name = "Lizard wine"
-	id = "lizardwine"
 	description = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 45
@@ -360,7 +346,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grappa
 	name = "Grappa"
-	id = "grappa"
 	description = "A fine Italian brandy, for when regular wine just isn't alcoholic enough for you."
 	color = "#F8EBF1"
 	boozepwr = 60
@@ -373,7 +358,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/cognac
 	name = "Cognac"
-	id = "cognac"
 	description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
 	color = "#AB3C05" // rgb: 171, 60, 5
 	boozepwr = 75
@@ -387,7 +371,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/absinthe
 	name = "Absinthe"
-	id = "absinthe"
 	description = "A powerful alcoholic drink. Rumored to cause hallucinations but does not."
 	color = rgb(10, 206, 0)
 	boozepwr = 80 //Very strong even by default
@@ -405,7 +388,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hooch
 	name = "Hooch"
-	id = "hooch"
 	description = "Either someone's failure at cocktail making or attempt in alcohol production. In any case, do you really want to drink that?"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 100
@@ -422,7 +404,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/ale
 	name = "Ale"
-	id = "ale"
 	description = "A dark alcoholic beverage made with malted barley and yeast."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 65
@@ -435,7 +416,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/goldschlager
 	name = "Goldschlager"
-	id = "goldschlager"
 	description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 25
@@ -449,7 +429,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/patron
 	name = "Patron"
-	id = "patron"
 	description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
 	color = "#585840" // rgb: 88, 88, 64
 	boozepwr = 60
@@ -464,7 +443,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gintonic
 	name = "Gin and Tonic"
-	id = "gintonic"
 	description = "An all time classic, mild cocktail."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 25
@@ -478,7 +456,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/rum_coke
 	name = "Rum and Coke"
-	id = "rumcoke"
 	description = "Rum, mixed with cola."
 	taste_description = "cola"
 	boozepwr = 40
@@ -492,7 +469,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/cuba_libre
 	name = "Cuba Libre"
-	id = "cubalibre"
 	description = "Viva la Revolucion! Viva Cuba Libre!"
 	color = "#3E1B00" // rgb: 62, 27, 0
 	boozepwr = 50
@@ -515,7 +491,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey_cola
 	name = "Whiskey Cola"
-	id = "whiskeycola"
 	description = "Whiskey, mixed with cola. Surprisingly refreshing."
 	color = "#3E1B00" // rgb: 62, 27, 0
 	boozepwr = 70
@@ -528,7 +503,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/martini
 	name = "Classic Martini"
-	id = "martini"
 	description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60
@@ -541,7 +515,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vodkamartini
 	name = "Vodka Martini"
-	id = "vodkamartini"
 	description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 65
@@ -555,7 +528,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/white_russian
 	name = "White Russian"
-	id = "whiterussian"
 	description = "That's just, like, your opinion, man..."
 	color = "#A68340" // rgb: 166, 131, 64
 	boozepwr = 50
@@ -568,7 +540,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/screwdrivercocktail
 	name = "Screwdriver"
-	id = "screwdrivercocktail"
 	description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
 	color = "#A68310" // rgb: 166, 131, 16
 	boozepwr = 55
@@ -586,7 +557,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/booger
 	name = "Booger"
-	id = "booger"
 	description = "Ewww..."
 	color = "#8CFF8C" // rgb: 140, 255, 140
 	boozepwr = 45
@@ -598,7 +568,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bloody_mary
 	name = "Bloody Mary"
-	id = "bloodymary"
 	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 55
@@ -618,7 +587,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/brave_bull
 	name = "Brave Bull"
-	id = "bravebull"
 	description = "It's just as effective as Dutch-Courage!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 80
@@ -643,7 +611,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/tequila_sunrise
 	name = "Tequila Sunrise"
-	id = "tequilasunrise"
 	description = "Tequila, Grenadine, and Orange Juice."
 	color = "#FFE48C" // rgb: 255, 228, 140
 	boozepwr = 45
@@ -662,7 +629,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/M)
 	if(QDELETED(light_holder))
-		M.reagents.del_reagent("tequilasunrise") //If we lost our light object somehow, remove the reagent
+		M.reagents.del_reagent(type) //If we lost our light object somehow, remove the reagent
 	else if(light_holder.loc != M)
 		light_holder.forceMove(M)
 	return ..()
@@ -673,7 +640,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/toxins_special
 	name = "Toxins Special"
-	id = "toxinsspecial"
 	description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 25
@@ -691,7 +657,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beepsky_smash
 	name = "Beepsky Smash"
-	id = "beepskysmash"
 	description = "Drink this and prepare for the LAW."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 90 //THE FIST OF THE LAW IS STRONG AND HARD
@@ -736,7 +701,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/irish_cream
 	name = "Irish Cream"
-	id = "irishcream"
 	description = "Whiskey-imbued cream, what else would you expect from the Irish?"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 50
@@ -749,7 +713,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/manly_dorf
 	name = "The Manly Dorf"
-	id = "manlydorf"
 	description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 100 //For the manly only
@@ -777,7 +740,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/longislandicedtea
 	name = "Long Island Iced Tea"
-	id = "longislandicedtea"
 	description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -790,7 +752,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/moonshine
 	name = "Moonshine"
-	id = "moonshine"
 	description = "You've really hit rock bottom now... your liver packed its bags and left last night."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 95
@@ -802,7 +763,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/b52
 	name = "B-52"
-	id = "b52"
 	description = "Coffee, Irish Cream, and cognac. You will get bombed."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 85
@@ -819,7 +779,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/irishcoffee
 	name = "Irish Coffee"
-	id = "irishcoffee"
 	description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -832,7 +791,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/margarita
 	name = "Margarita"
-	id = "margarita"
 	description = "On the rocks with salt on the rim. Arriba~!"
 	color = "#8CFF8C" // rgb: 140, 255, 140
 	boozepwr = 35
@@ -845,7 +803,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/black_russian
 	name = "Black Russian"
-	id = "blackrussian"
 	description = "For the lactose-intolerant. Still as classy as a White Russian."
 	color = "#360000" // rgb: 54, 0, 0
 	boozepwr = 70
@@ -859,7 +816,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/manhattan
 	name = "Manhattan"
-	id = "manhattan"
 	description = "The Detective's undercover drink of choice. He never could stomach gin..."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 30
@@ -873,7 +829,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/manhattan_proj
 	name = "Manhattan Project"
-	id = "manhattan_proj"
 	description = "A scientist's drink of choice, for pondering ways to blow up the station."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -891,7 +846,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskeysoda
 	name = "Whiskey Soda"
-	id = "whiskeysoda"
 	description = "For the more refined griffon."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 70
@@ -904,7 +858,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/antifreeze
 	name = "Anti-freeze"
-	id = "antifreeze"
 	description = "The ultimate refreshment. Not what it sounds like."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -921,7 +874,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/barefoot
 	name = "Barefoot"
-	id = "barefoot"
 	description = "Barefoot and pregnant."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -942,7 +894,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/snowwhite
 	name = "Snow White"
-	id = "snowwhite"
 	description = "A cold refreshment."
 	color = "#FFFFFF" // rgb: 255, 255, 255
 	boozepwr = 35
@@ -955,7 +906,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/demonsblood //Prevents the imbiber from being dragged into a pool of blood by a slaughter demon.
 	name = "Demon's Blood"
-	id = "demonsblood"
 	description = "AHHHH!!!!"
 	color = "#820000" // rgb: 130, 0, 0
 	boozepwr = 75
@@ -968,7 +918,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/devilskiss //If eaten by a slaughter demon, the demon will regret it.
 	name = "Devil's Kiss"
-	id = "devilskiss"
 	description = "Creepy time!"
 	color = "#A68310" // rgb: 166, 131, 16
 	boozepwr = 70
@@ -981,7 +930,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vodkatonic
 	name = "Vodka and Tonic"
-	id = "vodkatonic"
 	description = "For when a gin and tonic isn't Russian enough."
 	color = "#0064C8" // rgb: 0, 100, 200
 	boozepwr = 70
@@ -994,7 +942,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/ginfizz
 	name = "Gin Fizz"
-	id = "ginfizz"
 	description = "Refreshingly lemony, deliciously dry."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -1007,7 +954,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bahama_mama
 	name = "Bahama Mama"
-	id = "bahama_mama"
 	description = "Tropical cocktail."
 	color = "#FF7F3B" // rgb: 255, 127, 59
 	boozepwr = 35
@@ -1020,7 +966,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/singulo
 	name = "Singulo"
-	id = "singulo"
 	description = "A blue-space beverage!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 35
@@ -1033,7 +978,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sbiten
 	name = "Sbiten"
-	id = "sbiten"
 	description = "A spicy Vodka! Might be a little hot for the little guys!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 70
@@ -1050,7 +994,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/red_mead
 	name = "Red Mead"
-	id = "red_mead"
 	description = "The true Viking drink! Even though it has a strange red color."
 	color = "#C73C00" // rgb: 199, 60, 0
 	boozepwr = 31 //Red drinks are stronger
@@ -1063,7 +1006,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/mead
 	name = "Mead"
-	id = "mead"
 	description = "A Viking drink, though a cheap one."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -1077,7 +1019,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/iced_beer
 	name = "Iced Beer"
-	id = "iced_beer"
 	description = "A beer which is so cold the air around it freezes."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 15
@@ -1093,7 +1034,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grog
 	name = "Grog"
-	id = "grog"
 	description = "Watered down rum, Nanotrasen approves!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 1 //Basically nothing
@@ -1105,7 +1045,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/aloe
 	name = "Aloe"
-	id = "aloe"
 	description = "So very, very, very good."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -1118,7 +1057,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/andalusia
 	name = "Andalusia"
-	id = "andalusia"
 	description = "A nice, strangely named drink."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 40
@@ -1131,7 +1069,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/alliescocktail
 	name = "Allies Cocktail"
-	id = "alliescocktail"
 	description = "A drink made from your allies. Not as sweet as those made from your enemies."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -1144,7 +1081,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/acid_spit
 	name = "Acid Spit"
-	id = "acidspit"
 	description = "A drink for the daring, can be deadly if incorrectly prepared!"
 	color = "#365000" // rgb: 54, 80, 0
 	boozepwr = 80
@@ -1157,7 +1093,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/amasec
 	name = "Amasec"
-	id = "amasec"
 	description = "Official drink of the Nanotrasen Gun-Club!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -1170,7 +1105,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/changelingsting
 	name = "Changeling Sting"
-	id = "changelingsting"
 	description = "You take a tiny sip and feel a burning sensation..."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 95
@@ -1191,7 +1125,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/irishcarbomb
 	name = "Irish Car Bomb"
-	id = "irishcarbomb"
 	description = "Mmm, tastes like chocolate cake..."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 25
@@ -1204,7 +1137,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/syndicatebomb
 	name = "Syndicate Bomb"
-	id = "syndicatebomb"
 	description = "Tastes like terrorism!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 90
@@ -1222,7 +1154,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/erikasurprise
 	name = "Erika Surprise"
-	id = "erikasurprise"
 	description = "The surprise is, it's green!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 35
@@ -1235,7 +1166,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/driestmartini
 	name = "Driest Martini"
-	id = "driestmartini"
 	description = "Only for the experienced. You think you see sand floating in the glass."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#2E6671" // rgb: 46, 102, 113
@@ -1249,7 +1179,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bananahonk
 	name = "Banana Honk"
-	id = "bananahonk"
 	description = "A drink from Clown Heaven."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#FFFF91" // rgb: 255, 255, 140
@@ -1269,7 +1198,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/silencer
 	name = "Silencer"
-	id = "silencer"
 	description = "A drink from Mime Heaven."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#664300" // rgb: 102, 67, 0
@@ -1289,7 +1217,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/drunkenblumpkin
 	name = "Drunken Blumpkin"
-	id = "drunkenblumpkin"
 	description = "A weird mix of whiskey and blumpkin juice."
 	color = "#1EA0FF" // rgb: 102, 67, 0
 	boozepwr = 50
@@ -1302,7 +1229,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour.
 	name = "Whiskey Sour"
-	id = "whiskey_sour"
 	description = "Lemon juice/whiskey/sugar mixture. Moderate alcohol content."
 	color = rgb(255, 201, 49)
 	boozepwr = 35
@@ -1315,7 +1241,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hcider
 	name = "Hard Cider"
-	id = "hcider"
 	description = "Apple juice, for adults."
 	color = "#CD6839"
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -1329,7 +1254,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber!
 	name = "Fetching Fizz"
-	id = "fetching_fizz"
 	description = "Whiskey sour/iron/uranium mixture resulting in a highly magnetic slurry. Mild alcohol content." //Requires no alcohol to make but has alcohol anyway because ~magic~
 	color = rgb(255, 91, 15)
 	boozepwr = 10
@@ -1349,7 +1273,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 //Another reference. Heals those in critical condition extremely quickly.
 /datum/reagent/consumable/ethanol/hearty_punch
 	name = "Hearty Punch"
-	id = "hearty_punch"
 	description = "Brave bull/syndicate bomb/absinthe mixture resulting in an energizing beverage. Mild alcohol content."
 	color = rgb(140, 0, 0)
 	boozepwr = 90
@@ -1373,7 +1296,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bacchus_blessing //An EXTREMELY powerful drink. Smashed in seconds, dead in minutes.
 	name = "Bacchus' Blessing"
-	id = "bacchus_blessing"
 	description = "Unidentifiable mixture. Unmeasurably high alcohol content."
 	color = rgb(51, 19, 3) //Sickly brown
 	boozepwr = 300 //I warned you
@@ -1386,7 +1308,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/atomicbomb
 	name = "Atomic Bomb"
-	id = "atomicbomb"
 	description = "Nuclear proliferation never tasted so good."
 	color = "#666300" // rgb: 102, 99, 0
 	boozepwr = 0 //custom drunk effect
@@ -1416,7 +1337,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gargle_blaster
 	name = "Pan-Galactic Gargle Blaster"
-	id = "gargleblaster"
 	description = "Whoah, this stuff looks volatile!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 0 //custom drunk effect
@@ -1445,7 +1365,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/neurotoxin
 	name = "Neurotoxin"
-	id = "neurotoxin"
 	description = "A strong neurotoxin that puts the subject into a death-like state."
 	color = "#2E2E61" // rgb: 46, 46, 97
 	boozepwr = 50
@@ -1456,9 +1375,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_name = "Neurotoxin"
 	glass_desc = "A drink that is guaranteed to knock you silly."
 	//SplitChem			= TRUE
-	impure_chem 			= "neuroweak"
+	impure_chem 			= /datum/reagent/consumable/ethanol/neuroweak
 	inverse_chem_val 		= 0.5 //Clear conversion
-	inverse_chem			= "neuroweak"
+	inverse_chem			= /datum/reagent/consumable/ethanol/neuroweak
 	value = 4
 
 /datum/reagent/consumable/ethanol/neurotoxin/proc/pickt()
@@ -1468,12 +1387,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	M.set_drugginess(50)
 	M.dizziness +=2
 	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1*REM, 150)
-	if(prob(20) && !holder.has_reagent("neuroweak"))
+	if(prob(20) && !holder.has_reagent(/datum/reagent/consumable/ethanol/neuroweak))
 		M.adjustStaminaLoss(10)
 		M.drop_all_held_items()
 		to_chat(M, "<span class='notice'>You cant feel your hands!</span>")
 	if(current_cycle > 5)
-		if(prob(20) && !holder.has_reagent("neuroweak"))
+		if(prob(20) && !holder.has_reagent(/datum/reagent/consumable/ethanol/neuroweak))
 			var/t = pickt()
 			ADD_TRAIT(M, t, type)
 			M.adjustStaminaLoss(10)
@@ -1497,19 +1416,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/neuroweak
 	name = "Neuro-Smash"
-	id = "neuroweak"
 	description = "A mostly safe alcoholic drink for the true daredevils. Counteracts Neurotoxins."
 	boozepwr = 60
 	pH = 8
 	value = 3
 
 /datum/reagent/consumable/ethanol/neuroweak/on_mob_life(mob/living/carbon/M)
-	if(holder.has_reagent("neurotoxin"))
+	if(holder.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1*REM, 150)
-		M.reagents.remove_reagent("neurotoxin", 1.5 * REAGENTS_METABOLISM, FALSE)
-	if(holder.has_reagent("fentanyl"))
+		M.reagents.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 1.5 * REAGENTS_METABOLISM, FALSE)
+	else if(holder.has_reagent(/datum/reagent/toxin/fentanyl))
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1*REM, 150)
-		M.reagents.remove_reagent("fentanyl", 0.75 * REAGENTS_METABOLISM, FALSE)
+		M.reagents.remove_reagent(/datum/reagent/toxin/fentanyl, 0.75 * REAGENTS_METABOLISM, FALSE)
 	else
 		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -0.5*REM, 150)
 		M.dizziness +=2
@@ -1517,7 +1435,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hippies_delight
 	name = "Hippie's Delight"
-	id = "hippiesdelight"
 	description = "You just don't get it maaaan."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 0
@@ -1563,7 +1480,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/eggnog
 	name = "Eggnog"
-	id = "eggnog"
 	description = "The traditional way to get absolutely hammered at a Christmas party."
 	color = "#fcfdc6" // rgb: 252, 253, 198
 	nutriment_factor = 2 * REAGENTS_METABOLISM
@@ -1578,7 +1494,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/narsour
 	name = "Nar'Sour"
-	id = "narsour"
 	description = "Side effects include self-mutilation and hoarding plasteel."
 	color = RUNE_COLOR_DARKRED
 	boozepwr = 10
@@ -1596,7 +1511,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/triple_sec
 	name = "Triple Sec"
-	id = "triple_sec"
 	description = "A sweet and vibrant orange liqueur."
 	color = "#ffcc66"
 	boozepwr = 30
@@ -1608,7 +1522,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/creme_de_menthe
 	name = "Creme de Menthe"
-	id = "creme_de_menthe"
 	description = "A minty liqueur excellent for refreshing, cool drinks."
 	color = "#00cc00"
 	boozepwr = 20
@@ -1620,7 +1533,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/creme_de_cacao
 	name = "Creme de Cacao"
-	id = "creme_de_cacao"
 	description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
 	color = "#996633"
 	boozepwr = 20
@@ -1632,7 +1544,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/quadruple_sec
 	name = "Quadruple Sec"
-	id = "quadruple_sec"
 	description = "Kicks just as hard as licking the powercell on a baton, but tastier."
 	color = "#cc0000"
 	boozepwr = 35
@@ -1652,7 +1563,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/quintuple_sec
 	name = "Quintuple Sec"
-	id = "quintuple_sec"
 	description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE."
 	color = "#ff3300"
 	boozepwr = 80
@@ -1675,7 +1585,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grasshopper
 	name = "Grasshopper"
-	id = "grasshopper"
 	description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this."
 	color = "00ff00"
 	boozepwr = 25
@@ -1688,7 +1597,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/stinger
 	name = "Stinger"
-	id = "stinger"
 	description = "A snappy way to end the day."
 	color = "ccff99"
 	boozepwr = 25
@@ -1701,7 +1609,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bastion_bourbon
 	name = "Bastion Bourbon"
-	id = "bastion_bourbon"
 	description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors."
 	color = "#00FFFF"
 	boozepwr = 30
@@ -1741,7 +1648,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/squirt_cider
 	name = "Squirt Cider"
-	id = "squirt_cider"
 	description = "Fermented squirt extract with a nose of stale bread and ocean water. Whatever a squirt is."
 	color = "#FF0000"
 	boozepwr = 40
@@ -1760,7 +1666,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fringe_weaver
 	name = "Fringe Weaver"
-	id = "fringe_weaver"
 	description = "Bubbly, classy, and undoubtedly strong - a Glitch City classic."
 	color = "#FFEAC4"
 	boozepwr = 90 //classy hooch, essentially, but lower pwr to make up for slightly easier access
@@ -1773,7 +1678,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sugar_rush
 	name = "Sugar Rush"
-	id = "sugar_rush"
 	description = "Sweet, light, and fruity - as girly as it gets."
 	color = "#FF226C"
 	boozepwr = 10
@@ -1792,7 +1696,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/crevice_spike
 	name = "Crevice Spike"
-	id = "crevice_spike"
 	description = "Sour, bitter, and smashingly sobering."
 	color = "#5BD231"
 	boozepwr = -10 //sobers you up - ideally, one would drink to get hit with brute damage now to avoid alcohol problems later
@@ -1808,7 +1711,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sake
 	name = "Sake"
-	id = "sake"
 	description = "A sweet rice wine of questionable legality and extreme potency."
 	color = "#DDDDDD"
 	boozepwr = 70
@@ -1820,7 +1722,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/peppermint_patty
 	name = "Peppermint Patty"
-	id = "peppermint_patty"
 	description = "This lightly alcoholic drink combines the benefits of menthol and cocoa."
 	color = "#45ca7a"
 	taste_description = "mint and chocolate"
@@ -1838,7 +1739,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/alexander
 	name = "Alexander"
-	id = "alexander"
 	description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx."
 	color = "#F5E9D3"
 	boozepwr = 80
@@ -1862,7 +1762,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 /datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/L)
 	..()
 	if(mighty_shield && !(mighty_shield in L.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
-		L.reagents.del_reagent("alexander")
+		L.reagents.del_reagent(type)
 
 /datum/reagent/consumable/ethanol/alexander/on_mob_end_metabolize(mob/living/L)
 	if(mighty_shield)
@@ -1872,7 +1772,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sidecar
 	name = "Sidecar"
-	id = "sidecar"
 	description = "The one ride you'll gladly give up the wheel for."
 	color = "#FFC55B"
 	boozepwr = 80
@@ -1885,7 +1784,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/between_the_sheets
 	name = "Between the Sheets"
-	id = "between_the_sheets"
 	description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap."
 	color = "#F4C35A"
 	boozepwr = 80
@@ -1911,7 +1809,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/kamikaze
 	name = "Kamikaze"
-	id = "kamikaze"
 	description = "Divinely windy."
 	color = "#EEF191"
 	boozepwr = 60
@@ -1924,7 +1821,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/mojito
 	name = "Mojito"
-	id = "mojito"
 	description = "A drink that looks as refreshing as it tastes."
 	color = "#DFFAD9"
 	boozepwr = 30
@@ -1937,7 +1833,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fernet
 	name = "Fernet"
-	id = "fernet"
 	description = "An incredibly bitter herbal liqueur used as a digestif."
 	color = "#1B2E24" // rgb: 27, 46, 36
 	boozepwr = 80
@@ -1955,7 +1850,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fernet_cola
 	name = "Fernet Cola"
-	id = "fernet_cola"
 	description = "A very popular and bittersweet digestif, ideal after a heavy meal. Best served on a sawed-off cola bottle as per tradition."
 	color = "#390600" // rgb: 57, 6, 0
 	boozepwr = 25
@@ -1976,7 +1870,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 /datum/reagent/consumable/ethanol/fanciulli
 
 	name = "Fanciulli"
-	id = "fanciulli"
 	description = "What if the Manhattan coctail ACTUALLY used a bitter herb liquour? Helps you sobers up." //also causes a bit of stamina damage to symbolize the afterdrink lazyness
 	color = "#CA933F" // rgb: 202, 147, 63
 	boozepwr = -10
@@ -2001,7 +1894,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/branca_menta
 	name = "Branca Menta"
-	id = "branca_menta"
 	description = "A refreshing mixture of bitter Fernet with mint creme liquour."
 	color = "#4B5746" // rgb: 75, 87, 70
 	boozepwr = 35
@@ -2024,7 +1916,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/blank_paper
 	name = "Blank Paper"
-	id = "blank_paper"
 	description = "A bubbling glass of blank paper. Just looking at it makes you feel fresh."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#DCDCDC" // rgb: 220, 220, 220
@@ -2044,7 +1935,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/champagne //How the hell did we not have champagne already!?
 	name = "Champagne"
-	id = "champagne"
 	description = "A sparkling wine known for its ability to strike fast and hard."
 	color = "#ffffc1"
 	boozepwr = 40
@@ -2056,7 +1946,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/wizz_fizz
 	name = "Wizz Fizz"
-	id = "wizz_fizz"
 	description = "A magical potion, fizzy and wild! However the taste, you will find, is quite mild."
 	color = "#4235d0" //Just pretend that the triple-sec was blue curacao.
 	boozepwr = 50
@@ -2077,7 +1966,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bug_spray
 	name = "Bug Spray"
-	id = "bug_spray"
 	description = "A harsh, acrid, bitter drink, for those who need something to brace themselves."
 	color = "#33ff33"
 	boozepwr = 50
@@ -2101,7 +1989,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/applejack
 	name = "Applejack"
-	id = "applejack"
 	description = "The perfect beverage for when you feel the need to horse around."
 	color = "#ff6633"
 	boozepwr = 20
@@ -2113,7 +2000,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/jack_rose
 	name = "Jack Rose"
-	id = "jack_rose"
 	description = "A light cocktail perfect for sipping with a slice of pie."
 	color = "#ff6633"
 	boozepwr = 15
@@ -2126,7 +2012,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/turbo
 	name = "Turbo"
-	id = "turbo"
 	description = "A turbulent cocktail associated with outlaw hoverbike racing. Not for the faint of heart."
 	color = "#e94c3a"
 	boozepwr = 85
@@ -2145,7 +2030,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/old_timer
 	name = "Old Timer"
-	id = "old_timer"
 	description = "An archaic potation enjoyed by old coots of all ages."
 	color = "#996835"
 	boozepwr = 35
@@ -2166,7 +2050,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 				N.hair_color = "ccc"
 				N.update_hair()
 				if(N.age > 100)
-					N.become_nearsighted(id)
+					N.become_nearsighted(type)
 					if(N.gender == MALE)
 						N.facial_hair_style = "Beard (Very Long)"
 						N.update_hair()
@@ -2179,7 +2063,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/rubberneck
 	name = "Rubberneck"
-	id = "rubberneck"
 	description = "A quality rubberneck should not contain any gross natural ingredients."
 	color = "#ffe65b"
 	boozepwr = 60
@@ -2192,7 +2075,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/duplex
 	name = "Duplex"
-	id = "duplex"
 	description = "An inseparable combination of two fruity drinks."
 	color = "#50e5cf"
 	boozepwr = 25
@@ -2205,7 +2087,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/trappist
 	name = "Trappist Beer"
-	id = "trappist"
 	description = "A strong dark ale brewed by space-monks."
 	color = "#390c00"
 	boozepwr = 40
@@ -2225,7 +2106,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/blazaam
 	name = "Blazaam"
-	id = "blazaam"
 	description = "A strange drink that few people seem to remember existing. Doubles as a Berenstain remover."
 	boozepwr = 70
 	quality = DRINK_FANTASTIC
@@ -2249,7 +2129,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/planet_cracker
 	name = "Planet Cracker"
-	id = "planet_cracker"
 	description = "This jubilant drink celebrates humanity's triumph over the alien menace. May be offensive to non-human crewmembers."
 	boozepwr = 50
 	quality = DRINK_FANTASTIC
@@ -2261,7 +2140,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/commander_and_chief
 	name = "Commander and Chief"
-	id = "commander_and_chief"
 	description = "A cocktail for the captain on the go."
 	color = "#ffffc9"
 	boozepwr = 50
@@ -2285,7 +2163,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fruit_wine
 	name = "Fruit Wine"
-	id = "fruit_wine"
 	description = "A wine made from grown plants."
 	color = "#FFFFFF"
 	boozepwr = 35
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index ada4cd8d8e..fba0b47eb4 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -47,7 +47,6 @@
 //does brute damage but can replicate when damaged and has a chance of expanding again
 /datum/reagent/blob/replicating_foam
 	name = "Replicating Foam"
-	id = "replicating_foam"
 	description = "will do medium brute damage and occasionally expand again when expanding."
 	shortdesc = "will do medium brute damage."
 	effectdesc = "will also expand when attacked with burn damage, but takes more brute damage."
@@ -78,7 +77,6 @@
 //does massive brute and burn damage, but can only expand manually
 /datum/reagent/blob/networked_fibers
 	name = "Networked Fibers"
-	id = "networked_fibers"
 	description = "will do high brute and burn damage and will generate resources quicker, but can only expand manually."
 	shortdesc = "will do high brute and burn damage."
 	taste_description = "efficiency"
@@ -112,7 +110,6 @@
 //does brute damage, shifts away when damaged
 /datum/reagent/blob/shifting_fragments
 	name = "Shifting Fragments"
-	id = "shifting_fragments"
 	description = "will do medium brute damage."
 	effectdesc = "will also cause blob parts to shift away when attacked."
 	taste_description = "something other-dimensional"
@@ -134,7 +131,7 @@
 	if((damage_flag == "melee" || damage_flag == "bullet" || damage_flag == "laser") && damage > 0 && B.obj_integrity - damage > 0 && prob(60-damage))
 		var/list/blobstopick = list()
 		for(var/obj/structure/blob/OB in orange(1, B))
-			if((istype(OB, /obj/structure/blob/normal) || (istype(OB, /obj/structure/blob/shield) && prob(25))) && OB.overmind && OB.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id)
+			if((istype(OB, /obj/structure/blob/normal) || (istype(OB, /obj/structure/blob/shield) && prob(25))) && OB.overmind && OB.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type)
 				blobstopick += OB //as long as the blob picked is valid; ie, a normal or shield blob that has the same chemical as we do, we can swap with it
 		if(blobstopick.len)
 			var/obj/structure/blob/targeted = pick(blobstopick) //randomize the blob chosen, because otherwise it'd tend to the lower left
@@ -146,7 +143,6 @@
 //sets you on fire, does burn damage, explodes into flame when burnt, weak to water
 /datum/reagent/blob/blazing_oil
 	name = "Blazing Oil"
-	id = "blazing_oil"
 	description = "will do medium burn damage and set targets on fire."
 	effectdesc = "will also release bursts of flame when burnt, but takes damage from water."
 	taste_description = "burning oil"
@@ -174,7 +170,7 @@
 	if(damage_type == BURN && damage_flag != "energy")
 		for(var/turf/open/T in range(1, B))
 			var/obj/structure/blob/C = locate() in T
-			if(!(C && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) && prob(80))
+			if(!(C && C.overmind && C.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type) && prob(80))
 				new /obj/effect/hotspot(T)
 	if(damage_flag == "fire")
 		return 0
@@ -183,7 +179,6 @@
 //does toxin damage, hallucination, targets think they're not hurt at all
 /datum/reagent/blob/regenerative_materia
 	name = "Regenerative Materia"
-	id = "regenerative_materia"
 	description = "will do toxin damage and cause targets to believe they are fully healed."
 	analyzerdescdamage = "Does toxin damage and injects a toxin that causes the target to believe they are fully healed."
 	taste_description = "heaven"
@@ -195,8 +190,8 @@
 	reac_volume = ..()
 	M.adjust_drugginess(reac_volume)
 	if(M.reagents)
-		M.reagents.add_reagent("regenerative_materia", 0.2*reac_volume)
-		M.reagents.add_reagent("spore", 0.2*reac_volume)
+		M.reagents.add_reagent(/datum/reagent/blob/regenerative_materia, 0.2*reac_volume)
+		M.reagents.add_reagent(/datum/reagent/toxin/spore, 0.2*reac_volume)
 	M.apply_damage(0.7*reac_volume, TOX)
 
 /datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/C)
@@ -213,7 +208,6 @@
 //kills sleeping targets and turns them into blob zombies, produces fragile spores when killed or on expanding
 /datum/reagent/blob/zombifying_pods
 	name = "Zombifying Pods"
-	id = "zombifying_pods"
 	description = "will do very low toxin damage and harvest sleeping targets for additional resources and a blob zombie."
 	effectdesc = "will also produce fragile spores when killed and on expanding."
 	taste_description = "fungi"
@@ -257,7 +251,6 @@
 //does tons of oxygen damage and a little stamina, immune to tesla bolts, weak to EMP
 /datum/reagent/blob/energized_jelly
 	name = "Energized Jelly"
-	id = "energized_jelly"
 	description = "will cause low stamina and high oxygen damage, and cause targets to be unable to breathe."
 	taste_description = "gelatin"
 	effectdesc = "will also conduct electricity, but takes damage from EMPs."
@@ -289,7 +282,6 @@
 //does aoe brute damage when hitting targets, is immune to explosions
 /datum/reagent/blob/explosive_lattice
 	name = "Explosive Lattice"
-	id = "explosive_lattice"
 	description = "will do brute damage in an area around targets."
 	taste_description = "the bomb"
 	effectdesc = "will also resist explosions, but takes increased damage from fire and other energy sources."
@@ -326,7 +318,6 @@
 //does brute, burn, and toxin damage, and cools targets down
 /datum/reagent/blob/cryogenic_poison
 	name = "Cryogenic Poison"
-	id = "cryogenic_poison"
 	description = "will inject targets with a freezing poison that does high damage over time."
 	analyzerdescdamage = "Injects targets with a freezing poison that will gradually solidify the target's internal organs."
 	color = "#8BA6E9"
@@ -339,9 +330,9 @@
 /datum/reagent/blob/cryogenic_poison/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
 	reac_volume = ..()
 	if(M.reagents)
-		M.reagents.add_reagent("frostoil", 0.3*reac_volume)
-		M.reagents.add_reagent("ice", 0.3*reac_volume)
-		M.reagents.add_reagent("cryogenic_poison", 0.3*reac_volume)
+		M.reagents.add_reagent(/datum/reagent/consumable/frostoil, 0.3*reac_volume)
+		M.reagents.add_reagent(/datum/reagent/consumable/ice, 0.3*reac_volume)
+		M.reagents.add_reagent(/datum/reagent/blob/cryogenic_poison, 0.3*reac_volume)
 	M.apply_damage(0.2*reac_volume, BRUTE)
 
 /datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/M)
@@ -354,7 +345,6 @@
 //does burn damage and EMPs, slightly fragile
 /datum/reagent/blob/electromagnetic_web
 	name = "Electromagnetic Web"
-	id = "electromagnetic_web"
 	description = "will do high burn damage and EMP targets."
 	taste_description = "pop rocks"
 	effectdesc = "will also take massively increased damage and release an EMP when killed."
@@ -391,7 +381,6 @@
 //does brute damage, bonus damage for each nearby blob, and spreads damage out
 /datum/reagent/blob/synchronous_mesh
 	name = "Synchronous Mesh"
-	id = "synchronous_mesh"
 	description = "will do massively increased brute damage for each blob near the target."
 	effectdesc = "will also spread damage between each blob near the attacked blob."
 	taste_description = "toxic mold"
@@ -415,10 +404,10 @@
 	if(damage_flag == "melee" || damage_flag == "bullet" || damage_flag == "laser") //the cause isn't fire or bombs, so split the damage
 		var/damagesplit = 1 //maximum split is 9, reducing the damage each blob takes to 11% but doing that damage to 9 blobs
 		for(var/obj/structure/blob/C in orange(1, B))
-			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //if it doesn't have the same chemical or is a core or node, don't split damage to it
+			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type) //if it doesn't have the same chemical or is a core or node, don't split damage to it
 				damagesplit += 1
 		for(var/obj/structure/blob/C in orange(1, B))
-			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //only hurt blobs that have the same overmind chemical and aren't cores or nodes
+			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type) //only hurt blobs that have the same overmind chemical and aren't cores or nodes
 				C.take_damage(damage/damagesplit, CLONE, 0, 0)
 		return damage / damagesplit
 	else
@@ -427,7 +416,6 @@
 //does brute damage through armor and bio resistance
 /datum/reagent/blob/reactive_spines
 	name = "Reactive Spines"
-	id = "reactive_spines"
 	description = "will do medium brute damage through armor and bio resistance."
 	taste_description = "rock"
 	effectdesc = "will also react when attacked with brute damage, attacking all near the attacked blob."
@@ -454,7 +442,6 @@
 //does low brute damage, oxygen damage, and stamina damage and wets tiles when damaged
 /datum/reagent/blob/pressurized_slime
 	name = "Pressurized Slime"
-	id = "pressurized_slime"
 	description = "will do low brute, oxygen, and stamina damage, and wet tiles under targets."
 	effectdesc = "will also wet tiles near blobs that are attacked or killed."
 	taste_description = "a sponge"
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 5d31bfae9b..6460bfed78 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -6,7 +6,6 @@
 
 /datum/reagent/consumable/orangejuice
 	name = "Orange Juice"
-	id = "orangejuice"
 	description = "Both delicious AND rich in Vitamin C, what more do you need?"
 	color = "#E78108" // rgb: 231, 129, 8
 	taste_description = "oranges"
@@ -23,7 +22,6 @@
 
 /datum/reagent/consumable/tomatojuice
 	name = "Tomato Juice"
-	id = "tomatojuice"
 	description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
 	color = "#731008" // rgb: 115, 16, 8
 	taste_description = "tomatoes"
@@ -39,7 +37,6 @@
 
 /datum/reagent/consumable/limejuice
 	name = "Lime Juice"
-	id = "limejuice"
 	description = "The sweet-sour juice of limes."
 	color = "#365E30" // rgb: 54, 94, 48
 	taste_description = "unbearable sourness"
@@ -56,7 +53,6 @@
 
 /datum/reagent/consumable/carrotjuice
 	name = "Carrot Juice"
-	id = "carrotjuice"
 	description = "It is just like a carrot but without crunching."
 	color = "#973800" // rgb: 151, 56, 0
 	taste_description = "carrots"
@@ -78,7 +74,6 @@
 
 /datum/reagent/consumable/berryjuice
 	name = "Berry Juice"
-	id = "berryjuice"
 	description = "A delicious blend of several different kinds of berries."
 	color = "#863333" // rgb: 134, 51, 51
 	taste_description = "berries"
@@ -88,7 +83,6 @@
 
 /datum/reagent/consumable/applejuice
 	name = "Apple Juice"
-	id = "applejuice"
 	description = "The sweet juice of an apple, fit for all ages."
 	color = "#ECFF56" // rgb: 236, 255, 86
 	taste_description = "apples"
@@ -96,7 +90,6 @@
 
 /datum/reagent/consumable/poisonberryjuice
 	name = "Poison Berry Juice"
-	id = "poisonberryjuice"
 	description = "A tasty juice blended from various kinds of very deadly and toxic berries."
 	color = "#863353" // rgb: 134, 51, 83
 	taste_description = "berries"
@@ -111,7 +104,6 @@
 
 /datum/reagent/consumable/watermelonjuice
 	name = "Watermelon Juice"
-	id = "watermelonjuice"
 	description = "Delicious juice made from watermelon."
 	color = "#863333" // rgb: 134, 51, 51
 	taste_description = "juicy watermelon"
@@ -121,7 +113,6 @@
 
 /datum/reagent/consumable/lemonjuice
 	name = "Lemon Juice"
-	id = "lemonjuice"
 	description = "This juice is VERY sour."
 	color = "#863333" // rgb: 175, 175, 0
 	taste_description = "sourness"
@@ -132,7 +123,6 @@
 
 /datum/reagent/consumable/banana
 	name = "Banana Juice"
-	id = "banana"
 	description = "The raw essence of a banana. HONK"
 	color = "#863333" // rgb: 175, 175, 0
 	taste_description = "banana"
@@ -148,7 +138,6 @@
 
 /datum/reagent/consumable/nothing
 	name = "Nothing"
-	id = "nothing"
 	description = "Absolutely nothing."
 	taste_description = "nothing"
 	glass_icon_state = "nothing"
@@ -164,7 +153,6 @@
 
 /datum/reagent/consumable/laughter
 	name = "Laughter"
-	id = "laughter"
 	description = "Some say that this is the best medicine, but recent studies have proven that to be untrue."
 	metabolization_rate = INFINITY
 	color = "#FF4DD2"
@@ -177,7 +165,6 @@
 
 /datum/reagent/consumable/superlaughter
 	name = "Super Laughter"
-	id = "superlaughter"
 	description = "Funny until you're the one laughing."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	color = "#FF4DD2"
@@ -192,7 +179,6 @@
 
 /datum/reagent/consumable/potato_juice
 	name = "Potato Juice"
-	id = "potato"
 	description = "Juice of the potato. Bleh."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
@@ -203,14 +189,12 @@
 
 /datum/reagent/consumable/grapejuice
 	name = "Grape Juice"
-	id = "grapejuice"
 	description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
 	color = "#290029" // dark purple
 	taste_description = "grape soda"
 
 /datum/reagent/consumable/milk
 	name = "Milk"
-	id = "milk"
 	description = "An opaque white liquid produced by the mammary glands of mammals."
 	color = "#DFDFDF" // rgb: 223, 223, 223
 	taste_description = "milk"
@@ -227,13 +211,12 @@
 		if(M.getBruteLoss() && prob(20))
 			M.heal_bodypart_damage(1,0, 0)
 			. = 1
-	if(holder.has_reagent("capsaicin"))
-		holder.remove_reagent("capsaicin", 2)
+	if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
+		holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2)
 	..()
 
 /datum/reagent/consumable/soymilk
 	name = "Soy Milk"
-	id = "soymilk"
 	description = "An opaque white liquid made from soybeans."
 	color = "#DFDFC7" // rgb: 223, 223, 199
 	taste_description = "soy milk"
@@ -247,9 +230,24 @@
 		. = 1
 	..()
 
+/datum/reagent/consumable/coconutmilk
+	name = "Coconut Milk"
+	description = "A transparent white liquid extracted from coconuts. Rich in taste."
+	color = "#DFDFDF" // rgb: 223, 223, 223
+	taste_description = "sweet milk"
+	quality = DRINK_GOOD
+	glass_icon_state = "glass_white"
+	glass_name = "glass of coconut milk"
+	glass_desc = "White and nutritious goodness!"
+
+/datum/reagent/consumable/coconutmilk/on_mob_life(mob/living/carbon/M)
+	if(M.getBruteLoss() && prob(20))
+		M.heal_bodypart_damage(2,0, 0)
+		. = 1
+	..()
+
 /datum/reagent/consumable/cream
 	name = "Cream"
-	id = "cream"
 	description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
 	color = "#DFD7AF" // rgb: 223, 215, 175
 	taste_description = "creamy milk"
@@ -265,7 +263,6 @@
 
 /datum/reagent/consumable/coffee
 	name = "Coffee"
-	id = "coffee"
 	description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
 	color = "#482000" // rgb: 72, 32, 0
 	nutriment_factor = 0
@@ -285,14 +282,13 @@
 	M.AdjustSleeping(-40, FALSE)
 	//310.15 is the normal bodytemp.
 	M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
-	if(holder.has_reagent("frostoil"))
-		holder.remove_reagent("frostoil", 5)
+	if(holder.has_reagent(/datum/reagent/consumable/frostoil))
+		holder.remove_reagent(/datum/reagent/consumable/frostoil, 5)
 	..()
 	. = 1
 
 /datum/reagent/consumable/tea
 	name = "Tea"
-	id = "tea"
 	description = "Tasty black tea, it has antioxidants, it's good for you!"
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
@@ -314,7 +310,6 @@
 
 /datum/reagent/consumable/lemonade
 	name = "Lemonade"
-	id = "lemonade"
 	description = "Sweet, tangy lemonade. Good for the soul."
 	quality = DRINK_NICE
 	taste_description = "sunshine and summertime"
@@ -324,7 +319,6 @@
 
 /datum/reagent/consumable/tea/arnold_palmer
 	name = "Arnold Palmer"
-	id = "arnold_palmer"
 	description = "Encourages the patient to go golfing."
 	color = "#FFB766"
 	quality = DRINK_NICE
@@ -342,7 +336,6 @@
 
 /datum/reagent/consumable/icecoffee
 	name = "Iced Coffee"
-	id = "icecoffee"
 	description = "Coffee and ice, refreshing and cool."
 	color = "#102838" // rgb: 16, 40, 56
 	nutriment_factor = 0
@@ -362,7 +355,6 @@
 
 /datum/reagent/consumable/icetea
 	name = "Iced Tea"
-	id = "icetea"
 	description = "No relation to a certain rap artist/actor."
 	color = "#104038" // rgb: 16, 64, 56
 	nutriment_factor = 0
@@ -383,7 +375,6 @@
 
 /datum/reagent/consumable/space_cola
 	name = "Cola"
-	id = "cola"
 	description = "A refreshing beverage."
 	color = "#100800" // rgb: 16, 8, 0
 	taste_description = "cola"
@@ -398,7 +389,6 @@
 
 /datum/reagent/consumable/nuka_cola
 	name = "Nuka Cola"
-	id = "nuka_cola"
 	description = "Cola, cola never changes."
 	color = "#100800" // rgb: 16, 8, 0
 	quality = DRINK_VERYGOOD
@@ -407,10 +397,6 @@
 	glass_name = "glass of Nuka Cola"
 	glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
 
-/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
-	..()
-
 /datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
 	M.Jitter(20)
 	M.set_drugginess(30)
@@ -423,7 +409,6 @@
 
 /datum/reagent/consumable/spacemountainwind
 	name = "SM Wind"
-	id = "spacemountainwind"
 	description = "Blows right through you like a space wind."
 	color = "#102000" // rgb: 16, 32, 0
 	taste_description = "sweet citrus soda"
@@ -441,7 +426,6 @@
 
 /datum/reagent/consumable/dr_gibb
 	name = "Dr. Gibb"
-	id = "dr_gibb"
 	description = "A delicious blend of 42 different flavours."
 	color = "#102000" // rgb: 16, 32, 0
 	taste_description = "cherry soda" // FALSE ADVERTISING
@@ -456,7 +440,6 @@
 
 /datum/reagent/consumable/space_up
 	name = "Space-Up"
-	id = "space_up"
 	description = "Tastes like a hull breach in your mouth."
 	color = "#00FF00" // rgb: 0, 255, 0
 	taste_description = "cherry soda"
@@ -472,7 +455,6 @@
 /datum/reagent/consumable/lemon_lime
 	name = "Lemon Lime"
 	description = "A tangy substance made of 0.5% natural citrus!"
-	id = "lemon_lime"
 	color = "#8CFF00" // rgb: 135, 255, 0
 	taste_description = "tangy lime and lemon soda"
 	glass_icon_state = "glass_yellow"
@@ -486,7 +468,6 @@
 /datum/reagent/consumable/pwr_game
 	name = "Pwr Game"
 	description = "The only drink with the PWR that true gamers crave."
-	id = "pwr_game"
 	color = "#9385bf" // rgb: 58, 52, 75
 	taste_description = "sweet and salty tang"
 	glass_icon_state = "glass_red"
@@ -500,7 +481,6 @@
 /datum/reagent/consumable/shamblers
 	name = "Shambler's Juice"
 	description = "~Shake me up some of that Shambler's Juice!~"
-	id = "shamblers"
 	color = "#f00060" // rgb: 94, 0, 38
 	taste_description = "carbonated metallic soda"
 	glass_icon_state = "glass_red"
@@ -514,7 +494,6 @@
 /datum/reagent/consumable/buzz_fuzz
 	name = "Buzz Fuzz"
 	description = "~A Hive of Flavour!~ NOTICE: Addicting."
-	id = "buzz_fuzz"
 	addiction_threshold = 26 //A can and a sip
 	color = "#8CFF00" // rgb: 135, 255, 0
 	taste_description = "carbonated honey and pollen"
@@ -523,9 +502,9 @@
 	glass_desc = "Stinging with flavour."
 
 /datum/reagent/consumable/buzz_fuzz/on_mob_life(mob/living/carbon/M)
-	M.reagents.add_reagent("sugar",1)
+	M.reagents.add_reagent(/datum/reagent/consumable/sugar,1)
 	if(prob(5))
-		M.reagents.add_reagent("honey",1)
+		M.reagents.add_reagent(/datum/reagent/consumable/honey,1)
 	..()
 
 /datum/reagent/consumable/buzz_fuzz/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -558,7 +537,6 @@
 
 /datum/reagent/consumable/grey_bull
 	name = "Grey Bull"
-	id = "grey_bull"
 	description = "Grey Bull, it gives you gloves!"
 	color = "#EEFF00" // rgb: 238, 255, 0
 	quality = DRINK_VERYGOOD
@@ -569,10 +547,10 @@
 
 /datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
+	ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, type)
 
 /datum/reagent/consumable/grey_bull/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
+	REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, type)
 	..()
 
 /datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/M)
@@ -585,7 +563,6 @@
 
 /datum/reagent/consumable/sodawater
 	name = "Soda Water"
-	id = "sodawater"
 	description = "A can of club soda. Why not make a scotch and soda?"
 	color = "#619494" // rgb: 97, 148, 148
 	taste_description = "carbonated water"
@@ -601,7 +578,6 @@
 
 /datum/reagent/consumable/tonic
 	name = "Tonic Water"
-	id = "tonic"
 	description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
 	color = "#0064C8" // rgb: 0, 100, 200
 	taste_description = "tart and fresh"
@@ -619,7 +595,6 @@
 
 /datum/reagent/consumable/ice
 	name = "Ice"
-	id = "ice"
 	description = "Frozen water, your dentist wouldn't like you chewing this."
 	reagent_state = SOLID
 	color = "#619494" // rgb: 97, 148, 148
@@ -634,7 +609,6 @@
 
 /datum/reagent/consumable/soy_latte
 	name = "Soy Latte"
-	id = "soy_latte"
 	description = "A nice and tasty beverage while you are reading your hippie books."
 	color = "#664300" // rgb: 102, 67, 0
 	quality = DRINK_NICE
@@ -656,7 +630,6 @@
 
 /datum/reagent/consumable/cafe_latte
 	name = "Cafe Latte"
-	id = "cafe_latte"
 	description = "A nice, strong and tasty beverage while you are reading."
 	color = "#664300" // rgb: 102, 67, 0
 	quality = DRINK_NICE
@@ -678,7 +651,6 @@
 
 /datum/reagent/consumable/doctor_delight
 	name = "The Doctor's Delight"
-	id = "doctorsdelight"
 	description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly at the cost of hunger."
 	color = "#FF8CFF" // rgb: 255, 140, 255
 	quality = DRINK_VERYGOOD
@@ -700,7 +672,6 @@
 
 /datum/reagent/consumable/chocolatepudding
 	name = "Chocolate Pudding"
-	id = "chocolatepudding"
 	description = "A great dessert for chocolate lovers."
 	color = "#800000"
 	quality = DRINK_VERYGOOD
@@ -712,7 +683,6 @@
 
 /datum/reagent/consumable/vanillapudding
 	name = "Vanilla Pudding"
-	id = "vanillapudding"
 	description = "A great dessert for vanilla lovers."
 	color = "#FAFAD2"
 	quality = DRINK_VERYGOOD
@@ -724,7 +694,6 @@
 
 /datum/reagent/consumable/cherryshake
 	name = "Cherry Shake"
-	id = "cherryshake"
 	description = "A cherry flavored milkshake."
 	color = "#FFB6C1"
 	quality = DRINK_VERYGOOD
@@ -736,7 +705,6 @@
 
 /datum/reagent/consumable/bluecherryshake
 	name = "Blue Cherry Shake"
-	id = "bluecherryshake"
 	description = "An exotic milkshake."
 	color = "#00F1FF"
 	quality = DRINK_VERYGOOD
@@ -748,7 +716,6 @@
 
 /datum/reagent/consumable/pumpkin_latte
 	name = "Pumpkin Latte"
-	id = "pumpkin_latte"
 	description = "A mix of pumpkin juice and coffee."
 	color = "#F4A460"
 	quality = DRINK_VERYGOOD
@@ -760,7 +727,6 @@
 
 /datum/reagent/consumable/gibbfloats
 	name = "Gibb Floats"
-	id = "gibbfloats"
 	description = "Ice cream on top of a Dr. Gibb glass."
 	color = "#B22222"
 	quality = DRINK_NICE
@@ -772,21 +738,18 @@
 
 /datum/reagent/consumable/pumpkinjuice
 	name = "Pumpkin Juice"
-	id = "pumpkinjuice"
 	description = "Juiced from real pumpkin."
 	color = "#FFA500"
 	taste_description = "pumpkin"
 
 /datum/reagent/consumable/blumpkinjuice
 	name = "Blumpkin Juice"
-	id = "blumpkinjuice"
 	description = "Juiced from real blumpkin."
 	color = "#00BFFF"
 	taste_description = "a mouthful of pool water"
 
 /datum/reagent/consumable/triple_citrus
 	name = "Triple Citrus"
-	id = "triple_citrus"
 	description = "A solution."
 	color = "#fff12b"
 	quality = DRINK_NICE
@@ -797,7 +760,6 @@
 
 /datum/reagent/consumable/grape_soda
 	name = "Grape soda"
-	id = "grapesoda"
 	description = "Beloved of children and teetotalers."
 	color = "#E6CDFF"
 	taste_description = "grape soda"
@@ -810,7 +772,6 @@
 
 /datum/reagent/consumable/milk/chocolate_milk
 	name = "Chocolate Milk"
-	id = "chocolate_milk"
 	description = "Milk for cool kids."
 	color = "#7D4E29"
 	quality = DRINK_NICE
@@ -818,7 +779,6 @@
 
 /datum/reagent/consumable/menthol
 	name = "Menthol"
-	id = "menthol"
 	description = "Alleviates coughing symptoms one might have."
 	color = "#80AF9C"
 	taste_description = "mint"
@@ -832,7 +792,6 @@
 
 /datum/reagent/consumable/grenadine
 	name = "Grenadine"
-	id = "grenadine"
 	description = "Not cherry flavored!"
 	color = "#EA1D26"
 	taste_description = "sweet pomegranates"
@@ -841,7 +800,6 @@
 
 /datum/reagent/consumable/parsnipjuice
 	name = "Parsnip Juice"
-	id = "parsnipjuice"
 	description = "Why..."
 	color = "#FFA500"
 	taste_description = "parsnip"
@@ -849,7 +807,6 @@
 
 /datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
 	name = "Peach Juice"
-	id = "peachjuice"
 	description = "Just peachy."
 	color = "#E78108"
 	taste_description = "peaches"
@@ -857,7 +814,6 @@
 
 /datum/reagent/consumable/cream_soda
 	name = "Cream Soda"
-	id = "cream_soda"
 	description = "A classic space-American vanilla flavored soft drink."
 	color = "#dcb137"
 	quality = DRINK_VERYGOOD
@@ -872,7 +828,6 @@
 
 /datum/reagent/consumable/red_queen
 	name = "Red Queen"
-	id = "red_queen"
 	description = "DRINK ME."
 	color = "#e6ddc3"
 	quality = DRINK_GOOD
@@ -900,7 +855,6 @@
 
 /datum/reagent/consumable/pinkmilk
 	name = "Strawberry Milk"
-	id = "pinkmilk"
 	description = "A drink of a bygone era of milk and artificial sweetener back on a rock."
 	color = "#f76aeb"//rgb(247, 106, 235)
 	glass_icon_state = "pinkmilk"
@@ -917,7 +871,6 @@
 
 /datum/reagent/consumable/pinktea //Tiny Tim song
 	name = "Strawberry Tea"
-	id = "pinktea"
 	description = "A timeless classic!"
 	color = "#f76aeb"//rgb(247, 106, 235)
 	glass_icon_state = "pinktea"
@@ -934,7 +887,6 @@
 
 /datum/reagent/consumable/catnip_tea
 	name = "Catnip Tea"
-	id = "catnip_tea"
 	description = "A sleepy and tasty catnip tea!"
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
@@ -954,7 +906,6 @@
 
 /datum/reagent/consumable/monkey_energy
 	name = "Monkey Energy"
-	id = "monkey_energy"
 	description = "The only drink that will make you unleash the ape."
 	color = "#f39b03" // rgb: 243, 155, 3
 	taste_description = "barbecue and nostalgia"
@@ -969,3 +920,12 @@
 	M.AdjustSleeping(-40, FALSE)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
 	..()
+
+/datum/reagent/consumable/bungojuice
+	name = "Bungo Juice"
+	color = "#F9E43D"
+	description = "Exotic! You feel like you are on vactation already."
+	taste_description = "succulent bungo"
+	glass_icon_state = "glass_yellow"
+	glass_name = "glass of bungo juice"
+	glass_desc = "Exotic! You feel like you are on vacation already."
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index e956fcac36..a2e651d791 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -1,6 +1,5 @@
 /datum/reagent/drug
 	name = "Drug"
-	id = "drug"
 	value = 12
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	taste_description = "bitterness"
@@ -8,11 +7,10 @@
 
 /datum/reagent/drug/on_mob_end_metabolize(mob/living/M)
 	if(trippy)
-		SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[id]_high")
+		SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[type]_high")
 
 /datum/reagent/drug/space_drugs
 	name = "Space drugs"
-	id = "space_drugs"
 	value = 6
 	description = "An illegal chemical compound used as drug."
 	color = "#60A584" // rgb: 96, 165, 132
@@ -31,7 +29,7 @@
 
 /datum/reagent/drug/space_drugs/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You start tripping hard!</span>")
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/overdose, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
 
 /datum/reagent/drug/space_drugs/overdose_process(mob/living/M)
 	if(M.hallucination < volume && prob(20))
@@ -40,7 +38,6 @@
 
 /datum/reagent/drug/nicotine
 	name = "Nicotine"
-	id = "nicotine"
 	value = 0
 	description = "Slightly reduces stun times. If overdosed it will deal toxin and oxygen damage."
 	reagent_state = LIQUID
@@ -64,7 +61,6 @@
 
 /datum/reagent/drug/crank
 	name = "Crank"
-	id = "crank"
 	description = "Reduces stun times by about 200%. If overdosed or addicted it will deal significant Toxin, Brute and Brain damage."
 	reagent_state = LIQUID
 	color = "#FA00C8"
@@ -112,7 +108,6 @@
 
 /datum/reagent/drug/krokodil
 	name = "Krokodil"
-	id = "krokodil"
 	description = "Cools and calms you down. If overdosed it will deal significant Brain and Toxin damage. If addicted it will begin to deal fatal amounts of Brute damage as the subject's skin falls off."
 	reagent_state = LIQUID
 	color = "#0064B4"
@@ -164,7 +159,6 @@
 
 /datum/reagent/drug/methamphetamine
 	name = "Methamphetamine"
-	id = "methamphetamine"
 	description = "Reduces stun times by about 300%, and allows the user to quickly recover stamina while dealing a small amount of Brain damage. If overdosed the subject will move randomly, laugh randomly, drop items and suffer from Toxin and Brain damage. If addicted the subject will constantly jitter and drool, before becoming dizzy and losing motor control and eventually suffer heavy toxin damage."
 	reagent_state = LIQUID
 	color = "#FAFAFA"
@@ -178,10 +172,10 @@
 
 /datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L)
 	..()
-	L.ignore_slowdown(id)
+	L.ignore_slowdown(type)
 
 /datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L)
-	L.unignore_slowdown(id)
+	L.unignore_slowdown(type)
 	..()
 
 /datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)
@@ -252,7 +246,6 @@
 	. = 1
 
 /datum/reagent/drug/methamphetamine/changeling
-	id = "changelingmeth"
 	name = "Changeling Adrenaline"
 	addiction_threshold = 35
 	overdose_threshold = 35
@@ -261,7 +254,6 @@
 
 /datum/reagent/drug/bath_salts
 	name = "Bath Salts"
-	id = "bath_salts"
 	description = "Makes you impervious to stuns and grants a stamina regeneration buff, but you will be a nearly uncontrollable tramp-bearded raving lunatic."
 	reagent_state = LIQUID
 	color = "#FAFAFA"
@@ -273,16 +265,16 @@
 
 /datum/reagent/drug/bath_salts/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	ADD_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
 		rage = new()
 		C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
 
 /datum/reagent/drug/bath_salts/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 	if(rage)
 		QDEL_NULL(rage)
 	..()
@@ -362,7 +354,6 @@
 
 /datum/reagent/drug/aranesp
 	name = "Aranesp"
-	id = "aranesp"
 	description = "Amps you up and gets you going, fixes all stamina damage you might have but can cause toxin and oxygen damage."
 	reagent_state = LIQUID
 	color = "#78FFF0"
@@ -382,7 +373,6 @@
 
 /datum/reagent/drug/happiness
 	name = "Happiness"
-	id = "happiness"
 	description = "Fills you with ecstasic numbness and causes minor brain damage. Highly addictive. If overdosed causes sudden mood swings."
 	reagent_state = LIQUID
 	color = "#FFF378"
@@ -392,11 +382,11 @@
 
 /datum/reagent/drug/happiness/on_mob_add(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_FEARLESS, id)
+	ADD_TRAIT(L, TRAIT_FEARLESS, type)
 	SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "happiness_drug", /datum/mood_event/happiness_drug)
 
 /datum/reagent/drug/happiness/on_mob_delete(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FEARLESS, id)
+	REMOVE_TRAIT(L, TRAIT_FEARLESS, type)
 	SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "happiness_drug")
 	..()
 
@@ -460,7 +450,6 @@
 
 /datum/reagent/drug/skooma
 	name = "Skooma"
-	id = "skooma"
 	description = "An ancient, highly-addictive drug of long-forgotten times. It greatly improves the user's speed and strength, but heavily impedes their intelligence and agility."
 	reagent_state = LIQUID
 	color = "#F3E0F9"
@@ -472,7 +461,7 @@
 
 /datum/reagent/drug/skooma/on_mob_metabolize(mob/living/L)
 	. = ..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
 	L.next_move_modifier *= 2
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
@@ -483,7 +472,7 @@
 
 /datum/reagent/drug/skooma/on_mob_end_metabolize(mob/living/L)
 	. = ..()
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	L.next_move_modifier *= 0.5
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 64e693a326..b6cb387b81 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -9,7 +9,6 @@
 
 /datum/reagent/consumable
 	name = "Consumable"
-	id = "consumable"
 	taste_description = "generic food"
 	taste_mult = 4
 	value = 0.1
@@ -19,7 +18,7 @@
 /datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
 	current_cycle++
 	M.nutrition += nutriment_factor
-	holder.remove_reagent(src.id, metabolization_rate)
+	holder.remove_reagent(type, metabolization_rate)
 
 /datum/reagent/consumable/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(method == INGEST)
@@ -39,7 +38,6 @@
 
 /datum/reagent/consumable/nutriment
 	name = "Nutriment"
-	id = "nutriment"
 	description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
 	reagent_state = SOLID
 	nutriment_factor = 15 * REAGENTS_METABOLISM
@@ -90,7 +88,6 @@
 
 /datum/reagent/consumable/nutriment/vitamin
 	name = "Vitamin"
-	id = "vitamin"
 	description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
 	value = 0.5
 
@@ -104,7 +101,6 @@
 
 /datum/reagent/consumable/cooking_oil
 	name = "Cooking Oil"
-	id = "cooking_oil"
 	description = "A variety of cooking oil derived from fat or plants. Used in food preparation and frying."
 	color = "#EADD6B" //RGB: 234, 221, 107 (based off of canola oil)
 	taste_mult = 0.8
@@ -121,7 +117,7 @@
 			O.loc.visible_message("<span class='warning'>[O] rapidly fries as it's splashed with hot oil! Somehow.</span>")
 			var/obj/item/reagent_containers/food/snacks/deepfryholder/F = new(O.drop_location(), O)
 			F.fry(volume)
-			F.reagents.add_reagent("cooking_oil", reac_volume)
+			F.reagents.add_reagent(/datum/reagent/consumable/cooking_oil, reac_volume)
 
 /datum/reagent/consumable/cooking_oil/reaction_mob(mob/living/M, method = TOUCH, reac_volume, show_message = 1, touch_protection = 0)
 	if(!istype(M))
@@ -150,12 +146,11 @@
 
 /datum/reagent/consumable/sugar
 	name = "Sugar"
-	id = "sugar"
 	description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
 	reagent_state = SOLID
 	color = "#FFFFFF" // rgb: 255, 255, 255
 	taste_mult = 1.5 // stop sugar drowning out other flavours
-	nutriment_factor = 10 * REAGENTS_METABOLISM
+	nutriment_factor = 5 * REAGENTS_METABOLISM
 	metabolization_rate = 2 * REAGENTS_METABOLISM
 	overdose_threshold = 200 // Hyperglycaemic shock
 	taste_description = "sweetness"
@@ -173,7 +168,6 @@
 
 /datum/reagent/consumable/virus_food
 	name = "Virus Food"
-	id = "virusfood"
 	description = "A mixture of water and milk. Virus cells can use this mixture to reproduce."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#899613" // rgb: 137, 150, 19
@@ -181,7 +175,6 @@
 
 /datum/reagent/consumable/soysauce
 	name = "Soysauce"
-	id = "soysauce"
 	description = "A salty sauce made from the soy plant."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#792300" // rgb: 121, 35, 0
@@ -189,7 +182,6 @@
 
 /datum/reagent/consumable/ketchup
 	name = "Ketchup"
-	id = "ketchup"
 	description = "Ketchup, catsup, whatever. It's tomato paste."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#731008" // rgb: 115, 16, 8
@@ -197,7 +189,6 @@
 
 /datum/reagent/consumable/mustard
 	name = "Mustard"
-	id = "mustard"
 	description = "Mustard, mostly used on hotdogs, corndogs and burgers."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#DDED26" // rgb: 221, 237, 38
@@ -205,7 +196,6 @@
 
 /datum/reagent/consumable/capsaicin
 	name = "Capsaicin Oil"
-	id = "capsaicin"
 	description = "This is what makes chilis hot."
 	color = "#B31008" // rgb: 179, 16, 8
 	taste_description = "hot peppers"
@@ -216,8 +206,8 @@
 	switch(current_cycle)
 		if(1 to 15)
 			heating = 5 * TEMPERATURE_DAMAGE_COEFFICIENT
-			if(holder.has_reagent("cryostylane"))
-				holder.remove_reagent("cryostylane", 5)
+			if(holder.has_reagent(/datum/reagent/cryostylane))
+				holder.remove_reagent(/datum/reagent/cryostylane, 5)
 			if(isslime(M))
 				heating = rand(5,20)
 		if(15 to 25)
@@ -237,7 +227,6 @@
 
 /datum/reagent/consumable/frostoil
 	name = "Frost Oil"
-	id = "frostoil"
 	description = "A special oil that noticably chills the body. Extracted from Icepeppers and slimes."
 	color = "#8BA6E9" // rgb: 139, 166, 233
 	taste_description = "mint"
@@ -249,8 +238,8 @@
 	switch(current_cycle)
 		if(1 to 15)
 			cooling = -10 * TEMPERATURE_DAMAGE_COEFFICIENT
-			if(holder.has_reagent("capsaicin"))
-				holder.remove_reagent("capsaicin", 5)
+			if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
+				holder.remove_reagent(/datum/reagent/consumable/capsaicin, 5)
 			if(isslime(M))
 				cooling = -rand(5,20)
 		if(15 to 25)
@@ -284,7 +273,6 @@
 
 /datum/reagent/consumable/condensedcapsaicin
 	name = "Condensed Capsaicin"
-	id = "condensedcapsaicin"
 	description = "A chemical agent used for self-defense and in police work."
 	color = "#B31008" // rgb: 179, 16, 8
 	taste_description = "scorching agony"
@@ -358,7 +346,6 @@
 
 /datum/reagent/consumable/sodiumchloride
 	name = "Table Salt"
-	id = "sodiumchloride"
 	description = "A salt made of sodium chloride. Commonly used to season food."
 	reagent_state = SOLID
 	color = "#FFFFFF" // rgb: 255,255,255
@@ -379,7 +366,6 @@
 
 /datum/reagent/consumable/blackpepper
 	name = "Black Pepper"
-	id = "blackpepper"
 	description = "A powder ground from peppercorns. *AAAACHOOO*"
 	reagent_state = SOLID
 	// no color (ie, black)
@@ -387,7 +373,6 @@
 
 /datum/reagent/consumable/coco
 	name = "Coco Powder"
-	id = "cocoa"
 	description = "A fatty, bitter paste made from coco beans."
 	reagent_state = SOLID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
@@ -396,7 +381,6 @@
 
 /datum/reagent/consumable/hot_coco
 	name = "Hot Chocolate"
-	id = "hot_coco"
 	description = "Made with love! And coco beans."
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	color = "#403010" // rgb: 64, 48, 16
@@ -411,7 +395,6 @@
 
 /datum/reagent/drug/mushroomhallucinogen
 	name = "Mushroom Hallucinogen"
-	id = "mushroomhallucinogen"
 	description = "A strong hallucinogenic drug derived from certain species of mushroom."
 	color = "#E700E7" // rgb: 231, 0, 231
 	metabolization_rate = 0.2 * REAGENTS_METABOLISM
@@ -442,7 +425,6 @@
 
 /datum/reagent/consumable/sprinkles
 	name = "Sprinkles"
-	id = "sprinkles"
 	value = 3
 	description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
 	color = "#FF00FF" // rgb: 255, 0, 255
@@ -456,7 +438,6 @@
 
 /datum/reagent/consumable/peanut_butter
 	name = "Peanut Butter"
-	id = "peanut_butter"
 	description = "A popular food paste made from ground dry-roasted peanuts."
 	color = "#C29261"
 	value = 3
@@ -465,7 +446,6 @@
 
 /datum/reagent/consumable/cornoil
 	name = "Corn Oil"
-	id = "cornoil"
 	description = "An oil derived from various types of corn."
 	nutriment_factor = 20 * REAGENTS_METABOLISM
 	value = 4
@@ -486,7 +466,6 @@
 
 /datum/reagent/consumable/enzyme
 	name = "Universal Enzyme"
-	id = "enzyme"
 	value = 1
 	description = "A universal enzyme used in the preperation of certain chemicals and foods."
 	color = "#365E30" // rgb: 54, 94, 48
@@ -494,7 +473,6 @@
 
 /datum/reagent/consumable/dry_ramen
 	name = "Dry Ramen"
-	id = "dry_ramen"
 	description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
 	reagent_state = SOLID
 	color = "#302000" // rgb: 48, 32, 0
@@ -502,7 +480,6 @@
 
 /datum/reagent/consumable/hot_ramen
 	name = "Hot Ramen"
-	id = "hot_ramen"
 	description = "The noodles are boiled, the flavors are artificial, just like being back in school."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
@@ -514,7 +491,6 @@
 
 /datum/reagent/consumable/hell_ramen
 	name = "Hell Ramen"
-	id = "hell_ramen"
 	description = "The noodles are boiled, the flavors are artificial, just like being back in school."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
@@ -526,7 +502,6 @@
 
 /datum/reagent/consumable/flour
 	name = "Flour"
-	id = "flour"
 	value = 0.5
 	description = "This is what you rub all over yourself to pretend to be a ghost."
 	reagent_state = SOLID
@@ -538,11 +513,10 @@
 		var/obj/effect/decal/cleanable/flour/reagentdecal = new/obj/effect/decal/cleanable/flour(T)
 		reagentdecal = locate() in T //Might have merged with flour already there.
 		if(reagentdecal)
-			reagentdecal.reagents.add_reagent("flour", reac_volume)
+			reagentdecal.reagents.add_reagent(/datum/reagent/consumable/flour, reac_volume)
 
 /datum/reagent/consumable/cherryjelly
 	name = "Cherry Jelly"
-	id = "cherryjelly"
 	description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
 	color = "#801E28" // rgb: 128, 30, 40
 	value = 1
@@ -550,7 +524,6 @@
 
 /datum/reagent/consumable/bluecherryjelly
 	name = "Blue Cherry Jelly"
-	id = "bluecherryjelly"
 	description = "Blue and tastier kind of cherry jelly."
 	color = "#00F0FF"
 	value = 12
@@ -558,7 +531,6 @@
 
 /datum/reagent/consumable/rice
 	name = "Rice"
-	id = "rice"
 	value = 0.5
 	description = "tiny nutritious grains"
 	reagent_state = SOLID
@@ -568,7 +540,6 @@
 
 /datum/reagent/consumable/vanilla
 	name = "Vanilla Powder"
-	id = "vanilla"
 	value = 1
 	description = "A fatty, bitter paste made from vanilla pods."
 	reagent_state = SOLID
@@ -578,7 +549,6 @@
 
 /datum/reagent/consumable/eggyolk
 	name = "Egg Yolk"
-	id = "eggyolk"
 	value = 1
 	description = "It's full of protein."
 	nutriment_factor = 3 * REAGENTS_METABOLISM
@@ -587,7 +557,6 @@
 
 /datum/reagent/consumable/corn_starch
 	name = "Corn Starch"
-	id = "corn_starch"
 	value = 2
 	description = "A slippery solution."
 	color = "#f7f6e4"
@@ -595,7 +564,6 @@
 
 /datum/reagent/consumable/corn_syrup
 	name = "Corn Syrup"
-	id = "corn_syrup"
 	value = 1
 	description = "Decays into sugar."
 	color = "#fff882"
@@ -603,12 +571,11 @@
 	taste_description = "sweet slime"
 
 /datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/M)
-	holder.add_reagent("sugar", 3)
+	holder.add_reagent(/datum/reagent/consumable/sugar, 3)
 	..()
 
 /datum/reagent/consumable/honey
 	name = "honey"
-	id = "honey"
 	description = "Sweet sweet honey that decays into sugar. Has antibacterial and natural healing properties."
 	color = "#d3a308"
 	value = 15
@@ -617,7 +584,7 @@
 	taste_description = "sweetness"
 
 /datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M)
-	M.reagents.add_reagent("sugar",3)
+	M.reagents.add_reagent(/datum/reagent/consumable/sugar,3)
 	if(prob(55))
 		M.adjustBruteLoss(-1*REM, 0)
 		M.adjustFireLoss(-1*REM, 0)
@@ -635,7 +602,6 @@
 
 /datum/reagent/consumable/mayonnaise
 	name = "Mayonnaise"
-	id = "mayonnaise"
 	description = "An white and oily mixture of mixed egg yolks."
 	color = "#DFDFDF"
 	value = 5
@@ -643,7 +609,6 @@
 
 /datum/reagent/consumable/tearjuice
 	name = "Tear Juice"
-	id = "tearjuice"
 	description = "A blinding substance extracted from certain onions."
 	color = "#c0c9a0"
 	taste_description = "bitterness"
@@ -682,7 +647,6 @@
 
 /datum/reagent/consumable/nutriment/stabilized
 	name = "Stabilized Nutriment"
-	id = "stabilizednutriment"
 	description = "A bioengineered protien-nutrient structure designed to decompose in high saturation. In layman's terms, it won't get you fat."
 	reagent_state = SOLID
 	nutriment_factor = 15 * REAGENTS_METABOLISM
@@ -698,7 +662,6 @@
 
 /datum/reagent/consumable/entpoly
 	name = "Entropic Polypnium"
-	id = "entpoly"
 	description = "An ichor, derived from a certain mushroom, makes for a bad time."
 	color = "#1d043d"
 	taste_description = "bitter mushroom"
@@ -719,7 +682,6 @@
 
 /datum/reagent/consumable/tinlux
 	name = "Tinea Luxor"
-	id = "tinlux"
 	description = "A stimulating ichor which causes luminescent fungi to grow on the skin. "
 	color = "#b5a213"
 	taste_description = "tingling mushroom"
@@ -733,7 +695,6 @@
 
 /datum/reagent/consumable/vitfro
 	name = "Vitrium Froth"
-	id = "vitfro"
 	description = "A bubbly paste that heals wounds of the skin."
 	color = "#d3a308"
 	nutriment_factor = 3 * REAGENTS_METABOLISM
@@ -749,7 +710,6 @@
 
 /datum/reagent/consumable/clownstears
 	name = "Clown's Tears"
-	id = "clownstears"
 	description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#eef442" // rgb: 238, 244, 66
@@ -758,7 +718,6 @@
 
 /datum/reagent/consumable/liquidelectricity
 	name = "Liquid Electricity"
-	id = "liquidelectricity"
 	description = "The blood of Ethereals, and the stuff that keeps them going. Great for them, horrid for anyone else."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#97ee63"
@@ -782,7 +741,6 @@
 
 /datum/reagent/consumable/astrotame
 	name = "Astrotame"
-	id = "astrotame"
 	description = "A space age artifical sweetener."
 	nutriment_factor = 0
 	metabolization_rate = 2 * REAGENTS_METABOLISM
@@ -801,7 +759,6 @@
 
 /datum/reagent/consumable/caramel
 	name = "Caramel"
-	id = "caramel"
 	description = "Who would have guessed that heated sugar could be so delicious?"
 	nutriment_factor = 10 * REAGENTS_METABOLISM
 	color = "#D98736"
@@ -811,7 +768,6 @@
 
 /datum/reagent/consumable/secretsauce
 	name = "secret sauce"
-	id = "secret_sauce"
 	description = "What could it be."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#792300"
@@ -823,7 +779,6 @@
 
 /datum/reagent/consumable/char
 	name = "Char"
-	id = "char"
 	description = "Essence of the grill. Has strange properties when overdosed."
 	reagent_state = LIQUID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
@@ -838,7 +793,6 @@
 
 /datum/reagent/consumable/bbqsauce
 	name = "BBQ Sauce"
-	id = "bbqsauce"
 	description = "Sweet, Smokey, Savory, and gets everywhere. Perfect for Grilling."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#78280A" // rgb: 120 40, 10
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents.dm
index 4489088adc..63f62406b5 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents.dm
@@ -8,7 +8,6 @@
 
 /datum/reagent/impure/fermiTox
 	name = "Chemical Isomers"
-	id = "fermiTox"
 	description = "Toxic chemical isomers made from impure reactions. At low volumes will cause light toxin damage, but as the volume increases, it deals larger amounts, damages the liver, then eventually the heart. This is default impure chem for all chems, and changes only if stated."
 	data = "merge"
 	color = "FFFFFF"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 6adce8f204..b8b5bad902 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -7,17 +7,15 @@
 
 /datum/reagent/medicine
 	name = "Medicine"
-	id = "medicine"
 	value = 2
 	taste_description = "bitterness"
 
 /datum/reagent/medicine/on_mob_life(mob/living/carbon/M)
 	current_cycle++
-	holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
+	holder.remove_reagent(type, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
 
 /datum/reagent/medicine/leporazine
 	name = "Leporazine"
-	id = "leporazine"
 	description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
 	pH = 8.4
 	color = "#82b8aa"
@@ -31,7 +29,6 @@
 
 /datum/reagent/medicine/adminordrazine //An OP chemical for admins
 	name = "Adminordrazine"
-	id = "adminordrazine"
 	description = "It's magic. We don't have to explain it."
 	color = "#ffffff"
 	can_synth = FALSE
@@ -79,13 +76,11 @@
 
 /datum/reagent/medicine/adminordrazine/quantum_heal
 	name = "Quantum Medicine"
-	id = "quantum_heal"
 	description = "Rare and experimental particles, that apparently swap the user's body with one from an alternate dimension where it's completely healthy."
 	taste_description = "science"
 
 /datum/reagent/medicine/synaptizine
 	name = "Synaptizine"
-	id = "synaptizine"
 	description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
 	color = "#FF00FF"
 	pH = 4
@@ -95,8 +90,8 @@
 	M.AdjustStun(-20, 0)
 	M.AdjustKnockdown(-20, 0)
 	M.AdjustUnconscious(-20, 0)
-	if(holder.has_reagent("mindbreaker"))
-		holder.remove_reagent("mindbreaker", 5)
+	if(holder.has_reagent(/datum/reagent/toxin/mindbreaker))
+		holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
 	M.hallucination = max(0, M.hallucination - 10)
 	if(prob(30))
 		M.adjustToxLoss(1, 0)
@@ -105,17 +100,16 @@
 
 /datum/reagent/medicine/synaphydramine
 	name = "Diphen-Synaptizine"
-	id = "synaphydramine"
 	description = "Reduces drowsiness, hallucinations, and Histamine from body."
 	color = "#EC536D" // rgb: 236, 83, 109
 	pH = 5.2
 
 /datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(M.drowsyness-5, 0)
-	if(holder.has_reagent("mindbreaker"))
-		holder.remove_reagent("mindbreaker", 5)
-	if(holder.has_reagent("histamine"))
-		holder.remove_reagent("histamine", 5)
+	if(holder.has_reagent(/datum/reagent/toxin/mindbreaker))
+		holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5)
+	if(holder.has_reagent(/datum/reagent/toxin/histamine))
+		holder.remove_reagent(/datum/reagent/toxin/histamine, 5)
 	M.hallucination = max(0, M.hallucination - 10)
 	if(prob(30))
 		M.adjustToxLoss(1, 0)
@@ -124,7 +118,6 @@
 
 /datum/reagent/medicine/inacusiate
 	name = "Inacusiate"
-	id = "inacusiate"
 	description = "Instantly restores all hearing to the patient, but does not cure deafness."
 	color = "#6600FF" // rgb: 100, 165, 255
 	pH = 2
@@ -136,7 +129,6 @@
 
 /datum/reagent/medicine/cryoxadone
 	name = "Cryoxadone"
-	id = "cryoxadone"
 	description = "A chemical mixture with almost magical healing powers. Its main limitation is that the patient's body temperature must be under 270K for it to metabolise correctly."
 	color = "#0000C8"
 	taste_description = "sludge"
@@ -157,7 +149,6 @@
 
 /datum/reagent/medicine/clonexadone
 	name = "Clonexadone"
-	id = "clonexadone"
 	description = "A chemical that derives from Cryoxadone. It specializes in healing clone damage, but nothing else. Requires very cold temperatures to properly metabolize, and metabolizes quicker than cryoxadone."
 	color = "#0000C8"
 	taste_description = "muscle"
@@ -174,7 +165,6 @@
 
 /datum/reagent/medicine/pyroxadone
 	name = "Pyroxadone"
-	id = "pyroxadone"
 	description = "A mixture of cryoxadone and slime jelly, that apparently inverses the requirement for its activation."
 	color = "#f7832a"
 	taste_description = "spicy jelly"
@@ -204,7 +194,6 @@
 
 /datum/reagent/medicine/rezadone
 	name = "Rezadone"
-	id = "rezadone"
 	description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
 	reagent_state = SOLID
 	color = "#669900" // rgb: 102, 153, 0
@@ -229,7 +218,6 @@
 
 /datum/reagent/medicine/spaceacillin
 	name = "Spaceacillin"
-	id = "spaceacillin"
 	description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
 	color = "#f2f2f2"
 	metabolization_rate = 0.1 * REAGENTS_METABOLISM
@@ -238,7 +226,6 @@
 //Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
 /datum/reagent/medicine/silver_sulfadiazine
 	name = "Silver Sulfadiazine"
-	id = "silver_sulfadiazine"
 	description = "If used in touch-based applications, immediately restores burn wounds as well as restoring more over time. It is mildly poisonous taken orally or by injection. If overdosed, deals brute and minor liver damage."
 	reagent_state = LIQUID
 	pH = 7.2
@@ -277,7 +264,6 @@
 
 /datum/reagent/medicine/oxandrolone
 	name = "Oxandrolone"
-	id = "oxandrolone"
 	description = "Stimulates the healing of severe burns. Extremely rapidly heals severe burns and slowly heals minor ones. Overdose will worsen existing burns."
 	reagent_state = LIQUID
 	color = "#f7ffa5"
@@ -302,7 +288,6 @@
 
 /datum/reagent/medicine/styptic_powder
 	name = "Styptic Powder"
-	id = "styptic_powder"
 	description = "If used in touch-based applications, immediately restores bruising as well as restoring more over time. It is poisonous if taken orally or by injection. If overdosed, deals brute and minor liver damage."
 	reagent_state = LIQUID
 	color = "#FF9696"
@@ -342,7 +327,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/salglu_solution
 	name = "Saline-Glucose Solution"
-	id = "salglu_solution"
 	description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute."
 	reagent_state = LIQUID
 	color = "#DCDCDC"
@@ -374,12 +358,12 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 /datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M)
 	if(prob(3))
 		to_chat(M, "<span class = 'warning'>You feel salty.</span>")
-		holder.add_reagent("sodiumchloride", 1)
-		holder.remove_reagent("salglu_solution", 0.5)
+		holder.add_reagent(/datum/reagent/consumable/sodiumchloride, 1)
+		holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
 	else if(prob(3))
 		to_chat(M, "<span class = 'warning'>You feel sweet.</span>")
-		holder.add_reagent("sugar", 1)
-		holder.remove_reagent("salglu_solution", 0.5)
+		holder.add_reagent(/datum/reagent/consumable/sugar, 1)
+		holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
 	if(prob(33))
 		M.adjustBruteLoss(0.5*REM, 0)
 		M.adjustFireLoss(0.5*REM, 0)
@@ -388,7 +372,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/mine_salve
 	name = "Miner's Salve"
-	id = "mine_salve"
 	description = "A powerful painkiller. Restores bruising and burns in addition to making the patient believe they are fully healed."
 	reagent_state = LIQUID
 	color = "#6D6374"
@@ -428,7 +411,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/synthflesh
 	name = "Synthflesh"
-	id = "synthflesh"
 	description = "Has a 100% chance of healing large amounts of brute and burn damage very quickly. One unit of the chemical will heal one point of damage. Touch application only."
 	reagent_state = LIQUID
 	color = "#FFEBEB"
@@ -461,7 +443,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/charcoal
 	name = "Charcoal"
-	id = "charcoal"
 	description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream."
 	reagent_state = LIQUID
 	color = "#000000"
@@ -473,14 +454,14 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 /datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(-2*REM, 0)
 	. = 1
-	for(var/datum/reagent/R in M.reagents.reagent_list)
+	for(var/A in M.reagents.reagent_list)
+		var/datum/reagent/R = A
 		if(R != src)
-			M.reagents.remove_reagent(R.id,1)
+			M.reagents.remove_reagent(R.type,1)
 	..()
 
 /datum/reagent/medicine/omnizine
 	name = "Omnizine"
-	id = "omnizine"
 	description = "Slowly heals all damage types. Overdose will cause damage in all types instead."
 	reagent_state = LIQUID
 	color = "#DCDCDC"
@@ -507,7 +488,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/calomel
 	name = "Calomel"
-	id = "calomel"
 	description = "Quickly purges the body of all chemicals. Toxin damage is dealt if the patient is in good condition."
 	reagent_state = LIQUID
 	color = "#19C832"
@@ -516,9 +496,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	pH = 1.5
 
 /datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M)
-	for(var/datum/reagent/R in M.reagents.reagent_list)
+	for(var/A in M.reagents.reagent_list)
+		var/datum/reagent/R = A
 		if(R != src)
-			M.reagents.remove_reagent(R.id,2.5)
+			M.reagents.remove_reagent(R.type,2.5)
 	if(M.health > 20)
 		M.adjustToxLoss(2.5*REM, 0)
 		. = 1
@@ -526,7 +507,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/potass_iodide
 	name = "Potassium Iodide"
-	id = "potass_iodide"
 	description = "Efficiently restores low radiation damage."
 	reagent_state = LIQUID
 	color = "#14FF3C"
@@ -540,7 +520,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/prussian_blue
 	name = "Prussian Blue"
-	id = "prussian_blue"
 	description = "Efficiently restores heavy radiation damage."
 	reagent_state = LIQUID
 	color = "#003153" // RGB 0, 49, 83
@@ -554,7 +533,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/pen_acid
 	name = "Pentetic Acid"
-	id = "pen_acid"
 	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body."
 	reagent_state = LIQUID
 	color = "#E6FFF0"
@@ -565,15 +543,15 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 /datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/M)
 	M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
 	M.adjustToxLoss(-2*REM, 0, healtoxinlover)
-	for(var/datum/reagent/R in M.reagents.reagent_list)
+	for(var/A in M.reagents.reagent_list)
+		var/datum/reagent/R = A
 		if(R != src)
-			M.reagents.remove_reagent(R.id,2)
+			M.reagents.remove_reagent(R.type,2)
 	..()
 	. = 1
 
 /datum/reagent/medicine/pen_acid/pen_jelly
 	name = "Pentetic Jelly"
-	id = "pen_jelly"
 	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body. Slimepeople friendly!"
 	color = "#91D865"
 	healtoxinlover = TRUE
@@ -581,7 +559,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/sal_acid
 	name = "Salicyclic Acid"
-	id = "sal_acid"
 	description = "Stimulates the healing of severe bruises. Extremely rapidly heals severe bruising and slowly heals minor ones. Overdose will worsen existing bruising."
 	reagent_state = LIQUID
 	color = "#D2D2D2"
@@ -606,7 +583,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/salbutamol
 	name = "Salbutamol"
-	id = "salbutamol"
 	description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
 	reagent_state = LIQUID
 	color = "#00FFFF"
@@ -622,7 +598,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/perfluorodecalin
 	name = "Perfluorodecalin"
-	id = "perfluorodecalin"
 	description = "Extremely rapidly restores oxygen deprivation, but inhibits speech. May also heal small amounts of bruising and burns."
 	reagent_state = LIQUID
 	color = "#FF6464"
@@ -640,7 +615,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/ephedrine
 	name = "Ephedrine"
-	id = "ephedrine"
 	description = "Increases stun resistance. Overdose deals toxin damage and inhibits breathing."
 	reagent_state = LIQUID
 	color = "#D2FFFA"
@@ -697,7 +671,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/diphenhydramine
 	name = "Diphenhydramine"
-	id = "diphenhydramine"
 	description = "Rapidly purges the body of Histamine and reduces jitteriness. Slight chance of causing drowsiness."
 	reagent_state = LIQUID
 	color = "#64FFE6"
@@ -708,12 +681,11 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	if(prob(10))
 		M.drowsyness += 1
 	M.jitteriness -= 1
-	M.reagents.remove_reagent("histamine",3)
+	M.reagents.remove_reagent(/datum/reagent/toxin/histamine,3)
 	..()
 
 /datum/reagent/medicine/morphine
 	name = "Morphine"
-	id = "morphine"
 	description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
 	reagent_state = LIQUID
 	color = "#A9FBFB"
@@ -724,10 +696,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
 	..()
-	L.ignore_slowdown(id)
+	L.ignore_slowdown(type)
 
 /datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
-	L.unignore_slowdown(id)
+	L.unignore_slowdown(type)
 	..()
 
 /datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
@@ -783,7 +755,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/oculine
 	name = "Oculine"
-	id = "oculine"
 	description = "Quickly restores eye damage, cures nearsightedness, and has a chance to restore vision to the blind."
 	reagent_state = LIQUID
 	color = "#FFFFFF"
@@ -814,7 +785,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/atropine
 	name = "Atropine"
-	id = "atropine"
 	description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
 	reagent_state = LIQUID
 	color = "#000000"
@@ -844,7 +814,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/epinephrine
 	name = "Epinephrine"
-	id = "epinephrine"
 	description = "Minor boost to stun resistance. Slowly heals damage if a patient is in critical condition, as well as regulating oxygen loss. Overdose causes weakness and toxin damage."
 	reagent_state = LIQUID
 	color = "#D2FFFA"
@@ -881,7 +850,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/strange_reagent
 	name = "Strange Reagent"
-	id = "strange_reagent"
 	description = "A miracle drug capable of bringing the dead back to life. Only functions when applied by patch or spray, if the target has less than 100 brute and burn damage (independent of one another) and hasn't been husked. Causes slight damage to the living."
 	reagent_state = LIQUID
 	color = "#A0E85E"
@@ -933,7 +901,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/mannitol
 	name = "Mannitol"
-	id = "mannitol"
 	description = "Efficiently restores brain damage."
 	color = "#DCDCFF"
 	pH = 10.4
@@ -946,7 +913,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/neurine
 	name = "Neurine"
-	id = "neurine"
 	description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
 	color = "#EEFF8F"
 
@@ -966,15 +932,14 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 
 /datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/C)
-	if(holder.has_reagent("neurotoxin"))
-		holder.remove_reagent("neurotoxin", 5)
+	if(holder.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin))
+		holder.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 5)
 	if(prob(15))
 		C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
 	..()
 
 /datum/reagent/medicine/mutadone
 	name = "Mutadone"
-	id = "mutadone"
 	description = "Removes jitteriness and restores genetic defects."
 	color = "#5096C8"
 	taste_description = "acid"
@@ -989,7 +954,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/antihol
 	name = "Antihol"
-	id = "antihol"
 	description = "Purges alcoholic substance from the patient's body and eliminates its side effects."
 	color = "#00B4C8"
 	taste_description = "raw egg"
@@ -1010,7 +974,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/stimulants
 	name = "Stimulants"
-	id = "stimulants"
 	description = "Increases stun resistance and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
 	color = "#78008C"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -1019,10 +982,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
 	..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
 
 /datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	..()
 
 /datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M)
@@ -1048,7 +1011,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/insulin
 	name = "Insulin"
-	id = "insulin"
 	description = "Increases sugar depletion rates."
 	reagent_state = LIQUID
 	color = "#FFFFF0"
@@ -1058,13 +1020,12 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 /datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M)
 	if(M.AdjustSleeping(-20, FALSE))
 		. = 1
-	M.reagents.remove_reagent("sugar", 3)
+	M.reagents.remove_reagent(/datum/reagent/consumable/sugar, 3)
 	..()
 
 //Trek Chems, used primarily by medibots. Only heals a specific damage type, but is very efficient.
 /datum/reagent/medicine/bicaridine
 	name = "Bicaridine"
-	id = "bicaridine"
 	description = "Restores bruising. Overdose causes it instead."
 	reagent_state = LIQUID
 	color = "#fc2626"
@@ -1083,7 +1044,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/dexalin
 	name = "Dexalin"
-	id = "dexalin"
 	description = "Restores oxygen loss. Overdose causes it instead."
 	reagent_state = LIQUID
 	color = "#13d2f0"
@@ -1102,7 +1062,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/kelotane
 	name = "Kelotane"
-	id = "kelotane"
 	description = "Restores fire damage. Overdose causes it instead."
 	reagent_state = LIQUID
 	color = "#ffc400"
@@ -1121,7 +1080,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/antitoxin
 	name = "Anti-Toxin"
-	id = "antitoxin"
 	description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
 	reagent_state = LIQUID
 	color = "#6aff00"
@@ -1132,7 +1090,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 /datum/reagent/medicine/antitoxin/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(-2*REM, 0)
 	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.id,1)
+		M.reagents.remove_reagent(R.type,1)
 	..()
 	. = 1
 
@@ -1143,7 +1101,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/inaprovaline
 	name = "Inaprovaline"
-	id = "inaprovaline"
 	description = "Stabilizes the breathing of patients. Good for those in critical condition."
 	reagent_state = LIQUID
 	pH = 8.5
@@ -1156,7 +1113,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/tricordrazine
 	name = "Tricordrazine"
-	id = "tricordrazine"
 	description = "Has a high chance to heal all types of damage. Overdose instead causes it."
 	reagent_state = LIQUID
 	color = "#e650c0"
@@ -1182,7 +1138,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/regen_jelly
 	name = "Regenerative Jelly"
-	id = "regen_jelly"
 	description = "Gradually regenerates all types of damage, without harming slime anatomy."
 	reagent_state = LIQUID
 	color = "#91D865"
@@ -1198,7 +1153,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs
 	name = "Restorative Nanites"
-	id = "syndicate_nanites"
 	description = "Miniature medical robots that swiftly restore bodily damage."
 	reagent_state = SOLID
 	color = "#555555"
@@ -1219,7 +1173,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/lesser_syndicate_nanites // the one in the injector
 	name = "Regenerative Nanites"
-	id = "lesser_syndicate_nanites"
 	description = "Miniature medical robots that restore damage and get operatives back in the fight."
 	reagent_state = SOLID
 	color = "#555555"
@@ -1240,7 +1193,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/neo_jelly
 	name = "Neo Jelly"
-	id = "neo_jelly"
 	description = "Gradually regenerates all types of damage, without harming slime anatomy.Can OD"
 	reagent_state = LIQUID
 	metabolization_rate = 1 * REAGENTS_METABOLISM
@@ -1266,7 +1218,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
 	name = "Earthsblood"
-	id = "earthsblood"
 	description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain."
 	color = rgb(255, 175, 0)
 	overdose_threshold = 25
@@ -1293,7 +1244,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/haloperidol
 	name = "Haloperidol"
-	id = "haloperidol"
 	description = "Increases depletion rates for most stimulating/hallucinogenic drugs. Reduces druggy effects and jitteriness. Severe stamina regeneration penalty, causes drowsiness. Small chance of brain damage."
 	reagent_state = LIQUID
 	color = "#27870a"
@@ -1302,7 +1252,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/M)
 	for(var/datum/reagent/drug/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.id,5)
+		M.reagents.remove_reagent(R.type,5)
 	M.drowsyness += 2
 	if(M.jitteriness >= 3)
 		M.jitteriness -= 3
@@ -1316,7 +1266,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/lavaland_extract
 	name = "Lavaland Extract"
-	id = "lavaland_extract"
 	description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
 	color = "#a1a1a1"
 	overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
@@ -1338,7 +1287,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 //used for changeling's adrenaline power
 /datum/reagent/medicine/changelingadrenaline
 	name = "Changeling Adrenaline"
-	id = "changelingadrenaline"
 	description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed."
 	color = "#918e53"
 	overdose_threshold = 30
@@ -1359,17 +1307,16 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/changelinghaste
 	name = "Changeling Haste"
-	id = "changelinghaste"
 	description = "Drastically increases movement speed, but deals toxin damage."
 	color = "#669153"
 	metabolization_rate = 1
 
 /datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
 	..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING))
 
 /datum/reagent/medicine/changelinghaste/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	..()
 
 /datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
@@ -1381,7 +1328,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	// Heart attack code will not do damage if corazone is present
 	// because it's SPACE MAGIC ASPIRIN
 	name = "Corazone"
-	id = "corazone"
 	description = "A medication used to treat pain, fever, and inflammation, along with heart attacks."
 	color = "#F5F5F5"
 	self_consuming = TRUE
@@ -1399,20 +1345,18 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/muscle_stimulant
 	name = "Muscle Stimulant"
-	id = "muscle_stimulant"
 	description = "A potent chemical that allows someone under its influence to be at full physical ability even when under massive amounts of pain."
 
 /datum/reagent/medicine/muscle_stimulant/on_mob_metabolize(mob/living/M)
 	. = ..()
-	M.ignore_slowdown(id)
+	M.ignore_slowdown(type)
 
 /datum/reagent/medicine/muscle_stimulant/on_mob_end_metabolize(mob/living/M)
 	. = ..()
-	M.unignore_slowdown(id)
+	M.unignore_slowdown(type)
 
 /datum/reagent/medicine/modafinil
 	name = "Modafinil"
-	id = "modafinil"
 	description = "Long-lasting sleep suppressant that very slightly reduces stun and knockdown times. Overdosing has horrendous side effects and deals lethal oxygen damage, will knock you unconscious if not dealt with."
 	reagent_state = LIQUID
 	color = "#BEF7D8" // palish blue white
@@ -1423,11 +1367,11 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	pH = 7.89
 
 /datum/reagent/medicine/modafinil/on_mob_metabolize(mob/living/M)
-	ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, id)
+	ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
 	..()
 
 /datum/reagent/medicine/modafinil/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, id)
+	REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
 	..()
 
 /datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
@@ -1480,7 +1424,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/psicodine
 	name = "Psicodine"
-	id = "psicodine"
 	description = "Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage."
 	reagent_state = LIQUID
 	color = "#07E79E"
@@ -1490,10 +1433,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/psicodine/on_mob_add(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_FEARLESS, id)
+	ADD_TRAIT(L, TRAIT_FEARLESS, type)
 
 /datum/reagent/medicine/psicodine/on_mob_delete(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FEARLESS, id)
+	REMOVE_TRAIT(L, TRAIT_FEARLESS, type)
 	..()
 
 /datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/M)
@@ -1515,7 +1458,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/silibinin
 	name = "Silibinin"
-	id = "silibinin"
 	description = "A thistle derrived hepatoprotective flavolignan mixture that help reverse damage to the liver."
 	reagent_state = SOLID
 	color = "#FFFFD0"
@@ -1528,7 +1470,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/polypyr  //This is intended to be an ingredient in advanced chems.
 	name = "Polypyrylium Oligomers"
-	id = "polypyr"
 	description = "A�purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. It is valued as an intermediate in the synthesis of the cutting edge pharmaceuticals."
 	reagent_state = SOLID
 	color = "#9423FF"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 512b8a21a1..dbede29e5f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1,7 +1,6 @@
 /datum/reagent/blood
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_HUMAN, "blood_type"= null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null)
 	name = "Blood"
-	id = "blood"
 	value = 1
 	color = BLOOD_COLOR_HUMAN // rgb: 200, 0, 0
 	description = "Blood from some creature."
@@ -30,7 +29,7 @@
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
 		var/blood_id = C.get_blood_id()
-		if((HAS_TRAIT(C, TRAIT_NOMARROW) || blood_id == "blood" || blood_id == "jellyblood") && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
+		if((HAS_TRAIT(C, TRAIT_NOMARROW) || blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood) && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
 			C.blood_volume = min(C.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM * C.blood_ratio)
 			// we don't care about bloodtype here, we're just refilling the mob
 
@@ -41,7 +40,7 @@
 	if((HAS_TRAIT(C, TRAIT_NOMARROW)))
 		return //We dont want vampires getting toxed from blood
 	var/blood_id = C.get_blood_id()
-	if((blood_id == "blood" || blood_id == "jellyblood"))
+	if((blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood))
 		if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type)))	//we only care about bloodtype here because this is where the poisoning should be
 			C.adjustToxLoss(rand(2,8)*REM, TRUE, TRUE)	//forced to ensure people don't use it to gain beneficial toxin as slime person
 	..()
@@ -62,7 +61,7 @@
 	if(data["blood_DNA"])
 		B.blood_DNA[data["blood_DNA"]] = data["blood_type"]
 	if(!B.reagents)
-		B.reagents.add_reagent(id, reac_volume)
+		B.reagents.add_reagent(type, reac_volume)
 	B.update_icon()
 
 /datum/reagent/blood/on_new(list/data)
@@ -132,14 +131,12 @@
 /datum/reagent/blood/synthetics
 	data = list("donor"=null,"viruses"=null,"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Synthetic Blood"
-	id = "syntheticblood"
 	taste_description = "oily"
 	color = BLOOD_COLOR_SYNTHETIC // rgb: 11, 7, 48
 
 /datum/reagent/blood/lizard
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_LIZARD, "blood_type"="L","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Lizard Blood"
-	id = "lizardblood"
 	taste_description = "spicy"
 	color = BLOOD_COLOR_LIZARD // rgb: 11, 7, 48
 	pH = 6.85
@@ -147,7 +144,6 @@
 /datum/reagent/blood/jellyblood
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_SLIME, "blood_type"="GEL","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Slime Jelly Blood"
-	id = "jellyblood"
 	description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
 	color = BLOOD_COLOR_SLIME
 	taste_description = "slime"
@@ -157,7 +153,6 @@
 /datum/reagent/blood/xenomorph
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_XENO, "blood_type"="X*","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Xenomorph Blood"
-	id = "xenoblood"
 	taste_description = "acidic heresy"
 	color = BLOOD_COLOR_XENO // greenish yellow ooze
 	shot_glass_icon_state = "shotglassgreen"
@@ -166,7 +161,6 @@
 /datum/reagent/blood/oil
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_OIL, "blood_type"="HF","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Hydraulic Blood"
-	id = "oilblood"
 	taste_description = "burnt oil"
 	color = BLOOD_COLOR_OIL // dark, y'know, expected batman colors.
 	pH = 9.75
@@ -174,7 +168,6 @@
 /datum/reagent/blood/insect
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_BUG, "blood_type"="BUG","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Insectoid Blood"
-	id = "bugblood"
 	taste_description = "waxy"
 	color = BLOOD_COLOR_BUG // Bug colored, I guess.
 	pH = 7.25
@@ -193,7 +186,6 @@
 
 /datum/reagent/liquidgibs
 	name = "Liquid gibs"
-	id = "liquidgibs"
 	color = BLOOD_COLOR_HUMAN
 	description = "You don't even want to think about what's in here."
 	taste_description = "gross iron"
@@ -203,7 +195,6 @@
 
 /datum/reagent/liquidgibs/xeno
 	name = "Liquid xeno gibs"
-	id = "liquidxenogibs"
 	color = BLOOD_COLOR_XENO
 	taste_description = "blended heresy"
 	shot_glass_icon_state = "shotglassgreen"
@@ -212,7 +203,6 @@
 
 /datum/reagent/liquidgibs/slime
 	name = "Slime sludge"
-	id = "liquidslimegibs"
 	color = BLOOD_COLOR_SLIME
 	taste_description = "slime"
 	shot_glass_icon_state = "shotglassgreen"
@@ -221,14 +211,12 @@
 
 /datum/reagent/liquidgibs/synth
 	name = "Synthetic sludge"
-	id = "liquidsyntheticgibs"
 	color = BLOOD_COLOR_SYNTHETIC
 	taste_description = "jellied plastic"
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 
 /datum/reagent/liquidgibs/oil
 	name = "Hydraulic sludge"
-	id = "liquidoilgibs"
 	color = BLOOD_COLOR_OIL
 	taste_description = "chunky burnt oil"
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_OIL, "blood_type"="HF","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
@@ -237,7 +225,6 @@
 /datum/reagent/vaccine
 	//data must contain virus type
 	name = "Vaccine"
-	id = "vaccine"
 	color = "#C81040" // rgb: 200, 16, 64
 	taste_description = "slime"
 
@@ -255,7 +242,6 @@
 
 /datum/reagent/water
 	name = "Water"
-	id = "water"
 	description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen."
 	color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
 	taste_description = "water"
@@ -327,7 +313,6 @@
 
 /datum/reagent/water/holywater
 	name = "Holy Water"
-	id = "holywater"
 	description = "Water blessed by some deity."
 	color = "#E0E8EF" // rgb: 224, 232, 239
 	glass_icon_state  = "glass_clear"
@@ -337,7 +322,7 @@
 
 /datum/reagent/water/holywater/on_mob_metabolize(mob/living/L)
 	. = ..()
-	ADD_TRAIT(L, TRAIT_HOLY, id)
+	ADD_TRAIT(L, TRAIT_HOLY, type)
 
 	if(is_servant_of_ratvar(L))
 		to_chat(L, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
@@ -345,7 +330,7 @@
 		to_chat(L, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
 
 /datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_HOLY, id)
+	REMOVE_TRAIT(L, TRAIT_HOLY, type)
 	if(iscultist(L))
 		for(var/datum/action/innate/cult/blood_magic/BM in L.actions)
 			BM.holy_dispel = FALSE
@@ -392,9 +377,9 @@
 				remove_servant_of_ratvar(M)
 			M.jitteriness = 0
 			M.stuttering = 0
-			holder.remove_reagent(id, volume)	// maybe this is a little too perfect and a max() cap on the statuses would be better??
+			holder.del_reagent(type)	// maybe this is a little too perfect and a max() cap on the statuses would be better??
 			return
-	holder.remove_reagent(id, 0.4)	//fixed consumption to prevent balancing going out of whack
+	holder.remove_reagent(type, 0.4)	//fixed consumption to prevent balancing going out of whack
 
 /datum/reagent/water/holywater/reaction_turf(turf/T, reac_volume)
 	..()
@@ -407,14 +392,13 @@
 
 /datum/reagent/fuel/unholywater	//if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
 	name = "Unholy Water"
-	id = "unholywater"
 	description = "Something that shouldn't exist on this plane of existence."
 	taste_description = "suffering"
 	pH = 6.5
 
 /datum/reagent/fuel/unholywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(method == TOUCH || method == VAPOR)
-		M.reagents.add_reagent(id,reac_volume/4)
+		M.reagents.add_reagent(type, reac_volume/4)
 		return
 	return ..()
 
@@ -437,12 +421,11 @@
 		M.adjustFireLoss(2, 0)
 		M.adjustOxyLoss(2, 0)
 		M.adjustBruteLoss(2, 0)
-	holder.remove_reagent(id, 1)
+	holder.remove_reagent(type, 1)
 	return TRUE
 
 /datum/reagent/hellwater			//if someone has this in their system they've really pissed off an eldrich god
 	name = "Hell Water"
-	id = "hell_water"
 	description = "YOUR FLESH! IT BURNS!"
 	taste_description = "burning"
 
@@ -452,12 +435,11 @@
 	M.adjustToxLoss(1, 0)
 	M.adjustFireLoss(1, 0)		//Hence the other damages... ain't I a bastard?
 	M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150)
-	holder.remove_reagent(id, 1)
+	holder.remove_reagent(type, 1)
 	pH = 0.1
 
 /datum/reagent/fuel/holyoil		//Its oil
 	name = "Zelus Oil"
-	id = "holyoil"
 	description = "Oil blessed by a greater being."
 	taste_description = "metallic oil"
 
@@ -481,7 +463,7 @@
 		M.adjustToxLoss(3, 0)
 		M.adjustOxyLoss(2, 0)
 		M.adjustStaminaLoss(10, 0)
-		holder.remove_reagent(id, 1)
+		holder.remove_reagent(type, 1)
 	return TRUE
 
 //We only get 30u to start with...
@@ -496,13 +478,11 @@
 
 /datum/reagent/medicine/omnizine/godblood
 	name = "Godblood"
-	id = "godblood"
 	description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
 	overdose_threshold = 150
 
 /datum/reagent/lube
 	name = "Space Lube"
-	id = "lube"
 	description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
 	color = "#009CA8" // rgb: 0, 156, 168
 	taste_description = "cherry" // by popular demand
@@ -517,13 +497,11 @@
 ///Stronger kind of lube. Applies TURF_WET_SUPERLUBE.
 /datum/reagent/lube/superlube
 	name = "Super Duper Lube"
-	id = "superlube"
 	description = "This \[REDACTED\] has been outlawed after the incident on \[DATA EXPUNGED\]."
 	lube_kind = TURF_WET_SUPERLUBE
 
 /datum/reagent/spraytan
 	name = "Spray Tan"
-	id = "spraytan"
 	description = "A substance applied to the skin to darken the skin."
 	color = "#FFC080" // rgb: 255, 196, 128  Bright orange
 	metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly.  But this changes on an overdose
@@ -620,7 +598,6 @@
 
 /datum/reagent/mutationtoxin
 	name = "Stable Mutation Toxin"
-	id = "stablemutationtoxin"
 	description = "A humanizing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	metabolization_rate = INFINITY //So it instantly removes all of itself
@@ -651,7 +628,6 @@
 
 /datum/reagent/mutationtoxin/classic //The one from plasma on green slimes
 	name = "Mutation Toxin"
-	id = "mutationtoxin"
 	description = "A corruptive toxin."
 	color = "#13BC5E" // rgb: 19, 188, 94
 	race = /datum/species/jelly/slime
@@ -659,14 +635,12 @@
 
 /datum/reagent/mutationtoxin/felinid
 	name = "Felinid Mutation Toxin"
-	id = "felinidmutationtoxin"
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/human/felinid
 	mutationtext = "<span class='danger'>The pain subsides. You feel... like a degenerate.</span>"
 
 /datum/reagent/mutationtoxin/lizard
 	name = "Lizard Mutation Toxin"
-	id = "lizardmutationtoxin"
 	description = "A lizarding toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/lizard
@@ -674,7 +648,6 @@
 
 /datum/reagent/mutationtoxin/fly
 	name = "Fly Mutation Toxin"
-	id = "flymutationtoxin"
 	description = "An insectifying toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/fly
@@ -682,7 +655,6 @@
 
 /datum/reagent/mutationtoxin/insect
 	name = "Insect Mutation Toxin"
-	id = "mothmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/insect
@@ -690,7 +662,6 @@
 
 /datum/reagent/mutationtoxin/pod
 	name = "Podperson Mutation Toxin"
-	id = "podmutationtoxin"
 	description = "A vegetalizing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/pod
@@ -698,7 +669,6 @@
 
 /datum/reagent/mutationtoxin/jelly
 	name = "Imperfect Mutation Toxin"
-	id = "jellymutationtoxin"
 	description = "An jellyfying toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/jelly
@@ -706,7 +676,6 @@
 
 /datum/reagent/mutationtoxin/golem
 	name = "Golem Mutation Toxin"
-	id = "golemmutationtoxin"
 	description = "A crystal toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/golem/random
@@ -714,7 +683,6 @@
 
 /datum/reagent/mutationtoxin/abductor
 	name = "Abductor Mutation Toxin"
-	id = "abductormutationtoxin"
 	description = "An alien toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/abductor
@@ -722,7 +690,6 @@
 
 /datum/reagent/mutationtoxin/android
 	name = "Android Mutation Toxin"
-	id = "androidmutationtoxin"
 	description = "A robotic toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/android
@@ -731,7 +698,6 @@
 //Citadel Races
 /datum/reagent/mutationtoxin/mammal
 	name = "Mammal Mutation Toxin"
-	id = "mammalmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/mammal
@@ -739,7 +705,6 @@
 
 /datum/reagent/mutationtoxin/insect
 	name = "Insect Mutation Toxin"
-	id = "insectmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/insect
@@ -747,7 +712,6 @@
 
 /datum/reagent/mutationtoxin/xenoperson
 	name = "Xeno-Hybrid Mutation Toxin"
-	id = "xenopersonmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/xeno
@@ -756,7 +720,6 @@
 //BLACKLISTED RACES
 /datum/reagent/mutationtoxin/skeleton
 	name = "Skeleton Mutation Toxin"
-	id = "skeletonmutationtoxin"
 	description = "A scary toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/skeleton
@@ -764,7 +727,6 @@
 
 /datum/reagent/mutationtoxin/zombie
 	name = "Zombie Mutation Toxin"
-	id = "zombiemutationtoxin"
 	description = "An undead toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past.
@@ -772,7 +734,6 @@
 
 /datum/reagent/mutationtoxin/ash
 	name = "Ash Mutation Toxin"
-	id = "ashmutationtoxin"
 	description = "An ashen toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/lizard/ashwalker
@@ -782,7 +743,6 @@
 //DANGEROUS RACES
 /datum/reagent/mutationtoxin/shadow
 	name = "Shadow Mutation Toxin"
-	id = "shadowmutationtoxin"
 	description = "A dark toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/shadow
@@ -790,7 +750,6 @@
 
 /datum/reagent/mutationtoxin/plasma
 	name = "Plasma Mutation Toxin"
-	id = "plasmamutationtoxin"
 	description = "A plasma-based toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/plasmaman
@@ -798,7 +757,6 @@
 
 /datum/reagent/slime_toxin
 	name = "Slime Mutation Toxin"
-	id = "slime_toxin"
 	description = "A toxin that turns organic material into slime."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	taste_description = "slime"
@@ -815,7 +773,7 @@
 		to_chat(H, "<span class='warning'>Your jelly shifts and morphs, turning you into another subspecies!</span>")
 		var/species_type = pick(subtypesof(/datum/species/jelly))
 		H.set_species(species_type)
-		H.reagents.del_reagent(id)
+		H.reagents.del_reagent(type)
 
 	switch(current_cycle)
 		if(1 to 6)
@@ -830,12 +788,11 @@
 		if(20 to INFINITY)
 			var/species_type = pick(subtypesof(/datum/species/jelly))
 			H.set_species(species_type)
-			H.reagents.del_reagent(id)
+			H.reagents.del_reagent(type)
 			to_chat(H, "<span class='warning'>You've become \a jellyperson!</span>")
 
 /datum/reagent/mulligan
 	name = "Mulligan Toxin"
-	id = "mulligan"
 	description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	metabolization_rate = INFINITY
@@ -851,7 +808,6 @@
 
 /datum/reagent/aslimetoxin
 	name = "Advanced Mutation Toxin"
-	id = "amutationtoxin"
 	description = "An advanced corruptive toxin produced by slimes."
 	color = "#13BC5E" // rgb: 19, 188, 94
 	taste_description = "slime"
@@ -862,7 +818,6 @@
 
 /datum/reagent/gluttonytoxin
 	name = "Gluttony's Blessing"
-	id = "gluttonytoxin"
 	description = "An advanced corruptive toxin produced by something terrible."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	can_synth = FALSE
@@ -873,7 +828,6 @@
 
 /datum/reagent/serotrotium
 	name = "Serotrotium"
-	id = "serotrotium"
 	description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
 	color = "#202040" // rgb: 20, 20, 40
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -888,7 +842,6 @@
 
 /datum/reagent/oxygen
 	name = "Oxygen"
-	id = "oxygen"
 	description = "A colorless, odorless gas. Grows on trees but is still pretty valuable."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -909,7 +862,6 @@
 
 /datum/reagent/copper
 	name = "Copper"
-	id = "copper"
 	description = "A highly ductile metal. Things made out of copper aren't very durable, but it makes a decent material for electrical wiring."
 	reagent_state = SOLID
 	color = "#6E3B08" // rgb: 110, 59, 8
@@ -925,7 +877,6 @@
 
 /datum/reagent/nitrogen
 	name = "Nitrogen"
-	id = "nitrogen"
 	description = "A colorless, odorless, tasteless gas. A simple asphyxiant that can silently displace vital oxygen."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -946,7 +897,6 @@
 
 /datum/reagent/hydrogen
 	name = "Hydrogen"
-	id = "hydrogen"
 	description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -955,7 +905,6 @@
 
 /datum/reagent/potassium
 	name = "Potassium"
-	id = "potassium"
 	description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
 	reagent_state = SOLID
 	color = "#A0A0A0" // rgb: 160, 160, 160
@@ -963,7 +912,6 @@
 
 /datum/reagent/mercury
 	name = "Mercury"
-	id = "mercury"
 	description = "A curious metal that's a liquid at room temperature. Neurodegenerative and very bad for the mind."
 	color = "#484848" // rgb: 72, 72, 72A
 	taste_mult = 0 // apparently tasteless.
@@ -978,7 +926,6 @@
 
 /datum/reagent/sulfur
 	name = "Sulfur"
-	id = "sulfur"
 	description = "A sickly yellow solid mostly known for its nasty smell. It's actually much more helpful than it looks in biochemisty."
 	reagent_state = SOLID
 	color = "#BF8C00" // rgb: 191, 140, 0
@@ -987,7 +934,6 @@
 
 /datum/reagent/carbon
 	name = "Carbon"
-	id = "carbon"
 	description = "A crumbly black solid that, while unexciting on an physical level, forms the base of all known life. Kind of a big deal."
 	reagent_state = SOLID
 	color = "#1C1300" // rgb: 30, 20, 0
@@ -1002,7 +948,6 @@
 
 /datum/reagent/chlorine
 	name = "Chlorine"
-	id = "chlorine"
 	description = "A pale yellow gas that's well known as an oxidizer. While it forms many harmless molecules in its elemental form it is far from harmless."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -1016,7 +961,6 @@
 
 /datum/reagent/fluorine
 	name = "Fluorine"
-	id = "fluorine"
 	description = "A comically-reactive chemical element. The universe does not want this stuff to exist in this form in the slightest."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -1030,7 +974,6 @@
 
 /datum/reagent/sodium
 	name = "Sodium"
-	id = "sodium"
 	description = "A soft silver metal that can easily be cut with a knife. It's not salt just yet, so refrain from putting in on your chips."
 	reagent_state = SOLID
 	color = "#808080" // rgb: 128, 128, 128
@@ -1039,7 +982,6 @@
 
 /datum/reagent/phosphorus
 	name = "Phosphorus"
-	id = "phosphorus"
 	description = "A ruddy red powder that burns readily. Though it comes in many colors, the general theme is always the same."
 	reagent_state = SOLID
 	color = "#832828" // rgb: 131, 40, 40
@@ -1048,7 +990,6 @@
 
 /datum/reagent/lithium
 	name = "Lithium"
-	id = "lithium"
 	description = "A silver metal, its claim to fame is its remarkably low density. Using it is a bit too effective in calming oneself down."
 	reagent_state = SOLID
 	color = "#808080" // rgb: 128, 128, 128
@@ -1064,7 +1005,6 @@
 
 /datum/reagent/glycerol
 	name = "Glycerol"
-	id = "glycerol"
 	description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
 	color = "#808080" // rgb: 128, 128, 128
 	taste_description = "sweetness"
@@ -1072,7 +1012,6 @@
 
 /datum/reagent/radium
 	name = "Radium"
-	id = "radium"
 	description = "Radium is an alkaline earth metal. It is extremely radioactive."
 	reagent_state = SOLID
 	color = "#C7C7C7" // rgb: 199,199,199
@@ -1089,11 +1028,10 @@
 			var/obj/effect/decal/cleanable/greenglow/GG = locate() in T.contents
 			if(!GG)
 				GG = new/obj/effect/decal/cleanable/greenglow(T)
-			GG.reagents.add_reagent("radium", reac_volume)
+			GG.reagents.add_reagent(/datum/reagent/radium, reac_volume)
 
 /datum/reagent/space_cleaner/sterilizine
 	name = "Sterilizine"
-	id = "sterilizine"
 	description = "Sterilizes wounds in preparation for surgery."
 	color = "#e6f1f5" // rgb: 200, 165, 220
 	taste_description = "bitterness"
@@ -1109,7 +1047,6 @@
 
 /datum/reagent/iron
 	name = "Iron"
-	id = "iron"
 	description = "Pure iron is a metal."
 	reagent_state = SOLID
 	taste_description = "iron"
@@ -1127,12 +1064,12 @@
 /datum/reagent/iron/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(M.has_bane(BANE_IRON)) //If the target is weak to cold iron, then poison them.
 		if(holder && holder.chem_temp < 100) // COLD iron.
-			M.reagents.add_reagent("toxin", reac_volume)
+			M.reagents.add_reagent(/datum/reagent/toxin, reac_volume)
 	..()
 
 /datum/reagent/iron/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You start feeling your guts twisting painfully!</span>")
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/overdose, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
 
 /datum/reagent/iron/overdose_process(mob/living/carbon/C)
 	if(prob(20))
@@ -1143,7 +1080,6 @@
 
 /datum/reagent/gold
 	name = "Gold"
-	id = "gold"
 	description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
 	reagent_state = SOLID
 	color = "#F7C430" // rgb: 247, 196, 48
@@ -1151,7 +1087,6 @@
 
 /datum/reagent/silver
 	name = "Silver"
-	id = "silver"
 	description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
 	reagent_state = SOLID
 	color = "#D0D0D0" // rgb: 208, 208, 208
@@ -1159,12 +1094,11 @@
 
 /datum/reagent/silver/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(M.has_bane(BANE_SILVER))
-		M.reagents.add_reagent("toxin", reac_volume)
+		M.reagents.add_reagent(/datum/reagent/toxin, reac_volume)
 	..()
 
 /datum/reagent/uranium
 	name ="Uranium"
-	id = "uranium"
 	description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
 	reagent_state = SOLID
 	color = "#B8B8C0" // rgb: 184, 184, 192
@@ -1181,11 +1115,10 @@
 			var/obj/effect/decal/cleanable/greenglow/GG = locate() in T.contents
 			if(!GG)
 				GG = new/obj/effect/decal/cleanable/greenglow(T)
-			GG.reagents.add_reagent("uranium", reac_volume)
+			GG.reagents.add_reagent(/datum/reagent/uranium, reac_volume)
 
 /datum/reagent/bluespace
 	name = "Bluespace Dust"
-	id = "bluespace"
 	description = "A dust composed of microscopic bluespace crystals, with minor space-warping properties."
 	reagent_state = SOLID
 	color = "#0000CC"
@@ -1210,7 +1143,6 @@
 
 /datum/reagent/aluminium
 	name = "Aluminium"
-	id = "aluminium"
 	description = "A silvery white and ductile member of the boron group of chemical elements."
 	reagent_state = SOLID
 	color = "#A8A8A8" // rgb: 168, 168, 168
@@ -1218,7 +1150,6 @@
 
 /datum/reagent/silicon
 	name = "Silicon"
-	id = "silicon"
 	description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
 	reagent_state = SOLID
 	color = "#A8A8A8" // rgb: 168, 168, 168
@@ -1227,7 +1158,6 @@
 
 /datum/reagent/fuel
 	name = "Welding fuel"
-	id = "welding_fuel"
 	description = "Required for welders. Flamable."
 	color = "#660000" // rgb: 102, 0, 0
 	taste_description = "gross metal"
@@ -1250,7 +1180,6 @@
 
 /datum/reagent/space_cleaner
 	name = "Space cleaner"
-	id = "cleaner"
 	description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
 	color = "#A5F0EE" // rgb: 165, 240, 238
 	taste_description = "sourness"
@@ -1317,7 +1246,6 @@
 
 /datum/reagent/space_cleaner/ez_clean
 	name = "EZ Clean"
-	id = "ez_clean"
 	description = "A powerful, acidic cleaner sold by Waffle Co. Affects organic matter while leaving other objects unaffected."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	taste_description = "acid"
@@ -1337,7 +1265,6 @@
 
 /datum/reagent/cryptobiolin
 	name = "Cryptobiolin"
-	id = "cryptobiolin"
 	description = "Cryptobiolin causes confusion and dizziness."
 	color = "#7529b3" // rgb: 200, 165, 220
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -1353,7 +1280,6 @@
 
 /datum/reagent/impedrezene
 	name = "Impedrezene"
-	id = "impedrezene"
 	description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
 	color = "#587a31" // rgb: 200, 165, 220A
 	taste_description = "numbness"
@@ -1371,7 +1297,6 @@
 
 /datum/reagent/nanomachines
 	name = "Nanomachines"
-	id = "nanomachines"
 	description = "Microscopic construction robots."
 	color = "#535E66" // rgb: 83, 94, 102
 	can_synth = FALSE
@@ -1383,7 +1308,6 @@
 
 /datum/reagent/xenomicrobes
 	name = "Xenomicrobes"
-	id = "xenomicrobes"
 	description = "Microbes with an entirely alien cellular structure."
 	color = "#535E66" // rgb: 83, 94, 102
 	can_synth = FALSE
@@ -1395,7 +1319,6 @@
 
 /datum/reagent/fungalspores
 	name = "Tubercle bacillus Cosmosis microbes"
-	id = "fungalspores"
 	description = "Active fungal spores."
 	color = "#92D17D" // rgb: 146, 209, 125
 	can_synth = FALSE
@@ -1408,7 +1331,6 @@
 
 /datum/reagent/fluorosurfactant//foam precursor
 	name = "Fluorosurfactant"
-	id = "fluorosurfactant"
 	description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
 	color = "#9E6B38" // rgb: 158, 107, 56
 	taste_description = "metal"
@@ -1416,7 +1338,6 @@
 
 /datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually.
 	name = "Foaming agent"
-	id = "foaming_agent"
 	description = "An agent that yields metallic foam when mixed with light metal and a strong acid."
 	reagent_state = SOLID
 	color = "#664B63" // rgb: 102, 75, 99
@@ -1425,7 +1346,6 @@
 
 /datum/reagent/smart_foaming_agent //Smart foaming agent. Functions similarly to metal foam, but conforms to walls.
 	name = "Smart foaming agent"
-	id = "smart_foaming_agent"
 	description = "An agent that yields metallic foam which conforms to area boundaries when mixed with light metal and a strong acid."
 	reagent_state = SOLID
 	color = "#664B63" // rgb: 102, 75, 99
@@ -1434,7 +1354,6 @@
 
 /datum/reagent/ammonia
 	name = "Ammonia"
-	id = "ammonia"
 	description = "A caustic substance commonly used in fertilizer or household cleaners."
 	reagent_state = GAS
 	color = "#404030" // rgb: 64, 64, 48
@@ -1443,7 +1362,6 @@
 
 /datum/reagent/diethylamine
 	name = "Diethylamine"
-	id = "diethylamine"
 	description = "A secondary amine, mildly corrosive."
 	color = "#604030" // rgb: 96, 64, 48
 	taste_description = "iron"
@@ -1451,7 +1369,6 @@
 
 /datum/reagent/carbondioxide
 	name = "Carbon Dioxide"
-	id = "co2"
 	reagent_state = GAS
 	description = "A gas commonly produced by burning carbon fuels. You're constantly producing this in your lungs."
 	color = "#B0B0B0" // rgb : 192, 192, 192
@@ -1472,7 +1389,6 @@
 
 /datum/reagent/nitrous_oxide
 	name = "Nitrous Oxide"
-	id = "nitrous_oxide"
 	description = "A potent oxidizer used as fuel in rockets and as an anaesthetic during surgery."
 	reagent_state = LIQUID
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -1507,7 +1423,6 @@
 
 /datum/reagent/stimulum
 	name = "Stimulum"
-	id = "stimulum"
 	description = "An unstable experimental gas that greatly increases the energy of those that inhale it"
 	reagent_state = GAS
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -1516,23 +1431,22 @@
 
 /datum/reagent/stimulum/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	ADD_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 
 /datum/reagent/stimulum/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 	..()
 
 /datum/reagent/stimulum/on_mob_life(mob/living/carbon/M)
 	M.adjustStaminaLoss(-2*REM, 0)
 	current_cycle++
-	holder.remove_reagent(id, 0.99)		//Gives time for the next tick of life().
+	holder.remove_reagent(type, 0.99)		//Gives time for the next tick of life().
 	. = TRUE //Update status effects.
 
 /datum/reagent/nitryl
 	name = "Nitryl"
-	id = "no2"
 	description = "A highly reactive gas that makes you feel faster"
 	reagent_state = GAS
 	metabolization_rate = REAGENTS_METABOLISM
@@ -1542,10 +1456,10 @@
 
 /datum/reagent/nitryl/on_mob_metabolize(mob/living/L)
 	..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
 
 /datum/reagent/nitryl/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	..()
 
 /////////////////////////Coloured Crayon Powder////////////////////////////
@@ -1554,7 +1468,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder
 	name = "Crayon Powder"
-	id = "crayon powder"
 	var/colorname = "none"
 	description = "A powder made by grinding down crayons, good for colouring chemical reagents."
 	reagent_state = SOLID
@@ -1568,7 +1481,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/red
 	name = "Red Crayon Powder"
-	id = "redcrayonpowder"
 	colorname = "red"
 	color = "#DA0000" // red
 	random_color_list = list("#DA0000")
@@ -1576,7 +1488,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/orange
 	name = "Orange Crayon Powder"
-	id = "orangecrayonpowder"
 	colorname = "orange"
 	color = "#FF9300" // orange
 	random_color_list = list("#FF9300")
@@ -1584,7 +1495,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/yellow
 	name = "Yellow Crayon Powder"
-	id = "yellowcrayonpowder"
 	colorname = "yellow"
 	color = "#FFF200" // yellow
 	random_color_list = list("#FFF200")
@@ -1592,7 +1502,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/green
 	name = "Green Crayon Powder"
-	id = "greencrayonpowder"
 	colorname = "green"
 	color = "#A8E61D" // green
 	random_color_list = list("#A8E61D")
@@ -1600,7 +1509,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/blue
 	name = "Blue Crayon Powder"
-	id = "bluecrayonpowder"
 	colorname = "blue"
 	color = "#00B7EF" // blue
 	random_color_list = list("#00B7EF")
@@ -1608,7 +1516,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/purple
 	name = "Purple Crayon Powder"
-	id = "purplecrayonpowder"
 	colorname = "purple"
 	color = "#DA00FF" // purple
 	random_color_list = list("#DA00FF")
@@ -1616,21 +1523,18 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/invisible
 	name = "Invisible Crayon Powder"
-	id = "invisiblecrayonpowder"
 	colorname = "invisible"
 	color = "#FFFFFF00" // white + no alpha
 	random_color_list = list(null)	//because using the powder color turns things invisible
 
 /datum/reagent/colorful_reagent/crayonpowder/black
 	name = "Black Crayon Powder"
-	id = "blackcrayonpowder"
 	colorname = "black"
 	color = "#1C1C1C" // not quite black
 	random_color_list = list("#404040")
 
 /datum/reagent/colorful_reagent/crayonpowder/white
 	name = "White Crayon Powder"
-	id = "whitecrayonpowder"
 	colorname = "white"
 	color = "#FFFFFF" // white
 	random_color_list = list("#FFFFFF") //doesn't actually change appearance at all
@@ -1639,7 +1543,6 @@
 
 /datum/reagent/plantnutriment
 	name = "Generic nutriment"
-	id = "plantnutriment"
 	description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
 	color = "#000000" // RBG: 0, 0, 0
 	var/tox_prob = 0
@@ -1654,7 +1557,6 @@
 
 /datum/reagent/plantnutriment/eznutriment
 	name = "E-Z-Nutrient"
-	id = "eznutriment"
 	description = "Cheap and extremely common type of plant nutriment."
 	color = "#376400" // RBG: 50, 100, 0
 	tox_prob = 10
@@ -1662,7 +1564,6 @@
 
 /datum/reagent/plantnutriment/left4zednutriment
 	name = "Left 4 Zed"
-	id = "left4zednutriment"
 	description = "Unstable nutriment that makes plants mutate more often than usual."
 	color = "#1A1E4D" // RBG: 26, 30, 77
 	tox_prob = 25
@@ -1670,7 +1571,6 @@
 
 /datum/reagent/plantnutriment/robustharvestnutriment
 	name = "Robust Harvest"
-	id = "robustharvestnutriment"
 	description = "Very potent nutriment that prevents plants from mutating."
 	color = "#9D9D00" // RBG: 157, 157, 0
 	tox_prob = 15
@@ -1680,7 +1580,6 @@
 
 /datum/reagent/oil
 	name = "Oil"
-	id = "oil"
 	description = "Burns in a small smoky fire, mostly used to get Ash."
 	reagent_state = LIQUID
 	color = "#292929"
@@ -1688,7 +1587,6 @@
 
 /datum/reagent/stable_plasma
 	name = "Stable Plasma"
-	id = "stable_plasma"
 	description = "Non-flammable plasma locked into a liquid form that cannot ignite or become gaseous/solid."
 	reagent_state = LIQUID
 	color = "#6b008f"
@@ -1702,7 +1600,6 @@
 
 /datum/reagent/iodine
 	name = "Iodine"
-	id = "iodine"
 	description = "Commonly added to table salt as a nutrient. On its own it tastes far less pleasing."
 	reagent_state = LIQUID
 	color = "#694600"
@@ -1711,7 +1608,6 @@
 
 /datum/reagent/bromine
 	name = "Bromine"
-	id = "bromine"
 	description = "A brownish liquid that's highly reactive. Useful for stopping free radicals, but not intended for human consumption."
 	reagent_state = LIQUID
 	color = "#b37740"
@@ -1720,7 +1616,6 @@
 
 /datum/reagent/phenol
 	name = "Phenol"
-	id = "phenol"
 	description = "An aromatic ring of carbon with a hydroxyl group. A useful precursor to some medicines, but has no healing properties on its own."
 	reagent_state = LIQUID
 	taste_description = "sweet and tarry" //Again, not a strong acid.
@@ -1729,7 +1624,6 @@
 
 /datum/reagent/ash
 	name = "Ash"
-	id = "ash"
 	description = "Supposedly phoenixes rise from these, but you've never seen it."
 	reagent_state = LIQUID
 	color = "#665c56"
@@ -1738,7 +1632,6 @@
 
 /datum/reagent/acetone
 	name = "Acetone"
-	id = "acetone"
 	description = "A slick, slightly carcinogenic liquid. Has a multitude of mundane uses in everyday life."
 	reagent_state = LIQUID
 	taste_description = "solvent"//It's neutral though..?
@@ -1746,7 +1639,6 @@
 
 /datum/reagent/colorful_reagent
 	name = "Colorful Reagent"
-	id = "colorful_reagent"
 	description = "Thoroughly sample the rainbow."
 	reagent_state = LIQUID
 	color = "#FFFF00"
@@ -1776,7 +1668,6 @@
 
 /datum/reagent/hair_dye
 	name = "Quantum Hair Dye"
-	id = "hair_dye"
 	description = "Has a high chance of making you look like a mad scientist."
 	reagent_state = LIQUID
 	color = "#ff00dd"
@@ -1793,7 +1684,6 @@
 
 /datum/reagent/barbers_aid
 	name = "Barber's Aid"
-	id = "barbers_aid"
 	description = "A solution to hair loss across the world."
 	reagent_state = LIQUID
 	color = "#fac34b"
@@ -1811,7 +1701,6 @@
 
 /datum/reagent/concentrated_barbers_aid
 	name = "Concentrated Barber's Aid"
-	id = "concentrated_barbers_aid"
 	description = "A concentrated solution to hair loss across the world."
 	reagent_state = LIQUID
 	color = "#ffaf00"
@@ -1827,7 +1716,6 @@
 
 /datum/reagent/saltpetre
 	name = "Saltpetre"
-	id = "saltpetre"
 	description = "Volatile. Controversial. Third Thing."
 	reagent_state = LIQUID
 	color = "#60A584" // rgb: 96, 165, 132
@@ -1836,7 +1724,6 @@
 
 /datum/reagent/lye
 	name = "Lye"
-	id = "lye"
 	description = "Also known as sodium hydroxide. As a profession making this is somewhat underwhelming."
 	reagent_state = LIQUID
 	color = "#FFFFD6" // very very light yellow
@@ -1845,7 +1732,6 @@
 
 /datum/reagent/drying_agent
 	name = "Drying agent"
-	id = "drying_agent"
 	description = "A desiccant. Can be used to dry things."
 	reagent_state = LIQUID
 	color = "#A70FFF"
@@ -1865,189 +1751,118 @@
 // Liquid Carpets
 /datum/reagent/carpet
 	name = "Liquid Carpet"
-	id = "carpet"
 	description = "For those that need a more creative way to roll out a carpet."
 	reagent_state = LIQUID
 	color = "#b51d05"
 	taste_description = "carpet" // Your tounge feels furry.
+	var/carpet_type = /turf/open/floor/carpet
 
 /datum/reagent/carpet/reaction_turf(turf/T, reac_volume)
 	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
 		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet)
+		F.PlaceOnTop(carpet_type, flags = CHANGETURF_INHERIT_AIR)
 	..()
 
 /datum/reagent/carpet/black
 	name = "Liquid Black Carpet"
-	id = "blackcarpet"
 	color = "#363636"
-
-/datum/reagent/carpet/black/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/black)
-	..()
+	carpet_type = /turf/open/floor/carpet/black
 
 /datum/reagent/carpet/blackred
 	name = "Liquid Red Black Carpet"
-	id = "blackredcarpet"
 	color = "#342125"
-
-/datum/reagent/carpet/blackred/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/blackred)
-	..()
+	carpet_type = /turf/open/floor/carpet/blackred
 
 /datum/reagent/carpet/monochrome
 	name = "Liquid Monochrome Carpet"
-	id = "monochromecarpet"
 	color = "#b4b4b4"
-
-/datum/reagent/carpet/monochrome/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/monochrome)
-	..()
+	carpet_type = /turf/open/floor/carpet/monochrome
 
 /datum/reagent/carpet/blue
 	name = "Liquid Blue Carpet"
-	id = "bluecarpet"
 	color = "#1256ff"
-
-/datum/reagent/carpet/blue/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/blue)
-	..()
+	carpet_type = /turf/open/floor/carpet/blue
 
 /datum/reagent/carpet/cyan
 	name = "Liquid Cyan Carpet"
-	id = "cyancarpet"
 	color = "#3acfb9"
-
-/datum/reagent/carpet/cyan/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/cyan)
-	..()
+	carpet_type = /turf/open/floor/carpet/cyan
 
 /datum/reagent/carpet/green
 	name = "Liquid Green Carpet"
-	id = "greencarpet"
 	color = "#619b62"
-
-/datum/reagent/carpet/green/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/green)
-	..()
+	carpet_type = /turf/open/floor/carpet/green
 
 /datum/reagent/carpet/orange
 	name = "Liquid Orange Carpet"
-	id = "orangecarpet"
 	color = "#cc7900"
-
-/datum/reagent/carpet/orange/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/orange)
-	..()
+	carpet_type = /turf/open/floor/carpet/orange
 
 /datum/reagent/carpet/purple
 	name = "Liquid Purple Carpet"
-	id = "purplecarpet"
 	color = "#6d3392"
+	carpet_type = /turf/open/floor/carpet/purple
 
-/datum/reagent/carpet/purple/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/purple)
-	..()
 
 /datum/reagent/carpet/red
 	name = "Liquid Red Carpet"
-	id = "redcarpet"
 	color = "#871515"
+	carpet_type = /turf/open/floor/carpet/red
 
-/datum/reagent/carpet/red/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/red)
-	..()
 
 /datum/reagent/carpet/royalblack
 	name = "Liquid Royal Black Carpet"
-	id = "royalblackcarpet"
 	color = "#483d05"
+	carpet_type = /turf/open/floor/carpet/royalblack
 
-/datum/reagent/carpet/royalblack/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/royalblack)
-	..()
 
 /datum/reagent/carpet/royalblue
 	name = "Liquid Royal Blue Carpet"
-	id = "royalbluecarpet"
 	color = "#24227e"
-
-/datum/reagent/carpet/royalblue/reaction_turf(turf/T, reac_volume)
-	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
-		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/carpet/royalblue)
-	..()
+	carpet_type = /turf/open/floor/carpet/royalblue
 
 
 // Virology virus food chems.
 
 /datum/reagent/toxin/mutagen/mutagenvirusfood
 	name = "mutagenic agar"
-	id = "mutagenvirusfood"
 	color = "#A3C00F" // rgb: 163,192,15
 	taste_description = "sourness"
 
 /datum/reagent/toxin/mutagen/mutagenvirusfood/sugar
 	name = "sucrose agar"
-	id = "sugarvirusfood"
 	color = "#41B0C0" // rgb: 65,176,192
 	taste_description = "sweetness"
 
 /datum/reagent/medicine/synaptizine/synaptizinevirusfood
 	name = "virus rations"
-	id = "synaptizinevirusfood"
 	color = "#D18AA5" // rgb: 209,138,165
 	taste_description = "bitterness"
 
 /datum/reagent/toxin/plasma/plasmavirusfood
 	name = "virus plasma"
-	id = "plasmavirusfood"
 	color = "#A69DA9" // rgb: 166,157,169
 	taste_description = "bitterness"
 	taste_mult = 1.5
 
 /datum/reagent/toxin/plasma/plasmavirusfood/weak
 	name = "weakened virus plasma"
-	id = "weakplasmavirusfood"
 	color = "#CEC3C6" // rgb: 206,195,198
 	taste_description = "bitterness"
 	taste_mult = 1.5
 
 /datum/reagent/uranium/uraniumvirusfood
 	name = "decaying uranium gel"
-	id = "uraniumvirusfood"
 	color = "#67ADBA" // rgb: 103,173,186
 	taste_description = "the inside of a reactor"
 
 /datum/reagent/uranium/uraniumvirusfood/unstable
 	name = "unstable uranium gel"
-	id = "uraniumplasmavirusfood_unstable"
 	color = "#2FF2CB" // rgb: 47,242,203
 	taste_description = "the inside of a reactor"
 
 /datum/reagent/uranium/uraniumvirusfood/stable
 	name = "stable uranium gel"
-	id = "uraniumplasmavirusfood_stable"
 	color = "#04506C" // rgb: 4,80,108
 	taste_description = "the inside of a reactor"
 
@@ -2055,7 +1870,6 @@
 
 /datum/reagent/royal_bee_jelly
 	name = "royal bee jelly"
-	id = "royal_bee_jelly"
 	description = "Royal Bee Jelly, if injected into a Queen Space Bee said bee will split into two bees."
 	color = "#00ff80"
 	taste_description = "strange honey"
@@ -2071,7 +1885,6 @@
 /datum/reagent/romerol
 	name = "Romerol"
 	// the REAL zombie powder
-	id = "romerol"
 	description = "Romerol is a highly experimental bioterror agent \
 		which causes dormant nodules to be etched into the grey matter of \
 		the subject. These nodules only become active upon death of the \
@@ -2092,7 +1905,6 @@
 
 /datum/reagent/magillitis
 	name = "Magillitis"
-	id = "magillitis"
 	description = "An experimental serum which causes rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
 	reagent_state = LIQUID
 	color = "#00f041"
@@ -2104,7 +1916,6 @@
 
 /datum/reagent/growthserum
 	name = "Growth Serum"
-	id = "growthserum"
 	description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
 	color = "#ff0000"//strong red. rgb 255, 0, 0
 	var/current_size = 1
@@ -2136,7 +1947,6 @@
 
 /datum/reagent/plastic_polymers
 	name = "plastic polymers"
-	id = "plastic_polymers"
 	description = "the petroleum based components of plastic."
 	color = "#f7eded"
 	taste_description = "plastic"
@@ -2144,7 +1954,6 @@
 
 /datum/reagent/glitter
 	name = "generic glitter"
-	id = "glitter"
 	description = "if you can see this description, contact a coder."
 	color = "#FFFFFF" //pure white
 	taste_description = "plastic"
@@ -2158,27 +1967,23 @@
 
 /datum/reagent/glitter/pink
 	name = "pink glitter"
-	id = "pink_glitter"
 	description = "pink sparkles that get everywhere"
 	color = "#ff8080" //A light pink color
 	glitter_type = /obj/effect/decal/cleanable/glitter/pink
 
 /datum/reagent/glitter/white
 	name = "white glitter"
-	id = "white_glitter"
 	description = "white sparkles that get everywhere"
 	glitter_type = /obj/effect/decal/cleanable/glitter/white
 
 /datum/reagent/glitter/blue
 	name = "blue glitter"
-	id = "blue_glitter"
 	description = "blue sparkles that get everywhere"
 	color = "#4040FF" //A blueish color
 	glitter_type = /obj/effect/decal/cleanable/glitter/blue
 
 /datum/reagent/pax
 	name = "pax"
-	id = "pax"
 	description = "A colorless liquid that suppresses violence on the subjects."
 	color = "#AAAAAA55"
 	taste_description = "water"
@@ -2187,15 +1992,14 @@
 
 /datum/reagent/pax/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_PACIFISM, id)
+	ADD_TRAIT(L, TRAIT_PACIFISM, type)
 
 /datum/reagent/pax/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_PACIFISM, id)
+	REMOVE_TRAIT(L, TRAIT_PACIFISM, type)
 	..()
 
 /datum/reagent/bz_metabolites
 	name = "BZ metabolites"
-	id = "bz_metabolites"
 	description = "A harmless metabolite of BZ gas"
 	color = "#FAFF00"
 	taste_description = "acrid cinnamon"
@@ -2203,11 +2007,11 @@
 
 /datum/reagent/bz_metabolites/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, CHANGELING_HIVEMIND_MUTE, id)
+	ADD_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type)
 
 /datum/reagent/bz_metabolites/on_mob_end_metabolize(mob/living/L)
 	..()
-	REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, id)
+	REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type)
 
 /datum/reagent/bz_metabolites/on_mob_life(mob/living/L)
 	if(L.mind)
@@ -2218,13 +2022,11 @@
 
 /datum/reagent/pax/peaceborg
 	name = "synth-pax"
-	id = "synthpax"
 	description = "A colorless liquid that suppresses violence on the subjects. Cheaper to synthetize, but wears out faster than normal Pax."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 
 /datum/reagent/peaceborg_confuse
 	name = "Dizzying Solution"
-	id = "dizzysolution"
 	description = "Makes the target off balance and dizzy"
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	taste_description = "dizziness"
@@ -2240,7 +2042,6 @@
 
 /datum/reagent/peaceborg_tire
 	name = "Tiring Solution"
-	id = "tiresolution"
 	description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	taste_description = "tiredness"
@@ -2255,7 +2056,6 @@
 
 /datum/reagent/tranquility
 	name = "Tranquility"
-	id = "tranquility"
 	description = "A highly mutative liquid of unknown origin."
 	color = "#9A6750" //RGB: 154, 103, 80
 	taste_description = "inner peace"
@@ -2267,7 +2067,6 @@
 
 /datum/reagent/moonsugar
 	name = "Moonsugar"
-	id = "moonsugar"
 	description = "The primary precursor for an ancient feline delicacy known as skooma. While it has no notable effects on it's own, mixing it with morphine in a chilled container may yield interesting results."
 	color = "#FAEAFF"
 	taste_description = "synthetic catnip"
@@ -2280,7 +2079,6 @@
 
 /datum/reagent/changeling_string
 	name = "UNKNOWN"
-	id = "changeling_sting_real"
 	description = "404: Chemical not found."
 	metabolization_rate = REAGENTS_METABOLISM
 	color = "#0000FF"
@@ -2314,14 +2112,12 @@
 
 /datum/reagent/mustardgrind
 	name = "Mustardgrind"
-	id = "mustardgrind"
 	description = "A powerd that is mixed with water and enzymes to make mustard."
 	color = "#BCC740" //RGB: 188, 199, 64
 	taste_description = "plant dust"
 
 /datum/reagent/pax/catnip
 	name = "catnip"
-	id = "catnip"
 	taste_description = "grass"
 	description = "A colorless liquid that makes people more peaceful and felines more happy."
 	metabolization_rate = 1.75 * REAGENTS_METABOLISM
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index c170858d98..9eb033824d 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -1,7 +1,6 @@
 
 /datum/reagent/thermite
 	name = "Thermite"
-	id = "thermite"
 	description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
 	reagent_state = SOLID
 	color = "#550000"
@@ -18,7 +17,6 @@
 
 /datum/reagent/nitroglycerin
 	name = "Nitroglycerin"
-	id = "nitroglycerin"
 	value = 5
 	description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
 	color = "#808080" // rgb: 128, 128, 128
@@ -26,7 +24,6 @@
 
 /datum/reagent/stabilizing_agent
 	name = "Stabilizing Agent"
-	id = "stabilizing_agent"
 	description = "Keeps unstable chemicals stable. This does not work on everything."
 	reagent_state = LIQUID
 	color = "#FFFF00"
@@ -35,7 +32,6 @@
 
 /datum/reagent/clf3
 	name = "Chlorine Trifluoride"
-	id = "clf3"
 	description = "Makes a temporary 3x3 fireball when it comes into existence, so be careful when mixing. ClF3 applied to a surface burns things that wouldn't otherwise burn, sometimes through the very floors of the station and exposing it to the vacuum of space."
 	reagent_state = LIQUID
 	color = "#FFC8C8"
@@ -53,7 +49,7 @@
 	if(isplatingturf(T))
 		var/turf/open/floor/plating/F = T
 		if(prob(10 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed
-			F.ScrapeAway()
+			F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
 	if(isfloorturf(T))
 		var/turf/open/floor/F = T
 		if(prob(reac_volume))
@@ -79,7 +75,6 @@
 
 /datum/reagent/sorium
 	name = "Sorium"
-	id = "sorium"
 	description = "Sends everything flying from the detonation point."
 	reagent_state = LIQUID
 	color = "#5A64C8"
@@ -87,7 +82,6 @@
 
 /datum/reagent/liquid_dark_matter
 	name = "Liquid Dark Matter"
-	id = "liquid_dark_matter"
 	description = "Sucks everything into the detonation point."
 	reagent_state = LIQUID
 	color = "#210021"
@@ -96,7 +90,6 @@
 
 /datum/reagent/blackpowder
 	name = "Black Powder"
-	id = "blackpowder"
 	description = "Explodes. Violently."
 	reagent_state = LIQUID
 	color = "#000000"
@@ -118,7 +111,6 @@
 
 /datum/reagent/flash_powder
 	name = "Flash Powder"
-	id = "flash_powder"
 	description = "Makes a very bright flash."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -126,7 +118,6 @@
 
 /datum/reagent/smoke_powder
 	name = "Smoke Powder"
-	id = "smoke_powder"
 	description = "Makes a large cloud of smoke that can carry reagents."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -134,7 +125,6 @@
 
 /datum/reagent/sonic_powder
 	name = "Sonic Powder"
-	id = "sonic_powder"
 	description = "Makes a deafening noise."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -142,7 +132,6 @@
 
 /datum/reagent/phlogiston
 	name = "Phlogiston"
-	id = "phlogiston"
 	description = "Catches you on fire and makes you ignite."
 	reagent_state = LIQUID
 	color = "#FA00AF"
@@ -164,7 +153,6 @@
 
 /datum/reagent/napalm
 	name = "Napalm"
-	id = "napalm"
 	description = "Very flammable."
 	reagent_state = LIQUID
 	color = "#FA00AF"
@@ -182,7 +170,6 @@
 
 /datum/reagent/cryostylane
 	name = "Cryostylane"
-	id = "cryostylane"
 	description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Cryostylane slowly cools all other reagents in the container 0K."
 	color = "#0000DC"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -190,8 +177,8 @@
 
 
 /datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube
-	if(M.reagents.has_reagent("oxygen"))
-		M.reagents.remove_reagent("oxygen", 0.5)
+	if(M.reagents.has_reagent(/datum/reagent/oxygen))
+		M.reagents.remove_reagent(/datum/reagent/oxygen, 0.5)
 		M.adjust_bodytemperature(-15)
 	..()
 
@@ -202,21 +189,19 @@
 
 /datum/reagent/pyrosium
 	name = "Pyrosium"
-	id = "pyrosium"
 	description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly heats all other reagents in the container."
 	color = "#64FAC8"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	taste_description = "bitterness"
 
 /datum/reagent/pyrosium/on_mob_life(mob/living/carbon/M)
-	if(M.reagents.has_reagent("oxygen"))
-		M.reagents.remove_reagent("oxygen", 0.5)
+	if(M.reagents.has_reagent(/datum/reagent/oxygen))
+		M.reagents.remove_reagent(/datum/reagent/oxygen, 0.5)
 		M.adjust_bodytemperature(15)
 	..()
 
 /datum/reagent/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective.
 	name = "Teslium"
-	id = "teslium"
 	description = "An unstable, electrically-charged metallic slurry. Periodically electrocutes its victim, and makes electrocutions against them more deadly. Excessively heating teslium results in dangerous destabilization. Do not allow to come into contact with water."
 	reagent_state = LIQUID
 	color = "#20324D" //RGB: 32, 50, 77
@@ -234,7 +219,6 @@
 
 /datum/reagent/teslium/energized_jelly
 	name = "Energized Jelly"
-	id = "energized_jelly"
 	description = "Electrically-charged jelly. Boosts jellypeople's nervous system, but only shocks other lifeforms."
 	reagent_state = LIQUID
 	color = "#CAFF43"
@@ -255,7 +239,6 @@
 
 /datum/reagent/firefighting_foam
 	name = "Firefighting Foam"
-	id = "firefighting_foam"
 	description = "A historical fire suppressant. Originally believed to simply displace oxygen to starve fires, it actually interferes with the combustion reaction itself. Vastly superior to the cheap water-based extinguishers found on NT vessels."
 	reagent_state = LIQUID
 	color = "#A6FAFF55"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 62f2da33ef..784315f229 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -3,7 +3,6 @@
 
 /datum/reagent/toxin
 	name = "Toxin"
-	id = "toxin"
 	description = "A toxic chemical."
 	color = "#CF3600" // rgb: 207, 54, 0
 	taste_description = "bitterness"
@@ -18,7 +17,6 @@
 
 /datum/reagent/toxin/amatoxin
 	name = "Amatoxin"
-	id = "amatoxin"
 	description = "A powerful poison derived from certain species of mushroom."
 	color = "#792300" // rgb: 121, 35, 0
 	toxpwr = 2.5
@@ -27,7 +25,6 @@
 
 /datum/reagent/toxin/mutagen
 	name = "Unstable mutagen"
-	id = "mutagen"
 	description = "Might cause unpredictable mutations. Keep away from children."
 	color = "#00FF00"
 	toxpwr = 0
@@ -56,7 +53,6 @@
 
 /datum/reagent/toxin/plasma
 	name = "Plasma"
-	id = "plasma"
 	description = "Plasma in its liquid form."
 	taste_description = "bitterness"
 	specific_heat = SPECIFIC_HEAT_PLASMA
@@ -66,8 +62,8 @@
 	pH = 4
 
 /datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/C)
-	if(holder.has_reagent("epinephrine"))
-		holder.remove_reagent("epinephrine", 2*REM)
+	if(holder.has_reagent(/datum/reagent/medicine/epinephrine))
+		holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2*REM)
 	C.adjustPlasma(20)
 	return ..()
 
@@ -91,7 +87,6 @@
 
 /datum/reagent/toxin/lexorin
 	name = "Lexorin"
-	id = "lexorin"
 	description = "A powerful poison used to stop respiration."
 	color = "#7DC3A0"
 	toxpwr = 0
@@ -113,7 +108,6 @@
 
 /datum/reagent/toxin/slimejelly
 	name = "Slime Jelly"
-	id = "slimejelly"
 	description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
 	color = "#801E28" // rgb: 128, 30, 40
 	toxpwr = 0
@@ -133,7 +127,6 @@
 
 /datum/reagent/toxin/minttoxin
 	name = "Mint Toxin"
-	id = "minttoxin"
 	description = "Useful for dealing with undesirable customers."
 	color = "#CF3600" // rgb: 207, 54, 0
 	toxpwr = 0
@@ -147,7 +140,6 @@
 
 /datum/reagent/toxin/carpotoxin
 	name = "Carpotoxin"
-	id = "carpotoxin"
 	description = "A deadly neurotoxin produced by the dreaded spess carp."
 	color = "#003333" // rgb: 0, 51, 51
 	toxpwr = 2
@@ -156,7 +148,6 @@
 
 /datum/reagent/toxin/zombiepowder
 	name = "Zombie Powder"
-	id = "zombiepowder"
 	description = "A strong neurotoxin that puts the subject into a death-like state."
 	reagent_state = SOLID
 	color = "#669900" // rgb: 102, 153, 0
@@ -166,10 +157,10 @@
 
 /datum/reagent/toxin/zombiepowder/on_mob_metabolize(mob/living/L)
 	..()
-	L.fakedeath(id)
+	L.fakedeath(type)
 
 /datum/reagent/toxin/zombiepowder/on_mob_end_metabolize(mob/living/L)
-	L.cure_fakedeath(id)
+	L.cure_fakedeath(type)
 	..()
 
 /datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M)
@@ -179,7 +170,6 @@
 
 /datum/reagent/toxin/ghoulpowder
 	name = "Ghoul Powder"
-	id = "ghoulpowder"
 	description = "A strong neurotoxin that slows metabolism to a death-like state, while keeping the patient fully active. Causes toxin buildup if used too long."
 	reagent_state = SOLID
 	color = "#664700" // rgb: 102, 71, 0
@@ -189,10 +179,10 @@
 
 /datum/reagent/toxin/ghoulpowder/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_FAKEDEATH, id)
+	ADD_TRAIT(L, TRAIT_FAKEDEATH, type)
 
 /datum/reagent/toxin/ghoulpowder/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FAKEDEATH, id)
+	REMOVE_TRAIT(L, TRAIT_FAKEDEATH, type)
 	..()
 
 /datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/M)
@@ -202,7 +192,6 @@
 
 /datum/reagent/toxin/mindbreaker
 	name = "Mindbreaker Toxin"
-	id = "mindbreaker"
 	description = "A powerful hallucinogen. Not a thing to be messed with. For some mental patients. it counteracts their symptoms and anchors them to reality."
 	color = "#B31008" // rgb: 139, 166, 233
 	toxpwr = 0
@@ -215,7 +204,6 @@
 
 /datum/reagent/toxin/plantbgone
 	name = "Plant-B-Gone"
-	id = "plantbgone"
 	description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
 	color = "#49002E" // rgb: 73, 0, 46
 	toxpwr = 1
@@ -242,14 +230,12 @@
 
 /datum/reagent/toxin/plantbgone/weedkiller
 	name = "Weed Killer"
-	id = "weedkiller"
 	description = "A harmful toxic mixture to kill weeds. Do not ingest!"
 	color = "#4B004B" // rgb: 75, 0, 75
 	pH = 3
 
 /datum/reagent/toxin/pestkiller
 	name = "Pest Killer"
-	id = "pestkiller"
 	description = "A harmful toxic mixture to kill pests. Do not ingest!"
 	color = "#4B004B" // rgb: 75, 0, 75
 	toxpwr = 1
@@ -263,7 +249,6 @@
 
 /datum/reagent/toxin/spore
 	name = "Spore Toxin"
-	id = "spore"
 	description = "A natural toxin produced by blob spores that inhibits vision when ingested."
 	color = "#9ACD32"
 	toxpwr = 1
@@ -277,7 +262,6 @@
 
 /datum/reagent/toxin/spore_burning
 	name = "Burning Spore Toxin"
-	id = "spore_burning"
 	description = "A natural toxin produced by blob spores that induces combustion in its victim."
 	color = "#9ACD32"
 	toxpwr = 0.5
@@ -291,7 +275,6 @@
 
 /datum/reagent/toxin/chloralhydrate
 	name = "Chloral Hydrate"
-	id = "chloralhydrate"
 	description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep."
 	reagent_state = SOLID
 	color = "#000067" // rgb: 0, 0, 103
@@ -315,7 +298,6 @@
 
 /datum/reagent/toxin/fakebeer	//disguised as normal beer for use by emagged brobots
 	name = "Beer"
-	id = "fakebeer"
 	description = "A specially-engineered sedative disguised as beer. It induces instant sleep in its target."
 	color = "#664300" // rgb: 102, 67, 0
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -336,7 +318,6 @@
 
 /datum/reagent/toxin/coffeepowder
 	name = "Coffee Grounds"
-	id = "coffeepowder"
 	description = "Finely ground coffee beans, used to make coffee."
 	reagent_state = SOLID
 	color = "#5B2E0D" // rgb: 91, 46, 13
@@ -345,7 +326,6 @@
 
 /datum/reagent/toxin/teapowder
 	name = "Ground Tea Leaves"
-	id = "teapowder"
 	description = "Finely shredded tea leaves, used for making tea."
 	reagent_state = SOLID
 	color = "#7F8400" // rgb: 127, 132, 0
@@ -354,7 +334,6 @@
 
 /datum/reagent/toxin/mutetoxin //the new zombie powder.
 	name = "Mute Toxin"
-	id = "mutetoxin"
 	description = "A nonlethal poison that inhibits speech in its victim."
 	color = "#F0F8FF" // rgb: 240, 248, 255
 	toxpwr = 0
@@ -367,7 +346,6 @@
 
 /datum/reagent/toxin/staminatoxin
 	name = "Tirizene"
-	id = "tirizene"
 	description = "A nonlethal poison that causes extreme fatigue and weakness in its victim."
 	color = "#6E2828"
 	data = 15
@@ -381,7 +359,6 @@
 
 /datum/reagent/toxin/polonium
 	name = "Polonium"
-	id = "polonium"
 	description = "An extremely radioactive material in liquid form. Ingestion results in fatal irradiation."
 	reagent_state = LIQUID
 	color = "#787878"
@@ -394,7 +371,6 @@
 
 /datum/reagent/toxin/histamine
 	name = "Histamine"
-	id = "histamine"
 	description = "Histamine's effects become more dangerous depending on the dosage amount. They range from mildly annoying to incredibly lethal."
 	reagent_state = LIQUID
 	color = "#FA6464"
@@ -428,7 +404,6 @@
 
 /datum/reagent/toxin/formaldehyde
 	name = "Formaldehyde"
-	id = "formaldehyde"
 	description = "Formaldehyde, on its own, is a fairly weak toxin. It contains trace amounts of Histamine, very rarely making it decay into Histamine."
 	reagent_state = LIQUID
 	color = "#B4004B"
@@ -437,14 +412,13 @@
 
 /datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/M)
 	if(prob(5))
-		holder.add_reagent("histamine", pick(5,15))
-		holder.remove_reagent("formaldehyde", 1.2)
+		holder.add_reagent(/datum/reagent/toxin/histamine, pick(5,15))
+		holder.remove_reagent(type, 1.2)
 	else
 		return ..()
 
 /datum/reagent/toxin/venom
 	name = "Venom"
-	id = "venom"
 	description = "An exotic poison extracted from highly toxic fauna. Causes scaling amounts of toxin damage and bruising depending and dosage. Often decays into Histamine."
 	reagent_state = LIQUID
 	color = "#F0FFF0"
@@ -456,14 +430,13 @@
 	M.adjustBruteLoss((0.3*volume)*REM, 0)
 	. = 1
 	if(prob(15))
-		M.reagents.add_reagent("histamine", pick(5,10))
-		M.reagents.remove_reagent("venom", 1.1)
+		M.reagents.add_reagent(/datum/reagent/toxin/histamine, pick(5,10))
+		M.reagents.remove_reagent(type, 1.1)
 	else
 		..()
 
 /datum/reagent/toxin/fentanyl
 	name = "Fentanyl"
-	id = "fentanyl"
 	description = "Fentanyl will inhibit brain function and cause toxin damage before eventually knocking out its victim."
 	reagent_state = LIQUID
 	color = "#64916E"
@@ -481,7 +454,6 @@
 
 /datum/reagent/toxin/cyanide
 	name = "Cyanide"
-	id = "cyanide"
 	description = "An infamous poison known for its use in assassination. Causes small amounts of toxin damage with a small chance of oxygen damage or a stun."
 	reagent_state = LIQUID
 	color = "#00B4FF"
@@ -499,7 +471,6 @@
 
 /datum/reagent/toxin/bad_food
 	name = "Bad Food"
-	id = "bad_food"
 	description = "The result of some abomination of cookery, food so bad it's toxic."
 	reagent_state = LIQUID
 	color = "#d6d6d8"
@@ -509,7 +480,6 @@
 
 /datum/reagent/toxin/itching_powder
 	name = "Itching Powder"
-	id = "itching_powder"
 	description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -518,7 +488,7 @@
 
 /datum/reagent/toxin/itching_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(method == TOUCH || method == VAPOR)
-		M.reagents.add_reagent("itching_powder", reac_volume)
+		M.reagents.add_reagent(/datum/reagent/toxin/itching_powder, reac_volume)
 
 /datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M)
 	if(prob(15))
@@ -534,14 +504,13 @@
 		M.adjustBruteLoss(0.2*REM, 0)
 		. = 1
 	if(prob(3))
-		M.reagents.add_reagent("histamine",rand(1,3))
-		M.reagents.remove_reagent("itching_powder",1.2)
+		M.reagents.add_reagent(/datum/reagent/toxin/histamine,rand(1,3))
+		M.reagents.remove_reagent(type,1.2)
 		return
 	..()
 
 /datum/reagent/toxin/initropidril
 	name = "Initropidril"
-	id = "initropidril"
 	description = "A powerful poison with insidious effects. It can cause stuns, lethal breathing failure, and cardiac arrest."
 	reagent_state = LIQUID
 	color = "#7F10C0"
@@ -572,7 +541,6 @@
 
 /datum/reagent/toxin/pancuronium
 	name = "Pancuronium"
-	id = "pancuronium"
 	description = "An undetectable toxin that swiftly incapacitates its victim. May also cause breathing failure."
 	reagent_state = LIQUID
 	color = "#195096"
@@ -590,7 +558,6 @@
 
 /datum/reagent/toxin/sodium_thiopental
 	name = "Sodium Thiopental"
-	id = "sodium_thiopental"
 	description = "Sodium Thiopental induces heavy weakness in its target as well as unconsciousness."
 	reagent_state = LIQUID
 	color = "#6496FA"
@@ -606,7 +573,6 @@
 
 /datum/reagent/toxin/sulfonal
 	name = "Sulfonal"
-	id = "sulfonal"
 	description = "A stealthy poison that deals minor toxin damage and eventually puts the target to sleep."
 	reagent_state = LIQUID
 	color = "#7DC3A0"
@@ -620,7 +586,6 @@
 
 /datum/reagent/toxin/amanitin
 	name = "Amanitin"
-	id = "amanitin"
 	description = "A very powerful delayed toxin. Upon full metabolization, a massive amount of toxin damage will be dealt depending on how long it has been in the victim's bloodstream."
 	reagent_state = LIQUID
 	color = "#FFFFFF"
@@ -635,7 +600,6 @@
 
 /datum/reagent/toxin/lipolicide
 	name = "Lipolicide"
-	id = "lipolicide"
 	description = "A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. Deadly to those without nutriment in their body."
 	taste_description = "mothballs"
 	reagent_state = LIQUID
@@ -652,7 +616,6 @@
 
 /datum/reagent/toxin/coniine
 	name = "Coniine"
-	id = "coniine"
 	description = "Coniine metabolizes extremely slowly, but deals high amounts of toxin damage and stops breathing."
 	reagent_state = LIQUID
 	color = "#7DC3A0"
@@ -665,7 +628,6 @@
 
 /datum/reagent/toxin/spewium
 	name = "Spewium"
-	id = "spewium"
 	description = "A powerful emetic, causes uncontrollable vomiting.  May result in vomiting organs at high doses."
 	reagent_state = LIQUID
 	color = "#2f6617" //A sickly green color
@@ -680,7 +642,7 @@
 		C.vomit(10, prob(10), prob(50), rand(0,4), TRUE, prob(30))
 		for(var/datum/reagent/toxin/R in C.reagents.reagent_list)
 			if(R != src)
-				C.reagents.remove_reagent(R.id,1)
+				C.reagents.remove_reagent(R.type,1)
 
 /datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/C)
 	. = ..()
@@ -691,7 +653,6 @@
 
 /datum/reagent/toxin/curare
 	name = "Curare"
-	id = "curare"
 	description = "Causes slight toxin damage followed by chain-stunning and oxygen damage."
 	reagent_state = LIQUID
 	color = "#191919"
@@ -707,7 +668,6 @@
 
 /datum/reagent/toxin/heparin //Based on a real-life anticoagulant. I'm not a doctor, so this won't be realistic.
 	name = "Heparin"
-	id = "heparin"
 	description = "A powerful anticoagulant. Victims will bleed uncontrollably and suffer scaling bruising."
 	reagent_state = LIQUID
 	color = "#C8C8C8" //RGB: 200, 200, 200
@@ -725,7 +685,6 @@
 
 /datum/reagent/toxin/rotatium //Rotatium. Fucks up your rotation and is hilarious
 	name = "Rotatium"
-	id = "rotatium"
 	description = "A constantly swirling, oddly colourful fluid. Causes the consumer's sense of direction and hand-eye coordination to become wild."
 	reagent_state = LIQUID
 	color = "#AC88CA" //RGB: 172, 136, 202
@@ -752,7 +711,6 @@
 
 /datum/reagent/toxin/skewium
 	name = "Skewium"
-	id = "skewium"
 	description = "A strange, dull coloured liquid that appears to warp back and forth inside its container. Causes any consumer to experience a visual phenomena similar to said warping."
 	reagent_state = LIQUID
 	color = "#ADBDCD"
@@ -790,7 +748,6 @@
 
 /datum/reagent/toxin/anacea
 	name = "Anacea"
-	id = "anacea"
 	description = "A toxin that quickly purges medicines and metabolizes very slowly."
 	reagent_state = LIQUID
 	color = "#3C5133"
@@ -799,10 +756,10 @@
 
 /datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/M)
 	var/remove_amt = 5
-	if(holder.has_reagent("calomel") || holder.has_reagent("pen_acid") || holder.has_reagent("pen_jelly"))
+	if(holder.has_reagent(/datum/reagent/medicine/calomel) || holder.has_reagent(/datum/reagent/medicine/pen_acid) || holder.has_reagent(/datum/reagent/medicine/pen_acid/pen_jelly))
 		remove_amt = 0.5
 	for(var/datum/reagent/medicine/R in M.reagents.reagent_list)
-		M.reagents.remove_reagent(R.id,remove_amt)
+		M.reagents.remove_reagent(R.type,remove_amt)
 	return ..()
 
 //ACID
@@ -810,7 +767,6 @@
 
 /datum/reagent/toxin/acid
 	name = "Sulphuric acid"
-	id = "sacid"
 	description = "A strong mineral acid with the molecular formula H2SO4."
 	color = "#00FF32"
 	toxpwr = 1
@@ -845,7 +801,6 @@
 
 /datum/reagent/toxin/acid/fluacid
 	name = "Fluorosulfuric acid"
-	id = "facid"
 	description = "Fluorosulfuric acid is an extremely corrosive chemical substance."
 	color = "#5050FF"
 	toxpwr = 2
@@ -858,7 +813,6 @@
 
 /datum/reagent/toxin/delayed
 	name = "Toxin Microcapsules"
-	id = "delayed_toxin"
 	description = "Causes heavy toxin damage after a brief time of inactivity."
 	reagent_state = LIQUID
 	metabolization_rate = 0 //stays in the system until active.
@@ -869,7 +823,7 @@
 
 /datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/M)
 	if(current_cycle > delay)
-		holder.remove_reagent(id, actual_metaboliztion_rate * M.metabolism_efficiency)
+		holder.remove_reagent(type, actual_metaboliztion_rate * M.metabolism_efficiency)
 		M.adjustToxLoss(actual_toxpwr*REM, 0)
 		if(prob(10))
 			M.Knockdown(20, 0)
@@ -878,21 +832,19 @@
 
 /datum/reagent/toxin/mimesbane
 	name = "Mime's Bane"
-	id = "mimesbane"
 	description = "A nonlethal neurotoxin that interferes with the victim's ability to gesture."
 	color = "#F0F8FF" // rgb: 240, 248, 255
 	toxpwr = 0
 	taste_description = "stillness"
 
 /datum/reagent/toxin/mimesbane/on_mob_metabolize(mob/living/L)
-	ADD_TRAIT(L, TRAIT_EMOTEMUTE, id)
+	ADD_TRAIT(L, TRAIT_EMOTEMUTE, type)
 
 /datum/reagent/toxin/mimesbane/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_EMOTEMUTE, id)
+	REMOVE_TRAIT(L, TRAIT_EMOTEMUTE, type)
 
 /datum/reagent/toxin/bonehurtingjuice //oof ouch
 	name = "Bone Hurting Juice"
-	id = "bonehurtingjuice"
 	description = "A strange substance that looks a lot like water. Drinking it is oddly tempting. Oof ouch."
 	color = "#AAAAAA77" //RGBA: 170, 170, 170, 77
 	toxpwr = 0
@@ -953,7 +905,6 @@
 
 /datum/reagent/toxin/brainhurtingjuice //oof ouch
 	name = "Brain Hurting Juice"
-	id = "brainhurtingjuice"
 	color = "#AAAAAA77" //RGBA: 170, 170, 170, 77
 	toxpwr = 0
 	taste_description = "brain hurting"
@@ -970,7 +921,6 @@
 
 /datum/reagent/toxin/bungotoxin
 	name = "Bungotoxin"
-	id = "bungotoxin"
 	description = "A horrible cardiotoxin that protects the humble bungo pit."
 	//silent_toxin = TRUE //I guess we don't really have the entire tox system ported.
 	color = "#EBFF8E"
diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm
index 27b1fe12ee..468d29c052 100644
--- a/code/modules/reagents/chemistry/recipes/drugs.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs.dm
@@ -1,64 +1,64 @@
 /datum/chemical_reaction/space_drugs
 	name = "Space Drugs"
-	id = "space_drugs"
-	results = list("space_drugs" = 3)
-	required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
+	id = /datum/reagent/drug/space_drugs
+	results = list(/datum/reagent/drug/space_drugs = 3)
+	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/lithium = 1)
 
 /datum/chemical_reaction/crank
 	name = "Crank"
-	id = "crank"
-	results = list("crank" = 5)
-	required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "welding_fuel" = 1)
+	id = /datum/reagent/drug/crank
+	results = list(/datum/reagent/drug/crank = 5)
+	required_reagents = list(/datum/reagent/medicine/diphenhydramine = 1, /datum/reagent/ammonia = 1, /datum/reagent/lithium = 1, /datum/reagent/toxin/acid = 1, /datum/reagent/fuel = 1)
 	mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
 	required_temp = 390
 
 
 /datum/chemical_reaction/krokodil
 	name = "Krokodil"
-	id = "krokodil"
-	results = list("krokodil" = 6)
-	required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "welding_fuel" = 1)
+	id = /datum/reagent/drug/krokodil
+	results = list(/datum/reagent/drug/krokodil = 6)
+	required_reagents = list(/datum/reagent/medicine/diphenhydramine = 1, /datum/reagent/medicine/morphine = 1, /datum/reagent/space_cleaner = 1, /datum/reagent/potassium = 1, /datum/reagent/phosphorus = 1, /datum/reagent/fuel = 1)
 	mix_message = "The mixture dries into a pale blue powder."
 	required_temp = 380
 
 /datum/chemical_reaction/methamphetamine
 	name = "methamphetamine"
-	id = "methamphetamine"
-	results = list("methamphetamine" = 4)
-	required_reagents = list("ephedrine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1)
+	id = /datum/reagent/drug/methamphetamine
+	results = list(/datum/reagent/drug/methamphetamine = 4)
+	required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/bath_salts
 	name = "bath_salts"
-	id = "bath_salts"
-	results = list("bath_salts" = 7)
-	required_reagents = list("bad_food" = 1, "saltpetre" = 1, "nutriment" = 1, "cleaner" = 1, "enzyme" = 1, "tea" = 1, "mercury" = 1)
+	id = /datum/reagent/drug/bath_salts
+	results = list(/datum/reagent/drug/bath_salts = 7)
+	required_reagents = list(/datum/reagent/toxin/bad_food = 1, /datum/reagent/saltpetre = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/space_cleaner = 1, /datum/reagent/consumable/enzyme = 1, /datum/reagent/consumable/tea = 1, /datum/reagent/mercury = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/aranesp
 	name = "aranesp"
-	id = "aranesp"
-	results = list("aranesp" = 3)
-	required_reagents = list("epinephrine" = 1, "atropine" = 1, "morphine" = 1)
+	id = /datum/reagent/drug/aranesp
+	results = list(/datum/reagent/drug/aranesp = 3)
+	required_reagents = list(/datum/reagent/medicine/epinephrine = 1, /datum/reagent/medicine/atropine = 1, /datum/reagent/medicine/morphine = 1)
 
 /datum/chemical_reaction/happiness
 	name = "Happiness"
-	id = "happiness"
-	results = list("happiness" = 4)
-	required_reagents = list("nitrous_oxide" = 2, "epinephrine" = 1, "ethanol" = 1)
-	required_catalysts = list("plasma" = 5)
+	id = /datum/reagent/drug/happiness
+	results = list(/datum/reagent/drug/happiness = 4)
+	required_reagents = list(/datum/reagent/nitrous_oxide = 2, /datum/reagent/medicine/epinephrine = 1, /datum/reagent/consumable/ethanol = 1)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
 
 /datum/chemical_reaction/skooma
 	name = "skooma"
-	id = "skooma"
-	results = list("skooma" = 2, "moonshine" = 4, "sugar" = 4)
+	id = /datum/reagent/drug/skooma
+	results = list(/datum/reagent/drug/skooma = 2, /datum/reagent/consumable/ethanol/moonshine = 4, /datum/reagent/consumable/sugar = 4)
 	required_temp = 280
 	is_cold_recipe = TRUE
-	required_reagents = list("moonsugar" = 10, "morphine" = 5)
+	required_reagents = list(/datum/reagent/moonsugar = 10, /datum/reagent/medicine/morphine = 5)
 
 /datum/chemical_reaction/skoomarevert
 	name = "skoomarevert"
 	id = "skoomarevert"
-	results = list("moonsugar" = 1, "morphine" = 2.5)
+	results = list(/datum/reagent/moonsugar = 1, /datum/reagent/medicine/morphine = 2.5)
 	required_temp = 315 //a little above normal body temperature
-	required_reagents = list("skooma" = 1)
+	required_reagents = list(/datum/reagent/drug/skooma = 1)
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index 607e0b5a4e..a07e7697bc 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -1,79 +1,79 @@
 
 /datum/chemical_reaction/leporazine
 	name = "Leporazine"
-	id = "leporazine"
-	results = list("leporazine" = 2)
-	required_reagents = list("silicon" = 1, "copper" = 1)
-	required_catalysts = list("plasma" = 5)
+	id = /datum/reagent/medicine/leporazine
+	results = list(/datum/reagent/medicine/leporazine = 2)
+	required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/copper = 1)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
 
 /datum/chemical_reaction/rezadone
 	name = "Rezadone"
-	id = "rezadone"
-	results = list("rezadone" = 3)
-	required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
+	id = /datum/reagent/medicine/rezadone
+	results = list(/datum/reagent/medicine/rezadone = 3)
+	required_reagents = list(/datum/reagent/toxin/carpotoxin = 1, /datum/reagent/cryptobiolin = 1, /datum/reagent/copper = 1)
 
 /datum/chemical_reaction/spaceacillin
 	name = "Spaceacillin"
-	id = "spaceacillin"
-	results = list("spaceacillin" = 2)
-	required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
+	id = /datum/reagent/medicine/spaceacillin
+	results = list(/datum/reagent/medicine/spaceacillin = 2)
+	required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/medicine/epinephrine = 1)
 
 /datum/chemical_reaction/inacusiate
 	name = "inacusiate"
-	id = "inacusiate"
-	results = list("inacusiate" = 2)
-	required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
+	id = /datum/reagent/medicine/inacusiate
+	results = list(/datum/reagent/medicine/inacusiate = 2)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/charcoal = 1)
 
 /datum/chemical_reaction/synaptizine
 	name = "Synaptizine"
-	id = "synaptizine"
-	results = list("synaptizine" = 3)
-	required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
+	id = /datum/reagent/medicine/synaptizine
+	results = list(/datum/reagent/medicine/synaptizine = 3)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/lithium = 1, /datum/reagent/water = 1)
 
 /datum/chemical_reaction/charcoal
 	name = "Charcoal"
-	id = "charcoal"
-	results = list("charcoal" = 2)
-	required_reagents = list("ash" = 1, "sodiumchloride" = 1)
+	id = /datum/reagent/medicine/charcoal
+	results = list(/datum/reagent/medicine/charcoal = 2)
+	required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/sodiumchloride = 1)
 	mix_message = "The mixture yields a fine black powder."
 	required_temp = 380
 
 /datum/chemical_reaction/silver_sulfadiazine
 	name = "Silver Sulfadiazine"
-	id = "silver_sulfadiazine"
-	results = list("silver_sulfadiazine" = 5)
-	required_reagents = list("ammonia" = 1, "silver" = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
+	id = /datum/reagent/medicine/silver_sulfadiazine
+	results = list(/datum/reagent/medicine/silver_sulfadiazine = 5)
+	required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1)
 
 /datum/chemical_reaction/salglu_solution
 	name = "Saline-Glucose Solution"
-	id = "salglu_solution"
-	results = list("salglu_solution" = 3)
-	required_reagents = list("sodiumchloride" = 1, "water" = 1, "sugar" = 1)
+	id = /datum/reagent/medicine/salglu_solution
+	results = list(/datum/reagent/medicine/salglu_solution = 3)
+	required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/mine_salve
 	name = "Miner's Salve"
-	id = "mine_salve"
-	results = list("mine_salve" = 3)
-	required_reagents = list("oil" = 1, "water" = 1, "iron" = 1)
+	id = /datum/reagent/medicine/mine_salve
+	results = list(/datum/reagent/medicine/mine_salve = 3)
+	required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/water = 1, /datum/reagent/iron = 1)
 
 /datum/chemical_reaction/mine_salve2
 	name = "Miner's Salve"
-	id = "mine_salve"
-	results = list("mine_salve" = 15)
-	required_reagents = list("plasma" = 5, "iron" = 5, "sugar" = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
+	id = "mine_salve_2"
+	results = list(/datum/reagent/medicine/mine_salve = 15)
+	required_reagents = list(/datum/reagent/toxin/plasma = 5, /datum/reagent/iron = 5, /datum/reagent/consumable/sugar = 1) // A sheet of plasma, a twinkie and a sheet of metal makes four of these
 
 /datum/chemical_reaction/synthflesh
 	name = "Synthflesh"
-	id = "synthflesh"
-	results = list("synthflesh" = 3)
-	required_reagents = list("blood" = 1, "carbon" = 1, "styptic_powder" = 1)
+	id = /datum/reagent/medicine/synthflesh
+	results = list(/datum/reagent/medicine/synthflesh = 3)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/styptic_powder = 1)
 
 /datum/chemical_reaction/synthtissue
 	name = "Synthtissue"
-	id = "synthtissue"
-	results = list("synthtissue" = 5)
-	required_reagents = list("synthflesh" = 1)
-	required_catalysts = list("sugar" = 0.1)
+	id = /datum/reagent/synthtissue
+	results = list(/datum/reagent/synthtissue = 5)
+	required_reagents = list(/datum/reagent/medicine/synthflesh = 1)
+	required_catalysts = list(/datum/reagent/consumable/sugar = 0.1)
 	//FermiChem vars:
 	OptimalTempMin 		= 305		// Lower area of bell curve for determining heat based rate reactions
 	OptimalTempMax 		= 315 		// Upper end for above
@@ -91,13 +91,13 @@
 	PurityMin 			= 0
 
 /datum/chemical_reaction/synthtissue/FermiCreate(datum/reagents/holder, added_volume, added_purity)
-	var/datum/reagent/synthtissue/St = holder.has_reagent("synthtissue")
-	var/datum/reagent/N = holder.has_reagent("sugar")
+	var/datum/reagent/synthtissue/St = holder.has_reagent(/datum/reagent/synthtissue)
+	var/datum/reagent/N = holder.has_reagent(/datum/reagent/consumable/sugar)
 	if(!St)
 		return
 	if(holder.chem_temp > 320)
 		var/temp_ratio = 1-(330 - holder.chem_temp)/10
-		holder.remove_reagent(src.id, added_volume*temp_ratio)
+		holder.remove_reagent(id, added_volume*temp_ratio)
 	if(St.purity < 1)
 		St.volume *= St.purity
 		St.purity = 1
@@ -108,209 +108,209 @@
 
 /datum/chemical_reaction/styptic_powder
 	name = "Styptic Powder"
-	id = "styptic_powder"
-	results = list("styptic_powder" = 4)
-	required_reagents = list("aluminium" = 1, "hydrogen" = 1, "oxygen" = 1, "sacid" = 1)
+	id = /datum/reagent/medicine/styptic_powder
+	results = list(/datum/reagent/medicine/styptic_powder = 4)
+	required_reagents = list(/datum/reagent/aluminium = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
 	mix_message = "The solution yields an astringent powder."
 
 /datum/chemical_reaction/calomel
 	name = "Calomel"
-	id = "calomel"
-	results = list("calomel" = 2)
-	required_reagents = list("mercury" = 1, "chlorine" = 1)
+	id = /datum/reagent/medicine/calomel
+	results = list(/datum/reagent/medicine/calomel = 2)
+	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/chlorine = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/potass_iodide
 	name = "Potassium Iodide"
-	id = "potass_iodide"
-	results = list("potass_iodide" = 2)
-	required_reagents = list("potassium" = 1, "iodine" = 1)
+	id = /datum/reagent/medicine/potass_iodide
+	results = list(/datum/reagent/medicine/potass_iodide = 2)
+	required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/iodine = 1)
 
 /datum/chemical_reaction/pen_acid
 	name = "Pentetic Acid"
-	id = "pen_acid"
-	results = list("pen_acid" = 6)
-	required_reagents = list("welding_fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
+	id = /datum/reagent/medicine/pen_acid
+	results = list(/datum/reagent/medicine/pen_acid = 6)
+	required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/chlorine = 1, /datum/reagent/ammonia = 1, /datum/reagent/toxin/formaldehyde = 1, /datum/reagent/sodium = 1, /datum/reagent/toxin/cyanide = 1)
 
 /datum/chemical_reaction/pen_jelly
 	name = "Pentetic Jelly"
-	id = "pen_jelly"
-	results = list("pen_jelly" = 2)
-	required_reagents = list("pen_acid" = 1, "slimejelly" = 1)
+	id = /datum/reagent/medicine/pen_acid/pen_jelly
+	results = list(/datum/reagent/medicine/pen_acid/pen_jelly = 2)
+	required_reagents = list(/datum/reagent/medicine/pen_acid = 1, /datum/reagent/toxin/slimejelly = 1)
 
 /datum/chemical_reaction/sal_acid
 	name = "Salicyclic Acid"
-	id = "sal_acid"
-	results = list("sal_acid" = 5)
-	required_reagents = list("sodium" = 1, "phenol" = 1, "carbon" = 1, "oxygen" = 1, "sacid" = 1)
+	id = /datum/reagent/medicine/sal_acid
+	results = list(/datum/reagent/medicine/sal_acid = 5)
+	required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/oxandrolone
 	name = "Oxandrolone"
-	id = "oxandrolone"
-	results = list("oxandrolone" = 6)
-	required_reagents = list("carbon" = 3, "phenol" = 1, "hydrogen" = 1, "oxygen" = 1)
+	id = /datum/reagent/medicine/oxandrolone
+	results = list(/datum/reagent/medicine/oxandrolone = 6)
+	required_reagents = list(/datum/reagent/carbon = 3, /datum/reagent/phenol = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/salbutamol
 	name = "Salbutamol"
-	id = "salbutamol"
-	results = list("salbutamol" = 5)
-	required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminium" = 1, "bromine" = 1, "ammonia" = 1)
+	id = /datum/reagent/medicine/salbutamol
+	results = list(/datum/reagent/medicine/salbutamol = 5)
+	required_reagents = list(/datum/reagent/medicine/sal_acid = 1, /datum/reagent/lithium = 1, /datum/reagent/aluminium = 1, /datum/reagent/bromine = 1, /datum/reagent/ammonia = 1)
 
 /datum/chemical_reaction/perfluorodecalin
 	name = "Perfluorodecalin"
-	id = "perfluorodecalin"
-	results = list("perfluorodecalin" = 3)
-	required_reagents = list("hydrogen" = 1, "fluorine" = 1, "oil" = 1)
+	id = /datum/reagent/medicine/perfluorodecalin
+	results = list(/datum/reagent/medicine/perfluorodecalin = 3)
+	required_reagents = list(/datum/reagent/hydrogen = 1, /datum/reagent/fluorine = 1, /datum/reagent/oil = 1)
 	required_temp = 370
 	mix_message = "The mixture rapidly turns into a dense pink liquid."
 
 /datum/chemical_reaction/ephedrine
 	name = "Ephedrine"
-	id = "ephedrine"
-	results = list("ephedrine" = 4)
-	required_reagents = list("sugar" = 1, "oil" = 1, "hydrogen" = 1, "diethylamine" = 1)
+	id = /datum/reagent/medicine/ephedrine
+	results = list(/datum/reagent/medicine/ephedrine = 4)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/oil = 1, /datum/reagent/hydrogen = 1, /datum/reagent/diethylamine = 1)
 	mix_message = "The solution fizzes and gives off toxic fumes."
 
 /datum/chemical_reaction/diphenhydramine
 	name = "Diphenhydramine"
-	id = "diphenhydramine"
-	results = list("diphenhydramine" = 4)
-	required_reagents = list("oil" = 1, "carbon" = 1, "bromine" = 1, "diethylamine" = 1, "ethanol" = 1)
+	id = /datum/reagent/medicine/diphenhydramine
+	results = list(/datum/reagent/medicine/diphenhydramine = 4)
+	required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/carbon = 1, /datum/reagent/bromine = 1, /datum/reagent/diethylamine = 1, /datum/reagent/consumable/ethanol = 1)
 	mix_message = "The mixture dries into a pale blue powder."
 
 /datum/chemical_reaction/oculine
 	name = "Oculine"
-	id = "oculine"
-	results = list("oculine" = 3)
-	required_reagents = list("charcoal" = 1, "carbon" = 1, "hydrogen" = 1)
+	id = /datum/reagent/medicine/oculine
+	results = list(/datum/reagent/medicine/oculine = 3)
+	required_reagents = list(/datum/reagent/medicine/charcoal = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
 	mix_message = "The mixture sputters loudly and becomes a pale pink color."
 
 /datum/chemical_reaction/atropine
 	name = "Atropine"
-	id = "atropine"
-	results = list("atropine" = 5)
-	required_reagents = list("ethanol" = 1, "acetone" = 1, "diethylamine" = 1, "phenol" = 1, "sacid" = 1)
+	id = /datum/reagent/medicine/atropine
+	results = list(/datum/reagent/medicine/atropine = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/phenol = 1, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/epinephrine
 	name = "Epinephrine"
-	id = "epinephrine"
-	results = list("epinephrine" = 6)
-	required_reagents = list("phenol" = 1, "acetone" = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
+	id = /datum/reagent/medicine/epinephrine
+	results = list(/datum/reagent/medicine/epinephrine = 6)
+	required_reagents = list(/datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1, /datum/reagent/hydrogen = 1)
 
 /datum/chemical_reaction/strange_reagent
 	name = "Strange Reagent"
-	id = "strange_reagent"
-	results = list("strange_reagent" = 3)
-	required_reagents = list("omnizine" = 1, "holywater" = 1, "mutagen" = 1)
+	id = /datum/reagent/medicine/strange_reagent
+	results = list(/datum/reagent/medicine/strange_reagent = 3)
+	required_reagents = list(/datum/reagent/medicine/omnizine = 1, /datum/reagent/water/holywater = 1, /datum/reagent/toxin/mutagen = 1)
 
 /datum/chemical_reaction/mannitol
 	name = "Mannitol"
-	id = "mannitol"
-	results = list("mannitol" = 3)
-	required_reagents = list("sugar" = 1, "hydrogen" = 1, "water" = 1)
+	id = /datum/reagent/medicine/mannitol
+	results = list(/datum/reagent/medicine/mannitol = 3)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/hydrogen = 1, /datum/reagent/water = 1)
 	mix_message = "The solution slightly bubbles, becoming thicker."
 
 /datum/chemical_reaction/mutadone
 	name = "Mutadone"
-	id = "mutadone"
-	results = list("mutadone" = 3)
-	required_reagents = list("mutagen" = 1, "acetone" = 1, "bromine" = 1)
+	id = /datum/reagent/medicine/mutadone
+	results = list(/datum/reagent/medicine/mutadone = 3)
+	required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/acetone = 1, /datum/reagent/bromine = 1)
 
 /datum/chemical_reaction/neurine
 	name = "Neurine"
-	id = "neurine"
-	results = list("neurine" = 3)
-	required_reagents = list("mannitol" = 1, "acetone" = 1, "oxygen" = 1)
+	id = /datum/reagent/medicine/neurine
+	results = list(/datum/reagent/medicine/neurine = 3)
+	required_reagents = list(/datum/reagent/medicine/mannitol = 1, /datum/reagent/acetone = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/antihol
 	name = "antihol"
-	id = "antihol"
-	results = list("antihol" = 3)
-	required_reagents = list("ethanol" = 1, "charcoal" = 1, "copper" = 1)
+	id = /datum/reagent/medicine/antihol
+	results = list(/datum/reagent/medicine/antihol = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/copper = 1)
 
 /datum/chemical_reaction/cryoxadone
 	name = "Cryoxadone"
-	id = "cryoxadone"
-	results = list("cryoxadone" = 3)
-	required_reagents = list("stable_plasma" = 1, "acetone" = 1, "mutagen" = 1)
+	id = /datum/reagent/medicine/cryoxadone
+	results = list(/datum/reagent/medicine/cryoxadone = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/mutagen = 1)
 
 /datum/chemical_reaction/pyroxadone
 	name = "Pyroxadone"
-	id = "pyroxadone"
-	results = list("pyroxadone" = 2)
-	required_reagents = list("cryoxadone" = 1, "slimejelly" = 1)
+	id = /datum/reagent/medicine/pyroxadone
+	results = list(/datum/reagent/medicine/pyroxadone = 2)
+	required_reagents = list(/datum/reagent/medicine/cryoxadone = 1, /datum/reagent/toxin/slimejelly = 1)
 
 /datum/chemical_reaction/clonexadone
 	name = "Clonexadone"
-	id = "clonexadone"
-	results = list("clonexadone" = 2)
-	required_reagents = list("cryoxadone" = 1, "sodium" = 1)
-	required_catalysts = list("plasma" = 5)
+	id = /datum/reagent/medicine/clonexadone
+	results = list(/datum/reagent/medicine/clonexadone = 2)
+	required_reagents = list(/datum/reagent/medicine/cryoxadone = 1, /datum/reagent/sodium = 1)
+	required_catalysts = list(/datum/reagent/toxin/plasma = 5)
 
 /datum/chemical_reaction/haloperidol
 	name = "Haloperidol"
-	id = "haloperidol"
-	results = list("haloperidol" = 5)
-	required_reagents = list("chlorine" = 1, "fluorine" = 1, "aluminium" = 1, "potass_iodide" = 1, "oil" = 1)
+	id = /datum/reagent/medicine/haloperidol
+	results = list(/datum/reagent/medicine/haloperidol = 5)
+	required_reagents = list(/datum/reagent/chlorine = 1, /datum/reagent/fluorine = 1, /datum/reagent/aluminium = 1, /datum/reagent/medicine/potass_iodide = 1, /datum/reagent/oil = 1)
 
 /datum/chemical_reaction/bicaridine
 	name = "Bicaridine"
-	id = "bicaridine"
-	results = list("bicaridine" = 3)
-	required_reagents = list("carbon" = 1, "oxygen" = 1, "sugar" = 1)
+	id = /datum/reagent/medicine/bicaridine
+	results = list(/datum/reagent/medicine/bicaridine = 3)
+	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/kelotane
 	name = "Kelotane"
-	id = "kelotane"
-	results = list("kelotane" = 2)
-	required_reagents = list("carbon" = 1, "silicon" = 1)
+	id = /datum/reagent/medicine/kelotane
+	results = list(/datum/reagent/medicine/kelotane = 2)
+	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/silicon = 1)
 
 /datum/chemical_reaction/antitoxin
 	name = "Antitoxin"
-	id = "antitoxin"
-	results = list("antitoxin" = 3)
-	required_reagents = list("nitrogen" = 1, "silicon" = 1, "potassium" = 1)
+	id = /datum/reagent/medicine/antitoxin
+	results = list(/datum/reagent/medicine/antitoxin = 3)
+	required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/silicon = 1, /datum/reagent/potassium = 1)
 
 /datum/chemical_reaction/tricordrazine
 	name = "Tricordrazine"
-	id = "tricordrazine"
-	results = list("tricordrazine" = 3)
-	required_reagents = list("bicaridine" = 1, "kelotane" = 1, "antitoxin" = 1)
+	id = /datum/reagent/medicine/tricordrazine
+	results = list(/datum/reagent/medicine/tricordrazine = 3)
+	required_reagents = list(/datum/reagent/medicine/bicaridine = 1, /datum/reagent/medicine/kelotane = 1, /datum/reagent/medicine/antitoxin = 1)
 
 /datum/chemical_reaction/regen_jelly
 	name = "Regenerative Jelly"
-	id = "regen_jelly"
-	results = list("regen_jelly" = 2)
-	required_reagents = list("tricordrazine" = 1, "slimejelly" = 1)
+	id = /datum/reagent/medicine/regen_jelly
+	results = list(/datum/reagent/medicine/regen_jelly = 2)
+	required_reagents = list(/datum/reagent/medicine/tricordrazine = 1, /datum/reagent/toxin/slimejelly = 1)
 
 /datum/chemical_reaction/jelly_convert
 	name = "Blood Jelly Conversion"
-	id = "blood_jelly"
-	results = list("slimejelly" = 1)
-	required_reagents = list("toxin" = 1, "jellyblood" = 1)
+	id = /datum/reagent/toxin/slimejelly
+	results = list(/datum/reagent/toxin/slimejelly = 1)
+	required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/blood/jellyblood = 1)
 
 /datum/chemical_reaction/corazone
 	name = "Corazone"
-	id = "corazone"
-	results = list("corazone" = 3)
-	required_reagents = list("phenol" = 2, "lithium" = 1)
+	id = /datum/reagent/medicine/corazone
+	results = list(/datum/reagent/medicine/corazone = 3)
+	required_reagents = list(/datum/reagent/phenol = 2, /datum/reagent/lithium = 1)
 
 /datum/chemical_reaction/morphine
 	name = "Morphine"
-	id = "morphine"
-	results = list("morphine" = 2)
-	required_reagents = list("carbon" = 2, "hydrogen" = 2, "ethanol" = 1, "oxygen" = 1)
+	id = /datum/reagent/medicine/morphine
+	results = list(/datum/reagent/medicine/morphine = 2)
+	required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1)
 	required_temp = 480
 
 /datum/chemical_reaction/modafinil
 	name = "Modafinil"
-	id = "modafinil"
-	results = list("modafinil" = 5)
-	required_reagents = list("diethylamine" = 1, "ammonia" = 1, "phenol" = 1, "acetone" = 1, "sacid" = 1)
-	required_catalysts = list("bromine" = 1) // as close to the real world synthesis as possible
+	id = /datum/reagent/medicine/modafinil
+	results = list(/datum/reagent/medicine/modafinil = 5)
+	required_reagents = list(/datum/reagent/diethylamine = 1, /datum/reagent/ammonia = 1, /datum/reagent/phenol = 1, /datum/reagent/acetone = 1, /datum/reagent/toxin/acid = 1)
+	required_catalysts = list(/datum/reagent/bromine = 1) // as close to the real world synthesis as possible
 
 /datum/chemical_reaction/psicodine
 	name = "Psicodine"
-	id = "psicodine"
-	results = list("psicodine" = 5)
-	required_reagents = list( "mannitol" = 2, "water" = 2, "impedrezene" = 1)
+	id = /datum/reagent/medicine/psicodine
+	results = list(/datum/reagent/medicine/psicodine = 5)
+	required_reagents = list( /datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1)
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index eaae548d68..f4c378e8fe 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -2,55 +2,55 @@
 /datum/chemical_reaction/sterilizine
 	name = "Sterilizine"
 	id = "sterilizine"
-	results = list("sterilizine" = 3)
-	required_reagents = list("ethanol" = 1, "charcoal" = 1, "chlorine" = 1)
+	results = list(/datum/reagent/space_cleaner/sterilizine = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/chlorine = 1)
 
 /datum/chemical_reaction/lube
 	name = "Space Lube"
-	id = "lube"
-	results = list("lube" = 4)
-	required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+	id = /datum/reagent/lube
+	results = list(/datum/reagent/lube = 4)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/spraytan
 	name = "Spray Tan"
-	id = "spraytan"
-	results = list("spraytan" = 2)
-	required_reagents = list("orangejuice" = 1, "oil" = 1)
+	id = /datum/reagent/spraytan
+	results = list(/datum/reagent/spraytan = 2)
+	required_reagents = list(/datum/reagent/consumable/orangejuice = 1, /datum/reagent/oil = 1)
 
 /datum/chemical_reaction/spraytan2
 	name = "Spray Tan"
-	id = "spraytan"
-	results = list("spraytan" = 2)
-	required_reagents = list("orangejuice" = 1, "cornoil" = 1)
+	id = "spraytan2"
+	results = list(/datum/reagent/spraytan = 2)
+	required_reagents = list(/datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/cornoil = 1)
 
 /datum/chemical_reaction/impedrezene
 	name = "Impedrezene"
-	id = "impedrezene"
-	results = list("impedrezene" = 2)
-	required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
+	id = /datum/reagent/impedrezene
+	results = list(/datum/reagent/impedrezene = 2)
+	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/cryptobiolin
 	name = "Cryptobiolin"
-	id = "cryptobiolin"
-	results = list("cryptobiolin" = 3)
-	required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
+	id = /datum/reagent/cryptobiolin
+	results = list(/datum/reagent/cryptobiolin = 3)
+	required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/glycerol
 	name = "Glycerol"
-	id = "glycerol"
-	results = list("glycerol" = 1)
-	required_reagents = list("cornoil" = 3, "sacid" = 1)
+	id = /datum/reagent/glycerol
+	results = list(/datum/reagent/glycerol = 1)
+	required_reagents = list(/datum/reagent/consumable/cornoil = 3, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/sodiumchloride
 	name = "Sodium Chloride"
 	id = "sodiumchloride"
-	results = list("sodiumchloride" = 3)
-	required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
+	results = list(/datum/reagent/consumable/sodiumchloride = 3)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/sodium = 1, /datum/reagent/chlorine = 1)
 
 /datum/chemical_reaction/plasmasolidification
 	name = "Solid Plasma"
 	id = "solidplasma"
-	required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
+	required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/consumable/frostoil = 5, /datum/reagent/toxin/plasma = 20)
 	mob_react = FALSE
 
 /datum/chemical_reaction/plasmasolidification/on_reaction(datum/reagents/holder, created_volume)
@@ -61,7 +61,7 @@
 /datum/chemical_reaction/goldsolidification
 	name = "Solid Gold"
 	id = "solidgold"
-	required_reagents = list("frostoil" = 5, "gold" = 20, "iron" = 1)
+	required_reagents = list(/datum/reagent/consumable/frostoil = 5, /datum/reagent/gold = 20, /datum/reagent/iron = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/goldsolidification/on_reaction(datum/reagents/holder, created_volume)
@@ -71,22 +71,22 @@
 
 /datum/chemical_reaction/capsaicincondensation
 	name = "Capsaicincondensation"
-	id = "capsaicincondensation"
-	results = list("condensedcapsaicin" = 5)
-	required_reagents = list("capsaicin" = 1, "ethanol" = 5)
+	id = /datum/reagent/consumable/condensedcapsaicin
+	results = list(/datum/reagent/consumable/condensedcapsaicin = 5)
+	required_reagents = list(/datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/ethanol = 5)
 
 /datum/chemical_reaction/soapification
 	name = "Soapification"
 	id = "soapification"
-	required_reagents = list("liquidgibs" = 10, "lye"  = 10) // requires two scooped gib tiles
+	required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/lye  = 10) // requires two scooped gib tiles
 	required_temp = 374
 	mob_react = FALSE
 
 /datum/chemical_reaction/mustard
 	name = "Mustard"
-	id = "mustard"
-	results = list("mustard" = 5)
-	required_reagents = list("mustardgrind" = 1, "water"  = 10, "enzyme"= 1)
+	id = /datum/reagent/consumable/mustard
+	results = list(/datum/reagent/consumable/mustard = 5)
+	required_reagents = list(/datum/reagent/mustardgrind = 1, /datum/reagent/water  = 10, /datum/reagent/consumable/enzyme= 1)
 
 /datum/chemical_reaction/soapification/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -96,7 +96,7 @@
 /datum/chemical_reaction/candlefication
 	name = "Candlefication"
 	id = "candlefication"
-	required_reagents = list("liquidgibs" = 5, "oxygen"  = 5) //
+	required_reagents = list(/datum/reagent/liquidgibs = 5, /datum/reagent/oxygen  = 5)
 	required_temp = 374
 	mob_react = FALSE
 
@@ -108,7 +108,7 @@
 /datum/chemical_reaction/meatification
 	name = "Meatification"
 	id = "meatification"
-	required_reagents = list("liquidgibs" = 10, "nutriment" = 10, "carbon" = 10)
+	required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10)
 	mob_react = FALSE
 
 /datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
@@ -119,32 +119,32 @@
 
 /datum/chemical_reaction/carbondioxide
 	name = "Direct Carbon Oxidation"
-	id = "burningcarbon"
-	results = list("co2" = 3)
-	required_reagents = list("carbon" = 1, "oxygen" = 2)
+	id = /datum/reagent/carbondioxide
+	results = list(/datum/reagent/carbondioxide = 3)
+	required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 2)
 	required_temp = 777 // pure carbon isn't especially reactive.
 
 /datum/chemical_reaction/nitrous_oxide
 	name = "Nitrous Oxide"
-	id = "nitrous_oxide"
-	results = list("nitrous_oxide" = 5)
-	required_reagents = list("ammonia" = 2, "nitrogen" = 1, "oxygen" = 2)
+	id = /datum/reagent/nitrous_oxide
+	results = list(/datum/reagent/nitrous_oxide = 5)
+	required_reagents = list(/datum/reagent/ammonia = 2, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 2)
 	required_temp = 525
 
 //Technically a mutation toxin
 /datum/chemical_reaction/mulligan
 	name = "Mulligan"
 	id = "mulligan"
-	results = list("mulligan" = 1)
-	required_reagents = list("slime_toxin" = 1, "mutagen" = 1)
+	results = list(/datum/reagent/mulligan = 1)
+	required_reagents = list(/datum/reagent/slime_toxin = 1, /datum/reagent/toxin/mutagen = 1)
 
 
 /datum/chemical_reaction/fermis_plush
 	name = "Fermis plush"
 	id = "fermis_plush"
-	required_reagents = list("sugar" = 10, "blood" = 10, "stable_plasma" = 10)
+	required_reagents = list(/datum/reagent/consumable/caramel = 10, /datum/reagent/blood = 10, /datum/reagent/stable_plasma = 10)
 	mob_react = FALSE
-	required_temp = 400
+	required_temp = 300
 
 /datum/chemical_reaction/fermis_plush/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -156,75 +156,75 @@
 /datum/chemical_reaction/virus_food
 	name = "Virus Food"
 	id = "virusfood"
-	results = list("virusfood" = 15)
-	required_reagents = list("water" = 5, "milk" = 5)
+	results = list(/datum/reagent/consumable/virus_food = 15)
+	required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/milk = 5)
 
 /datum/chemical_reaction/virus_food_mutagen
 	name = "mutagenic agar"
 	id = "mutagenvirusfood"
-	results = list("mutagenvirusfood" = 1)
-	required_reagents = list("mutagen" = 1, "virusfood" = 1)
+	results = list(/datum/reagent/toxin/mutagen/mutagenvirusfood = 1)
+	required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/consumable/virus_food = 1)
 
 /datum/chemical_reaction/virus_food_synaptizine
 	name = "virus rations"
 	id = "synaptizinevirusfood"
-	results = list("synaptizinevirusfood" = 1)
-	required_reagents = list("synaptizine" = 1, "virusfood" = 1)
+	results = list(/datum/reagent/medicine/synaptizine/synaptizinevirusfood = 1)
+	required_reagents = list(/datum/reagent/medicine/synaptizine = 1, /datum/reagent/consumable/virus_food = 1)
 
 /datum/chemical_reaction/virus_food_plasma
 	name = "virus plasma"
-	id = "plasmavirusfood"
-	results = list("plasmavirusfood" = 1)
-	required_reagents = list("plasma" = 1, "virusfood" = 1)
+	id = /datum/reagent/toxin/plasma/plasmavirusfood
+	results = list(/datum/reagent/toxin/plasma/plasmavirusfood = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/virus_food = 1)
 
 /datum/chemical_reaction/virus_food_plasma_synaptizine
 	name = "weakened virus plasma"
-	id = "weakplasmavirusfood"
-	results = list("weakplasmavirusfood" = 2)
-	required_reagents = list("synaptizine" = 1, "plasmavirusfood" = 1)
+	id = /datum/reagent/toxin/plasma/plasmavirusfood/weak
+	results = list(/datum/reagent/toxin/plasma/plasmavirusfood/weak = 2)
+	required_reagents = list(/datum/reagent/medicine/synaptizine = 1, /datum/reagent/toxin/plasma/plasmavirusfood = 1)
 
 /datum/chemical_reaction/virus_food_mutagen_sugar
 	name = "sucrose agar"
-	id = "sugarvirusfood"
-	results = list("sugarvirusfood" = 2)
-	required_reagents = list("sugar" = 1, "mutagenvirusfood" = 1)
+	id = /datum/reagent/toxin/mutagen/mutagenvirusfood/sugar
+	results = list(/datum/reagent/toxin/mutagen/mutagenvirusfood/sugar = 2)
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/toxin/mutagen/mutagenvirusfood = 1)
 
 /datum/chemical_reaction/virus_food_mutagen_salineglucose
 	name = "sucrose agar"
 	id = "salineglucosevirusfood"
-	results = list("sugarvirusfood" = 2)
-	required_reagents = list("salglu_solution" = 1, "mutagenvirusfood" = 1)
+	results = list(/datum/reagent/toxin/mutagen/mutagenvirusfood/sugar = 2)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/toxin/mutagen/mutagenvirusfood = 1)
 
 /datum/chemical_reaction/virus_food_uranium
 	name = "Decaying uranium gel"
-	id = "uraniumvirusfood"
-	results = list("uraniumvirusfood" = 1)
-	required_reagents = list("uranium" = 1, "virusfood" = 1)
+	id = /datum/reagent/uranium/uraniumvirusfood
+	results = list(/datum/reagent/uranium/uraniumvirusfood = 1)
+	required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/virus_food = 1)
 
 /datum/chemical_reaction/virus_food_uranium_plasma
 	name = "Unstable uranium gel"
-	id = "uraniumvirusfood_plasma"
-	results = list("uraniumplasmavirusfood_unstable" = 1)
-	required_reagents = list("uranium" = 5, "plasmavirusfood" = 1)
+	id = /datum/reagent/uranium/uraniumvirusfood/unstable
+	results = list(/datum/reagent/uranium/uraniumvirusfood/unstable = 1)
+	required_reagents = list(/datum/reagent/uranium = 5, /datum/reagent/toxin/plasma/plasmavirusfood = 1)
 
 /datum/chemical_reaction/virus_food_uranium_plasma_gold
 	name = "Stable uranium gel"
 	id = "uraniumvirusfood_gold"
-	results = list("uraniumplasmavirusfood_stable" = 1)
-	required_reagents = list("uranium" = 10, "gold" = 10, "plasma" = 1)
+	results = list(/datum/reagent/uranium/uraniumvirusfood/stable = 1)
+	required_reagents = list(/datum/reagent/uranium = 10, /datum/reagent/gold = 10, /datum/reagent/toxin/plasma = 1)
 
 /datum/chemical_reaction/virus_food_uranium_plasma_silver
 	name = "Stable uranium gel"
 	id = "uraniumvirusfood_silver"
-	results = list("uraniumplasmavirusfood_stable" = 1)
-	required_reagents = list("uranium" = 10, "silver" = 10, "plasma" = 1)
+	results = list(/datum/reagent/uranium/uraniumvirusfood/stable = 1)
+	required_reagents = list(/datum/reagent/uranium = 10, /datum/reagent/silver = 10, /datum/reagent/toxin/plasma = 1)
 
 /datum/chemical_reaction/mix_virus
 	name = "Mix Virus"
 	id = "mixvirus"
-	results = list("blood" = 1)
-	required_reagents = list("virusfood" = 1)
-	required_catalysts = list("blood" = 1)
+	results = list(/datum/reagent/blood = 1)
+	required_reagents = list(/datum/reagent/consumable/virus_food = 1)
+	required_catalysts = list(/datum/reagent/blood = 1)
 	var/level_min = 1
 	var/level_max = 2
 
@@ -241,7 +241,7 @@
 
 	name = "Mix Virus 2"
 	id = "mixvirus2"
-	required_reagents = list("mutagen" = 1)
+	required_reagents = list(/datum/reagent/toxin/mutagen = 1)
 	level_min = 2
 	level_max = 4
 
@@ -249,7 +249,7 @@
 
 	name = "Mix Virus 3"
 	id = "mixvirus3"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	level_min = 4
 	level_max = 6
 
@@ -257,7 +257,7 @@
 
 	name = "Mix Virus 4"
 	id = "mixvirus4"
-	required_reagents = list("uranium" = 1)
+	required_reagents = list(/datum/reagent/uranium = 1)
 	level_min = 5
 	level_max = 6
 
@@ -265,7 +265,7 @@
 
 	name = "Mix Virus 5"
 	id = "mixvirus5"
-	required_reagents = list("mutagenvirusfood" = 1)
+	required_reagents = list(/datum/reagent/toxin/mutagen/mutagenvirusfood = 1)
 	level_min = 3
 	level_max = 3
 
@@ -273,7 +273,7 @@
 
 	name = "Mix Virus 6"
 	id = "mixvirus6"
-	required_reagents = list("sugarvirusfood" = 1)
+	required_reagents = list(/datum/reagent/toxin/mutagen/mutagenvirusfood/sugar = 1)
 	level_min = 4
 	level_max = 4
 
@@ -281,7 +281,7 @@
 
 	name = "Mix Virus 7"
 	id = "mixvirus7"
-	required_reagents = list("weakplasmavirusfood" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma/plasmavirusfood/weak = 1)
 	level_min = 5
 	level_max = 5
 
@@ -289,7 +289,7 @@
 
 	name = "Mix Virus 8"
 	id = "mixvirus8"
-	required_reagents = list("plasmavirusfood" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma/plasmavirusfood = 1)
 	level_min = 6
 	level_max = 6
 
@@ -297,7 +297,7 @@
 
 	name = "Mix Virus 9"
 	id = "mixvirus9"
-	required_reagents = list("synaptizinevirusfood" = 1)
+	required_reagents = list(/datum/reagent/medicine/synaptizine/synaptizinevirusfood = 1)
 	level_min = 1
 	level_max = 1
 
@@ -305,7 +305,7 @@
 
 	name = "Mix Virus 10"
 	id = "mixvirus10"
-	required_reagents = list("uraniumvirusfood" = 1)
+	required_reagents = list(/datum/reagent/uranium/uraniumvirusfood = 1)
 	level_min = 6
 	level_max = 7
 
@@ -313,7 +313,7 @@
 
 	name = "Mix Virus 11"
 	id = "mixvirus11"
-	required_reagents = list("uraniumplasmavirusfood_unstable" = 1)
+	required_reagents = list(/datum/reagent/uranium/uraniumvirusfood/unstable = 1)
 	level_min = 7
 	level_max = 7
 
@@ -321,7 +321,7 @@
 
 	name = "Mix Virus 12"
 	id = "mixvirus12"
-	required_reagents = list("uraniumplasmavirusfood_stable" = 1)
+	required_reagents = list(/datum/reagent/uranium/uraniumvirusfood/stable = 1)
 	level_min = 8
 	level_max = 8
 
@@ -329,8 +329,8 @@
 
 	name = "Devolve Virus"
 	id = "remvirus"
-	required_reagents = list("synaptizine" = 1)
-	required_catalysts = list("blood" = 1)
+	required_reagents = list(/datum/reagent/medicine/synaptizine = 1)
+	required_catalysts = list(/datum/reagent/blood = 1)
 
 /datum/chemical_reaction/mix_virus/rem_virus/on_reaction(datum/reagents/holder, created_volume)
 
@@ -343,8 +343,8 @@
 /datum/chemical_reaction/mix_virus/neuter_virus
 	name = "Neuter Virus"
 	id = "neutervirus"
-	required_reagents = list("formaldehyde" = 1)
-	required_catalysts = list("blood" = 1)
+	required_reagents = list(/datum/reagent/toxin/formaldehyde = 1)
+	required_catalysts = list(/datum/reagent/blood = 1)
 
 /datum/chemical_reaction/mix_virus/neuter_virus/on_reaction(datum/reagents/holder, created_volume)
 
@@ -362,13 +362,13 @@
 /datum/chemical_reaction/surfactant
 	name = "Foam surfactant"
 	id = "foam surfactant"
-	results = list("fluorosurfactant" = 5)
-	required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
+	results = list(/datum/reagent/fluorosurfactant = 5)
+	required_reagents = list(/datum/reagent/fluorine = 2, /datum/reagent/carbon = 2, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/foam
 	name = "Foam"
 	id = "foam"
-	required_reagents = list("fluorosurfactant" = 1, "water" = 1)
+	required_reagents = list(/datum/reagent/fluorosurfactant = 1, /datum/reagent/water = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/foam/on_reaction(datum/reagents/holder, created_volume)
@@ -385,7 +385,7 @@
 /datum/chemical_reaction/metalfoam
 	name = "Metal Foam"
 	id = "metalfoam"
-	required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "facid" = 1)
+	required_reagents = list(/datum/reagent/aluminium = 3, /datum/reagent/foaming_agent = 1, /datum/reagent/toxin/acid/fluacid = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/metalfoam/on_reaction(datum/reagents/holder, created_volume)
@@ -402,7 +402,7 @@
 /datum/chemical_reaction/smart_foam
 	name = "Smart Metal Foam"
 	id = "smart_metal_foam"
-	required_reagents = list("aluminium" = 3, "smart_foaming_agent" = 1, "facid" = 1)
+	required_reagents = list(/datum/reagent/aluminium = 3, /datum/reagent/smart_foaming_agent = 1, /datum/reagent/toxin/acid/fluacid = 1)
 	mob_react = TRUE
 
 /datum/chemical_reaction/smart_foam/on_reaction(datum/reagents/holder, created_volume)
@@ -416,7 +416,7 @@
 /datum/chemical_reaction/ironfoam
 	name = "Iron Foam"
 	id = "ironlfoam"
-	required_reagents = list("iron" = 3, "foaming_agent" = 1, "facid" = 1)
+	required_reagents = list(/datum/reagent/iron = 3, /datum/reagent/foaming_agent = 1, /datum/reagent/toxin/acid/fluacid = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume)
@@ -430,15 +430,15 @@
 
 /datum/chemical_reaction/foaming_agent
 	name = "Foaming Agent"
-	id = "foaming_agent"
-	results = list("foaming_agent" = 1)
-	required_reagents = list("lithium" = 1, "hydrogen" = 1)
+	id = /datum/reagent/foaming_agent
+	results = list(/datum/reagent/foaming_agent = 1)
+	required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/hydrogen = 1)
 
 /datum/chemical_reaction/smart_foaming_agent
 	name = "Smart foaming Agent"
-	id = "smart_foaming_agent"
-	results = list("smart_foaming_agent" = 3)
-	required_reagents = list("foaming_agent" = 3, "acetone" = 1, "iron" = 1)
+	id = /datum/reagent/smart_foaming_agent
+	results = list(/datum/reagent/smart_foaming_agent = 3)
+	required_reagents = list(/datum/reagent/foaming_agent = 3, /datum/reagent/acetone = 1, /datum/reagent/iron = 1)
 	mix_message = "The solution mixes into a frothy metal foam and conforms to the walls of its container."
 
 
@@ -446,83 +446,83 @@
 
 /datum/chemical_reaction/ammonia
 	name = "Ammonia"
-	id = "ammonia"
-	results = list("ammonia" = 3)
-	required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
+	id = /datum/reagent/ammonia
+	results = list(/datum/reagent/ammonia = 3)
+	required_reagents = list(/datum/reagent/hydrogen = 3, /datum/reagent/nitrogen = 1)
 
 /datum/chemical_reaction/diethylamine
 	name = "Diethylamine"
-	id = "diethylamine"
-	results = list("diethylamine" = 2)
-	required_reagents = list ("ammonia" = 1, "ethanol" = 1)
+	id = /datum/reagent/diethylamine
+	results = list(/datum/reagent/diethylamine = 2)
+	required_reagents = list (/datum/reagent/ammonia = 1, /datum/reagent/consumable/ethanol = 1)
 
 /datum/chemical_reaction/space_cleaner
 	name = "Space cleaner"
-	id = "cleaner"
-	results = list("cleaner" = 2)
-	required_reagents = list("ammonia" = 1, "water" = 1)
+	id = /datum/reagent/space_cleaner
+	results = list(/datum/reagent/space_cleaner = 2)
+	required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/water = 1)
 
 /datum/chemical_reaction/plantbgone
 	name = "Plant-B-Gone"
-	id = "plantbgone"
-	results = list("plantbgone" = 5)
-	required_reagents = list("toxin" = 1, "water" = 4)
+	id = /datum/reagent/toxin/plantbgone
+	results = list(/datum/reagent/toxin/plantbgone = 5)
+	required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/water = 4)
 
 /datum/chemical_reaction/weedkiller
 	name = "Weed Killer"
-	id = "weedkiller"
-	results = list("weedkiller" = 5)
-	required_reagents = list("toxin" = 1, "ammonia" = 4)
+	id = /datum/reagent/toxin/plantbgone/weedkiller
+	results = list(/datum/reagent/toxin/plantbgone/weedkiller = 5)
+	required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/ammonia = 4)
 
 /datum/chemical_reaction/pestkiller
 	name = "Pest Killer"
-	id = "pestkiller"
-	results = list("pestkiller" = 5)
-	required_reagents = list("toxin" = 1, "ethanol" = 4)
+	id = /datum/reagent/toxin/pestkiller
+	results = list(/datum/reagent/toxin/pestkiller = 5)
+	required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/consumable/ethanol = 4)
 
 /datum/chemical_reaction/drying_agent
 	name = "Drying agent"
-	id = "drying_agent"
-	results = list("drying_agent" = 3)
-	required_reagents = list("stable_plasma" = 2, "ethanol" = 1, "sodium" = 1)
+	id = /datum/reagent/drying_agent
+	results = list(/datum/reagent/drying_agent = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 2, /datum/reagent/consumable/ethanol = 1, /datum/reagent/sodium = 1)
 
 //////////////////////////////////// Other goon stuff ///////////////////////////////////////////
 
 /datum/chemical_reaction/acetone
 	name = "acetone"
-	id = "acetone"
-	results = list("acetone" = 3)
-	required_reagents = list("oil" = 1, "welding_fuel" = 1, "oxygen" = 1)
+	id = /datum/reagent/acetone
+	results = list(/datum/reagent/acetone = 3)
+	required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/fuel = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/oil
 	name = "Oil"
-	id = "oil"
-	results = list("oil" = 3)
-	required_reagents = list("welding_fuel" = 1, "carbon" = 1, "hydrogen" = 1)
+	id = /datum/reagent/oil
+	results = list(/datum/reagent/oil = 3)
+	required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/carbon = 1, /datum/reagent/hydrogen = 1)
 
 /datum/chemical_reaction/phenol
 	name = "phenol"
-	id = "phenol"
-	results = list("phenol" = 3)
-	required_reagents = list("water" = 1, "chlorine" = 1, "oil" = 1)
+	id = /datum/reagent/phenol
+	results = list(/datum/reagent/phenol = 3)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/chlorine = 1, /datum/reagent/oil = 1)
 
 /datum/chemical_reaction/ash
 	name = "Ash"
-	id = "ash"
-	results = list("ash" = 1)
-	required_reagents = list("oil" = 1)
+	id = /datum/reagent/ash
+	results = list(/datum/reagent/ash = 1)
+	required_reagents = list(/datum/reagent/oil = 1)
 	required_temp = 480
 
 /datum/chemical_reaction/colorful_reagent
 	name = "colorful_reagent"
-	id = "colorful_reagent"
-	results = list("colorful_reagent" = 5)
-	required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
+	id = /datum/reagent/colorful_reagent
+	results = list(/datum/reagent/colorful_reagent = 5)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/radium = 1, /datum/reagent/drug/space_drugs = 1, /datum/reagent/medicine/cryoxadone = 1, /datum/reagent/consumable/triple_citrus = 1)
 
 /datum/chemical_reaction/life
 	name = "Life"
 	id = "life"
-	required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "blood" = 1)
+	required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/synthflesh = 1, /datum/reagent/blood = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/life/on_reaction(datum/reagents/holder, created_volume)
@@ -532,7 +532,7 @@
 /datum/chemical_reaction/life_friendly
 	name = "Life (Friendly)"
 	id = "life_friendly"
-	required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "sugar" = 1)
+	required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/synthflesh = 1, /datum/reagent/consumable/sugar = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/life_friendly/on_reaction(datum/reagents/holder, created_volume)
@@ -541,7 +541,7 @@
 /datum/chemical_reaction/corgium
 	name = "corgium"
 	id = "corgium"
-	required_reagents = list("nutriment" = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
+	required_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/blood = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, created_volume)
@@ -552,56 +552,56 @@
 
 /datum/chemical_reaction/hair_dye
 	name = "hair_dye"
-	id = "hair_dye"
-	results = list("hair_dye" = 5)
-	required_reagents = list("colorful_reagent" = 1, "radium" = 1, "space_drugs" = 1)
+	id = /datum/reagent/hair_dye
+	results = list(/datum/reagent/hair_dye = 5)
+	required_reagents = list(/datum/reagent/colorful_reagent = 1, /datum/reagent/radium = 1, /datum/reagent/drug/space_drugs = 1)
 
 /datum/chemical_reaction/barbers_aid
 	name = "barbers_aid"
-	id = "barbers_aid"
-	results = list("barbers_aid" = 5)
-	required_reagents = list("carpet" = 1, "radium" = 1, "space_drugs" = 1)
+	id = /datum/reagent/barbers_aid
+	results = list(/datum/reagent/barbers_aid = 5)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/radium = 1, /datum/reagent/drug/space_drugs = 1)
 
 /datum/chemical_reaction/concentrated_barbers_aid
 	name = "concentrated_barbers_aid"
-	id = "concentrated_barbers_aid"
-	results = list("concentrated_barbers_aid" = 2)
-	required_reagents = list("barbers_aid" = 1, "mutagen" = 1)
+	id = /datum/reagent/concentrated_barbers_aid
+	results = list(/datum/reagent/concentrated_barbers_aid = 2)
+	required_reagents = list(/datum/reagent/barbers_aid = 1, /datum/reagent/toxin/mutagen = 1)
 
 /datum/chemical_reaction/saltpetre
 	name = "saltpetre"
-	id = "saltpetre"
-	results = list("saltpetre" = 3)
-	required_reagents = list("potassium" = 1, "nitrogen" = 1, "oxygen" = 3)
+	id = /datum/reagent/saltpetre
+	results = list(/datum/reagent/saltpetre = 3)
+	required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 3)
 
 /datum/chemical_reaction/lye
 	name = "lye"
-	id = "lye"
-	results = list("lye" = 3)
-	required_reagents = list("sodium" = 1, "hydrogen" = 1, "oxygen" = 1)
+	id = /datum/reagent/lye
+	results = list(/datum/reagent/lye = 3)
+	required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/lye2
 	name = "lye"
-	id = "lye"
-	results = list("lye" = 2)
-	required_reagents = list("ash" = 1, "water" = 1, "carbon" = 1)
+	id = "lye2"
+	results = list(/datum/reagent/lye = 2)
+	required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/water = 1, /datum/reagent/carbon = 1)
 
 /datum/chemical_reaction/royal_bee_jelly
 	name = "royal bee jelly"
-	id = "royal_bee_jelly"
-	results = list("royal_bee_jelly" = 5)
-	required_reagents = list("mutagen" = 10, "honey" = 40)
+	id = /datum/reagent/royal_bee_jelly
+	results = list(/datum/reagent/royal_bee_jelly = 5)
+	required_reagents = list(/datum/reagent/toxin/mutagen = 10, /datum/reagent/consumable/honey = 40)
 
 /datum/chemical_reaction/laughter
 	name = "laughter"
-	id = "laughter"
-	results = list("laughter" = 10) // Fuck it. I'm not touching this one.
-	required_reagents = list("sugar" = 1, "banana" = 1)
+	id = /datum/reagent/consumable/laughter
+	results = list(/datum/reagent/consumable/laughter = 10) // Fuck it. I'm not touching this one.
+	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/banana = 1)
 
 /datum/chemical_reaction/plastic_polymers
 	name = "plastic polymers"
 	id = "plastic_polymers"
-	required_reagents = list("oil" = 5, "sacid" = 2, "ash" = 3)
+	required_reagents = list(/datum/reagent/oil = 5, /datum/reagent/toxin/acid = 2, /datum/reagent/ash = 3)
 	required_temp = 374 //lazily consistent with soap & other crafted objects generically created with heat.
 
 /datum/chemical_reaction/plastic_polymers/on_reaction(datum/reagents/holder, created_volume)
@@ -611,101 +611,101 @@
 
 /datum/chemical_reaction/pax
 	name = "pax"
-	id = "pax"
-	results = list("pax" = 3)
-	required_reagents  = list("mindbreaker" = 1, "synaptizine" = 1, "water" = 1)
+	id = /datum/reagent/pax
+	results = list(/datum/reagent/pax = 3)
+	required_reagents  = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/water = 1)
 
 /datum/chemical_reaction/cat
 	name = "felined mutation toxic"
-	id = "cats"
-	results = list("felinidmutationtoxin" = 1)
-	required_reagents  = list("mindbreaker" = 1, "ammonia" = 1, "water" = 1, "aphro" = 10, "stablemutationtoxin" = 1) // Maybe aphro+ if it becomes a shitty meme
+	id = /datum/reagent/mutationtoxin/felinid
+	results = list(/datum/reagent/mutationtoxin/felinid = 1)
+	required_reagents  = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/ammonia = 1, /datum/reagent/water = 1, /datum/reagent/drug/aphrodisiac = 10, /datum/reagent/mutationtoxin = 1) // Maybe aphro+ if it becomes a shitty meme
 	required_temp = 450
 
 /datum/chemical_reaction/moff
 	name = "insect mutation toxic"
-	id = "moffs"
-	results = list("mothmutationtoxin" = 1)
-	required_reagents  = list("liquid_dark_matter" = 2, "ammonia" = 5, "lithium" = 1, "stablemutationtoxin" = 1)
+	id = /datum/reagent/mutationtoxin/insect
+	results = list(/datum/reagent/mutationtoxin/insect = 1)
+	required_reagents  = list(/datum/reagent/liquid_dark_matter = 2, /datum/reagent/ammonia = 5, /datum/reagent/lithium = 1, /datum/reagent/mutationtoxin = 1)
 	required_temp = 320
 
 /datum/chemical_reaction/notlight //Harder to make do to it being a hard race to play
 	name = "shadow muatatuin toxic"
-	id = "notlight"
-	results = list("shadowmutationtoxin" = 1)
-	required_reagents  = list("liquid_dark_matter" = 5, "synaptizine" = 10, "oculine" = 10, "stablemutationtoxin" = 1)
+	id = /datum/reagent/mutationtoxin/shadow
+	results = list(/datum/reagent/mutationtoxin/shadow = 1)
+	required_reagents  = list(/datum/reagent/liquid_dark_matter = 5, /datum/reagent/medicine/synaptizine = 10, /datum/reagent/medicine/oculine = 10, /datum/reagent/mutationtoxin = 1)
 	required_temp = 600
 
 // Liquid Carpets
 
 /datum/chemical_reaction/carpet
 	name = "carpet"
-	id = "carpet"
-	results = list("carpet" = 2)
-	required_reagents = list("space_drugs" = 1, "blood" = 1)
+	id = /datum/reagent/carpet
+	results = list(/datum/reagent/carpet = 2)
+	required_reagents = list(/datum/reagent/drug/space_drugs = 1, /datum/reagent/blood = 1)
 
 /datum/chemical_reaction/carpet/black
 	name = "liquid black carpet"
-	id = "blackcarpet"
-	results = list("blackcarpet" = 2)
-	required_reagents = list("carpet" = 1, "carbon" = 1)
+	id = /datum/reagent/carpet/black
+	results = list(/datum/reagent/carpet/black = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/carbon = 1)
 
 /datum/chemical_reaction/carpet/blackred
 	name = "liquid red black carpet"
-	id = "blackredcarpet"
-	results = list("blackredcarpet" = 2)
-	required_reagents = list("carpet" = 1, "charcoal" = 1)
+	id = /datum/reagent/carpet/blackred
+	results = list(/datum/reagent/carpet/blackred = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/medicine/charcoal = 1)
 
 /datum/chemical_reaction/carpet/monochrome
 	name = "liquid monochrome carpet"
-	id = "monochromecarpet"
-	results = list("monochromecarpet" = 2)
-	required_reagents = list("carpet" = 1, "oil" = 1)
+	id = /datum/reagent/carpet/monochrome
+	results = list(/datum/reagent/carpet/monochrome = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/oil = 1)
 
 /datum/chemical_reaction/carpet/blue
 	name = "liquid blue carpet"
-	id = "bluecarpet"
-	results = list("bluecarpet" = 2)
-	required_reagents = list("carpet" = 1, "tonic" = 1)
+	id = /datum/reagent/carpet/blue
+	results = list(/datum/reagent/carpet/blue = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/consumable/tonic = 1)
 
 /datum/chemical_reaction/carpet/cyan
 	name = "liquid cyan carpet"
-	id = "cyancarpet"
-	results = list("cyancarpet" = 2)
-	required_reagents = list("carpet" = 1, "ice" = 1)
+	id = /datum/reagent/carpet/cyan
+	results = list(/datum/reagent/carpet/cyan = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/carpet/green
 	name = "liquid green carpet"
-	id = "greencarpet"
-	results = list("greencarpet" = 2)
-	required_reagents = list("carpet" = 1, "sacid" = 1)
+	id = /datum/reagent/carpet/green
+	results = list(/datum/reagent/carpet/green = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/carpet/orange
 	name = "liquid orange carpet"
-	id = "orangecarpet"
-	results = list("orangecarpet" = 2)
-	required_reagents = list("carpet" = 1, "orangejuice" = 1)
+	id = /datum/reagent/carpet/orange
+	results = list(/datum/reagent/carpet/orange = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/consumable/orangejuice = 1)
 
 /datum/chemical_reaction/carpet/purple
 	name = "liquid purple carpet"
-	id = "purplecarpet"
-	results = list("purplecarpet" = 2)
-	required_reagents = list("carpet" = 1, "stable_plasma" = 1)
+	id = /datum/reagent/carpet/purple
+	results = list(/datum/reagent/carpet/purple = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/stable_plasma = 1)
 
 /datum/chemical_reaction/carpet/red
 	name = "liquid red carpet"
-	id = "redcarpet"
-	results = list("redcarpet" = 2)
-	required_reagents = list("carpet" = 1, "welding_fuel" = 1)
+	id = /datum/reagent/carpet/red
+	results = list(/datum/reagent/carpet/red = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/fuel = 1)
 
 /datum/chemical_reaction/carpet/royalblack
 	name = "liquid royal black carpet"
-	id = "royalblackcarpet"
-	results = list("royalblackcarpet" = 2)
-	required_reagents = list("carpet" = 1, "blackpepper" = 1)
+	id = /datum/reagent/carpet/royalblack
+	results = list(/datum/reagent/carpet/royalblack = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/consumable/blackpepper = 1)
 
 /datum/chemical_reaction/carpet/royalblue
 	name = "liquid royal blue carpet"
-	id = "royalbluecarpet"
-	results = list("royalbluecarpet" = 2)
-	required_reagents = list("carpet" = 1, "clonexadone" = 1)
+	id = /datum/reagent/carpet/royalblue
+	results = list(/datum/reagent/carpet/royalblue = 2)
+	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/medicine/clonexadone = 1)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index ad1efc1da7..cb9636bf02 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -27,21 +27,21 @@
 
 /datum/chemical_reaction/reagent_explosion/nitroglycerin
 	name = "Nitroglycerin"
-	id = "nitroglycerin"
-	results = list("nitroglycerin" = 2)
-	required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
+	id = /datum/reagent/nitroglycerin
+	results = list(/datum/reagent/nitroglycerin = 2)
+	required_reagents = list(/datum/reagent/glycerol = 1, /datum/reagent/toxin/acid/fluacid = 1, /datum/reagent/toxin/acid = 1)
 	strengthdiv = 2
 
 /datum/chemical_reaction/reagent_explosion/nitroglycerin/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
-	holder.remove_reagent("nitroglycerin", created_volume*2)
+	holder.remove_reagent(/datum/reagent/nitroglycerin, created_volume*2)
 	..()
 
 /datum/chemical_reaction/reagent_explosion/nitroglycerin_explosion
 	name = "Nitroglycerin explosion"
 	id = "nitroglycerin_explosion"
-	required_reagents = list("nitroglycerin" = 1)
+	required_reagents = list(/datum/reagent/nitroglycerin = 1)
 	required_temp = 474
 	strengthdiv = 2
 
@@ -49,13 +49,13 @@
 /datum/chemical_reaction/reagent_explosion/potassium_explosion
 	name = "Explosion"
 	id = "potassium_explosion"
-	required_reagents = list("water" = 1, "potassium" = 1)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/potassium = 1)
 	strengthdiv = 10
 
 /datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom
 	name = "Holy Explosion"
 	id = "holyboom"
-	required_reagents = list("holywater" = 1, "potassium" = 1)
+	required_reagents = list(/datum/reagent/water/holywater = 1, /datum/reagent/potassium = 1)
 
 /datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/on_reaction(datum/reagents/holder, created_volume)
 	var/turf/T = get_turf(holder.my_atom)
@@ -84,14 +84,14 @@
 
 /datum/chemical_reaction/blackpowder
 	name = "Black Powder"
-	id = "blackpowder"
-	results = list("blackpowder" = 3)
-	required_reagents = list("saltpetre" = 1, "charcoal" = 1, "sulfur" = 1)
+	id = /datum/reagent/blackpowder
+	results = list(/datum/reagent/blackpowder = 3)
+	required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/sulfur = 1)
 
 /datum/chemical_reaction/reagent_explosion/blackpowder_explosion
 	name = "Black Powder Kaboom"
 	id = "blackpowder_explosion"
-	required_reagents = list("blackpowder" = 1)
+	required_reagents = list(/datum/reagent/blackpowder = 1)
 	required_temp = 474
 	strengthdiv = 6
 	modifier = 1
@@ -103,14 +103,14 @@
 
 /datum/chemical_reaction/thermite
 	name = "Thermite"
-	id = "thermite"
-	results = list("thermite" = 3)
-	required_reagents = list("aluminium" = 1, "iron" = 1, "oxygen" = 1)
+	id = /datum/reagent/thermite
+	results = list(/datum/reagent/thermite = 3)
+	required_reagents = list(/datum/reagent/aluminium = 1, /datum/reagent/iron = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/emp_pulse
 	name = "EMP Pulse"
 	id = "emp_pulse"
-	required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
+	required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/iron = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
 
 /datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -123,7 +123,7 @@
 /datum/chemical_reaction/beesplosion
 	name = "Bee Explosion"
 	id = "beesplosion"
-	required_reagents = list("honey" = 1, "strange_reagent" = 1, "radium" = 1)
+	required_reagents = list(/datum/reagent/consumable/honey = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/radium = 1)
 
 /datum/chemical_reaction/beesplosion/on_reaction(datum/reagents/holder, created_volume)
 	var/location = holder.my_atom.drop_location()
@@ -134,7 +134,7 @@
 		var/list/beeagents = list()
 		for(var/X in holder.reagent_list)
 			var/datum/reagent/R = X
-			if(required_reagents[R.id])
+			if(required_reagents[R.type])
 				continue
 			beeagents += R
 		var/bee_amount = round(created_volume * 0.2)
@@ -146,15 +146,15 @@
 
 /datum/chemical_reaction/stabilizing_agent
 	name = "stabilizing_agent"
-	id = "stabilizing_agent"
-	results = list("stabilizing_agent" = 3)
-	required_reagents = list("iron" = 1, "oxygen" = 1, "hydrogen" = 1)
+	id = /datum/reagent/stabilizing_agent
+	results = list(/datum/reagent/stabilizing_agent = 3)
+	required_reagents = list(/datum/reagent/iron = 1, /datum/reagent/oxygen = 1, /datum/reagent/hydrogen = 1)
 
 /datum/chemical_reaction/clf3
 	name = "Chlorine Trifluoride"
-	id = "clf3"
-	results = list("clf3" = 4)
-	required_reagents = list("chlorine" = 1, "fluorine" = 3)
+	id = /datum/reagent/clf3
+	results = list(/datum/reagent/clf3 = 4)
+	required_reagents = list(/datum/reagent/chlorine = 1, /datum/reagent/fluorine = 3)
 	required_temp = 424
 
 /datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume)
@@ -167,7 +167,7 @@
 	name = "Meth explosion"
 	id = "methboom1"
 	required_temp = 380 //slightly above the meth mix time.
-	required_reagents = list("methamphetamine" = 1)
+	required_reagents = list(/datum/reagent/drug/methamphetamine = 1)
 	strengthdiv = 6
 	modifier = 1
 	mob_react = FALSE
@@ -181,19 +181,19 @@
 
 /datum/chemical_reaction/reagent_explosion/methsplosion/methboom2
 	id = "methboom2"
-	required_reagents = list("diethylamine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1) //diethylamine is often left over from mixing the ephedrine.
+	required_reagents = list(/datum/reagent/diethylamine = 1, /datum/reagent/iodine = 1, /datum/reagent/phosphorus = 1, /datum/reagent/hydrogen = 1) //diethylamine is often left over from mixing the ephedrine.
 	required_temp = 300 //room temperature, chilling it even a little will prevent the explosion
 
 /datum/chemical_reaction/sorium
 	name = "Sorium"
-	id = "sorium"
-	results = list("sorium" = 4)
-	required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, "carbon" = 1)
+	id = /datum/reagent/sorium
+	results = list(/datum/reagent/sorium = 4)
+	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/oxygen = 1, /datum/reagent/nitrogen = 1, /datum/reagent/carbon = 1)
 
 /datum/chemical_reaction/sorium/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
-	holder.remove_reagent("sorium", created_volume*4)
+	holder.remove_reagent(/datum/reagent/sorium, created_volume*4)
 	var/turf/T = get_turf(holder.my_atom)
 	var/range = CLAMP(sqrt(created_volume*4), 1, 6)
 	goonchem_vortex(T, 1, range)
@@ -201,7 +201,7 @@
 /datum/chemical_reaction/sorium_vortex
 	name = "sorium_vortex"
 	id = "sorium_vortex"
-	required_reagents = list("sorium" = 1)
+	required_reagents = list(/datum/reagent/sorium = 1)
 	required_temp = 474
 
 /datum/chemical_reaction/sorium_vortex/on_reaction(datum/reagents/holder, created_volume)
@@ -211,14 +211,14 @@
 
 /datum/chemical_reaction/liquid_dark_matter
 	name = "Liquid Dark Matter"
-	id = "liquid_dark_matter"
-	results = list("liquid_dark_matter" = 3)
-	required_reagents = list("stable_plasma" = 1, "radium" = 1, "carbon" = 1)
+	id = /datum/reagent/liquid_dark_matter
+	results = list(/datum/reagent/liquid_dark_matter = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/radium = 1, /datum/reagent/carbon = 1)
 
 /datum/chemical_reaction/liquid_dark_matter/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
-	holder.remove_reagent("liquid_dark_matter", created_volume*3)
+	holder.remove_reagent(/datum/reagent/liquid_dark_matter, created_volume*3)
 	var/turf/T = get_turf(holder.my_atom)
 	var/range = CLAMP(sqrt(created_volume*3), 1, 6)
 	goonchem_vortex(T, 0, range)
@@ -226,7 +226,7 @@
 /datum/chemical_reaction/ldm_vortex
 	name = "LDM Vortex"
 	id = "ldm_vortex"
-	required_reagents = list("liquid_dark_matter" = 1)
+	required_reagents = list(/datum/reagent/liquid_dark_matter = 1)
 	required_temp = 474
 
 /datum/chemical_reaction/ldm_vortex/on_reaction(datum/reagents/holder, created_volume)
@@ -236,12 +236,12 @@
 
 /datum/chemical_reaction/flash_powder
 	name = "Flash powder"
-	id = "flash_powder"
-	results = list("flash_powder" = 3)
-	required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 )
+	id = /datum/reagent/flash_powder
+	results = list(/datum/reagent/flash_powder = 3)
+	required_reagents = list(/datum/reagent/aluminium = 1, /datum/reagent/potassium = 1, /datum/reagent/sulfur = 1 )
 
 /datum/chemical_reaction/flash_powder/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
 	var/location = get_turf(holder.my_atom)
 	do_sparks(2, TRUE, location)
@@ -255,12 +255,12 @@
 				C.Knockdown(60)
 			else
 				C.Stun(100)
-	holder.remove_reagent("flash_powder", created_volume*3)
+	holder.remove_reagent(/datum/reagent/flash_powder, created_volume*3)
 
 /datum/chemical_reaction/flash_powder_flash
 	name = "Flash powder activation"
 	id = "flash_powder_flash"
-	required_reagents = list("flash_powder" = 1)
+	required_reagents = list(/datum/reagent/flash_powder = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/flash_powder_flash/on_reaction(datum/reagents/holder, created_volume)
@@ -279,14 +279,14 @@
 
 /datum/chemical_reaction/smoke_powder
 	name = "smoke_powder"
-	id = "smoke_powder"
-	results = list("smoke_powder" = 3)
-	required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
+	id = /datum/reagent/smoke_powder
+	results = list(/datum/reagent/smoke_powder = 3)
+	required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/phosphorus = 1)
 
 /datum/chemical_reaction/smoke_powder/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
-	holder.remove_reagent("smoke_powder", created_volume*3)
+	holder.remove_reagent(/datum/reagent/smoke_powder, created_volume*3)
 	var/smoke_radius = round(sqrt(created_volume * 1.5), 1)
 	var/location = get_turf(holder.my_atom)
 	var/datum/effect_system/smoke_spread/chem/S = new
@@ -301,7 +301,7 @@
 /datum/chemical_reaction/smoke_powder_smoke
 	name = "smoke_powder_smoke"
 	id = "smoke_powder_smoke"
-	required_reagents = list("smoke_powder" = 1)
+	required_reagents = list(/datum/reagent/smoke_powder = 1)
 	required_temp = 374
 	mob_react = FALSE
 
@@ -319,14 +319,14 @@
 
 /datum/chemical_reaction/sonic_powder
 	name = "sonic_powder"
-	id = "sonic_powder"
-	results = list("sonic_powder" = 3)
-	required_reagents = list("oxygen" = 1, "cola" = 1, "phosphorus" = 1)
+	id = /datum/reagent/sonic_powder
+	results = list(/datum/reagent/sonic_powder = 3)
+	required_reagents = list(/datum/reagent/oxygen = 1, /datum/reagent/consumable/space_cola = 1, /datum/reagent/phosphorus = 1)
 
 /datum/chemical_reaction/sonic_powder/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
-	holder.remove_reagent("sonic_powder", created_volume*3)
+	holder.remove_reagent(/datum/reagent/sonic_powder, created_volume*3)
 	var/location = get_turf(holder.my_atom)
 	playsound(location, 'sound/effects/bang.ogg', 25, 1)
 	for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/3, location))
@@ -335,7 +335,7 @@
 /datum/chemical_reaction/sonic_powder_deafen
 	name = "sonic_powder_deafen"
 	id = "sonic_powder_deafen"
-	required_reagents = list("sonic_powder" = 1)
+	required_reagents = list(/datum/reagent/sonic_powder = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/sonic_powder_deafen/on_reaction(datum/reagents/holder, created_volume)
@@ -346,12 +346,12 @@
 
 /datum/chemical_reaction/phlogiston
 	name = "phlogiston"
-	id = "phlogiston"
-	results = list("phlogiston" = 3)
-	required_reagents = list("phosphorus" = 1, "sacid" = 1, "stable_plasma" = 1)
+	id = /datum/reagent/phlogiston
+	results = list(/datum/reagent/phlogiston = 3)
+	required_reagents = list(/datum/reagent/phosphorus = 1, /datum/reagent/toxin/acid = 1, /datum/reagent/stable_plasma = 1)
 
 /datum/chemical_reaction/phlogiston/on_reaction(datum/reagents/holder, created_volume)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return
 	var/turf/open/T = get_turf(holder.my_atom)
 	if(istype(T))
@@ -361,15 +361,15 @@
 
 /datum/chemical_reaction/napalm
 	name = "Napalm"
-	id = "napalm"
-	results = list("napalm" = 3)
-	required_reagents = list("oil" = 1, "welding_fuel" = 1, "ethanol" = 1 )
+	id = /datum/reagent/napalm
+	results = list(/datum/reagent/napalm = 3)
+	required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol = 1 )
 
 /datum/chemical_reaction/cryostylane
 	name = "cryostylane"
-	id = "cryostylane"
-	results = list("cryostylane" = 3)
-	required_reagents = list("water" = 1, "stable_plasma" = 1, "nitrogen" = 1)
+	id = /datum/reagent/cryostylane
+	results = list(/datum/reagent/cryostylane = 3)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/stable_plasma = 1, /datum/reagent/nitrogen = 1)
 
 /datum/chemical_reaction/cryostylane/on_reaction(datum/reagents/holder, created_volume)
 	holder.chem_temp = 20 // cools the fuck down
@@ -378,8 +378,8 @@
 /datum/chemical_reaction/cryostylane_oxygen
 	name = "ephemeral cryostylane reaction"
 	id = "cryostylane_oxygen"
-	results = list("cryostylane" = 1)
-	required_reagents = list("cryostylane" = 1, "oxygen" = 1)
+	results = list(/datum/reagent/cryostylane = 1)
+	required_reagents = list(/datum/reagent/cryostylane = 1, /datum/reagent/oxygen = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/cryostylane_oxygen/on_reaction(datum/reagents/holder, created_volume)
@@ -388,8 +388,8 @@
 /datum/chemical_reaction/pyrosium_oxygen
 	name = "ephemeral pyrosium reaction"
 	id = "pyrosium_oxygen"
-	results = list("pyrosium" = 1)
-	required_reagents = list("pyrosium" = 1, "oxygen" = 1)
+	results = list(/datum/reagent/pyrosium = 1)
+	required_reagents = list(/datum/reagent/pyrosium = 1, /datum/reagent/oxygen = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/pyrosium_oxygen/on_reaction(datum/reagents/holder, created_volume)
@@ -397,9 +397,9 @@
 
 /datum/chemical_reaction/pyrosium
 	name = "pyrosium"
-	id = "pyrosium"
-	results = list("pyrosium" = 3)
-	required_reagents = list("stable_plasma" = 1, "radium" = 1, "phosphorus" = 1)
+	id = /datum/reagent/pyrosium
+	results = list(/datum/reagent/pyrosium = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/radium = 1, /datum/reagent/phosphorus = 1)
 
 /datum/chemical_reaction/pyrosium/on_reaction(datum/reagents/holder, created_volume)
 	holder.chem_temp = 20 // also cools the fuck down
@@ -407,23 +407,23 @@
 
 /datum/chemical_reaction/teslium
 	name = "Teslium"
-	id = "teslium"
-	results = list("teslium" = 3)
-	required_reagents = list("stable_plasma" = 1, "silver" = 1, "blackpowder" = 1)
+	id = /datum/reagent/teslium
+	results = list(/datum/reagent/teslium = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/silver = 1, /datum/reagent/blackpowder = 1)
 	mix_message = "<span class='danger'>A jet of sparks flies from the mixture as it merges into a flickering slurry.</span>"
 	required_temp = 400
 
 /datum/chemical_reaction/energized_jelly
 	name = "Energized Jelly"
-	id = "energized_jelly"
-	results = list("energized_jelly" = 2)
-	required_reagents = list("slimejelly" = 1, "teslium" = 1)
+	id = /datum/reagent/teslium/energized_jelly
+	results = list(/datum/reagent/teslium/energized_jelly = 2)
+	required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/teslium = 1)
 	mix_message = "<span class='danger'>The slime jelly starts glowing intermittently.</span>"
 
 /datum/chemical_reaction/reagent_explosion/teslium_lightning
 	name = "Teslium Destabilization"
 	id = "teslium_lightning"
-	required_reagents = list("teslium" = 1, "water" = 1)
+	required_reagents = list(/datum/reagent/teslium = 1, /datum/reagent/water = 1)
 	strengthdiv = 100
 	modifier = -100
 	noexplosion = TRUE
@@ -452,29 +452,29 @@
 /datum/chemical_reaction/reagent_explosion/teslium_lightning/heat
 	id = "teslium_lightning2"
 	required_temp = 474
-	required_reagents = list("teslium" = 1)
+	required_reagents = list(/datum/reagent/teslium = 1)
 
 /datum/chemical_reaction/reagent_explosion/nitrous_oxide
 	name = "N2O explosion"
 	id = "n2o_explosion"
-	required_reagents = list("nitrous_oxide" = 1)
+	required_reagents = list(/datum/reagent/nitrous_oxide = 1)
 	strengthdiv = 7
 	required_temp = 575
 	modifier = 1
 
 /datum/chemical_reaction/firefighting_foam
 	name = "Firefighting Foam"
-	id = "firefighting_foam"
-	results = list("firefighting_foam" = 3)
-	required_reagents = list("stabilizing_agent" = 1,"fluorosurfactant" = 1,"carbon" = 1)
+	id = /datum/reagent/firefighting_foam
+	results = list(/datum/reagent/firefighting_foam = 3)
+	required_reagents = list(/datum/reagent/stabilizing_agent = 1, /datum/reagent/fluorosurfactant = 1,/datum/reagent/carbon = 1)
 	required_temp = 200
 	is_cold_recipe = 1
 
 /datum/chemical_reaction/reagent_explosion/lingblood
 	name = "Changeling Blood Reaction"
 	id = "ling_blood_reaction"
-	results = list("ash" = 1)
-	required_reagents = list("blood" = 1)
+	results = list(/datum/reagent/ash = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	strengthdiv = 4 //The explosion should be somewhat strong if a full 15u is heated within a syringe. !!fun!!
 	required_temp = 666
 	special_react = TRUE
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 8edca91a91..5228d4a281 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -16,7 +16,7 @@
 /datum/chemical_reaction/slime/slimespawn
 	name = "Slime Spawn"
 	id = "m_spawn"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/grey
 	required_other = TRUE
 
@@ -28,15 +28,15 @@
 /datum/chemical_reaction/slime/slimeinaprov
 	name = "Slime epinephrine"
 	id = "m_inaprov"
-	results = list("epinephrine" = 3)
-	required_reagents = list("water" = 5)
+	results = list(/datum/reagent/medicine/epinephrine = 3)
+	required_reagents = list(/datum/reagent/water = 5)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/grey
 
 /datum/chemical_reaction/slime/slimemonkey
 	name = "Slime Monkey"
 	id = "m_monkey"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/grey
 	required_other = TRUE
 
@@ -48,25 +48,25 @@
 //Green
 /datum/chemical_reaction/slime/slimemutate
 	name = "Mutation Toxin"
-	id = "slimetoxin"
-	results = list("slime_toxin" = 1)
-	required_reagents = list("plasma" = 1)
+	id = /datum/reagent/slime_toxin
+	results = list(/datum/reagent/slime_toxin = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/green
 
 /datum/chemical_reaction/slime/slimehuman
 	name = "Human Mutation Toxin"
-	id = "humanmuttoxin"
-	results = list("stablemutationtoxin" = 1)
-	required_reagents = list("blood" = 1)
+	id = /datum/reagent/mutationtoxin
+	results = list(/datum/reagent/mutationtoxin = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/green
 
 /datum/chemical_reaction/slime/slimelizard
 	name = "Lizard Mutation Toxin"
-	id = "lizardmuttoxin"
-	results = list("lizardmutationtoxin" = 1)
-	required_reagents = list("radium" = 1)
+	id = /datum/reagent/mutationtoxin/lizard
+	results = list(/datum/reagent/mutationtoxin/lizard = 1)
+	required_reagents = list(/datum/reagent/radium = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/green
 
@@ -74,7 +74,7 @@
 /datum/chemical_reaction/slime/slimemetal
 	name = "Slime Metal"
 	id = "m_metal"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/metal
 	required_other = TRUE
 
@@ -87,7 +87,7 @@
 /datum/chemical_reaction/slime/slimeglass
 	name = "Slime Glass"
 	id = "m_glass"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_container = /obj/item/slime_extract/metal
 	required_other = TRUE
 
@@ -101,7 +101,7 @@
 /datum/chemical_reaction/slime/slimemobspawn
 	name = "Slime Crit"
 	id = "m_tele"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/gold
 	required_other = TRUE
 	deletes_extract = FALSE //we do delete, but we don't do so instantly
@@ -121,7 +121,7 @@
 /datum/chemical_reaction/slime/slimemobspawn/lesser
 	name = "Slime Crit Lesser"
 	id = "m_tele3"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 
 /datum/chemical_reaction/slime/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T)
 	T.visible_message("<span class='danger'>The slime extract begins to vibrate violently!</span>")
@@ -130,7 +130,7 @@
 /datum/chemical_reaction/slime/slimemobspawn/friendly
 	name = "Slime Crit Friendly"
 	id = "m_tele5"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 
 /datum/chemical_reaction/slime/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T)
 	T.visible_message("<span class='danger'>The slime extract begins to vibrate adorably!</span>")
@@ -140,7 +140,7 @@
 /datum/chemical_reaction/slime/slimebork
 	name = "Slime Bork"
 	id = "m_tele2"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/silver
 	required_other = TRUE
 
@@ -172,7 +172,7 @@
 /datum/chemical_reaction/slime/slimebork/drinks
 	name = "Slime Bork 2"
 	id = "m_tele4"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 
 /datum/chemical_reaction/slime/slimebork/drinks/getbork()
 	return get_random_drink()
@@ -181,15 +181,15 @@
 /datum/chemical_reaction/slime/slimefrost
 	name = "Slime Frost Oil"
 	id = "m_frostoil"
-	results = list("frostoil" = 10)
-	required_reagents = list("plasma" = 1)
+	results = list(/datum/reagent/consumable/frostoil = 10)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/blue
 	required_other = TRUE
 
 /datum/chemical_reaction/slime/slimestabilizer
 	name = "Slime Stabilizer"
 	id = "m_slimestabilizer"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/blue
 	required_other = TRUE
 
@@ -200,8 +200,8 @@
 /datum/chemical_reaction/slime/slimefoam
 	name = "Slime Foam"
 	id = "m_foam"
-	results = list("fluorosurfactant" = 20, "water" = 20)
-	required_reagents = list("water" = 5)
+	results = list(/datum/reagent/fluorosurfactant = 20, /datum/reagent/water = 20)
+	required_reagents = list(/datum/reagent/water = 5)
 	required_container = /obj/item/slime_extract/blue
 	required_other = TRUE
 
@@ -209,7 +209,7 @@
 /datum/chemical_reaction/slime/slimefreeze
 	name = "Slime Freeze"
 	id = "m_freeze"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/darkblue
 	required_other = TRUE
 	deletes_extract = FALSE
@@ -233,7 +233,7 @@
 /datum/chemical_reaction/slime/slimefireproof
 	name = "Slime Fireproof"
 	id = "m_fireproof"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_container = /obj/item/slime_extract/darkblue
 	required_other = TRUE
 
@@ -245,15 +245,15 @@
 /datum/chemical_reaction/slime/slimecasp
 	name = "Slime Capsaicin Oil"
 	id = "m_capsaicinoil"
-	results = list("capsaicin" = 10)
-	required_reagents = list("blood" = 1)
+	results = list(/datum/reagent/consumable/capsaicin = 10)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/orange
 	required_other = TRUE
 
 /datum/chemical_reaction/slime/slimefire
 	name = "Slime fire"
 	id = "m_fire"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/orange
 	required_other = TRUE
 	deletes_extract = FALSE
@@ -277,8 +277,8 @@
 /datum/chemical_reaction/slime/slimesmoke
 	name = "Slime Smoke"
 	id = "m_smoke"
-	results = list("phosphorus" = 10, "potassium" = 10, "sugar" = 10)
-	required_reagents = list("water" = 5)
+	results = list(/datum/reagent/phosphorus = 10, /datum/reagent/potassium = 10, /datum/reagent/consumable/sugar = 10)
+	required_reagents = list(/datum/reagent/water = 5)
 	required_container = /obj/item/slime_extract/orange
 	required_other = TRUE
 
@@ -286,7 +286,7 @@
 /datum/chemical_reaction/slime/slimeoverload
 	name = "Slime EMP"
 	id = "m_emp"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/yellow
 	required_other = TRUE
 
@@ -297,7 +297,7 @@
 /datum/chemical_reaction/slime/slimecell
 	name = "Slime Powercell"
 	id = "m_cell"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/yellow
 	required_other = TRUE
 
@@ -308,7 +308,7 @@
 /datum/chemical_reaction/slime/slimeglow
 	name = "Slime Glow"
 	id = "m_glow"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_container = /obj/item/slime_extract/yellow
 	required_other = TRUE
 
@@ -322,7 +322,7 @@
 /datum/chemical_reaction/slime/slimepsteroid
 	name = "Slime Steroid"
 	id = "m_steroid"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/purple
 	required_other = TRUE
 
@@ -333,8 +333,8 @@
 /datum/chemical_reaction/slime/slimeregen
 	name = "Slime Regen"
 	id = "m_regen"
-	results = list("regen_jelly" = 5)
-	required_reagents = list("blood" = 1)
+	results = list(/datum/reagent/medicine/regen_jelly = 5)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/purple
 	required_other = TRUE
 
@@ -342,7 +342,7 @@
 /datum/chemical_reaction/slime/slimeplasma
 	name = "Slime Plasma"
 	id = "m_plasma"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/darkpurple
 	required_other = TRUE
 
@@ -354,7 +354,7 @@
 /datum/chemical_reaction/slime/slimemutator
 	name = "Slime Mutator"
 	id = "m_slimemutator"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/red
 	required_other = TRUE
 
@@ -365,7 +365,7 @@
 /datum/chemical_reaction/slime/slimebloodlust
 	name = "Bloodlust"
 	id = "m_bloodlust"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/red
 	required_other = TRUE
 
@@ -383,7 +383,7 @@
 /datum/chemical_reaction/slime/slimespeed
 	name = "Slime Speed"
 	id = "m_speed"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_container = /obj/item/slime_extract/red
 	required_other = TRUE
 
@@ -395,7 +395,7 @@
 /datum/chemical_reaction/slime/docility
 	name = "Docility Potion"
 	id = "m_potion"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/pink
 	required_other = TRUE
 
@@ -406,7 +406,7 @@
 /datum/chemical_reaction/slime/gender
 	name = "Gender Potion"
 	id = "m_gender"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/pink
 	required_other = TRUE
 
@@ -417,9 +417,9 @@
 //Black
 /datum/chemical_reaction/slime/slimemutate2
 	name = "Advanced Mutation Toxin"
-	id = "mutationtoxin2"
-	results = list("amutationtoxin" = 1)
-	required_reagents = list("plasma" = 1)
+	id = /datum/reagent/aslimetoxin
+	results = list(/datum/reagent/aslimetoxin = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/black
 
@@ -427,7 +427,7 @@
 /datum/chemical_reaction/slime/slimeexplosion
 	name = "Slime Explosion"
 	id = "m_explosion"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/oil
 	required_other = TRUE
 	deletes_extract = FALSE
@@ -456,8 +456,8 @@
 /datum/chemical_reaction/slime/slimecornoil
 	name = "Slime Corn Oil"
 	id = "m_cornoil"
-	results = list("cornoil" = 10)
-	required_reagents = list("blood" = 1)
+	results = list(/datum/reagent/consumable/cornoil = 10)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/oil
 	required_other = TRUE
 
@@ -466,7 +466,7 @@
 	name = "Slime Potion 2"
 	id = "m_potion2"
 	required_container = /obj/item/slime_extract/lightpink
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_other = TRUE
 
 /datum/chemical_reaction/slime/slimepotion2/on_reaction(datum/reagents/holder)
@@ -477,7 +477,7 @@
 	name = "Renaming Potion"
 	id = "m_renaming_potion"
 	required_container = /obj/item/slime_extract/lightpink
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_other = TRUE
 
 /datum/chemical_reaction/slime/renaming/on_reaction(datum/reagents/holder)
@@ -489,7 +489,7 @@
 /datum/chemical_reaction/slime/adamantine
 	name = "Adamantine"
 	id = "adamantine"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/adamantine
 	required_other = TRUE
 
@@ -501,7 +501,7 @@
 /datum/chemical_reaction/slime/slimefloor2
 	name = "Bluespace Floor"
 	id = "m_floor2"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/bluespace
 	required_other = TRUE
 
@@ -513,7 +513,7 @@
 /datum/chemical_reaction/slime/slimecrystal
 	name = "Slime Crystal"
 	id = "m_crystal"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/bluespace
 	required_other = TRUE
 
@@ -525,7 +525,7 @@
 /datum/chemical_reaction/slime/slimeradio
 	name = "Slime Radio"
 	id = "m_radio"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_container = /obj/item/slime_extract/bluespace
 	required_other = TRUE
 
@@ -537,7 +537,7 @@
 /datum/chemical_reaction/slime/slimepsteroid2
 	name = "Slime Steroid 2"
 	id = "m_steroid2"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/cerulean
 	required_other = TRUE
 
@@ -548,7 +548,7 @@
 /datum/chemical_reaction/slime/slime_territory
 	name = "Slime Territory"
 	id = "s_territory"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/cerulean
 	required_other = TRUE
 
@@ -560,7 +560,7 @@
 /datum/chemical_reaction/slime/slimestop
 	name = "Slime Stop"
 	id = "m_stop"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/sepia
 	required_other = TRUE
 
@@ -573,7 +573,7 @@
 /datum/chemical_reaction/slime/slimecamera
 	name = "Slime Camera"
 	id = "m_camera"
-	required_reagents = list("water" = 1)
+	required_reagents = list(/datum/reagent/water = 1)
 	required_container = /obj/item/slime_extract/sepia
 	required_other = TRUE
 
@@ -585,7 +585,7 @@
 /datum/chemical_reaction/slime/slimefloor
 	name = "Sepia Floor"
 	id = "m_floor"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/sepia
 	required_other = TRUE
 
@@ -597,7 +597,7 @@
 /datum/chemical_reaction/slime/slimepaint
 	name = "Slime Paint"
 	id = "s_paint"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_container = /obj/item/slime_extract/pyrite
 	required_other = TRUE
 
@@ -609,7 +609,7 @@
 /datum/chemical_reaction/slime/slimecrayon
 	name = "Slime Crayon"
 	id = "s_crayon"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_container = /obj/item/slime_extract/pyrite
 	required_other = TRUE
 
@@ -622,7 +622,7 @@
 /datum/chemical_reaction/slime/slimeRNG
 	name = "Random Core"
 	id = "slimerng"
-	required_reagents = list("plasma" = 1)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/rainbow
 
@@ -642,7 +642,7 @@
 /datum/chemical_reaction/slime/slimebomb
 	name = "Clusterblorble"
 	id = "slimebomb"
-	required_reagents = list("slimejelly" = 1)
+	required_reagents = list(/datum/reagent/toxin/slimejelly = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/rainbow
 
@@ -658,7 +658,7 @@
 /datum/chemical_reaction/slime/slime_transfer
 	name = "Transfer Potion"
 	id = "slimetransfer"
-	required_reagents = list("blood" = 1)
+	required_reagents = list(/datum/reagent/blood = 1)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/rainbow
 
@@ -669,7 +669,7 @@
 /datum/chemical_reaction/slime/flight_potion
 	name = "Flight Potion"
 	id = "flightpotion"
-	required_reagents = list("holywater" = 5, "uranium" = 5)
+	required_reagents = list(/datum/reagent/water/holywater = 5, /datum/reagent/uranium = 5)
 	required_other = TRUE
 	required_container = /obj/item/slime_extract/rainbow
 
diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm
index 59394e6e4b..5ad9728b22 100644
--- a/code/modules/reagents/chemistry/recipes/special.dm
+++ b/code/modules/reagents/chemistry/recipes/special.dm
@@ -123,7 +123,6 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
 
 /datum/chemical_reaction/randomized/proc/LoadOldRecipe(recipe_data)
 	created = text2num(recipe_data["timestamp"])
-
 	var/req_reag = unwrap_reagent_list(recipe_data["required_reagents"])
 	if(!req_reag)
 		return FALSE
@@ -149,13 +148,13 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
 
 /datum/chemical_reaction/randomized/secret_sauce
 	name = "secret sauce creation"
-	id = "secretsauce"
+	id = /datum/reagent/consumable/secretsauce
 	persistent = TRUE
 	persistence_period = 7 //Reset every week
 	randomize_container = TRUE
 	possible_containers = list(/obj/item/reagent_containers/glass/bucket) //easy way to ensure no common conflicts
 	randomize_req_temperature = TRUE
-	results = list("secret_sauce" =1)
+	results = list(/datum/reagent/consumable/secretsauce =1)
 
 /datum/chemical_reaction/randomized/secret_sauce/GetPossibleReagents(kind)
 	switch(kind)
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index 726175a6c6..d9f28d2135 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -1,128 +1,128 @@
 
 /datum/chemical_reaction/formaldehyde
 	name = "formaldehyde"
-	id = "Formaldehyde"
-	results = list("formaldehyde" = 3)
-	required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
+	id = /datum/reagent/toxin/formaldehyde
+	results = list(/datum/reagent/toxin/formaldehyde = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/oxygen = 1, /datum/reagent/silver = 1)
 	required_temp = 420
 
 /datum/chemical_reaction/fentanyl
 	name = "fentanyl"
-	id = "fentanyl"
-	results = list("fentanyl" = 1)
-	required_reagents = list("space_drugs" = 1)
+	id = /datum/reagent/toxin/fentanyl
+	results = list(/datum/reagent/toxin/fentanyl = 1)
+	required_reagents = list(/datum/reagent/drug/space_drugs = 1)
 	required_temp = 674
 
 /datum/chemical_reaction/cyanide
 	name = "Cyanide"
-	id = "cyanide"
-	results = list("cyanide" = 3)
-	required_reagents = list("oil" = 1, "ammonia" = 1, "oxygen" = 1)
+	id = /datum/reagent/toxin/cyanide
+	results = list(/datum/reagent/toxin/cyanide = 3)
+	required_reagents = list(/datum/reagent/oil = 1, /datum/reagent/ammonia = 1, /datum/reagent/oxygen = 1)
 	required_temp = 380
 
 /datum/chemical_reaction/itching_powder
 	name = "Itching Powder"
-	id = "itching_powder"
-	results = list("itching_powder" = 3)
-	required_reagents = list("welding_fuel" = 1, "ammonia" = 1, "charcoal" = 1)
+	id = /datum/reagent/toxin/itching_powder
+	results = list(/datum/reagent/toxin/itching_powder = 3)
+	required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/ammonia = 1, /datum/reagent/medicine/charcoal = 1)
 
 /datum/chemical_reaction/facid
 	name = "Fluorosulfuric acid"
-	id = "facid"
-	results = list("facid" = 4)
-	required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
+	id = /datum/reagent/toxin/acid/fluacid
+	results = list(/datum/reagent/toxin/acid/fluacid = 4)
+	required_reagents = list(/datum/reagent/toxin/acid = 1, /datum/reagent/fluorine = 1, /datum/reagent/hydrogen = 1, /datum/reagent/potassium = 1)
 	required_temp = 380
 
 /datum/chemical_reaction/sulfonal
 	name = "sulfonal"
-	id = "sulfonal"
-	results = list("sulfonal" = 3)
-	required_reagents = list("acetone" = 1, "diethylamine" = 1, "sulfur" = 1)
+	id = /datum/reagent/toxin/sulfonal
+	results = list(/datum/reagent/toxin/sulfonal = 3)
+	required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/sulfur = 1)
 
 /datum/chemical_reaction/lipolicide
 	name = "lipolicide"
-	id = "lipolicide"
-	results = list("lipolicide" = 3)
-	required_reagents = list("mercury" = 1, "diethylamine" = 1, "ephedrine" = 1)
+	id = /datum/reagent/toxin/lipolicide
+	results = list(/datum/reagent/toxin/lipolicide = 3)
+	required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/diethylamine = 1, /datum/reagent/medicine/ephedrine = 1)
 
 /datum/chemical_reaction/mutagen
 	name = "Unstable mutagen"
-	id = "mutagen"
-	results = list("mutagen" = 3)
-	required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
+	id = /datum/reagent/toxin/mutagen
+	results = list(/datum/reagent/toxin/mutagen = 3)
+	required_reagents = list(/datum/reagent/radium = 1, /datum/reagent/phosphorus = 1, /datum/reagent/chlorine = 1)
 
 /datum/chemical_reaction/lexorin
 	name = "Lexorin"
-	id = "lexorin"
-	results = list("lexorin" = 3)
-	required_reagents = list("plasma" = 1, "hydrogen" = 1, "oxygen" = 1)
+	id = /datum/reagent/toxin/lexorin
+	results = list(/datum/reagent/toxin/lexorin = 3)
+	required_reagents = list(/datum/reagent/toxin/plasma = 1, /datum/reagent/hydrogen = 1, /datum/reagent/oxygen = 1)
 
 /datum/chemical_reaction/chloralhydrate
 	name = "Chloral Hydrate"
-	id = "chloralhydrate"
-	results = list("chloralhydrate" = 1)
-	required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
+	id = /datum/reagent/toxin/chloralhydrate
+	results = list(/datum/reagent/toxin/chloralhydrate = 1)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/chlorine = 3, /datum/reagent/water = 1)
 
 /datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v
 	name = "Mute Toxin"
-	id = "mutetoxin"
-	results = list("mutetoxin" = 2)
-	required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1)
+	id = /datum/reagent/toxin/mutetoxin
+	results = list(/datum/reagent/toxin/mutetoxin = 2)
+	required_reagents = list(/datum/reagent/uranium = 2, /datum/reagent/water = 1, /datum/reagent/carbon = 1)
 
 /datum/chemical_reaction/zombiepowder
 	name = "Zombie Powder"
-	id = "zombiepowder"
-	results = list("zombiepowder" = 2)
-	required_reagents = list("carpotoxin" = 5, "morphine" = 5, "copper" = 5)
-	
+	id = /datum/reagent/toxin/zombiepowder
+	results = list(/datum/reagent/toxin/zombiepowder = 2)
+	required_reagents = list(/datum/reagent/toxin/carpotoxin = 5, /datum/reagent/medicine/morphine = 5, /datum/reagent/copper = 5)
+
 /datum/chemical_reaction/ghoulpowder
 	name = "Ghoul Powder"
-	id = "ghoulpowder"
-	results = list("ghoulpowder" = 2)
-	required_reagents = list("zombiepowder" = 1, "epinephrine" = 1)
+	id = /datum/reagent/toxin/ghoulpowder
+	results = list(/datum/reagent/toxin/ghoulpowder = 2)
+	required_reagents = list(/datum/reagent/toxin/zombiepowder = 1, /datum/reagent/medicine/epinephrine = 1)
 
 /datum/chemical_reaction/mindbreaker
 	name = "Mindbreaker Toxin"
-	id = "mindbreaker"
-	results = list("mindbreaker" = 5)
-	required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
+	id = /datum/reagent/toxin/mindbreaker
+	results = list(/datum/reagent/toxin/mindbreaker = 5)
+	required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/hydrogen = 1, /datum/reagent/medicine/charcoal = 1)
 
 /datum/chemical_reaction/heparin
 	name = "Heparin"
-	id = "Heparin"
-	results = list("heparin" = 4)
-	required_reagents = list("formaldehyde" = 1, "sodium" = 1, "chlorine" = 1, "lithium" = 1)
+	id = /datum/reagent/toxin/heparin
+	results = list(/datum/reagent/toxin/heparin = 4)
+	required_reagents = list(/datum/reagent/toxin/formaldehyde = 1, /datum/reagent/sodium = 1, /datum/reagent/chlorine = 1, /datum/reagent/lithium = 1)
 	mix_message = "<span class='danger'>The mixture thins and loses all color.</span>"
 
 /datum/chemical_reaction/rotatium
 	name = "Rotatium"
-	id = "Rotatium"
-	results = list("rotatium" = 3)
-	required_reagents = list("mindbreaker" = 1, "teslium" = 1, "fentanyl" = 1)
+	id = /datum/reagent/toxin/rotatium
+	results = list(/datum/reagent/toxin/rotatium = 3)
+	required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/teslium = 1, /datum/reagent/toxin/fentanyl = 1)
 	mix_message = "<span class='danger'>After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight.</span>"
 
 /datum/chemical_reaction/skewium
 	name = "Skewium"
-	id = "Skewium"
-	results = list("skewium" = 5)
-	required_reagents = list("rotatium" = 2, "plasma" = 2, "sacid" = 1)
+	id = /datum/reagent/toxin/skewium
+	results = list(/datum/reagent/toxin/skewium = 5)
+	required_reagents = list(/datum/reagent/toxin/rotatium = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/toxin/acid = 1)
 	mix_message = "<span class='danger'>Wow! it turns out if you mix rotatium with some plasma and sulphuric acid, it gets even worse!</span>"
 
 /datum/chemical_reaction/anacea
 	name = "Anacea"
-	id = "anacea"
-	results = list("anacea" = 3)
-	required_reagents = list("haloperidol" = 1, "impedrezene" = 1, "radium" = 1)
+	id = /datum/reagent/toxin/anacea
+	results = list(/datum/reagent/toxin/anacea = 3)
+	required_reagents = list(/datum/reagent/medicine/haloperidol = 1, /datum/reagent/impedrezene = 1, /datum/reagent/radium = 1)
 
 /datum/chemical_reaction/mimesbane
 	name = "Mime's Bane"
-	id = "mimesbane"
-	results = list("mimesbane" = 3)
-	required_reagents = list("radium" = 1, "mutetoxin" = 1, "nothing" = 1)
+	id = /datum/reagent/toxin/mimesbane
+	results = list(/datum/reagent/toxin/mimesbane = 3)
+	required_reagents = list(/datum/reagent/radium = 1, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1)
 
 /datum/chemical_reaction/bonehurtingjuice
 	name = "Bone Hurting Juice"
-	id = "bonehurtingjuice"
-	results = list("bonehurtingjuice" = 5)
-	required_reagents = list("mutagen" = 1, "itching_powder" = 3, "milk" = 1)
+	id = /datum/reagent/toxin/bonehurtingjuice
+	results = list(/datum/reagent/toxin/bonehurtingjuice = 5)
+	required_reagents = list(/datum/reagent/toxin/mutagen = 1, /datum/reagent/toxin/itching_powder = 3, /datum/reagent/consumable/milk = 1)
 	mix_message = "<span class='danger'>The mixture suddenly becomes clear and looks a lot like water. You feel a strong urge to drink it.</span>"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 618b74fffb..d869e086a5 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -9,6 +9,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	var/amount_per_transfer_from_this = 5
 	var/list/possible_transfer_amounts = list(5,10,15,20,25,30)
+	var/APTFT_altclick = TRUE //will the set amount_per_transfer_from_this proc be called on AltClick() ?
 	var/volume = 30
 	var/reagent_flags
 	var/list/list_reagents = null
@@ -23,14 +24,36 @@
 	. = ..()
 	if(isnum(vol) && vol > 0)
 		volume = vol
+	if(length(possible_transfer_amounts))
+		verbs += /obj/item/reagent_containers/proc/set_APTFT
 	create_reagents(volume, reagent_flags)
 	if(spawned_disease)
 		var/datum/disease/F = new spawned_disease()
 		var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY","viruses"= list(F))
-		reagents.add_reagent("blood", disease_amount, data)
-
+		reagents.add_reagent(/datum/reagent/blood, disease_amount, data)
 	add_initial_reagents()
 
+/obj/item/reagent_containers/examine(mob/user)
+	. = ..()
+	. += "Currently transferring [amount_per_transfer_from_this] units per use."
+	if(possible_transfer_amounts && user.Adjacent(src))
+		. += "<span class='notice'>Alt-click it to set its transfer amount.</span>"
+
+/obj/item/reagent_containers/AltClick(mob/user)
+	. = ..()
+	if(APTFT_altclick && length(possible_transfer_amounts) > 1 && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
+		set_APTFT()
+		return TRUE
+
+/obj/item/reagent_containers/proc/set_APTFT(mob/user) //set amount_per_transfer_from_this
+	set name = "Set Transfer Amount"
+	set category = "Object"
+	set waitfor = FALSE
+	var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
+	if(N)
+		amount_per_transfer_from_this = N
+		to_chat(user, "<span class='notice'>[src]'s transfer amount is now [amount_per_transfer_from_this] units.</span>")
+
 /obj/item/reagent_containers/proc/add_initial_reagents()
 	if(list_reagents)
 		reagents.add_reagent_list(list_reagents)
@@ -104,7 +127,7 @@
 		target.visible_message("<span class='danger'>[M] has been splashed with something!</span>", \
 						"<span class='userdanger'>[M] has been splashed with something!</span>")
 		for(var/datum/reagent/A in reagents.reagent_list)
-			R += A.id + " ("
+			R += A.type + " ("
 			R += num2text(A.volume) + "),"
 
 		if(thrownby)
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 61449fc153..2f5fb067ea 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -13,12 +13,12 @@
 /obj/item/reagent_containers/blood/Initialize()
 	. = ..()
 	if(blood_type != null)
-		reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_colour"=color, "blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
+		reagents.add_reagent(/datum/reagent/blood, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_colour"=color, "blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
 		update_icon()
 
 /obj/item/reagent_containers/blood/on_reagent_change(changetype)
 	if(reagents)
-		var/datum/reagent/blood/B = reagents.has_reagent("blood")
+		var/datum/reagent/blood/B = reagents.has_reagent(/datum/reagent/blood)
 		if(B && B.data && B.data["blood_type"])
 			blood_type = B.data["blood_type"]
 			color_to_apply = bloodtype_to_color(blood_type)
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 94ad5fdb2c..980e823a82 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -26,7 +26,8 @@ Borg Hypospray
 	var/bypass_protection = 0 //If the hypospray can go through armor or thick material
 
 	var/list/datum/reagents/reagent_list = list()
-	var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "antitoxin", "epinephrine", "spaceacillin", "salglu_solution", "insulin")
+	var/list/reagent_ids = list(/datum/reagent/medicine/dexalin, /datum/reagent/medicine/kelotane, /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/antitoxin,
+								/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/insulin)
 	var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed.
 	var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values.
 								//Used as list for input() in shakers.
@@ -138,19 +139,19 @@ Borg Hypospray
 
 /obj/item/reagent_containers/borghypo/hacked
 	icon_state = "borghypo_s"
-	reagent_ids = list ("facid", "mutetoxin", "cyanide", "sodium_thiopental", "heparin", "lexorin")
+	reagent_ids = list (/datum/reagent/toxin/acid, /datum/reagent/toxin/mutetoxin, /datum/reagent/toxin/cyanide, /datum/reagent/toxin/sodium_thiopental, /datum/reagent/toxin/heparin, /datum/reagent/toxin/lexorin)
 	accepts_reagent_upgrades = FALSE
 
 /obj/item/reagent_containers/borghypo/clown
 	name = "laughter injector"
 	desc = "Keeps the crew happy and productive!"
-	reagent_ids = list("laughter")
+	reagent_ids = list(/datum/reagent/consumable/laughter)
 	accepts_reagent_upgrades = FALSE
 
 /obj/item/reagent_containers/borghypo/clown/hacked
 	name = "laughter injector"
 	desc = "Keeps the crew so happy they don't work!"
-	reagent_ids = list("superlaughter")
+	reagent_ids = list(/datum/reagent/consumable/superlaughter)
 	accepts_reagent_upgrades = FALSE
 
 /obj/item/reagent_containers/borghypo/syndicate
@@ -159,7 +160,7 @@ Borg Hypospray
 	icon_state = "borghypo_s"
 	charge_cost = 20
 	recharge_time = 2
-	reagent_ids = list("syndicate_nanites", "potass_iodide", "morphine", "insulin")
+	reagent_ids = list(/datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/potass_iodide, /datum/reagent/medicine/morphine, /datum/reagent/medicine/insulin)
 	bypass_protection = 1
 	accepts_reagent_upgrades = FALSE
 
@@ -175,7 +176,14 @@ Borg Shaker
 	charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
 	recharge_time = 3
 	accepts_reagent_upgrades = FALSE
-	reagent_ids = list("beer", "orangejuice", "grenadine", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "milk", "coffee", "banana", "lemonjuice")
+	reagent_ids = list(/datum/reagent/consumable/ethanol/beer, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/grenadine,
+						/datum/reagent/consumable/limejuice, /datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/space_cola,
+						/datum/reagent/consumable/tonic, /datum/reagent/consumable/sodawater, /datum/reagent/consumable/ice,
+						/datum/reagent/consumable/cream, /datum/reagent/consumable/ethanol/whiskey, /datum/reagent/consumable/ethanol/vodka,
+						/datum/reagent/consumable/ethanol/rum, /datum/reagent/consumable/ethanol/gin, /datum/reagent/consumable/ethanol/tequila,
+						/datum/reagent/consumable/ethanol/vermouth, /datum/reagent/consumable/ethanol/wine, /datum/reagent/consumable/ethanol/kahlua,
+						/datum/reagent/consumable/ethanol/cognac, /datum/reagent/consumable/ethanol/ale, /datum/reagent/consumable/milk,
+						/datum/reagent/consumable/coffee, /datum/reagent/consumable/banana, /datum/reagent/consumable/lemonjuice)
 
 /obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
 	return //Can't inject stuff with a shaker, can we? //not with that attitude
@@ -230,21 +238,24 @@ Borg Shaker
 	charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
 	recharge_time = 3
 	accepts_reagent_upgrades = FALSE
-	reagent_ids = list("fakebeer", "fernet")
+	reagent_ids = list(/datum/reagent/toxin/fakebeer, /datum/reagent/consumable/ethanol/fernet)
 
 /obj/item/reagent_containers/borghypo/peace
 	name = "Peace Hypospray"
-	reagent_ids = list("dizzysolution", "tiresolution", "synthpax", "insulin")
+
+	reagent_ids = list(/datum/reagent/peaceborg_confuse, /datum/reagent/peaceborg_tire, /datum/reagent/pax/peaceborg, /datum/reagent/medicine/insulin)
 	accepts_reagent_upgrades = FALSE
 
 /obj/item/reagent_containers/borghypo/peace/hacked
 	desc = "Everything's peaceful in death!"
 	icon_state = "borghypo_s"
-	reagent_ids = list("dizzysolution", "tiresolution", "synthpax", "tirizene", "sulfonal", "sodium_thiopental", "cyanide", "fentanyl")
+	reagent_ids = list(/datum/reagent/peaceborg_confuse, /datum/reagent/peaceborg_tire, /datum/reagent/pax/peaceborg,
+					/datum/reagent/toxin/staminatoxin,/datum/reagent/toxin/sulfonal,/datum/reagent/toxin/sodium_thiopental,
+					/datum/reagent/toxin/cyanide,/datum/reagent/toxin/fentanyl)
 	accepts_reagent_upgrades = FALSE
 
 /obj/item/reagent_containers/borghypo/epi
 	name = "Stabilizer injector"
 	desc = "An advanced chemical synthesizer and injection system, designed to stabilize patients."
-	reagent_ids = list("epinephrine", "insulin")
+	reagent_ids = list(/datum/reagent/medicine/epinephrine, /datum/reagent/medicine/insulin)
 	accepts_reagent_upgrades = FALSE
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 0ee131bc14..c05f4f3e78 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -43,96 +43,96 @@
 /obj/item/reagent_containers/glass/bottle/epinephrine
 	name = "epinephrine bottle"
 	desc = "A small bottle. Contains epinephrine - used to stabilize patients."
-	list_reagents = list("epinephrine" = 30)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
 
 /obj/item/reagent_containers/glass/bottle/toxin
 	name = "toxin bottle"
 	desc = "A small bottle of toxins. Do not drink, it is poisonous."
-	list_reagents = list("toxin" = 30)
+	list_reagents = list(/datum/reagent/toxin = 30)
 
 /obj/item/reagent_containers/glass/bottle/cyanide
 	name = "cyanide bottle"
 	desc = "A small bottle of cyanide. Bitter almonds?"
-	list_reagents = list("cyanide" = 30)
+	list_reagents = list(/datum/reagent/toxin/cyanide = 30)
 
 /obj/item/reagent_containers/glass/bottle/spewium
 	name = "spewium bottle"
 	desc = "A small bottle of spewium."
-	list_reagents = list("spewium" = 30)
+	list_reagents = list(/datum/reagent/toxin/spewium = 30)
 
 /obj/item/reagent_containers/glass/bottle/morphine
 	name = "morphine bottle"
 	desc = "A small bottle of morphine."
 	icon = 'icons/obj/chemical.dmi'
-	list_reagents = list("morphine" = 30)
+	list_reagents = list(/datum/reagent/medicine/morphine = 30)
 
 /obj/item/reagent_containers/glass/bottle/chloralhydrate
 	name = "Chloral Hydrate Bottle"
 	desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
 	icon_state = "bottle20"
-	list_reagents = list("chloralhydrate" = 15)
+	list_reagents = list(/datum/reagent/toxin/chloralhydrate = 15)
 
 /obj/item/reagent_containers/glass/bottle/charcoal
 	name = "charcoal bottle"
 	desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
-	list_reagents = list("charcoal" = 30)
+	list_reagents = list(/datum/reagent/medicine/charcoal = 30)
 
 /obj/item/reagent_containers/glass/bottle/cryoxadone
 	name = "cryoxadone bottle"
 	desc = "A small bottle of cryoxadone, heals most types of damage when used in extremely cold enviornments."
-	list_reagents = list("cryoxadone" = 30)
+	list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
 
 /obj/item/reagent_containers/glass/bottle/mutagen
 	name = "unstable mutagen bottle"
 	desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
-	list_reagents = list("mutagen" = 30)
+	list_reagents = list(/datum/reagent/toxin/mutagen = 30)
 
 /obj/item/reagent_containers/glass/bottle/plasma
 	name = "liquid plasma bottle"
 	desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood."
-	list_reagents = list("plasma" = 30)
+	list_reagents = list(/datum/reagent/toxin/plasma = 30)
 
 /obj/item/reagent_containers/glass/bottle/synaptizine
 	name = "synaptizine bottle"
 	desc = "A small bottle of synaptizine."
-	list_reagents = list("synaptizine" = 30)
+	list_reagents = list(/datum/reagent/medicine/synaptizine = 30)
 
 /obj/item/reagent_containers/glass/bottle/formaldehyde
 	name = "formaldehyde bottle"
 	desc = "A small bottle of formaldehyde."
-	list_reagents = list("formaldehyde" = 30)
+	list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
 
 /obj/item/reagent_containers/glass/bottle/ammonia
 	name = "ammonia bottle"
 	desc = "A small bottle of ammonia."
-	list_reagents = list("ammonia" = 30)
+	list_reagents = list(/datum/reagent/ammonia = 30)
 
 /obj/item/reagent_containers/glass/bottle/diethylamine
 	name = "diethylamine bottle"
 	desc = "A small bottle of diethylamine."
-	list_reagents = list("diethylamine" = 30)
+	list_reagents = list(/datum/reagent/diethylamine = 30)
 
 /obj/item/reagent_containers/glass/bottle/facid
 	name = "Fluorosulfuric Acid Bottle"
 	desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
-	list_reagents = list("facid" = 30)
+	list_reagents = list(/datum/reagent/toxin/acid/fluacid = 30)
 
 /obj/item/reagent_containers/glass/bottle/adminordrazine
 	name = "Adminordrazine Bottle"
 	desc = "A small bottle. Contains the liquid essence of the gods."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "holyflask"
-	list_reagents = list("adminordrazine" = 30)
+	list_reagents = list(/datum/reagent/medicine/adminordrazine = 30)
 
 /obj/item/reagent_containers/glass/bottle/capsaicin
 	name = "Capsaicin Bottle"
 	desc = "A small bottle. Contains hot sauce."
-	list_reagents = list("capsaicin" = 30)
+	list_reagents = list(/datum/reagent/consumable/capsaicin = 30)
 
 /obj/item/reagent_containers/glass/bottle/frostoil
 	name = "Frost Oil Bottle"
 	desc = "A small bottle. Contains cold sauce."
-	list_reagents = list("frostoil" = 30)
+	list_reagents = list(/datum/reagent/consumable/frostoil = 30)
 
 /obj/item/reagent_containers/glass/bottle/traitor
 	name = "syndicate bottle"
@@ -142,94 +142,95 @@
 
 /obj/item/reagent_containers/glass/bottle/traitor/Initialize()
 	. = ..()
-	extra_reagent = pick("polonium", "histamine", "formaldehyde", "venom", "fentanyl", "cyanide")
-	reagents.add_reagent("[extra_reagent]", 3)
+	extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde,
+					/datum/reagent/toxin/venom, /datum/reagent/toxin/fentanyl, /datum/reagent/toxin/cyanide)
+	reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/reagent_containers/glass/bottle/polonium
 	name = "polonium bottle"
 	desc = "A small bottle. Contains Polonium."
-	list_reagents = list("polonium" = 30)
+	list_reagents = list(/datum/reagent/toxin/polonium = 30)
 
 /obj/item/reagent_containers/glass/bottle/magillitis
 	name = "magillitis bottle"
 	desc = "A small bottle. Contains a serum known only as 'magillitis'."
-	list_reagents = list("magillitis" = 5)
+	list_reagents = list(/datum/reagent/magillitis = 5)
 
 /obj/item/reagent_containers/glass/bottle/venom
 	name = "venom bottle"
 	desc = "A small bottle. Contains Venom."
-	list_reagents = list("venom" = 30)
+	list_reagents = list(/datum/reagent/toxin/venom = 30)
 
 /obj/item/reagent_containers/glass/bottle/fentanyl
 	name = "fentanyl bottle"
 	desc = "A small bottle. Contains Fentanyl."
-	list_reagents = list("fentanyl" = 30)
+	list_reagents = list(/datum/reagent/toxin/fentanyl = 30)
 
 /obj/item/reagent_containers/glass/bottle/formaldehyde
 	name = "formaldehyde bottle"
 	desc = "A small bottle. Contains Formaldehyde."
-	list_reagents = list("formaldehyde" = 30)
+	list_reagents = list(/datum/reagent/toxin/formaldehyde = 30)
 
 /obj/item/reagent_containers/glass/bottle/initropidril
 	name = "initropidril bottle"
 	desc = "A small bottle. Contains initropidril."
-	list_reagents = list("initropidril" = 30)
+	list_reagents = list(/datum/reagent/toxin/initropidril = 30)
 
 /obj/item/reagent_containers/glass/bottle/pancuronium
 	name = "pancuronium bottle"
 	desc = "A small bottle. Contains pancuronium."
-	list_reagents = list("pancuronium" = 30)
+	list_reagents = list(/datum/reagent/toxin/pancuronium = 30)
 
 /obj/item/reagent_containers/glass/bottle/sodium_thiopental
 	name = "sodium thiopental bottle"
 	desc = "A small bottle. Contains sodium thiopental."
-	list_reagents = list("sodium_thiopental" = 30)
+	list_reagents = list(/datum/reagent/toxin/sodium_thiopental = 30)
 
 /obj/item/reagent_containers/glass/bottle/coniine
 	name = "coniine bottle"
 	desc = "A small bottle. Contains coniine."
-	list_reagents = list("coniine" = 30)
+	list_reagents = list(/datum/reagent/toxin/coniine = 30)
 
 /obj/item/reagent_containers/glass/bottle/curare
 	name = "curare bottle"
 	desc = "A small bottle. Contains curare."
-	list_reagents = list("curare" = 30)
+	list_reagents = list(/datum/reagent/toxin/curare = 30)
 
 /obj/item/reagent_containers/glass/bottle/amanitin
 	name = "amanitin bottle"
 	desc = "A small bottle. Contains amanitin."
-	list_reagents = list("amanitin" = 30)
+	list_reagents = list(/datum/reagent/toxin/amanitin = 30)
 
 /obj/item/reagent_containers/glass/bottle/histamine
 	name = "histamine bottle"
 	desc = "A small bottle. Contains Histamine."
-	list_reagents = list("histamine" = 30)
+	list_reagents = list(/datum/reagent/toxin/histamine = 30)
 
 /obj/item/reagent_containers/glass/bottle/diphenhydramine
 	name = "antihistamine bottle"
 	desc = "A small bottle of diphenhydramine."
-	list_reagents = list("diphenhydramine" = 30)
+	list_reagents = list(/datum/reagent/medicine/diphenhydramine = 30)
 
 /obj/item/reagent_containers/glass/bottle/potass_iodide
 	name = "anti-radiation bottle"
 	desc = "A small bottle of potassium iodide."
-	list_reagents = list("potass_iodide" = 30)
+	list_reagents = list(/datum/reagent/medicine/potass_iodide = 30)
 
 /obj/item/reagent_containers/glass/bottle/salglu_solution
 	name = "saline-glucose solution bottle"
 	desc = "A small bottle of saline-glucose solution."
 	icon_state = "bottle1"
-	list_reagents = list("salglu_solution" = 30)
+	list_reagents = list(/datum/reagent/medicine/salglu_solution = 30)
 
 /obj/item/reagent_containers/glass/bottle/atropine
 	name = "atropine bottle"
 	desc = "A small bottle of atropine."
-	list_reagents = list("atropine" = 30)
+	list_reagents = list(/datum/reagent/medicine/atropine = 30)
 
 /obj/item/reagent_containers/glass/bottle/romerol
 	name = "romerol bottle"
 	desc = "A small bottle of Romerol. The REAL zombie powder."
-	list_reagents = list("romerol" = 30)
+	list_reagents = list(/datum/reagent/romerol = 30)
 
 /obj/item/reagent_containers/glass/bottle/random_virus
 	name = "Experimental disease culture bottle"
@@ -306,128 +307,128 @@
 /obj/item/reagent_containers/glass/bottle/tuberculosiscure
 	name = "BVAK bottle"
 	desc = "A small bottle containing Bio Virus Antidote Kit."
-	list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
+	list_reagents = list(/datum/reagent/medicine/atropine = 5, /datum/reagent/medicine/epinephrine = 5, /datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/spaceacillin = 10)
 
 //Oldstation.dmm chemical storage bottles
 
 /obj/item/reagent_containers/glass/bottle/hydrogen
 	name = "hydrogen bottle"
-	list_reagents = list("hydrogen" = 30)
+	list_reagents = list(/datum/reagent/hydrogen = 30)
 
 /obj/item/reagent_containers/glass/bottle/lithium
 	name = "lithium bottle"
-	list_reagents = list("lithium" = 30)
+	list_reagents = list(/datum/reagent/lithium = 30)
 
 /obj/item/reagent_containers/glass/bottle/carbon
 	name = "carbon bottle"
-	list_reagents = list("carbon" = 30)
+	list_reagents = list(/datum/reagent/carbon = 30)
 
 /obj/item/reagent_containers/glass/bottle/nitrogen
 	name = "nitrogen bottle"
-	list_reagents = list("nitrogen" = 30)
+	list_reagents = list(/datum/reagent/nitrogen = 30)
 
 /obj/item/reagent_containers/glass/bottle/oxygen
 	name = "oxygen bottle"
-	list_reagents = list("oxygen" = 30)
+	list_reagents = list(/datum/reagent/oxygen = 30)
 
 /obj/item/reagent_containers/glass/bottle/fluorine
 	name = "fluorine bottle"
-	list_reagents = list("fluorine" = 30)
+	list_reagents = list(/datum/reagent/fluorine = 30)
 
 /obj/item/reagent_containers/glass/bottle/sodium
 	name = "sodium bottle"
-	list_reagents = list("sodium" = 30)
+	list_reagents = list(/datum/reagent/sodium = 30)
 
 /obj/item/reagent_containers/glass/bottle/aluminium
 	name = "aluminium bottle"
-	list_reagents = list("aluminium" = 30)
+	list_reagents = list(/datum/reagent/aluminium = 30)
 
 /obj/item/reagent_containers/glass/bottle/silicon
 	name = "silicon bottle"
-	list_reagents = list("silicon" = 30)
+	list_reagents = list(/datum/reagent/silicon = 30)
 
 /obj/item/reagent_containers/glass/bottle/phosphorus
 	name = "phosphorus bottle"
-	list_reagents = list("phosphorus" = 30)
+	list_reagents = list(/datum/reagent/phosphorus = 30)
 
 /obj/item/reagent_containers/glass/bottle/sulfur
 	name = "sulfur bottle"
-	list_reagents = list("sulfur" = 30)
+	list_reagents = list(/datum/reagent/sulfur = 30)
 
 /obj/item/reagent_containers/glass/bottle/chlorine
 	name = "chlorine bottle"
-	list_reagents = list("chlorine" = 30)
+	list_reagents = list(/datum/reagent/chlorine = 30)
 
 /obj/item/reagent_containers/glass/bottle/potassium
 	name = "potassium bottle"
-	list_reagents = list("potassium" = 30)
+	list_reagents = list(/datum/reagent/potassium = 30)
 
 /obj/item/reagent_containers/glass/bottle/iron
 	name = "iron bottle"
-	list_reagents = list("iron" = 30)
+	list_reagents = list(/datum/reagent/iron = 30)
 
 /obj/item/reagent_containers/glass/bottle/copper
 	name = "copper bottle"
-	list_reagents = list("copper" = 30)
+	list_reagents = list(/datum/reagent/copper = 30)
 
 /obj/item/reagent_containers/glass/bottle/mercury
 	name = "mercury bottle"
-	list_reagents = list("mercury" = 30)
+	list_reagents = list(/datum/reagent/mercury = 30)
 
 /obj/item/reagent_containers/glass/bottle/radium
 	name = "radium bottle"
-	list_reagents = list("radium" = 30)
+	list_reagents = list(/datum/reagent/radium = 30)
 
 /obj/item/reagent_containers/glass/bottle/water
 	name = "water bottle"
-	list_reagents = list("water" = 30)
+	list_reagents = list(/datum/reagent/water = 30)
 
 /obj/item/reagent_containers/glass/bottle/ethanol
 	name = "ethanol bottle"
-	list_reagents = list("ethanol" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol = 30)
 
 /obj/item/reagent_containers/glass/bottle/sugar
 	name = "sugar bottle"
-	list_reagents = list("sugar" = 30)
+	list_reagents = list(/datum/reagent/consumable/sugar = 30)
 
 /obj/item/reagent_containers/glass/bottle/sacid
 	name = "sulphuric acid bottle"
-	list_reagents = list("sacid" = 30)
+	list_reagents = list(/datum/reagent/toxin/acid = 30)
 
 /obj/item/reagent_containers/glass/bottle/welding_fuel
 	name = "welding fuel bottle"
-	list_reagents = list("welding_fuel" = 30)
+	list_reagents = list(/datum/reagent/fuel = 30)
 
 /obj/item/reagent_containers/glass/bottle/silver
 	name = "silver bottle"
-	list_reagents = list("silver" = 30)
+	list_reagents = list(/datum/reagent/silver = 30)
 
 /obj/item/reagent_containers/glass/bottle/iodine
 	name = "iodine bottle"
-	list_reagents = list("iodine" = 30)
+	list_reagents = list(/datum/reagent/iodine = 30)
 
 /obj/item/reagent_containers/glass/bottle/bromine
 	name = "bromine bottle"
-	list_reagents = list("bromine" = 30)
+	list_reagents = list(/datum/reagent/bromine = 30)
 
 //Lewd Stuff
 
 /obj/item/reagent_containers/glass/bottle/crocin
 	name = "Crocin bottle"
 	desc = "A bottle of mild aphrodisiac. Increases libido."
-	list_reagents = list("aphro" = 30)
+	list_reagents = list(/datum/reagent/drug/aphrodisiac = 30)
 
 /obj/item/reagent_containers/glass/bottle/hexacrocin
 	name = "Hexacrocin bottle"
 	desc = "A bottle of strong aphrodisiac. Increases libido."
-	list_reagents = list("aphro+" = 30)
+	list_reagents = list(/datum/reagent/drug/aphrodisiacplus = 30)
 
 /obj/item/reagent_containers/glass/bottle/camphor
 	name = "Camphor bottle"
 	desc = "A bottle of mild anaphrodisiac. Reduces libido."
-	list_reagents = list("anaphro" = 30)
+	list_reagents = list(/datum/reagent/drug/anaphrodisiac = 30)
 
 /obj/item/reagent_containers/glass/bottle/hexacamphor
 	name = "Hexacamphor bottle"
 	desc = "A bottle of strong anaphrodisiac. Reduces libido."
-	list_reagents = list("anaphro+" = 30)
\ No newline at end of file
+	list_reagents = list(/datum/reagent/drug/anaphrodisiacplus = 30)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index efe9c378d9..a215d09517 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -67,7 +67,7 @@
 			var/R
 			if(reagents)
 				for(var/datum/reagent/A in src.reagents.reagent_list)
-					R += A.id + " ("
+					R += A.type + " ("
 					R += num2text(A.volume) + "),"
 			log_combat(user, M, "squirted", R)
 
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 3ed505c360..98f5111501 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -27,7 +27,7 @@
 							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
 			if(reagents)
 				for(var/datum/reagent/A in reagents.reagent_list)
-					R += A.id + " ("
+					R += A.type + " ("
 					R += num2text(A.volume) + "),"
 			if(isturf(target) && reagents.reagent_list.len && thrownby)
 				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
@@ -109,11 +109,13 @@
 
 /obj/item/reagent_containers/glass/beaker
 	name = "beaker"
-	desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
+	desc = "A beaker. It can hold up to 60 units. Unable to withstand extreme pHes."
 	icon = 'icons/obj/chemical.dmi'
+	volume = 60
 	icon_state = "beaker"
 	item_state = "beaker"
 	materials = list(MAT_GLASS=500)
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,60)
 	beaker_weakness_bitflag = PH_WEAK
 
 /obj/item/reagent_containers/glass/beaker/Initialize()
@@ -156,28 +158,28 @@
 
 /obj/item/reagent_containers/glass/beaker/jar
 	name = "honey jar"
-	desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
+	desc = "A jar for honey. It can hold up to 60 units of sweet delight. Unable to withstand reagents of an extreme pH."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "vapour"
 
 /obj/item/reagent_containers/glass/beaker/large
 	name = "large beaker"
-	desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
+	desc = "A large beaker. Can hold up to 120 units. Unable to withstand reagents of an extreme pH."
 	icon_state = "beakerlarge"
 	materials = list(MAT_GLASS=2500)
-	volume = 100
+	volume = 120
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+	possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120)
 	container_HP = 3
 
 /obj/item/reagent_containers/glass/beaker/plastic
 	name = "x-large beaker"
-	desc = "An extra-large beaker. Can hold up to 150 units. Is able to resist acid and alkaline solutions, but melts at 444K"
+	desc = "An extra-large beaker. Can hold up to 180 units. Is able to resist acid and alkaline solutions, but melts at 444 K."
 	icon_state = "beakerwhite"
 	materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
-	volume = 150
+	volume = 180
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
+	possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120,180)
 
 /obj/item/reagent_containers/glass/beaker/plastic/Initialize()
 	beaker_weakness_bitflag &= ~PH_WEAK
@@ -191,14 +193,14 @@
 
 /obj/item/reagent_containers/glass/beaker/meta
 	name = "metamaterial beaker"
-	desc = "A large beaker. Can hold up to 200 units. Is able to withstand all chemical situations."
+	desc = "A large beaker. Can hold up to 240 units, and is able to withstand all chemical situations."
 	icon_state = "beakergold"
 	materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
-	volume = 200
+	volume = 240
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
+	possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120,200,240)
 
-/obj/item/reagent_containers/glass/beaker/meta/Initialize()
+/obj/item/reagent_containers/glass/beaker/meta/Initialize() // why the fuck can't you just set the beaker weakness bitflags to nothing? fuck you
 	beaker_weakness_bitflag &= ~PH_WEAK
 	. = ..()
 
@@ -228,35 +230,35 @@
 	volume = 300
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
-	container_HP = 4
+	container_HP = 5
 
 /obj/item/reagent_containers/glass/beaker/cryoxadone
-	list_reagents = list("cryoxadone" = 30)
+	list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
 
 /obj/item/reagent_containers/glass/beaker/sulphuric
-	list_reagents = list("sacid" = 50)
+	list_reagents = list(/datum/reagent/toxin/acid = 50)
 
 /obj/item/reagent_containers/glass/beaker/slime
-	list_reagents = list("slimejelly" = 50)
+	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/styptic
 	name = "styptic reserve tank"
-	list_reagents = list("styptic_powder" = 50)
+	list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
 	name = "silver sulfadiazine reserve tank"
-	list_reagents = list("silver_sulfadiazine" = 50)
+	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/charcoal
 	name = "charcoal reserve tank"
-	list_reagents = list("charcoal" = 50)
+	list_reagents = list(/datum/reagent/medicine/charcoal = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/epinephrine
 	name = "epinephrine reserve tank"
-	list_reagents = list("epinephrine" = 50)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
 
 /obj/item/reagent_containers/glass/beaker/synthflesh
-	list_reagents = list("synthflesh" = 50)
+	list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
 
 /obj/item/reagent_containers/glass/bucket
 	name = "bucket"
@@ -335,10 +337,11 @@
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "smallbottle"
 	item_state = "bottle"
-	list_reagents = list("water" = 49.5, "fluorine" = 0.5)//see desc, don't think about it too hard
+	list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
 	materials = list(MAT_GLASS=0)
 	volume = 50
 	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,20,25,30,50)
 	container_HP = 1
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
@@ -352,9 +355,10 @@
 	desc = "A fresh commercial-sized bottle of water."
 	icon_state = "largebottle"
 	materials = list(MAT_GLASS=0)
-	list_reagents = list("water" = 100)
+	list_reagents = list(/datum/reagent/water = 100)
 	volume = 100
 	amount_per_transfer_from_this = 20
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
 	container_HP = 1
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 9232bb69b3..664ba81f9e 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -51,7 +51,7 @@
 			log_combat(user, M, "injected", src, "([contained])")
 
 /obj/item/reagent_containers/hypospray/CMO
-	list_reagents = list("omnizine" = 30)
+	list_reagents = list(/datum/reagent/medicine/omnizine = 30)
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/item/reagent_containers/hypospray/combat
@@ -61,17 +61,17 @@
 	icon_state = "combat_hypo"
 	volume = 100
 	ignore_flags = 1 // So they can heal their comrades.
-	list_reagents = list("epinephrine" = 30, "lesser_syndicate_nanites" = 40, "leporazine" = 15, "atropine" = 15)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 30, /datum/reagent/medicine/lesser_syndicate_nanites = 40, /datum/reagent/medicine/leporazine = 15, /datum/reagent/medicine/atropine = 15)
 
 /obj/item/reagent_containers/hypospray/combat/omnizine // owned idiot
 	desc = "A modified air-needle autoinjector, used by underfunded support operatives to slowly heal injuries in combat and limp away from a fight."
 	volume = 90
-	list_reagents = list("epinephrine" = 30, "omnizine" = 30, "leporazine" = 15, "atropine" = 15)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 30, /datum/reagent/medicine/omnizine = 30, /datum/reagent/medicine/leporazine = 15, /datum/reagent/medicine/atropine = 15)
 
 /obj/item/reagent_containers/hypospray/combat/nanites
 	desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with experimental medical compounds for rapid healing."
 	volume = 100
-	list_reagents = list("quantum_heal" = 80, "synaptizine" = 20)
+	list_reagents = list(/datum/reagent/medicine/adminordrazine/quantum_heal = 80, /datum/reagent/medicine/synaptizine = 20)
 
 /obj/item/reagent_containers/hypospray/magillitis
 	name = "experimental autoinjector"
@@ -79,7 +79,7 @@
 	icon_state = "combat_hypo"
 	volume = 5
 	reagent_flags = NONE
-	list_reagents = list("magillitis" = 5)
+	list_reagents = list(/datum/reagent/magillitis = 5)
 
 //MediPens
 
@@ -95,7 +95,7 @@
 	ignore_flags = 1 //so you can medipen through hardsuits
 	reagent_flags = DRAWABLE
 	flags_1 = null
-	list_reagents = list("epinephrine" = 10)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 10)
 
 /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -137,7 +137,7 @@
 	desc = "A highly illegal medipen due to its load and small injections, allow for five uses before being drained"
 	volume = 50
 	amount_per_transfer_from_this = 10
-	list_reagents = list("stimulants" = 50)
+	list_reagents = list(/datum/reagent/medicine/stimulants = 50)
 
 /obj/item/reagent_containers/hypospray/medipen/stimulants/baseball
 	name = "the reason the syndicate major league team wins"
@@ -145,7 +145,7 @@
 	icon_state = "baseballstim"
 	volume = 50
 	amount_per_transfer_from_this = 50
-	list_reagents = list("stimulants" = 50)
+	list_reagents = list(/datum/reagent/medicine/stimulants = 50)
 
 /obj/item/reagent_containers/hypospray/medipen/stimpack //goliath kiting
 	name = "stimpack medipen"
@@ -153,16 +153,16 @@
 	icon_state = "stimpen"
 	volume = 20
 	amount_per_transfer_from_this = 20
-	list_reagents = list("ephedrine" = 10, "coffee" = 10)
+	list_reagents = list(/datum/reagent/medicine/ephedrine = 10, /datum/reagent/consumable/coffee = 10)
 
 /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor
 	desc = "A modified stimulants autoinjector for use in combat situations. Has a mild healing effect."
-	list_reagents = list("stimulants" = 10, "omnizine" = 10)
+	list_reagents = list(/datum/reagent/medicine/stimulants = 10, /datum/reagent/medicine/omnizine = 10)
 
 /obj/item/reagent_containers/hypospray/medipen/morphine
 	name = "morphine medipen"
 	desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though."
-	list_reagents = list("morphine" = 10)
+	list_reagents = list(/datum/reagent/medicine/morphine = 10)
 
 /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure
 	name = "BVAK autoinjector"
@@ -170,7 +170,7 @@
 	icon_state = "stimpen"
 	volume = 60
 	amount_per_transfer_from_this = 30
-	list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20)
+	list_reagents = list(/datum/reagent/medicine/atropine = 10, /datum/reagent/medicine/epinephrine = 10, /datum/reagent/medicine/salbutamol = 20, /datum/reagent/medicine/spaceacillin = 20)
 
 /obj/item/reagent_containers/hypospray/medipen/survival
 	name = "survival medipen"
@@ -178,28 +178,20 @@
 	icon_state = "stimpen"
 	volume = 52
 	amount_per_transfer_from_this = 52
-	list_reagents = list("salbutamol" = 10, "leporazine" = 15, "neo_jelly" = 15, "epinephrine" = 10, "lavaland_extract" = 2)
-
-/obj/item/reagent_containers/hypospray/medipen/species_mutator
-	name = "species mutator medipen"
-	desc = "Embark on a whirlwind tour of racial insensitivity by \
-		literally appropriating other races."
-	volume = 1
-	amount_per_transfer_from_this = 1
-	list_reagents = list("unstablemutationtoxin" = 1)
+	list_reagents = list(/datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/leporazine = 15, /datum/reagent/medicine/neo_jelly = 15, /datum/reagent/medicine/epinephrine = 10, /datum/reagent/medicine/lavaland_extract = 2)
 
 /obj/item/reagent_containers/hypospray/medipen/firelocker
 	name = "fire treatment medipen"
 	desc = "A medipen that has been fulled with burn healing chemicals for personnel without advanced medical knowledge."
 	volume = 15
 	amount_per_transfer_from_this = 15
-	list_reagents = list("oxandrolone" = 5, "kelotane" = 10)
+	list_reagents = list(/datum/reagent/medicine/oxandrolone = 5, /datum/reagent/medicine/kelotane = 10)
 
 /obj/item/reagent_containers/hypospray/combat/heresypurge
 	name = "holy water autoinjector"
 	desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with 5 doses of a holy water mixture."
 	volume = 250
-	list_reagents = list("holywater" = 150, "tiresolution" = 50, "dizzysolution" = 50)
+	list_reagents = list(/datum/reagent/water/holywater = 150, /datum/reagent/peaceborg_tire = 50, /datum/reagent/peaceborg_confuse = 50)
 	amount_per_transfer_from_this = 50
 
 #define HYPO_SPRAY 0
@@ -240,19 +232,19 @@
 	var/penetrates = FALSE
 
 /obj/item/hypospray/mkii/brute
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine
 
 /obj/item/hypospray/mkii/toxin
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/antitoxin
 
 /obj/item/hypospray/mkii/oxygen
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/dexalin
 
 /obj/item/hypospray/mkii/burn
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/kelotane
 
 /obj/item/hypospray/mkii/tricord
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/tricord
 
 /obj/item/hypospray/mkii/enlarge
 	spawnwithvial = FALSE
@@ -263,7 +255,7 @@
 	icon_state = "cmo2"
 	desc = "The Deluxe Hypospray can take larger-size vials. It also acts faster and delivers more reagents per spray."
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/large/CMO
 	inject_wait = DELUXE_WAIT_INJECT
 	spray_wait = DELUXE_WAIT_SPRAY
 	spray_self = DELUXE_SELF_SPRAY
@@ -273,7 +265,7 @@
 	name = "combat hypospray mk.II"
 	desc = "A combat-ready deluxe hypospray that acts almost instantly. It can be tactically reloaded by using a vial on it."
 	icon_state = "combat2"
-	start_vial = /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat
+	start_vial = /obj/item/reagent_containers/glass/bottle/vial/large/combat
 	inject_wait = COMBAT_WAIT_INJECT
 	spray_wait = COMBAT_WAIT_SPRAY
 	spray_self = COMBAT_SELF_SPRAY
diff --git a/code/modules/reagents/reagent_containers/hypovial.dm b/code/modules/reagents/reagent_containers/hypovial.dm
index ba5ce48a4a..c0db92e0e8 100644
--- a/code/modules/reagents/reagent_containers/hypovial.dm
+++ b/code/modules/reagents/reagent_containers/hypovial.dm
@@ -1,13 +1,13 @@
 //hypovials used with the MkII hypospray. See hypospray.dm.
 
-/obj/item/reagent_containers/glass/bottle/vial
+/obj/item/reagent_containers/glass/bottle/vial // these have literally no fucking right to just be better beakers that you can shit out of a chemmaster
 	name = "broken hypovial"
 	desc = "A hypovial compatible with most hyposprays."
 	icon_state = "hypovial"
 	spillable = FALSE
-	var/comes_with = list() //Easy way of doing this.
 	volume = 10
 	possible_transfer_amounts = list(1,2,5,10)
+	APTFT_altclick = FALSE
 	obj_flags = UNIQUE_RENAME
 	unique_reskin = list("hypovial" = "hypovial",
 						"red hypovial" = "hypovial-b",
@@ -24,9 +24,9 @@
 	. = ..()
 	if(!icon_state)
 		icon_state = "hypovial"
-	for(var/R in comes_with)
-		reagents.add_reagent(R,comes_with[R])
 	update_icon()
+//	beaker_weakness_bitflag |= PH_WEAK // fuck you if you're using these like beakers
+//	beaker_weakness_bitflag |= TEMP_WEAK
 
 
 /obj/item/reagent_containers/glass/bottle/vial/on_reagent_change()
@@ -60,11 +60,11 @@
 /obj/item/reagent_containers/glass/bottle/vial/small
 	name = "hypovial"
 	volume = 60
-	possible_transfer_amounts = list(5,10)
+	possible_transfer_amounts = list(1,2,5,10,20)
 
 /obj/item/reagent_containers/glass/bottle/vial/small/bluespace
 	volume = 120
-	possible_transfer_amounts = list(5,10)
+	possible_transfer_amounts = list(1,2,5,10,20)
 	name = "bluespace hypovial"
 	icon_state = "hypovialbs"
 	unique_reskin = null
@@ -74,7 +74,7 @@
 	desc = "A large hypovial, for deluxe hypospray models."
 	icon_state = "hypoviallarge"
 	volume = 120
-	possible_transfer_amounts = list(5,10,15,20)
+	possible_transfer_amounts = list(1,2,5,10,20)
 	unique_reskin = list("large hypovial" = "hypoviallarge",
 						"large red hypovial" = "hypoviallarge-b",
 						"large blue hypovial" = "hypoviallarge-d",
@@ -106,94 +106,94 @@
 		add_overlay(filling)
 
 /obj/item/reagent_containers/glass/bottle/vial/large/bluespace
-	possible_transfer_amounts = list(5,10,15,20)
+	possible_transfer_amounts = list(1,2,5,10,20)
 	name = "bluespace large hypovial"
 	volume = 240
 	icon_state = "hypoviallargebs"
 	unique_reskin = null
 
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine
+/obj/item/reagent_containers/glass/bottle/vial/small/bicaridine
 	name = "red hypovial (bicaridine)"
 	icon_state = "hypovial-b"
-	comes_with = list("bicaridine" = 30)
+	list_reagents = list(/datum/reagent/medicine/bicaridine = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin
+/obj/item/reagent_containers/glass/bottle/vial/small/antitoxin
 	name = "green hypovial (Anti-Tox)"
 	icon_state = "hypovial-a"
-	comes_with = list("antitoxin" = 30)
+	list_reagents = list(/datum/reagent/medicine/antitoxin = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane
+/obj/item/reagent_containers/glass/bottle/vial/small/kelotane
 	name = "orange hypovial (kelotane)"
 	icon_state = "hypovial-k"
-	comes_with = list("kelotane" = 30)
+	list_reagents = list(/datum/reagent/medicine/kelotane = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin
+/obj/item/reagent_containers/glass/bottle/vial/small/dexalin
 	name = "blue hypovial (dexalin)"
 	icon_state = "hypovial-d"
-	comes_with = list("dexalin" = 30)
+	list_reagents = list(/datum/reagent/medicine/dexalin = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord
+/obj/item/reagent_containers/glass/bottle/vial/small/tricord
 	name = "hypovial (tricordrazine)"
 	icon_state = "hypovial"
-	comes_with = list("tricordrazine" = 30)
+	list_reagents = list(/datum/reagent/medicine/tricordrazine = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction
+/obj/item/reagent_containers/glass/bottle/vial/small/breastreduction
 	name = "pink hypovial (breast treatment)"
 	icon_state = "hypovial-pink"
-	comes_with = list("BEsmaller_hypo" = 30)
+	list_reagents = list(/datum/reagent/fermi/BEsmaller_hypo = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction
+/obj/item/reagent_containers/glass/bottle/vial/small/penisreduction
 	name = "pink hypovial (penis treatment)"
 	icon_state = "hypovial-pink"
-	comes_with = list("PEsmaller_hypo" = 30)
+	list_reagents = list(/datum/reagent/fermi/PEsmaller_hypo = 30)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/CMO
+/obj/item/reagent_containers/glass/bottle/vial/large/CMO
 	name = "deluxe hypovial"
 	icon_state = "hypoviallarge-cmos"
-	comes_with = list("omnizine" = 20, "leporazine" = 20, "atropine" = 20)
+	list_reagents = list(/datum/reagent/medicine/omnizine = 20, /datum/reagent/medicine/leporazine = 20, /datum/reagent/medicine/atropine = 20)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/bicaridine
+/obj/item/reagent_containers/glass/bottle/vial/large/bicaridine
 	name = "large red hypovial (bicaridine)"
 	icon_state = "hypoviallarge-b"
-	comes_with = list("bicaridine" = 60)
+	list_reagents = list(/datum/reagent/medicine/bicaridine = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/antitoxin
+/obj/item/reagent_containers/glass/bottle/vial/large/antitoxin
 	name = "large green hypovial (anti-tox)"
 	icon_state = "hypoviallarge-a"
-	comes_with = list("antitoxin" = 60)
+	list_reagents = list(/datum/reagent/medicine/antitoxin = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/kelotane
+/obj/item/reagent_containers/glass/bottle/vial/large/kelotane
 	name = "large orange hypovial (kelotane)"
 	icon_state = "hypoviallarge-k"
-	comes_with = list("kelotane" = 60)
+	list_reagents = list(/datum/reagent/medicine/kelotane = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin
+/obj/item/reagent_containers/glass/bottle/vial/large/dexalin
 	name = "large blue hypovial (dexalin)"
 	icon_state = "hypoviallarge-d"
-	comes_with = list("dexalin" = 60)
+	list_reagents = list(/datum/reagent/medicine/dexalin = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal
+/obj/item/reagent_containers/glass/bottle/vial/large/charcoal
 	name = "large black hypovial (charcoal)"
 	icon_state = "hypoviallarge-t"
-	comes_with = list("charcoal" = 60)
+	list_reagents = list(/datum/reagent/medicine/charcoal = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord
+/obj/item/reagent_containers/glass/bottle/vial/large/tricord
 	name = "large hypovial (tricord)"
 	icon_state = "hypoviallarge"
-	comes_with = list("tricordrazine" = 60)
+	list_reagents = list(/datum/reagent/medicine/tricordrazine = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu
+/obj/item/reagent_containers/glass/bottle/vial/large/salglu
 	name = "large green hypovial (salglu)"
 	icon_state = "hypoviallarge-a"
-	comes_with = list("salglu_solution" = 60)
+	list_reagents = list(/datum/reagent/medicine/salglu_solution = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh
+/obj/item/reagent_containers/glass/bottle/vial/large/synthflesh
 	name = "large orange hypovial (synthflesh)"
 	icon_state = "hypoviallarge-k"
-	comes_with = list("synthflesh" = 60)
+	list_reagents = list(/datum/reagent/medicine/synthflesh = 60)
 
-/obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat
+/obj/item/reagent_containers/glass/bottle/vial/large/combat
 	name = "combat hypovial"
 	icon_state = "hypoviallarge-t"
-	comes_with = list("epinephrine" = 3, "omnizine" = 19, "leporazine" = 19, "atropine" = 19) //Epinephrine's main effect here is to kill suff damage, so we don't need much given atropine
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 3, /datum/reagent/medicine/omnizine = 19, /datum/reagent/medicine/leporazine = 19, /datum/reagent/medicine/atropine = 19) //Epinephrine's main effect here is to kill suff damage, so we don't need much given atropine
diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm
index b445c38ad9..02a3f987bc 100644
--- a/code/modules/reagents/reagent_containers/medspray.dm
+++ b/code/modules/reagents/reagent_containers/medspray.dm
@@ -82,26 +82,26 @@
 	name = "medical spray (styptic powder)"
 	desc = "A medical spray bottle, designed for precision application, with an unscrewable cap. This one contains styptic powder, for treating cuts and bruises."
 	icon_state = "brutespray"
-	list_reagents = list("styptic_powder" = 60)
+	list_reagents = list(/datum/reagent/medicine/styptic_powder = 60)
 
 /obj/item/reagent_containers/medspray/silver_sulf
 	name = "medical spray (silver sulfadiazine)"
 	desc = "A medical spray bottle, designed for precision application, with an unscrewable cap. This one contains silver sulfadiazine, useful for treating burns."
 	icon_state = "burnspray"
-	list_reagents = list("silver_sulfadiazine" = 60)
+	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 60)
 
 /obj/item/reagent_containers/medspray/synthflesh
 	name = "medical spray (synthflesh)"
 	desc = "A medical spray bottle, designed for precision application, with an unscrewable cap. This one contains synthflesh, an apex brute and burn healing agent."
 	icon_state = "synthspray"
-	list_reagents = list("synthflesh" = 60)
+	list_reagents = list(/datum/reagent/medicine/synthflesh = 60)
 
 /obj/item/reagent_containers/medspray/sterilizine
 	name = "sterilizer spray"
 	desc = "Spray bottle loaded with non-toxic sterilizer. Useful in preparation for surgery."
-	list_reagents = list("sterilizine" = 60)
+	list_reagents = list(/datum/reagent/space_cleaner/sterilizine = 60)
 
 /obj/item/reagent_containers/medspray/synthtissue
 	name = "Synthtissue young culture spray"
 	desc = "Spray bottle loaded with synthtissue. Useful in synthtissue grafting surgeries."
-	list_reagents = list("synthtissue" = 60)
+	list_reagents = list(/datum/reagent/synthtissue = 60)
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index 02852f2218..1e23f46d9f 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -32,13 +32,13 @@
 /obj/item/reagent_containers/pill/patch/styptic
 	name = "brute patch"
 	desc = "Helps with brute injuries."
-	list_reagents = list("styptic_powder" = 20)
+	list_reagents = list(/datum/reagent/medicine/styptic_powder = 20)
 	icon_state = "bandaid_brute"
 
 /obj/item/reagent_containers/pill/patch/silver_sulf
 	name = "burn patch"
 	desc = "Helps with burn injuries."
-	list_reagents = list("silver_sulfadiazine" = 20)
+	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 20)
 	icon_state = "bandaid_burn"
 
 /obj/item/reagent_containers/pill/patch/get_belt_overlay()
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index d4880aa085..e6fa18ba9c 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -82,97 +82,97 @@
 	name = "toxins pill"
 	desc = "Highly toxic."
 	icon_state = "pill5"
-	list_reagents = list("toxin" = 50)
+	list_reagents = list(/datum/reagent/toxin = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/cyanide
 	name = "cyanide pill"
 	desc = "Don't swallow this."
 	icon_state = "pill5"
-	list_reagents = list("cyanide" = 50)
+	list_reagents = list(/datum/reagent/toxin/cyanide = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/adminordrazine
 	name = "adminordrazine pill"
 	desc = "It's magic. We don't have to explain it."
 	icon_state = "pill16"
-	list_reagents = list("adminordrazine" = 50)
+	list_reagents = list(/datum/reagent/medicine/adminordrazine = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/morphine
 	name = "morphine pill"
 	desc = "Commonly used to treat insomnia."
 	icon_state = "pill8"
-	list_reagents = list("morphine" = 30)
+	list_reagents = list(/datum/reagent/medicine/morphine = 30)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/stimulant
 	name = "stimulant pill"
 	desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!"
 	icon_state = "pill19"
-	list_reagents = list("ephedrine" = 10, "antihol" = 10, "coffee" = 30)
+	list_reagents = list(/datum/reagent/medicine/ephedrine = 10, /datum/reagent/medicine/antihol = 10, /datum/reagent/consumable/coffee = 30)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/salbutamol
 	name = "salbutamol pill"
 	desc = "Used to treat oxygen deprivation."
 	icon_state = "pill16"
-	list_reagents = list("salbutamol" = 30)
+	list_reagents = list(/datum/reagent/medicine/salbutamol = 30)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/charcoal
 	name = "charcoal pill"
 	desc = "Neutralizes many common toxins."
 	icon_state = "pill17"
-	list_reagents = list("charcoal" = 10)
+	list_reagents = list(/datum/reagent/medicine/charcoal = 10)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/epinephrine
 	name = "epinephrine pill"
 	desc = "Used to stabilize patients."
 	icon_state = "pill5"
-	list_reagents = list("epinephrine" = 15)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 15)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/mannitol
 	name = "mannitol pill"
 	desc = "Used to treat brain damage."
 	icon_state = "pill17"
-	list_reagents = list("mannitol" = 50)
+	list_reagents = list(/datum/reagent/medicine/mannitol = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/mutadone
 	name = "mutadone pill"
 	desc = "Used to treat genetic damage."
 	icon_state = "pill20"
-	list_reagents = list("mutadone" = 50)
+	list_reagents = list(/datum/reagent/medicine/mutadone = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/salicyclic
 	name = "salicylic acid pill"
 	desc = "Used to dull pain."
 	icon_state = "pill9"
-	list_reagents = list("sal_acid" = 24)
+	list_reagents = list(/datum/reagent/medicine/sal_acid = 24)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/oxandrolone
 	name = "oxandrolone pill"
 	desc = "Used to stimulate burn healing."
 	icon_state = "pill11"
-	list_reagents = list("oxandrolone" = 24)
+	list_reagents = list(/datum/reagent/medicine/oxandrolone = 24)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/insulin
 	name = "insulin pill"
 	desc = "Handles hyperglycaemic coma."
 	icon_state = "pill18"
-	list_reagents = list("insulin" = 50)
+	list_reagents = list(/datum/reagent/medicine/insulin = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/psicodine
 	name = "psicodine pill"
 	desc = "Used to treat mental instability and traumas."
-	list_reagents = list("psicodine" = 10)
+	list_reagents = list(/datum/reagent/medicine/psicodine = 10)
 	icon_state = "pill22"
 	roundstart = 1
 
@@ -180,21 +180,21 @@
 	name = "potassium iodide pill"
 	desc = "Used to treat radition used to counter radiation poisoning."
 	icon_state = "pill18"
-	list_reagents = list("potass_iodide" = 50)
+	list_reagents = list(/datum/reagent/medicine/potass_iodide = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/antirad_plus
 	name = "prussian blue pill"
 	desc = "Used to treat heavy radition poisoning."
 	icon_state = "prussian_blue"
-	list_reagents = list("prussian_blue" = 25, "water" = 10)
+	list_reagents = list(/datum/reagent/medicine/prussian_blue = 25, /datum/reagent/water = 10)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/mutarad
 	name = "radiation treatment deluxe pill"
 	desc = "Used to treat heavy radition poisoning and genetic defects."
 	icon_state = "anit_rad_fixgene"
-	list_reagents = list("prussian_blue" = 15, "potass_iodide" = 15, "mutadone" = 15, "water" = 5)
+	list_reagents = list(/datum/reagent/medicine/prussian_blue = 15, /datum/reagent/medicine/potass_iodide = 15, /datum/reagent/medicine/mutadone = 15, /datum/reagent/water = 5)
 	roundstart = 1
 
 ///////////////////////////////////////// this pill is used only in a legion mob drop
@@ -203,32 +203,32 @@
 	desc = "I wouldn't eat this if I were you."
 	icon_state = "pill9"
 	color = "#454545"
-	list_reagents = list("shadowmutationtoxin" = 1)
+	list_reagents = list(/datum/reagent/mutationtoxin/shadow = 1)
 //////////////////////////////////////// drugs
 /obj/item/reagent_containers/pill/zoom
 	name = "zoom pill"
-	list_reagents = list("synaptizine" = 10, "nicotine" = 10, "methamphetamine" = 1)
+	list_reagents = list(/datum/reagent/medicine/synaptizine = 10, /datum/reagent/drug/nicotine = 10, /datum/reagent/drug/methamphetamine = 1)
 
 
 /obj/item/reagent_containers/pill/happy
 	name = "happy pill"
-	list_reagents = list("sugar" = 10, "space_drugs" = 10)
+	list_reagents = list(/datum/reagent/consumable/sugar = 10, /datum/reagent/drug/space_drugs = 10)
 
 
 /obj/item/reagent_containers/pill/lsd
 	name = "hallucinogen pill"
-	list_reagents = list("mushroomhallucinogen" = 15, "mindbreaker" = 15)
+	list_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 15, /datum/reagent/toxin/mindbreaker = 15)
 
 
 /obj/item/reagent_containers/pill/aranesp
 	name = "speedy pill"
-	list_reagents = list("aranesp" = 10)
+	list_reagents = list(/datum/reagent/drug/aranesp = 10)
 
 /obj/item/reagent_containers/pill/happiness
 	name = "happiness pill"
 	desc = "It has a creepy smiling face on it."
 	icon_state = "pill_happy"
-	list_reagents = list("happiness" = 10)
+	list_reagents = list(/datum/reagent/drug/happiness = 10)
 
 /obj/item/reagent_containers/pill/floorpill
 	name = "floorpill"
@@ -250,8 +250,8 @@
 
 /obj/item/reagent_containers/pill/penis_enlargement
 	name = "penis enlargement pill"
-	list_reagents = list("penis_enlarger" = 10)
+	list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
 
 /obj/item/reagent_containers/pill/breast_enlargement
 	name = "breast enlargement pill"
-	list_reagents = list("breast_enlarger" = 10)
+	list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm
index d09b18f244..812b3144e9 100644
--- a/code/modules/reagents/reagent_containers/rags.dm
+++ b/code/modules/reagents/reagent_containers/rags.dm
@@ -8,6 +8,7 @@
 	reagent_flags = REFILLABLE | DRAINABLE
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list()
+	APTFT_altclick = FALSE
 	volume = 5
 	spillable = FALSE
 	var/wipe_sound
@@ -73,9 +74,9 @@
 				if(M.fire_stacks)
 					var/minus_plus = M.fire_stacks < 0 ? 1 : -1
 					var/amount = min(abs(M.fire_stacks), soak_efficiency)
-					var/r_id = "fuel"
+					var/r_id = /datum/reagent/fuel
 					if(M.fire_stacks < 0)
-						r_id = "water"
+						r_id = /datum/reagent/water
 					reagents.add_reagent(r_id, amount * 0.3)
 					M.adjust_fire_stacks(minus_plus * amount)
 				M.wash_cream()
diff --git a/code/modules/reagents/reagent_containers/sleeper_buffer.dm b/code/modules/reagents/reagent_containers/sleeper_buffer.dm
index 044dab2924..d353174c06 100644
--- a/code/modules/reagents/reagent_containers/sleeper_buffer.dm
+++ b/code/modules/reagents/reagent_containers/sleeper_buffer.dm
@@ -8,4 +8,4 @@
 	spillable = TRUE
 	resistance_flags = ACID_PROOF
 	amount_per_transfer_from_this = 0
-	possible_transfer_amounts = list(0)
+	possible_transfer_amounts = list()
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index ddbc6cf92b..ad8eb871e1 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -52,13 +52,13 @@
 	user.changeNext_move(CLICK_CD_RANGE*2)
 	user.newtonian_move(get_dir(A, user))
 	var/turf/T = get_turf(src)
-	if(reagents.has_reagent("sacid"))
+	if(reagents.has_reagent(/datum/reagent/toxin/acid))
 		message_admins("[ADMIN_LOOKUPFLW(user)] fired sulphuric acid from \a [src] at [ADMIN_VERBOSEJMP(T)].")
 		log_game("[key_name(user)] fired sulphuric acid from \a [src] at [AREACOORD(T)].")
-	if(reagents.has_reagent("facid"))
+	if(reagents.has_reagent(/datum/reagent/toxin/acid/fluacid))
 		message_admins("[ADMIN_LOOKUPFLW(user)] fired Fluacid from \a [src] at [ADMIN_VERBOSEJMP(T)].")
 		log_game("[key_name(user)] fired Fluacid from \a [src] at [AREACOORD(T)].")
-	if(reagents.has_reagent("lube"))
+	if(reagents.has_reagent(/datum/reagent/lube))
 		message_admins("[ADMIN_LOOKUPFLW(user)] fired Space lube from \a [src] at [ADMIN_VERBOSEJMP(T)].")
 		log_game("[key_name(user)] fired Space lube from \a [src] at [AREACOORD(T)].")
 	return
@@ -149,7 +149,7 @@
 	name = "space cleaner"
 	desc = "BLAM!-brand non-foaming space cleaner!"
 	volume = 100
-	list_reagents = list("cleaner" = 100)
+	list_reagents = list(/datum/reagent/space_cleaner = 100)
 	amount_per_transfer_from_this = 2
 	stream_amount = 5
 
@@ -172,7 +172,7 @@
 	name = "drying agent spray"
 	desc = "A spray bottle for drying agent."
 	volume = 100
-	list_reagents = list("drying_agent" = 100)
+	list_reagents = list(/datum/reagent/drying_agent = 100)
 	amount_per_transfer_from_this = 2
 	stream_amount = 5
 
@@ -181,7 +181,7 @@
 	name = "spray tan"
 	volume = 50
 	desc = "Gyaro brand spray tan. Do not spray near eyes or other orifices."
-	list_reagents = list("spraytan" = 50)
+	list_reagents = list(/datum/reagent/spraytan = 50)
 
 
 //pepperspray
@@ -197,7 +197,7 @@
 	stream_range = 4
 	spray_delay = 1
 	amount_per_transfer_from_this = 5
-	list_reagents = list("condensedcapsaicin" = 40)
+	list_reagents = list(/datum/reagent/consumable/condensedcapsaicin = 40)
 
 /obj/item/reagent_containers/spray/pepper/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins huffing \the [src]! It looks like [user.p_theyre()] getting a dirty high!</span>")
@@ -218,7 +218,7 @@
 	item_state = "sunflower"
 	amount_per_transfer_from_this = 1
 	volume = 10
-	list_reagents = list("water" = 10)
+	list_reagents = list(/datum/reagent/water = 10)
 
 /obj/item/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays
 	return
@@ -230,14 +230,14 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "clownflower"
 	volume = 30
-	list_reagents = list("superlube" = 30)
+	list_reagents = list(/datum/reagent/lube/superlube = 30)
 
 /obj/item/reagent_containers/spray/waterflower/cyborg
 	reagent_flags = NONE
 	volume = 100
-	list_reagents = list("water" = 100)
+	list_reagents = list(/datum/reagent/water = 100)
 	var/generate_amount = 5
-	var/generate_type = "water"
+	var/generate_type = /datum/reagent/water
 	var/last_generate = 0
 	var/generate_delay = 10	//deciseconds
 	can_fill_from_container = FALSE
@@ -245,9 +245,9 @@
 /obj/item/reagent_containers/spray/waterflower/cyborg/hacked
 	name = "nova flower"
 	desc = "This doesn't look safe at all..."
-	list_reagents = list("clf3" = 3)
+	list_reagents = list(/datum/reagent/clf3 = 3)
 	volume = 3
-	generate_type = "clf3"
+	generate_type = /datum/reagent/clf3
 	generate_amount = 1
 	generate_delay = 40		//deciseconds
 
@@ -309,7 +309,7 @@
 		..(the_targets[i])
 
 /obj/item/reagent_containers/spray/chemsprayer/bioterror
-	list_reagents = list("sodium_thiopental" = 100, "coniine" = 100, "venom" = 100, "condensedcapsaicin" = 100, "initropidril" = 100, "polonium" = 100)
+	list_reagents = list(/datum/reagent/toxin/sodium_thiopental = 100, /datum/reagent/toxin/coniine = 100, /datum/reagent/toxin/venom = 100, /datum/reagent/consumable/condensedcapsaicin = 100, /datum/reagent/toxin/initropidril = 100, /datum/reagent/toxin/polonium = 100)
 
 // Plant-B-Gone
 /obj/item/reagent_containers/spray/plantbgone // -- Skie
@@ -321,4 +321,4 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-	list_reagents = list("plantbgone" = 100)
+	list_reagents = list(/datum/reagent/toxin/plantbgone = 100)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 6bdae6225a..7fafbc319c 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -179,39 +179,39 @@
 /obj/item/reagent_containers/syringe/epinephrine
 	name = "syringe (epinephrine)"
 	desc = "Contains epinephrine - used to stabilize patients."
-	list_reagents = list("epinephrine" = 15)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 15)
 
 /obj/item/reagent_containers/syringe/charcoal
 	name = "syringe (charcoal)"
 	desc = "Contains charcoal."
-	list_reagents = list("charcoal" = 15)
+	list_reagents = list(/datum/reagent/medicine/charcoal = 15)
 
 /obj/item/reagent_containers/syringe/antiviral
 	name = "syringe (spaceacillin)"
 	desc = "Contains antiviral agents."
-	list_reagents = list("spaceacillin" = 15)
+	list_reagents = list(/datum/reagent/medicine/spaceacillin = 15)
 
 /obj/item/reagent_containers/syringe/bioterror
 	name = "bioterror syringe"
 	desc = "Contains several paralyzing reagents."
-	list_reagents = list("neurotoxin" = 5, "mutetoxin" = 5, "sodium_thiopental" = 5)
+	list_reagents = list(/datum/reagent/consumable/ethanol/neurotoxin = 5, /datum/reagent/toxin/mutetoxin = 5, /datum/reagent/toxin/sodium_thiopental = 5)
 
 /obj/item/reagent_containers/syringe/stimulants
 	name = "Stimpack"
 	desc = "Contains stimulants."
 	amount_per_transfer_from_this = 50
 	volume = 50
-	list_reagents = list("stimulants" = 50)
+	list_reagents = list(/datum/reagent/medicine/stimulants = 50)
 
 /obj/item/reagent_containers/syringe/calomel
 	name = "syringe (calomel)"
 	desc = "Contains calomel."
-	list_reagents = list("calomel" = 15)
+	list_reagents = list(/datum/reagent/medicine/calomel = 15)
 
 /obj/item/reagent_containers/syringe/plasma
 	name = "syringe (plasma)"
 	desc = "Contains plasma."
-	list_reagents = list("plasma" = 15)
+	list_reagents = list(/datum/reagent/toxin/plasma = 15)
 
 /obj/item/reagent_containers/syringe/lethal
 	name = "lethal injection syringe"
@@ -220,24 +220,24 @@
 	volume = 50
 
 /obj/item/reagent_containers/syringe/lethal/choral
-	list_reagents = list("chloralhydrate" = 50)
+	list_reagents = list(/datum/reagent/toxin/chloralhydrate = 50)
 
 /obj/item/reagent_containers/syringe/lethal/execution
-	list_reagents = list("amatoxin" = 15, "formaldehyde" = 15, "cyanide" = 10, "facid" = 10) //Citadel edit, changing out plasma from lethals
+	list_reagents = list(/datum/reagent/toxin/amatoxin = 15, /datum/reagent/toxin/formaldehyde = 15, /datum/reagent/toxin/cyanide = 10, /datum/reagent/toxin/acid/fluacid = 10) //Citadel edit, changing out plasma from lethals
 
 /obj/item/reagent_containers/syringe/mulligan
 	name = "Mulligan"
 	desc = "A syringe used to completely change the users identity."
 	amount_per_transfer_from_this = 1
 	volume = 1
-	list_reagents = list("mulligan" = 1)
+	list_reagents = list(/datum/reagent/mulligan = 1)
 
 /obj/item/reagent_containers/syringe/gluttony
 	name = "Gluttony's Blessing"
 	desc = "A syringe recovered from a dread place. It probably isn't wise to use."
 	amount_per_transfer_from_this = 1
 	volume = 1
-	list_reagents = list("gluttonytoxin" = 1)
+	list_reagents = list(/datum/reagent/gluttonytoxin = 1)
 
 /obj/item/reagent_containers/syringe/bluespace
 	name = "bluespace syringe"
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 0964b67490..e9f8053631 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -8,7 +8,7 @@
 	pressure_resistance = 2*ONE_ATMOSPHERE
 	max_integrity = 300
 	var/tank_volume = 1000 //In units, how much the dispenser can hold
-	var/reagent_id = "water" //The ID of the reagent that the dispenser uses
+	var/reagent_id = /datum/reagent/water //The ID of the reagent that the dispenser uses
 
 /obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
@@ -58,7 +58,7 @@
 	name = "firefighting foam tank"
 	desc = "A tank full of firefighting foam."
 	icon_state = "foam"
-	reagent_id = "firefighting_foam"
+	reagent_id = /datum/reagent/firefighting_foam
 	tank_volume = 500
 
 /obj/structure/reagent_dispensers/water_cooler
@@ -99,7 +99,7 @@
 	name = "fuel tank"
 	desc = "A tank full of industrial welding fuel. Do not consume."
 	icon_state = "fuel"
-	reagent_id = "welding_fuel"
+	reagent_id = /datum/reagent/fuel
 
 /obj/structure/reagent_dispensers/fueltank/high //Unused - Good for ghost roles
 	name = "high-capacity fuel tank"
@@ -136,12 +136,12 @@
 
 /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/weldingtool))
-		if(!reagents.has_reagent("welding_fuel"))
+		if(!reagents.has_reagent(/datum/reagent/fuel))
 			to_chat(user, "<span class='warning'>[src] is out of fuel!</span>")
 			return
 		var/obj/item/weldingtool/W = I
 		if(!W.welding)
-			if(W.reagents.has_reagent("welding_fuel", W.max_fuel))
+			if(W.reagents.has_reagent(/datum/reagent/fuel, W.max_fuel))
 				to_chat(user, "<span class='warning'>Your [W.name] is already full!</span>")
 				return
 			reagents.trans_to(W, W.max_fuel)
@@ -171,7 +171,7 @@
 	icon_state = "pepper"
 	anchored = TRUE
 	density = FALSE
-	reagent_id = "condensedcapsaicin"
+	reagent_id = /datum/reagent/consumable/condensedcapsaicin
 
 /obj/structure/reagent_dispensers/peppertank/Initialize()
 	. = ..()
@@ -184,14 +184,14 @@
 	icon_state = "virus_food"
 	anchored = TRUE
 	density = FALSE
-	reagent_id = "virusfood"
+	reagent_id = /datum/reagent/toxin/mutagen/mutagenvirusfood
 
 /obj/structure/reagent_dispensers/cooking_oil
 	name = "vat of cooking oil"
 	desc = "A huge metal vat with a tap on the front. Filled with cooking oil for use in frying food."
 	icon_state = "vat"
 	anchored = TRUE
-	reagent_id = "cooking_oil"
+	reagent_id = /datum/reagent/consumable/cooking_oil
 
 ////////
 //Kegs//
@@ -201,7 +201,7 @@
 	name = "beer keg"
 	desc = "Beer is liquid bread, it's good for you..."
 	icon_state = "beer"
-	reagent_id = "beer"
+	reagent_id = /datum/reagent/consumable/ethanol/beer
 
 /obj/structure/reagent_dispensers/beerkeg/blob_act(obj/structure/blob/B)
 	explosion(src.loc,0,3,5,7,10)
@@ -213,42 +213,41 @@
 	desc = "A keg."
 	icon = 'modular_citadel/icons/obj/objects.dmi'
 	icon_state = "keg"
-	reagent_id = "water"
 
 /obj/structure/reagent_dispensers/keg/mead
 	name = "keg of mead"
 	desc = "A keg of mead."
 	icon_state = "orangekeg"
-	reagent_id = "mead"
+	reagent_id = /datum/reagent/consumable/ethanol/mead
 
 /obj/structure/reagent_dispensers/keg/aphro
 	name = "keg of aphrodisiac"
 	desc = "A keg of aphrodisiac."
 	icon_state = "pinkkeg"
-	reagent_id = "aphro"
+	reagent_id = /datum/reagent/drug/aphrodisiac
 	tank_volume = 150
 
 /obj/structure/reagent_dispensers/keg/aphro/strong
 	name = "keg of strong aphrodisiac"
 	desc = "A keg of strong and addictive aphrodisiac."
-	reagent_id = "aphro+"
+	reagent_id = /datum/reagent/drug/aphrodisiacplus
 	tank_volume = 120
 
 /obj/structure/reagent_dispensers/keg/milk
 	name = "keg of milk"
 	desc = "It's not quite what you were hoping for."
 	icon_state = "whitekeg"
-	reagent_id = "milk"
+	reagent_id = /datum/reagent/consumable/milk
 
 /obj/structure/reagent_dispensers/keg/semen
 	name = "keg of semen"
 	desc = "Dear lord, where did this even come from?"
 	icon_state = "whitekeg"
-	reagent_id = "semen"
+	reagent_id = /datum/reagent/consumable/semen
 
 /obj/structure/reagent_dispensers/keg/gargle
 	name = "keg of pan galactic gargleblaster"
 	desc = "A keg of... wow that's a long name."
 	icon_state = "bluekeg"
-	reagent_id = "gargleblaster"
+	reagent_id = /datum/reagent/consumable/ethanol/gargle_blaster
 	tank_volume = 100
\ No newline at end of file
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 7701e58616..46ddb1e2ed 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 /obj/machinery/conveyor/inverted/Initialize(mapload)
 	. = ..()
 	if(mapload && !(dir in GLOB.diagonals))
-		log_game("### MAPPING ERROR: [src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
+		log_mapping("[src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
 
 // Auto conveyour is always on unless unpowered
 
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index cdb9ea4120..516ae5bddd 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -37,9 +37,9 @@ other types of metals and chemistry for reagents).
 	var/list/materials = list()			//List of materials. Format: "id" = amount.
 	var/construction_time				//Amount of time required for building the object
 	var/build_path = null				//The file path of the object that gets created
-	var/list/make_reagents = list()			//Reagents produced. Format: "id" = amount. Currently only supported by the biogenerator.
+	var/list/make_reagents = list()			//Reagents produced. Format: type = amount. Currently only supported by the biogenerator.
 	var/list/category = null 			//Primarily used for Mech Fabricators, but can be used for anything
-	var/list/reagents_list = list()			//List of reagents. Format: "id" = amount.
+	var/list/reagents_list = list()			//List of reagents. Format: type = amount.
 	var/maxstack = 1
 	var/lathe_time_factor = 1			//How many times faster than normal is this to build on the protolathe
 	var/dangerous_construction = FALSE	//notify and log for admin investigations if this is printed.
diff --git a/code/modules/research/designs/autobotter_designs.dm b/code/modules/research/designs/autobotter_designs.dm
index 7b56beaf77..d2a38a29f9 100644
--- a/code/modules/research/designs/autobotter_designs.dm
+++ b/code/modules/research/designs/autobotter_designs.dm
@@ -151,97 +151,97 @@
 	name = "Export Design (Wine)"
 	desc = "Allows for the blowing, and bottling of Wine bottles."
 	id = "wine_export"
-	reagents_list = list("wine" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/wine = 100)
 	build_path = /obj/item/export/bottle/wine
 
 /datum/design/bottle/export/rum
 	name = "Export Design (Rum)"
 	desc = "Allows for the blowing, and bottling of Rum bottles."
 	id = "rum_export"
-	reagents_list = list("rum" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/rum = 100)
 	build_path = /obj/item/export/bottle/rum
 
 /datum/design/bottle/export/gin
 	name = "Export Design (Gin)"
 	desc = "Allows for the blowing, and bottling of Gin bottles."
 	id = "gin_export"
-	reagents_list = list("gin" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/gin = 100)
 	build_path = /obj/item/export/bottle/gin
 
 /datum/design/bottle/export/whiskey
 	name = "Export Design (Whiskey)"
 	desc = "Allows for the blowing, and bottling of Whiskey bottles."
 	id = "whiskey_export"
-	reagents_list = list("whiskey" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/whiskey = 100)
 	build_path = /obj/item/export/bottle/whiskey
 
 /datum/design/bottle/export/vodka
 	name = "Export Design (Vodka)"
 	desc = "Allows for the blowing, and bottling of 99% Vodka bottles."
 	id = "vodka_export"
-	reagents_list = list("vodka" = 99, "water" = 1)
+	reagents_list = list(/datum/reagent/consumable/ethanol/vodka = 99, /datum/reagent/water = 1)
 	build_path = /obj/item/export/bottle/vodka
 
 /datum/design/bottle/export/tequila
 	name = "Export Design (Tequila)"
 	desc = "Allows for the blowing, and bottling of Tequila bottles."
 	id = "tequila_export"
-	reagents_list = list("tequila" = 80, "lemon_juice" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/tequila = 80, /datum/reagent/consumable/lemonjuice = 20)
 	build_path = /obj/item/export/bottle/tequila
 
 /datum/design/bottle/export/patron
 	name = "Export Design (Patron)"
 	desc = "Allows for the blowing, and bottling of Patron bottles."
 	id = "patron_export"
-	reagents_list = list("patron" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/patron = 100)
 	build_path = /obj/item/export/bottle/patron
 
 /datum/design/bottle/export/kahlua
 	name = "Export Design (Kahlua)"
 	desc = "Allows for the blowing, and bottling of Kahlua bottles."
 	id = "kahlua_export"
-	reagents_list = list("kahlua" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/kahlua = 100)
 	build_path = /obj/item/export/bottle/kahlua
 
 /datum/design/bottle/export/sake
 	name = "Export Design (Sake)"
 	desc = "Allows for the blowing, and bottling of Sake bottles."
 	id = "sake_export"
-	reagents_list = list("sake" = 80, "rice" = 10, "sugar" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/sake = 80, /datum/reagent/consumable/rice = 10, /datum/reagent/consumable/sugar = 10)
 	build_path = /obj/item/export/bottle/sake
 
 /datum/design/bottle/export/vermouth
 	name = "Export Design (Vermouth)"
 	desc = "Allows for the blowing, and bottling of Vermouth bottles."
 	id = "vermouth_export"
-	reagents_list = list("vermouth" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/vermouth = 100)
 	build_path = /obj/item/export/bottle/vermouth
 
 /datum/design/bottle/export/goldschlager
 	name = "Export Design (Goldschlager)"
 	desc = "Allows for the blowing, and bottling of Goldschlager bottles."
 	id = "goldschlager_export"
-	reagents_list = list("goldschlager" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/goldschlager = 100)
 	build_path = /obj/item/export/bottle/goldschlager
 
 /datum/design/bottle/export/hcider
 	name = "Export Design (Cider)"
 	desc = "Allows for the blowing, and bottling of Cider bottles."
 	id = "hcider_export"
-	reagents_list = list("hcider" = 30, "water" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/hcider = 30, /datum/reagent/water = 20)
 	build_path = /obj/item/export/bottle/hcider
 
 /datum/design/bottle/export/cognac
 	name = "Export Design (Cognac)"
 	desc = "Allows for the blowing, and bottling of Cognac bottles."
 	id = "cognac_export"
-	reagents_list = list("cognac" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/cognac = 100)
 	build_path = /obj/item/export/bottle/cognac
 
 /datum/design/bottle/export/absinthe
 	name = "Export Design (Absinthe)"
 	desc = "Allows for the blowing, and bottling of Absinthe bottles."
-	reagents_list = list("absinthe" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/absinthe = 100)
 	id = "absinthe_export"
 	build_path = /obj/item/export/bottle/absinthe
 
@@ -249,49 +249,49 @@
 	name = "Export Design (Grappa)"
 	desc = "Allows for the blowing, and bottling of Grappa bottles."
 	id = "grappa_export"
-	reagents_list = list("grappa" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/grappa = 100)
 	build_path = /obj/item/export/bottle/grappa
 
 /datum/design/bottle/export/fernet
 	name = "Export Design (Fernet)"
 	desc = "Allows for the blowing, and bottling of Fernet bottles."
 	id = "fernet_export"
-	reagents_list = list("fernet" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/fernet = 100)
 	build_path = /obj/item/export/bottle/fernet
 
 /datum/design/bottle/export/applejack
 	name = "Export Design (Applejack)"
 	desc = "Allows for the blowing, and bottling of Applejack bottles."
 	id = "applejack_export"
-	reagents_list = list("applejack" = 50, "gin" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/applejack = 50, /datum/reagent/consumable/ethanol/gin = 10)
 	build_path = /obj/item/export/bottle/applejack
 
 /datum/design/bottle/export/champagne
 	name = "Export Design (Champagne)"
 	desc = "Allows for the blowing, and bottling of Champagne bottles."
 	id = "champagne_export"
-	reagents_list = list("champagne" = 90, "co2" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/champagne = 90, /datum/reagent/carbondioxide = 10)
 	build_path = /obj/item/export/bottle/champagne
 
 /datum/design/bottle/export/blazaam
 	name = "Export Design (Blazaam)"
 	desc = "Allows for the blowing, and bottling of Blazaam bottles."
 	id = "blazaam_export"
-	reagents_list = list("blazaam" = 80, "holywater" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/blazaam = 80, /datum/reagent/water/holywater = 20)
 	build_path = /obj/item/export/bottle/blazaam
 
 /datum/design/bottle/export/trappist
 	name = "Export Design (Trappist)"
 	desc = "Allows for the blowing, and bottling of Trappist bottles."
 	id = "trappist_export"
-	reagents_list = list("trappist" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/trappist = 100)
 	build_path = /obj/item/export/bottle/trappist
 
 /datum/design/bottle/export/grenadine
 	name = "Export Design (Grenadine)"
 	desc = "Allows for the blowing, and bottling of Grenadine bottles."
 	id = "grenadine_export"
-	reagents_list = list("grenadine" = 100)
+	reagents_list = list(/datum/reagent/consumable/grenadine = 100)
 	build_path = /obj/item/export/bottle/grenadine
 
 /datum/design/bottle/export/minikeg
@@ -299,7 +299,7 @@
 	desc = "Allows for the fabication, and bottling of Minikeg of craft beer."
 	id = "minikeg"
 	category = list("Beers")
-	reagents_list = list("light_beer" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/beer/light = 100)
 	build_path = /obj/item/export/bottle/minikeg
 
 /datum/design/bottle/export/blooddrop
@@ -307,7 +307,7 @@
 	desc = "Allows for the blowing, and bottling of Blooddrop bottles."
 	id = "blooddrop"
 	category = list("Wines")
-	reagents_list = list("champagne" = 30, "co2" = 30, "wine" = 10, "grape_juice" = 30)
+	reagents_list = list(/datum/reagent/consumable/ethanol/champagne = 30, /datum/reagent/carbondioxide = 30, /datum/reagent/consumable/ethanol/wine = 10, /datum/reagent/consumable/grapejuice = 30)
 	build_path = /obj/item/export/bottle/blooddrop
 
 /datum/design/bottle/export/slim_gold
@@ -315,7 +315,7 @@
 	desc = "Allows for the blowing, and bottling of Slim Gold bottles."
 	id = "slim_gold"
 	category = list("Beers")
-	reagents_list = list("gold" = 10, "co2" = 10, "rum" = 30, "beer" = 40)
+	reagents_list = list(/datum/reagent/gold = 10, /datum/reagent/carbondioxide = 10, /datum/reagent/consumable/ethanol/rum = 30, /datum/reagent/consumable/ethanol/beer = 40)
 	build_path = /obj/item/export/bottle/slim_gold
 
 /datum/design/bottle/export/white_bloodmoon
@@ -323,13 +323,13 @@
 	desc = "Allows for the blowing, and bottling of White Bloodmoon bottles."
 	id = "white_bloodmoon"
 	category = list("Wines")
-	reagents_list = list("synthflesh" = 50, "blood" = 50, "gib" = 10)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 50, /datum/reagent/blood = 50, /datum/reagent/liquidgibs = 10)
 	build_path = /obj/item/export/bottle/white_bloodmoon
 
 /datum/design/bottle/export/greenroad
 	name = "Export Design (Greenroad)"
 	desc = "Allows for the blowing, and bottling of Greenroad bottles."
 	id = "greenroad"
-	reagents_list = list("vitfro" = 50, "rum" = 50, "ash" = 10)
+	reagents_list = list(/datum/reagent/consumable/vitfro = 50, /datum/reagent/consumable/ethanol/rum = 50, /datum/reagent/ash = 10)
 	category = list("Beers")
 	build_path = /obj/item/export/bottle/greenroad
\ No newline at end of file
diff --git a/modular_citadel/code/modules/research/designs/autoylathe_designs.dm b/code/modules/research/designs/autoylathe_designs.dm
similarity index 100%
rename from modular_citadel/code/modules/research/designs/autoylathe_designs.dm
rename to code/modules/research/designs/autoylathe_designs.dm
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 05e4c667f6..dd55697bee 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -7,7 +7,7 @@
 	id = "milk"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 20)
-	make_reagents = list("milk" = 10)
+	make_reagents = list(/datum/reagent/consumable/milk = 10)
 	category = list("initial","Food")
 
 /datum/design/cream
@@ -15,7 +15,7 @@
 	id = "cream"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 30)
-	make_reagents = list("cream" = 10)
+	make_reagents = list(/datum/reagent/consumable/cream = 10)
 	category = list("initial","Food")
 
 /datum/design/milk_carton
@@ -39,7 +39,7 @@
 	id = "black_pepper"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 25)
-	make_reagents = list("blackpepper" = 10)
+	make_reagents = list(/datum/reagent/consumable/blackpepper = 10)
 	category = list("initial","Food")
 
 /datum/design/pepper_mill
@@ -51,6 +51,22 @@
 	make_reagents = list()
 	category = list("initial","Food")
 
+/datum/design/enzyme
+	name = "10u Universal Enzyme"
+	id = "enzyme"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 30)
+	make_reagents = list("enzyme" = 10)
+	category = list("initial","Food")
+
+/datum/design/flour_sack
+	name = "Flour Sack"
+	id = "flour_sack"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 150)
+	build_path = /obj/item/reagent_containers/food/condiment/flour
+	category = list("initial","Food")
+
 /datum/design/monkey_cube
 	name = "Monkey Cube"
 	id = "mcube"
diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm
index dae59408c8..d002c84c5f 100644
--- a/code/modules/research/designs/limbgrower_designs.dm
+++ b/code/modules/research/designs/limbgrower_designs.dm
@@ -6,7 +6,7 @@
 	name = "Left Arm"
 	id = "leftarm"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/l_arm
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -14,7 +14,7 @@
 	name = "Right Arm"
 	id = "rightarm"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/r_arm
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -22,7 +22,7 @@
 	name = "Left Leg"
 	id = "leftleg"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/l_leg
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -30,7 +30,7 @@
 	name = "Right Leg"
 	id = "rightleg"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/r_leg
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -38,6 +38,6 @@
 	name = "Arm Blade"
 	id = "armblade"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 75)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 75)
 	build_path = /obj/item/melee/synthetic_arm_blade
 	category = list("other","emagged")
\ No newline at end of file
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 113a6262c9..5fab7705a8 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -624,12 +624,21 @@
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 
-/datum/design/borg_upgrade_holding
-	name = "Cyborg Upgrade (Ore Satchel of Holding)"
-	id = "borg_upgrade_holding"
+/datum/design/borg_upgrade_advcutter
+	name = "Cyborg Upgrade (Advanced Plasma Cutter)"
+	id = "borg_upgrade_advcutter"
 	build_type = MECHFAB
-	build_path = /obj/item/borg/upgrade/soh
-	materials = list(MAT_METAL = 10000, MAT_GOLD = 250, MAT_URANIUM = 500)
+	build_path = /obj/item/borg/upgrade/advcutter
+	materials = list(MAT_METAL=8000, MAT_PLASMA=2000, MAT_GOLD= 2000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_premiumka
+	name = "Cyborg Upgrade (Premium Kinetic Accelerator)"
+	id = "borg_upgrade_premiumka"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/premiumka
+	materials = list(MAT_METAL=8000, MAT_GLASS=4000, MAT_TITANIUM=2000)
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 
diff --git a/code/modules/research/designs/nanite_designs.dm b/code/modules/research/designs/nanite_designs.dm
index 177d7073a1..09fe1d9c9b 100644
--- a/code/modules/research/designs/nanite_designs.dm
+++ b/code/modules/research/designs/nanite_designs.dm
@@ -25,6 +25,20 @@
 	program_type = /datum/nanite_program/viral
 	category = list("Utility Nanites")
 
+/datum/design/nanites/research
+	name = "Distributed Computing"
+	desc = "The nanites aid the research servers by performing a portion of its calculations, increasing research point generation."
+	id = "research_nanites"
+	program_type = /datum/nanite_program/research
+	category = list("Utility Nanites")
+
+/datum/design/nanites/researchplus
+	name = "Neural Network"
+	desc = "The nanites link the host's brains together forming a neural research network, that becomes more efficient with the amount of total hosts. Can be overloaded to increase research output."
+	id = "researchplus_nanites"
+	program_type = /datum/nanite_program/researchplus
+	category = list("Utility Nanites")
+
 /datum/design/nanites/monitoring
 	name = "Monitoring"
 	desc = "The nanites monitor the host's vitals and location, sending them to the suit sensor network."
@@ -39,6 +53,13 @@
 	program_type = /datum/nanite_program/triggered/self_scan
 	category = list("Utility Nanites")
 
+/datum/design/nanites/dermal_button
+	name = "Dermal Button"
+	desc = "Displays a button on the host's skin, which can be used to send a signal to the nanites."
+	id = "dermal_button_nanites"
+	program_type = /datum/nanite_program/dermal_button
+	category = list("Utility Nanites")
+
 /datum/design/nanites/stealth
 	name = "Stealth"
 	desc = "The nanites hide their activity and programming from superficial scans."
@@ -46,6 +67,15 @@
 	program_type = /datum/nanite_program/stealth
 	category = list("Utility Nanites")
 
+
+/datum/design/nanites/reduced_diagnostics
+	name = "Reduced Diagnostics"
+	desc = "Disables some high-cost diagnostics in the nanites, making them unable to communicate their program list to portable scanners. \
+	Doing so saves some power, slightly increasing their replication speed."
+	id = "red_diag_nanites"
+	program_type = /datum/nanite_program/reduced_diagnostics
+	category = list("Utility Nanites")
+
 /datum/design/nanites/access
 	name = "Subdermal ID"
 	desc = "The nanites store the host's ID access rights in a subdermal magnetic strip. Updates when triggered, copying the host's current access."
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index fde795d87c..e6f4670f87 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -237,7 +237,7 @@
 	id = "decloner"
 	build_type = PROTOLATHE
 	materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000)
-	reagents_list = list("mutagen" = 40)
+	reagents_list = list(/datum/reagent/toxin/mutagen = 40)
 	build_path = /obj/item/gun/energy/decloner
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -268,7 +268,7 @@
 	id = "flora_gun"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 2000, MAT_GLASS = 500)
-	reagents_list = list("radium" = 20)
+	reagents_list = list(/datum/reagent/radium = 20)
 	build_path = /obj/item/gun/energy/floragun
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_SCIENCE
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 05c4a7cd93..b25ee9bb2d 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -271,7 +271,7 @@
 				if(!T.density)
 					if(prob(EFFECT_PROB_VERYHIGH) && !(locate(/obj/effect/decal/cleanable/greenglow) in T))
 						var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
-						reagentdecal.reagents.add_reagent("radium", 7)
+						reagentdecal.reagents.add_reagent(/datum/reagent/radium, 7)
 		else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
 			var/savedName = "[exp_on]"
 			ejectItem(TRUE)
@@ -291,7 +291,9 @@
 			new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
 		else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
 			visible_message("<span class='danger'>[src] destroys [exp_on], leaking dangerous gas!</span>")
-			chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
+			chosenchem = pick(/datum/reagent/carbon,/datum/reagent/radium,/datum/reagent/toxin,
+							/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,
+							/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash)
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = src
 			R.add_reagent(chosenchem , 50)
@@ -304,7 +306,7 @@
 			ejectItem(TRUE)
 		else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
 			visible_message("<span class='danger'>[src]'s chemical chamber has sprung a leak!</span>")
-			chosenchem = pick("mutationtoxin","nanomachines","sacid")
+			chosenchem = pick(/datum/reagent/mutationtoxin,/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = src
 			R.add_reagent(chosenchem , 50)
@@ -331,7 +333,7 @@
 			visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
 			playsound(src, 'sound/machines/ding.ogg', 50, 1)
 			var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
-			chosenchem = pick("plasma","capsaicin","ethanol")
+			chosenchem = pick(/datum/reagent/toxin/plasma,/datum/reagent/consumable/capsaicin,/datum/reagent/consumable/ethanol)
 			C.reagents.remove_any(25)
 			C.reagents.add_reagent(chosenchem , 50)
 			C.name = "Cup of Suspicious Liquid"
@@ -380,7 +382,7 @@
 			visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
 			var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
 			playsound(src, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
-			chosenchem = pick("uranium","frostoil","ephedrine")
+			chosenchem = pick(/datum/reagent/uranium,/datum/reagent/consumable/frostoil,/datum/reagent/medicine/ephedrine)
 			C.reagents.remove_any(25)
 			C.reagents.add_reagent(chosenchem , 50)
 			C.name = "Cup of Suspicious Liquid"
@@ -390,7 +392,7 @@
 			visible_message("<span class='danger'>[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!</span>")
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = src
-			R.add_reagent("frostoil" , 50)
+			R.add_reagent(/datum/reagent/consumable/frostoil, 50)
 			investigate_log("Experimentor has released frostoil gas.", INVESTIGATE_EXPERIMENTOR)
 			var/datum/effect_system/smoke_spread/chem/smoke = new
 			smoke.set_up(R, 0, src, silent = TRUE)
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 78f636d948..9ba45fb1a3 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -222,7 +222,7 @@
 	l += "<h3>Chemical Storage:</h3>"
 	for(var/datum/reagent/R in reagents.reagent_list)
 		l += "[R.name]: [R.volume]"
-		l += "<A href='?src=[REF(src)];dispose=[R.id]'>Purge</A>"
+		l += "<A href='?src=[REF(src)];dispose=[R.type]'>Purge</A>"
 	l += "</div>"
 	return l
 
diff --git a/code/modules/research/nanites/nanite_programs/buffing.dm b/code/modules/research/nanites/nanite_programs/buffing.dm
index be12d06ede..dde61ec378 100644
--- a/code/modules/research/nanites/nanite_programs/buffing.dm
+++ b/code/modules/research/nanites/nanite_programs/buffing.dm
@@ -35,7 +35,7 @@
 	host_mob.adjustStaminaLoss(-10) //stimulants give stamina heal now
 	host_mob.lying = 0
 	host_mob.update_canmove()
-	host_mob.reagents.add_reagent("stimulants", 1.5)
+	host_mob.reagents.add_reagent(/datum/reagent/medicine/stimulants, 1.5)
 
 /datum/nanite_program/hardening
 	name = "Dermal Hardening"
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index e2e1661ab7..ad48b64baa 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -61,10 +61,10 @@
 /datum/nanite_program/purging/active_effect()
 	host_mob.adjustToxLoss(-1)
 	for(var/datum/reagent/R in host_mob.reagents.reagent_list)
-		if(R.id == "nanite_b_gone")
+		if(R.type == /datum/reagent/fermi/nanite_b_gone)
 			host_mob.adjustToxLoss(4)
 			continue
-		host_mob.reagents.remove_reagent(R.id,1)
+		host_mob.reagents.remove_reagent(R.type,1)
 
 /datum/nanite_program/brain_heal
 	name = "Neural Regeneration"
@@ -164,7 +164,7 @@
 /datum/nanite_program/purging_advanced/active_effect()
 	host_mob.adjustToxLoss(-1, forced = TRUE)
 	for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list)
-		host_mob.reagents.remove_reagent(R.id,1)
+		host_mob.reagents.remove_reagent(R.type,1)
 
 /datum/nanite_program/regenerative_advanced
 	name = "Bio-Reconstruction"
diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm
index a269d01ac0..3db482d989 100644
--- a/code/modules/research/nanites/nanite_programs/utility.dm
+++ b/code/modules/research/nanites/nanite_programs/utility.dm
@@ -130,7 +130,7 @@
 
 /datum/nanite_program/stealth
 	name = "Stealth"
-	desc = "The nanites hide their activity and programming from superficial scans."
+	desc = "The nanites mask their activity from superficial scans, becoming undetectable by HUDs and non-specialized scanners."
 	rogue_types = list(/datum/nanite_program/toxic)
 	use_rate = 0.2
 
@@ -142,6 +142,22 @@
 	. = ..()
 	nanites.stealth = FALSE
 
+/datum/nanite_program/reduced_diagnostics
+	name = "Reduced Diagnostics"
+	desc = "Disables some high-cost diagnostics in the nanites, making them unable to communicate their program list to portable scanners. \
+	Doing so saves some power, slightly increasing their replication speed."
+	rogue_types = list(/datum/nanite_program/toxic)
+	use_rate = -0.1
+
+/datum/nanite_program/reduced_diagnostics/enable_passive_effect()
+	. = ..()
+	nanites.diagnostics = FALSE
+
+/datum/nanite_program/reduced_diagnostics/disable_passive_effect()
+	. = ..()
+	nanites.diagnostics = TRUE
+
+
 /datum/nanite_program/relay
 	name = "Relay"
 	desc = "The nanites receive and relay long-range nanite signals."
@@ -271,3 +287,138 @@
 		if(fault == src)
 			return
 		fault.software_error()
+
+/datum/nanite_program/dermal_button
+	name = "Dermal Button"
+	desc = "Displays a button on the host's skin, which can be used to send a signal to the nanites."
+	extra_settings = list("Sent Code","Button Name","Icon","Color")
+	unique = FALSE
+	var/datum/action/innate/nanite_button/button
+	var/button_name = "Button"
+	var/icon = "power"
+	var/color = "green"
+	var/sent_code = 0
+
+/datum/nanite_program/dermal_button/set_extra_setting(user, setting)
+	if(setting == "Sent Code")
+		var/new_code = input(user, "Set the sent code (1-9999):", name, null) as null|num
+		if(isnull(new_code))
+			return
+		sent_code = CLAMP(round(new_code, 1), 1, 9999)
+	if(setting == "Button Name")
+		var/new_button_name = stripped_input(user, "Choose the name for the button.", "Button Name", button_name, MAX_NAME_LEN)
+		if(!new_button_name)
+			return
+		button_name = new_button_name
+	if(setting == "Icon")
+		var/new_icon = input("Select the icon to display on the button:", name) as null|anything in list("one","two","three","four","five","plus","minus","power")
+		if(!new_icon)
+			return
+		icon = new_icon
+	if(setting == "Color")
+		var/new_color = input("Select the color of the button's icon:", name) as null|anything in list("green","red","yellow","blue")
+		if(!new_color)
+			return
+		color = new_color
+
+/datum/nanite_program/dermal_button/get_extra_setting(setting)
+	if(setting == "Sent Code")
+		return sent_code
+	if(setting == "Button Name")
+		return button_name
+	if(setting == "Icon")
+		return capitalize(icon)
+	if(setting == "Color")
+		return capitalize(color)
+
+/datum/nanite_program/dermal_button/copy_extra_settings_to(datum/nanite_program/dermal_button/target)
+	target.sent_code = sent_code
+	target.button_name = button_name
+	target.icon = icon
+	target.color = color
+
+/datum/nanite_program/dermal_button/enable_passive_effect()
+	. = ..()
+	if(!button)
+		button = new(src, button_name, icon, color)
+	button.target = host_mob
+	button.Grant(host_mob)
+
+/datum/nanite_program/dermal_button/disable_passive_effect()
+	. = ..()
+	if(button)
+		button.Remove(host_mob)
+
+/datum/nanite_program/dermal_button/on_mob_remove()
+	. = ..()
+	qdel(button)
+
+/datum/nanite_program/dermal_button/proc/press()
+	if(activated)
+		host_mob.visible_message("<span class='notice'>[host_mob] presses a button on [host_mob.p_their()] forearm.</span>",
+								"<span class='notice'>You press the nanite button on your forearm.</span>", null, 2)
+		SEND_SIGNAL(host_mob, COMSIG_NANITE_SIGNAL, sent_code, "a [name] program")
+
+/datum/action/innate/nanite_button
+	name = "Button"
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
+	button_icon_state = "power_green"
+	var/datum/nanite_program/dermal_button/program
+
+/datum/action/innate/nanite_button/New(datum/nanite_program/dermal_button/_program, _name, _icon, _color)
+	..()
+	program = _program
+	name = _name
+	button_icon_state = "[_icon]_[_color]"
+
+/datum/action/innate/nanite_button/Activate()
+	program.press()
+
+/datum/nanite_program/research
+	name = "Distributed Computing"
+	desc = "The nanites aid the research servers by performing a portion of its calculations, increasing research point generation."
+	use_rate = 0.2
+	rogue_types = list(/datum/nanite_program/toxic)
+
+/datum/nanite_program/research/active_effect()
+	if(!iscarbon(host_mob))
+		return
+	var/points = 1
+	if(!host_mob.client) //less brainpower
+		points *= 0.25
+	SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = points))
+
+/datum/nanite_program/researchplus
+	name = "Neural Network"
+	desc = "The nanites link the host's brains together forming a neural research network, that becomes more efficient with the amount of total hosts."
+	use_rate = 0.3
+	rogue_types = list(/datum/nanite_program/brain_decay)
+
+/datum/nanite_program/researchplus/enable_passive_effect()
+	. = ..()
+	if(!iscarbon(host_mob))
+		return
+	if(host_mob.client)
+		SSnanites.neural_network_count++
+	else
+		SSnanites.neural_network_count += 0.25
+
+/datum/nanite_program/researchplus/disable_passive_effect()
+	. = ..()
+	if(!iscarbon(host_mob))
+		return
+	if(host_mob.client)
+		SSnanites.neural_network_count--
+	else
+		SSnanites.neural_network_count -= 0.25
+
+/datum/nanite_program/researchplus/active_effect()
+	if(!iscarbon(host_mob))
+		return
+	var/mob/living/carbon/C = host_mob
+	var/points = round(SSnanites.neural_network_count / 12, 0.1)
+	if(!C.client) //less brainpower
+		points *= 0.25
+	SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = points))
+
diff --git a/code/modules/research/nanites/program_disks.dm b/code/modules/research/nanites/program_disks.dm
index 86b7803fc9..f780f40932 100644
--- a/code/modules/research/nanites/program_disks.dm
+++ b/code/modules/research/nanites/program_disks.dm
@@ -130,4 +130,16 @@
 	program_type = /datum/nanite_program/pacifying
 
 /obj/item/disk/nanite_program/stun
-	program_type = /datum/nanite_program/triggered/stun
\ No newline at end of file
+	program_type = /datum/nanite_program/triggered/stun
+
+/obj/item/disk/nanite_program/dermal_button
+	program_type = /datum/nanite_program/dermal_button
+
+/obj/item/disk/nanite_program/research
+	program_type = /datum/nanite_program/research
+
+/obj/item/disk/nanite_program/researchplus
+	program_type = /datum/nanite_program/researchplus
+
+/obj/item/disk/nanite_program/reduced_diagnostics
+	program_type = /datum/nanite_program/reduced_diagnostics
\ No newline at end of file
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 38a5282aef..6cd54dd941 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -394,7 +394,7 @@ Nothing else in the console has ID requirements.
 	l += "<h3>Chemical Storage:</h3>"
 	for(var/datum/reagent/R in linked_lathe.reagents.reagent_list)
 		l += "[R.name]: [R.volume]"
-		l += "<A href='?src=[REF(src)];disposeP=[R.id]'>Purge</A>"
+		l += "<A href='?src=[REF(src)];disposeP=[R]'>Purge</A>"
 	l += "</div>"
 	return l
 
@@ -497,7 +497,7 @@ Nothing else in the console has ID requirements.
 	l += "<h3>Chemical Storage:</h3>"
 	for(var/datum/reagent/R in linked_imprinter.reagents.reagent_list)
 		l += "[R.name]: [R.volume]"
-		l += "<A href='?src=[REF(src)];disposeI=[R.id]'>Purge</A>"
+		l += "<A href='?src=[REF(src)];disposeI=[R]'>Purge</A>"
 	return l
 
 /obj/machinery/computer/rdconsole/proc/ui_circuit_materials()	//Legacy code!
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 12fe64463d..e29cf28f34 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -51,6 +51,56 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
 	alt_sound = 'sound/items/pshoom_2.ogg'
 	component_type = /datum/component/storage/concrete/bluespace/rped
 
+/obj/item/storage/part_replacer/bluespace/tier1
+
+/obj/item/storage/part_replacer/bluespace/tier1/PopulateContents()
+	for(var/i in 1 to 10)
+		new /obj/item/stock_parts/capacitor(src)
+		new /obj/item/stock_parts/scanning_module(src)
+		new /obj/item/stock_parts/manipulator(src)
+		new /obj/item/stock_parts/micro_laser(src)
+		new /obj/item/stock_parts/matter_bin(src)
+
+/obj/item/storage/part_replacer/bluespace/tier2
+
+/obj/item/storage/part_replacer/bluespace/tier2/PopulateContents()
+	for(var/i in 1 to 10)
+		new /obj/item/stock_parts/capacitor/adv(src)
+		new /obj/item/stock_parts/scanning_module/adv(src)
+		new /obj/item/stock_parts/manipulator/nano(src)
+		new /obj/item/stock_parts/micro_laser/high(src)
+		new /obj/item/stock_parts/matter_bin/adv(src)
+
+/obj/item/storage/part_replacer/bluespace/tier3
+
+/obj/item/storage/part_replacer/bluespace/tier3/PopulateContents()
+	for(var/i in 1 to 10)
+		new /obj/item/stock_parts/capacitor/super(src)
+		new /obj/item/stock_parts/scanning_module/phasic(src)
+		new /obj/item/stock_parts/manipulator/pico(src)
+		new /obj/item/stock_parts/micro_laser/ultra(src)
+		new /obj/item/stock_parts/matter_bin/super(src)
+
+/obj/item/storage/part_replacer/bluespace/tier4
+
+/obj/item/storage/part_replacer/bluespace/tier4/PopulateContents()
+	for(var/i in 1 to 10)
+		new /obj/item/stock_parts/capacitor/quadratic(src)
+		new /obj/item/stock_parts/scanning_module/triphasic(src)
+		new /obj/item/stock_parts/manipulator/femto(src)
+		new /obj/item/stock_parts/micro_laser/quadultra(src)
+		new /obj/item/stock_parts/matter_bin/bluespace(src)
+
+/obj/item/storage/part_replacer/cargo //used in a cargo crate
+
+/obj/item/storage/part_replacer/cargo/PopulateContents()
+	for(var/i in 1 to 10)
+		new /obj/item/stock_parts/capacitor(src)
+		new /obj/item/stock_parts/scanning_module(src)
+		new /obj/item/stock_parts/manipulator(src)
+		new /obj/item/stock_parts/micro_laser(src)
+		new /obj/item/stock_parts/matter_bin(src)
+
 /obj/item/storage/part_replacer/cyborg
 	icon_state = "borgrped"
 
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index aff927c4f5..21c37725bf 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -365,7 +365,7 @@
 	display_name = "Advanced Robotics Research"
 	description = "It can even do the dishes!"
 	prereq_ids = list("robotics")
-	design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_advancedmop")
+	design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_advancedmop", "borg_upgrade_advcutter", "borg_upgrade_premiumka")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
 	export_price = 5000
 
@@ -391,7 +391,7 @@
 	display_name = "Cyborg Upgrades: Utility"
 	description = "Utility upgrades for cyborgs."
 	prereq_ids = list("engineering", "robotics")
-	design_ids = list("borg_upgrade_holding", "borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped")
+	design_ids = list("borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 	export_price = 5000
 
@@ -960,7 +960,7 @@
 	prereq_ids = list("datatheory","robotics")
 	design_ids = list("nanite_disk","nanite_remote","nanite_scanner",\
 						"nanite_chamber","public_nanite_chamber","nanite_chamber_control","nanite_programmer","nanite_program_hub","nanite_cloud_control",\
-						"relay_nanites", "monitoring_nanites", "access_nanites", "repairing_nanites","sensor_nanite_volume", "repeater_nanites", "relay_repeater_nanites")
+						"relay_nanites", "monitoring_nanites", "access_nanites", "repairing_nanites","sensor_nanite_volume", "repeater_nanites", "relay_repeater_nanites","red_diag_nanites")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
 
@@ -969,7 +969,7 @@
 	display_name = "Smart Nanite Programming"
 	description = "Nanite programs that require nanites to perform complex actions, act independently, roam or seek targets."
 	prereq_ids = list("nanite_base","adv_robotics")
-	design_ids = list("purging_nanites", "metabolic_nanites", "stealth_nanites", "memleak_nanites","sensor_voice_nanites", "voice_nanites")
+	design_ids = list("purging_nanites", "research_nanites", "metabolic_nanites", "stealth_nanites", "memleak_nanites","sensor_voice_nanites", "voice_nanites")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 	export_price = 4000
 
@@ -978,7 +978,7 @@
 	display_name = "Mesh Nanite Programming"
 	description = "Nanite programs that require static structures and membranes."
 	prereq_ids = list("nanite_base","engineering")
-	design_ids = list("hardening_nanites", "refractive_nanites", "cryo_nanites", "conductive_nanites", "shock_nanites", "emp_nanites", "temperature_nanites")
+	design_ids = list("hardening_nanites", "dermal_button_nanites", "refractive_nanites", "cryo_nanites", "conductive_nanites", "shock_nanites", "emp_nanites", "temperature_nanites")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
 
@@ -1015,7 +1015,7 @@
 	display_name = "Harmonic Nanite Programming"
 	description = "Nanite programs that require seamless integration between nanites and biology."
 	prereq_ids = list("nanite_bio","nanite_smart","nanite_mesh")
-	design_ids = list("fakedeath_nanites","aggressive_nanites","defib_nanites","regenerative_plus_nanites","brainheal_plus_nanites","purging_plus_nanites","adrenaline_nanites")
+	design_ids = list("fakedeath_nanites","researchplus_nanites","aggressive_nanites","defib_nanites","regenerative_plus_nanites","brainheal_plus_nanites","purging_plus_nanites","adrenaline_nanites")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
 	export_price = 8000
 
diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm
index 1146f01f0b..17a6b77bfe 100644
--- a/code/modules/research/xenobiology/crossbreeding/__corecross.dm
+++ b/code/modules/research/xenobiology/crossbreeding/__corecross.dm
@@ -114,19 +114,19 @@ To add a crossbreed:
 	name = "blood extract"
 	desc = "A sphere of liquid blood, somehow managing to stay together."
 	color = "#FF0000"
-	list_reagents = list("blood" = 50)
+	list_reagents = list(/datum/reagent/blood = 50)
 
 /obj/item/slimecrossbeaker/pax //5u synthpax.
 	name = "peace-inducing extract"
 	desc = "A small blob of synthetic pax."
 	color = "#FFCCCC"
-	list_reagents = list("synthpax" = 5)
+	list_reagents = list(/datum/reagent/pax/peaceborg = 5)
 
 /obj/item/slimecrossbeaker/omnizine //15u omnizine.
 	name = "healing extract"
 	desc = "A gelatinous extract of pure omnizine."
 	color = "#FF00FF"
-	list_reagents = list("omnizine" = 15)
+	list_reagents = list(/datum/reagent/medicine/omnizine = 15)
 
 /obj/item/slimecrossbeaker/autoinjector //As with the above, but automatically injects whomever it is used on with contents.
 	var/ignore_flags = FALSE
@@ -160,7 +160,7 @@ To add a crossbreed:
 	name = "mending solution"
 	desc = "A strange glob of sweet-smelling semifluid, which seems to stick to skin rather easily."
 	color = "#FF00FF"
-	list_reagents = list("regen_jelly" = 20)
+	list_reagents = list(/datum/reagent/medicine/regen_jelly = 20)
 
 /obj/item/slimecrossbeaker/autoinjector/slimejelly //Primarily for slimepeople, but you do you.
 	self_use_only = TRUE
@@ -168,13 +168,13 @@ To add a crossbreed:
 	name = "slime jelly bubble"
 	desc = "A sphere of slime jelly. It seems to stick to your skin, but avoids other surfaces."
 	color = "#00FF00"
-	list_reagents = list("slimejelly" = 50)
+	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
 
 /obj/item/slimecrossbeaker/autoinjector/peaceandlove
 	name = "peaceful distillation"
 	desc = "A light pink gooey sphere. Simply touching it makes you a little dizzy."
 	color = "#DDAAAA"
-	list_reagents = list("synthpax" = 10, "space_drugs" = 15) //Peace, dudes
+	list_reagents = list(/datum/reagent/pax/peaceborg = 10, /datum/reagent/drug/space_drugs = 15) //Peace, dudes
 
 /obj/item/slimecrossbeaker/autoinjector/peaceandlove/Initialize()
 	. = ..()
@@ -184,4 +184,4 @@ To add a crossbreed:
 	name = "invigorating gel"
 	desc = "A bubbling purple mixture, designed to heal and boost movement."
 	color = "#FF00FF"
-	list_reagents = list("regen_jelly" = 30, "methamphetamine" = 9)
+	list_reagents = list(/datum/reagent/medicine/regen_jelly = 30, /datum/reagent/drug/methamphetamine = 9)
diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm
index 0099fe143d..4684352ef5 100644
--- a/code/modules/research/xenobiology/crossbreeding/_misc.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm
@@ -50,7 +50,7 @@
 	filling_color = "#964B00"
 	tastes = list("cardboard" = 3, "sadness" = 3)
 	foodtype = null //Don't ask what went into them. You're better off not knowing.
-	list_reagents = list("stabilizednutriment" = 10, "nutriment" = 2) //Won't make you fat. Will make you question your sanity.
+	list_reagents = list(/datum/reagent/consumable/nutriment/stabilized = 10, /datum/reagent/consumable/nutriment = 2) //Won't make you fat. Will make you question your sanity.
 
 /obj/item/reagent_containers/food/snacks/rationpack/checkLiked(fraction, mob/M)	//Nobody likes rationpacks. Nobody.
 	if(last_check_time + 50 < world.time)
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 292aba6c05..0838e70bfd 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -910,9 +910,9 @@ datum/status_effect/stabilized/blue/on_remove()
 /datum/status_effect/stabilized/lightpink/tick()
 	owner.adjustStaminaLoss(-4.5)
 	for(var/mob/living/carbon/human/H in range(1, get_turf(owner)))
-		if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent("epinephrine"))
+		if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
 			to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.")
-			H.reagents.add_reagent("epinephrine",5)
+			H.reagents.add_reagent(/datum/reagent/medicine/epinephrine,5)
 	return ..()
 
 /datum/status_effect/stabilized/lightpink/on_remove()
diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
index 363331e12d..e5b30962ae 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -14,10 +14,10 @@ Burning extracts:
 	create_reagents(10, INJECTABLE | DRAWABLE)
 
 /obj/item/slimecross/burning/attack_self(mob/user)
-	if(!reagents.has_reagent("plasma",10))
+	if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
 		to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
 		return
-	reagents.remove_reagent("plasma",10)
+	reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
 	to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
 	playsound(src, 'sound/magic/fireball.ogg', 50, 1)
@@ -44,7 +44,7 @@ Burning extracts:
 /obj/item/slimecross/burning/orange/do_effect(mob/user)
 	user.visible_message("<span class='danger'>[src] boils over with a caustic gas!</span>")
 	var/datum/reagents/R = new/datum/reagents(100)
-	R.add_reagent("condensedcapsaicin", 100)
+	R.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 100)
 
 	var/datum/effect_system/smoke_spread/chem/smoke = new
 	smoke.set_up(R, 7, get_turf(user))
@@ -113,8 +113,8 @@ Burning extracts:
 /obj/item/slimecross/burning/darkblue/do_effect(mob/user)
 	user.visible_message("<span class='danger'>[src] releases a burst of chilling smoke!</span>")
 	var/datum/reagents/R = new/datum/reagents(100)
-	R.add_reagent("frostoil", 40)
-	user.reagents.add_reagent("cryoxadone",10)
+	R.add_reagent(/datum/reagent/consumable/frostoil, 40)
+	user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,10)
 	var/datum/effect_system/smoke_spread/chem/smoke = new
 	smoke.set_up(R, 7, get_turf(user))
 	smoke.start()
@@ -131,7 +131,7 @@ Burning extracts:
 	for(var/i = 0, i < amount, i++)
 		var/path = get_random_food()
 		var/obj/item/O = new path(pick(turfs))
-		O.reagents.add_reagent("slimejelly",5) //Oh god it burns
+		O.reagents.add_reagent(/datum/reagent/toxin/slimejelly, 5) //Oh god it burns
 		if(prob(50))
 			O.desc += " It smells strange..."
 	user.visible_message("<span class='danger'>[src] produces a few pieces of food!</span>")
@@ -268,7 +268,7 @@ Burning extracts:
 /obj/item/slimecross/burning/lightpink/do_effect(mob/user)
 	user.visible_message("<span class='danger'>[src] lets off a hypnotizing pink glow!</span>")
 	for(var/mob/living/carbon/C in view(7, get_turf(user)))
-		C.reagents.add_reagent("pax",5)
+		C.reagents.add_reagent(/datum/reagent/pax, 5)
 	..()
 
 /obj/item/slimecross/burning/adamantine
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index 7b5fe9e8b8..75a15be9ce 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -15,10 +15,10 @@ Charged extracts:
 	create_reagents(10, INJECTABLE | DRAWABLE)
 
 /obj/item/slimecross/charged/attack_self(mob/user)
-	if(!reagents.has_reagent("plasma",10))
+	if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
 		to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
 		return
-	reagents.remove_reagent("plasma",10)
+	reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
 	to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
 	playsound(src, 'sound/effects/light_flicker.ogg', 50, 1)
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index ff55a87dfa..1405bbad51 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -14,10 +14,10 @@ Chilling extracts:
 	create_reagents(10, INJECTABLE | DRAWABLE)
 
 /obj/item/slimecross/chilling/attack_self(mob/user)
-	if(!reagents.has_reagent("plasma",10))
+	if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
 		to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
 		return
-	reagents.remove_reagent("plasma",10)
+	reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
 	to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
 	playsound(src, 'sound/effects/glassbr1.ogg', 50, 1)
@@ -56,7 +56,7 @@ Chilling extracts:
 		return
 	user.visible_message("<span class='notice'>[src] shatters, and a healing aura fills the room briefly.</span>")
 	for(var/mob/living/carbon/C in A)
-		C.reagents.add_reagent("regen_jelly",10)
+		C.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
 	..()
 
 /obj/item/slimecross/chilling/blue
diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm
index d6536f4fdd..0e8bf1e11f 100644
--- a/code/modules/research/xenobiology/crossbreeding/consuming.dm
+++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm
@@ -20,7 +20,7 @@ Consuming extracts:
 		if(last_produced + cooldown > world.time)
 			to_chat(user, "<span class='warning'>[src] is still digesting after its last meal!<span>")
 			return
-		var/datum/reagent/N = O.reagents.has_reagent("nutriment")
+		var/datum/reagent/N = O.reagents.has_reagent(/datum/reagent/consumable/nutriment)
 		if(N)
 			nutriment_eaten += N.volume
 			to_chat(user, "<span class='notice'>[src] opens up and swallows [O] whole!</span>")
@@ -73,7 +73,7 @@ Consuming extracts:
 		to_chat(M, "Tastes like [taste].")
 		playsound(get_turf(M), 'sound/items/eatfood.ogg', 20, 1)
 		if(nutrition)
-			M.reagents.add_reagent("nutriment",nutrition)
+			M.reagents.add_reagent(/datum/reagent/consumable/nutriment,nutrition)
 		do_effect(M, user)
 		qdel(src)
 		return
@@ -199,7 +199,7 @@ Consuming extracts:
 	nutrition = 0 //We don't want normal nutriment
 
 /obj/item/slime_cookie/silver/do_effect(mob/living/M, mob/user)
-	M.reagents.add_reagent("stabilizednutriment",10)
+	M.reagents.add_reagent(/datum/reagent/consumable/nutriment/stabilized, 10)
 
 /obj/item/slimecross/consuming/bluespace
 	colour = "bluespace"
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index a21fddb6cf..bec2c2c1ae 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -30,13 +30,13 @@ Industrial extracts:
 
 /obj/item/slimecross/industrial/process()
 	var/IsWorking = FALSE
-	if(reagents.has_reagent("plasma",amount = 2) && plasmarequired > 1) //Can absorb as much as 2
+	if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 2) && plasmarequired > 1) //Can absorb as much as 2
 		IsWorking = TRUE
-		reagents.remove_reagent("plasma",2)
+		reagents.remove_reagent(/datum/reagent/toxin/plasma,2)
 		plasmaabsorbed += 2
-	else if(reagents.has_reagent("plasma",amount = 1)) //Can absorb as little as 1
+	else if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 1)) //Can absorb as little as 1
 		IsWorking = TRUE
-		reagents.remove_reagent("plasma",1)
+		reagents.remove_reagent(/datum/reagent/toxin/plasma,1)
 		plasmaabsorbed += 1
 
 	if(plasmaabsorbed >= plasmarequired)
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 6c7ea102bc..55865d1ae2 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -51,7 +51,7 @@ Regenerative extracts:
 	colour = "purple"
 
 /obj/item/slimecross/regenerative/purple/core_effect(mob/living/target, mob/user)
-	target.reagents.add_reagent("regen_jelly",10)
+	target.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
 
 /obj/item/slimecross/regenerative/blue
 	colour = "blue"
@@ -174,7 +174,7 @@ Regenerative extracts:
 
 /obj/item/slimecross/regenerative/red/core_effect(mob/living/target, mob/user)
 	to_chat(target, "<span class='notice'>You feel... <i>faster.</i></span>")
-	target.reagents.add_reagent("ephedrine",3)
+	target.reagents.add_reagent(/datum/reagent/medicine/ephedrine,3)
 
 /obj/item/slimecross/regenerative/green
 	colour = "green"
@@ -185,7 +185,7 @@ Regenerative extracts:
 		var/mob/living/simple_animal/slime/S = target
 		S.random_colour()
 	if(isjellyperson(target))
-		target.reagents.add_reagent("slime_toxin",5)
+		target.reagents.add_reagent(/datum/reagent/slime_toxin,5)
 
 
 /obj/item/slimecross/regenerative/pink
@@ -193,7 +193,7 @@ Regenerative extracts:
 
 /obj/item/slimecross/regenerative/pink/core_effect(mob/living/target, mob/user)
 	to_chat(target, "<span class='notice'>You feel more calm.</span>")
-	target.reagents.add_reagent("krokodil",4)
+	target.reagents.add_reagent(/datum/reagent/drug/krokodil,4)
 
 /obj/item/slimecross/regenerative/gold
 	colour = "gold"
diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
index a86db788a6..72b4158be6 100644
--- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
+++ b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
@@ -38,10 +38,10 @@ Self-sustaining extracts:
 		return
 	if(reagentselect == "lesser plasma")
 		amount = 4
-		reagentselect = "plasma"
+		reagentselect = /datum/reagent/toxin/plasma
 	if(reagentselect == "holy water and uranium")
-		reagentselect = "holywater"
-		secondary = "uranium"
+		reagentselect = /datum/reagent/water/holywater
+		secondary = /datum/reagent/uranium
 	extract.forceMove(user.drop_location())
 	qdel(src)
 	user.put_in_active_hand(extract)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index ab0db8c4a7..8eecf1f635 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -42,7 +42,7 @@
 
 /obj/item/slime_extract/on_grind()
 	if(Uses)
-		grind_results["slimejelly"] = 20
+		grind_results[/datum/reagent/toxin/slimejelly] = 20
 
 //Effect when activated by a Luminescent. Separated into a minor and major effect. Returns cooldown in deciseconds.
 /obj/item/slime_extract/proc/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
@@ -78,7 +78,7 @@
 	name = "grey slime extract"
 	icon_state = "grey slime extract"
 	effectmod = "reproductive"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -103,7 +103,7 @@
 	name = "gold slime extract"
 	icon_state = "gold slime extract"
 	effectmod = "symbiont"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/gold/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -132,7 +132,7 @@
 	name = "silver slime extract"
 	icon_state = "silver slime extract"
 	effectmod = "consuming"
-	activate_reagents = list("plasma","water")
+	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/silver/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -157,7 +157,7 @@
 	name = "metal slime extract"
 	icon_state = "metal slime extract"
 	effectmod = "industrial"
-	activate_reagents = list("plasma","water")
+	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/metal/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -181,7 +181,7 @@
 	name = "purple slime extract"
 	icon_state = "purple slime extract"
 	effectmod = "regenerative"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/purple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -193,14 +193,14 @@
 
 		if(SLIME_ACTIVATE_MAJOR)
 			to_chat(user, "<span class='notice'>You activate [src], and it releases regenerative chemicals!</span>")
-			user.reagents.add_reagent("regen_jelly",10)
+			user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
 			return 600
 
 /obj/item/slime_extract/darkpurple
 	name = "dark purple slime extract"
 	icon_state = "dark purple slime extract"
 	effectmod = "self-sustaining"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/darkpurple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -223,19 +223,19 @@
 	name = "orange slime extract"
 	icon_state = "orange slime extract"
 	effectmod = "burning"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/orange/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
 			to_chat(user, "<span class='notice'>You activate [src]. You start feeling hot!</span>")
-			user.reagents.add_reagent("capsaicin",10)
+			user.reagents.add_reagent(/datum/reagent/consumable/capsaicin,10)
 			return 150
 
 		if(SLIME_ACTIVATE_MAJOR)
-			user.reagents.add_reagent("phosphorus",5)//
-			user.reagents.add_reagent("potassium",5) // = smoke, along with any reagents inside mr. slime
-			user.reagents.add_reagent("sugar",5)     //
+			user.reagents.add_reagent(/datum/reagent/phosphorus,5)
+			user.reagents.add_reagent(/datum/reagent/potassium,5) // = smoke, along with any reagents inside mr. slime
+			user.reagents.add_reagent(/datum/reagent/consumable/sugar,5)
 			to_chat(user, "<span class='warning'>You activate [src], and a cloud of smoke bursts out of your skin!</span>")
 			return 450
 
@@ -243,7 +243,7 @@
 	name = "yellow slime extract"
 	icon_state = "yellow slime extract"
 	effectmod = "charged"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/yellow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -266,13 +266,13 @@
 	name = "red slime extract"
 	icon_state = "red slime extract"
 	effectmod = "sanguine"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/red/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
 			to_chat(user, "<span class='notice'>You activate [src]. You start feeling fast!</span>")
-			user.reagents.add_reagent("ephedrine",5)
+			user.reagents.add_reagent(/datum/reagent/medicine/ephedrine,5)
 			return 450
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -286,15 +286,15 @@
 	name = "blue slime extract"
 	icon_state = "blue slime extract"
 	effectmod = "stabilized"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/water)
 
 /obj/item/slime_extract/blue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
 			to_chat(user, "<span class='notice'>You activate [src]. Your genome feels more stable!</span>")
 			user.adjustCloneLoss(-15)
-			user.reagents.add_reagent("mutadone", 10)
-			user.reagents.add_reagent("potass_iodide", 10)
+			user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10)
+			user.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, 10)
 			return 250
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -310,7 +310,7 @@
 	name = "dark blue slime extract"
 	icon_state = "dark blue slime extract"
 	effectmod = "chilling"
-	activate_reagents = list("plasma","water")
+	activate_reagents = list(/datum/reagent/toxin/plasma, /datum/reagent/water)
 
 /obj/item/slime_extract/darkblue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -318,8 +318,8 @@
 			to_chat(user, "<span class='notice'>You activate [src]. You start feeling colder!</span>")
 			user.ExtinguishMob()
 			user.adjust_fire_stacks(-20)
-			user.reagents.add_reagent("frostoil",4)
-			user.reagents.add_reagent("cryoxadone",5)
+			user.reagents.add_reagent(/datum/reagent/consumable/frostoil,4)
+			user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,5)
 			return 100
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -333,7 +333,7 @@
 	name = "pink slime extract"
 	icon_state = "pink slime extract"
 	effectmod = "gentle"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/pink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -354,14 +354,14 @@
 			user.visible_message("<span class='warning'>[user]'s skin starts flashing hypnotically...</span>", "<span class='notice'>Your skin starts forming odd patterns, pacifying creatures around you.</span>")
 			for(var/mob/living/carbon/C in viewers(user, null))
 				if(C != user)
-					C.reagents.add_reagent("pax",2)
+					C.reagents.add_reagent(/datum/reagent/pax,2)
 			return 600
 
 /obj/item/slime_extract/green
 	name = "green slime extract"
 	icon_state = "green slime extract"
 	effectmod = "mutative"
-	activate_reagents = list("blood","plasma","radium")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/radium)
 
 /obj/item/slime_extract/green/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -385,7 +385,7 @@
 	name = "light pink slime extract"
 	icon_state = "light pink slime extract"
 	effectmod = "loyal"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/lightpink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -409,7 +409,7 @@
 	name = "black slime extract"
 	icon_state = "black slime extract"
 	effectmod = "transformative"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/black/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -430,7 +430,7 @@
 	name = "oil slime extract"
 	icon_state = "oil slime extract"
 	effectmod = "detonating"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/oil/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -453,7 +453,7 @@
 	name = "adamantine slime extract"
 	icon_state = "adamantine slime extract"
 	effectmod = "crystalline"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/adamantine/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -482,7 +482,7 @@
 	name = "bluespace slime extract"
 	icon_state = "bluespace slime extract"
 	effectmod = "warping"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 	var/teleport_ready = FALSE
 	var/teleport_x = 0
 	var/teleport_y = 0
@@ -518,7 +518,7 @@
 	name = "pyrite slime extract"
 	icon_state = "pyrite slime extract"
 	effectmod = "prismatic"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/pyrite/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -545,12 +545,12 @@
 	name = "cerulean slime extract"
 	icon_state = "cerulean slime extract"
 	effectmod = "recurring"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/cerulean/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
-			user.reagents.add_reagent("salbutamol",15)
+			user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15)
 			to_chat(user, "<span class='notice'>You feel like you don't need to breathe!</span>")
 			return 150
 
@@ -565,7 +565,7 @@
 	name = "sepia slime extract"
 	icon_state = "sepia slime extract"
 	effectmod = "lengthened"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/water)
 
 /obj/item/slime_extract/sepia/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -587,7 +587,7 @@
 	name = "rainbow slime extract"
 	icon_state = "rainbow slime extract"
 	effectmod = "hyperchromatic"
-	activate_reagents = list("blood","plasma","lesser plasma","slimejelly","holy water and uranium") //Curse this snowflake reagent list.
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma,"lesser plasma", /datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
 
 /obj/item/slime_extract/rainbow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
diff --git a/code/modules/ruins/lavalandruin_code/alien_nest.dm b/code/modules/ruins/lavalandruin_code/alien_nest.dm
index ca33324a90..d98a6bf5c1 100644
--- a/code/modules/ruins/lavalandruin_code/alien_nest.dm
+++ b/code/modules/ruins/lavalandruin_code/alien_nest.dm
@@ -16,4 +16,4 @@
 	desc = "A syringe filled with a strange viscous liquid. It might be best to leave it alone."
 	amount_per_transfer_from_this = 1
 	volume = 1
-	list_reagents = list("xenomicrobes" = 1)
+	list_reagents = list(/datum/reagent/xenomicrobes = 1)
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index caa2ca7adf..76897b5276 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -108,7 +108,7 @@
 	if (levels.len)
 		dest = locate(T.x, T.y, pick(levels))
 
-	T.ChangeTurf(/turf/open/chasm)
+	T.ChangeTurf(/turf/open/chasm, flags = CHANGETURF_INHERIT_AIR)
 	var/turf/open/chasm/C = T
 	C.set_target(dest)
 	C.drop(user)
diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm
index 3ebded7487..38a2d5bddd 100644
--- a/code/modules/spells/spell_types/conjure.dm
+++ b/code/modules/spells/spell_types/conjure.dm
@@ -31,7 +31,7 @@
 		if(ispath(summoned_object_type, /turf))
 			var/turf/O = spawn_place
 			var/N = summoned_object_type
-			O.ChangeTurf(N)
+			O.ChangeTurf(N, flags = CHANGETURF_INHERIT_AIR)
 		else
 			var/atom/summoned_object = new summoned_object_type(spawn_place)
 
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
index 8b8328abbe..d97d466e4d 100644
--- a/code/modules/spells/spell_types/devil.dm
+++ b/code/modules/spells/spell_types/devil.dm
@@ -234,7 +234,7 @@
 		dancefloor_exists = FALSE
 		for(var/i in 1 to dancefloor_turfs.len)
 			var/turf/T = dancefloor_turfs[i]
-			T.ChangeTurf(dancefloor_turfs_types[i])
+			T.ChangeTurf(dancefloor_turfs_types[i], flags = CHANGETURF_INHERIT_AIR)
 	else
 		var/list/funky_turfs = RANGE_TURFS(1, user)
 		for(var/turf/closed/solid in funky_turfs)
@@ -248,7 +248,7 @@
 			var/turf/T = t
 			dancefloor_turfs[i] = T
 			dancefloor_turfs_types[i] = T.type
-			T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b)
+			T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b, flags = CHANGETURF_INHERIT_AIR)
 			i++
 
 /datum/effect_system/smoke_spread/transparent/dancefloor_devil
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 8108b121ae..c4a2b4aa7e 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -216,4 +216,4 @@
 	P.original = user
 	P.firer = user
 	P.fire()
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm
index b4c236d150..e5b9144535 100644
--- a/code/modules/spells/spell_types/touch_attacks.dm
+++ b/code/modules/spells/spell_types/touch_attacks.dm
@@ -80,8 +80,8 @@
 	hand_path = /obj/item/melee/touch_attack/nuclearfist
 
 	school = "evocation"
-	charge_max = 200
+	charge_max = 100
 	clothes_req = 0
-	cooldown_min = 40
+	cooldown_min = 20
 
-	action_icon_state = "nuclearfist"
\ No newline at end of file
+	action_icon_state = "nuclearfist"
diff --git a/code/modules/surgery/advanced/necrotic_revival.dm b/code/modules/surgery/advanced/necrotic_revival.dm
index f8fb160a8a..d95d0a3ac7 100644
--- a/code/modules/surgery/advanced/necrotic_revival.dm
+++ b/code/modules/surgery/advanced/necrotic_revival.dm
@@ -19,7 +19,7 @@
 	implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
 	implements = list(/obj/item/reagent_containers/syringe = 100, /obj/item/pen = 30)
 	time = 50
-	chems_needed = list("zombiepowder", "rezadone")
+	chems_needed = list(/datum/reagent/toxin/zombiepowder, /datum/reagent/medicine/rezadone)
 	require_all_chems = FALSE
 
 /datum/surgery_step/bionecrosis/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm
index 87e6a8a99f..86832602e8 100644
--- a/code/modules/surgery/advanced/viral_bonding.dm
+++ b/code/modules/surgery/advanced/viral_bonding.dm
@@ -20,7 +20,7 @@
 	name = "viral bond"
 	implements = list(TOOL_CAUTERY  = 100, TOOL_WELDER = 50, /obj/item = 30) // 30% success with any hot item.
 	time = 100
-	chems_needed = list("spaceacillin","virusfood","formaldehyde")
+	chems_needed = list(/datum/reagent/medicine/spaceacillin, /datum/reagent/consumable/virus_food,/datum/reagent/toxin/formaldehyde)
 
 /datum/surgery_step/viral_bond/tool_check(mob/user, obj/item/tool)
 	if(implement_type == TOOL_WELDER || implement_type == /obj/item)
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index a1b74942e0..63a392bf06 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -172,9 +172,8 @@
 	var/total_damage = brute + burn
 
 	if(total_damage > can_inflict)
-		var/excess = total_damage - can_inflict
-		brute = round(brute * (excess / total_damage),DAMAGE_PRECISION)
-		burn = round(burn * (excess / total_damage),DAMAGE_PRECISION)
+		brute = round(brute * (max_damage / total_damage),DAMAGE_PRECISION)
+		burn = round(burn * (max_damage / total_damage),DAMAGE_PRECISION)
 
 	brute_dam += brute
 	burn_dam += burn
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index fdc7ac9fe9..cfab53b3fd 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -22,11 +22,14 @@
 	SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
 	drop_limb()
 
+	C.bleed(40)
+
+	if(QDELETED(src)) //Could have dropped into lava/explosion/chasm/whatever
+		return TRUE
 	if(dam_type == BURN)
 		burn()
-		return 1
+		return TRUE
 	add_mob_blood(C)
-	C.bleed(40)
 	var/direction = pick(GLOB.cardinals)
 	var/t_range = rand(2,max(throw_range/2, 2))
 	var/turf/target_turf = get_turf(src)
@@ -38,7 +41,7 @@
 		if(new_turf.density)
 			break
 	throw_at(target_turf, throw_range, throw_speed)
-	return 1
+	return TRUE
 
 
 /obj/item/bodypart/chest/dismember()
@@ -149,7 +152,6 @@
 		LB.brainmob = brainmob
 		brainmob = null
 		LB.brainmob.forceMove(LB)
-		LB.brainmob.container = LB
 		LB.brainmob.stat = DEAD
 
 /obj/item/organ/eyes/transfer_to_limb(obj/item/bodypart/head/LB, mob/living/carbon/human/C)
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index 069f30e24c..51866b6719 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -287,51 +287,19 @@
 			. = "ffc905"
 
 /mob/living/carbon/proc/Digitigrade_Leg_Swap(swap_back)
-	var/body_plan_changed = FALSE
 	for(var/X in bodyparts)
 		var/obj/item/bodypart/O = X
-		var/obj/item/bodypart/N
-		if((!O.use_digitigrade && swap_back == FALSE) || (O.use_digitigrade && swap_back == TRUE))
-			if(O.body_part == LEG_LEFT)
-				if(swap_back == TRUE)
-					N = new /obj/item/bodypart/l_leg
-				else
-					N = new /obj/item/bodypart/l_leg/digitigrade
-			else if(O.body_part == LEG_RIGHT)
-				if(swap_back == TRUE)
-					N = new /obj/item/bodypart/r_leg
-				else
-					N = new /obj/item/bodypart/r_leg/digitigrade
-		if(!N)
-			continue
-		body_plan_changed = TRUE
-		O.drop_limb(1)
-		qdel(O)
-		N.attach_limb(src)
+		if((O.body_part == LEG_LEFT || O.body_part == LEG_RIGHT) && ((!O.use_digitigrade && !swap_back) || (O.use_digitigrade && swap_back)))
+			O.use_digitigrade = swap_back ? NOT_DIGITIGRADE : FULL_DIGITIGRADE
+			O.update_limb(FALSE, src)
 
-	if(body_plan_changed && ishuman(src))
+	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
 		if(H.w_uniform)
-			var/obj/item/clothing/under/U = H.w_uniform
-			if(U.mutantrace_variation)
-				if(swap_back)
-					U.suit_style = NORMAL_SUIT_STYLE
-				else
-					U.suit_style = DIGITIGRADE_SUIT_STYLE
-				H.update_inv_w_uniform()
+			H.update_inv_w_uniform()
 		if(H.shoes)
-			var/obj/item/clothing/shoes/S = H.shoes
-			if(swap_back)
-				S.adjusted = NORMAL_STYLE
-			else
-				S.adjusted = ALT_STYLE
 			H.update_inv_shoes()
 		if(H.wear_suit)
-			var/obj/item/clothing/suit/S = H.wear_suit
-			if(swap_back)
-				S.adjusted = NORMAL_STYLE
-			else
-				S.adjusted = ALT_STYLE
 			H.update_inv_wear_suit()
 
 /mob/living/carbon/proc/get_body_parts_flags()
diff --git a/code/modules/surgery/embalming.dm b/code/modules/surgery/embalming.dm
index 0af3240c5d..c6d2c72caa 100644
--- a/code/modules/surgery/embalming.dm
+++ b/code/modules/surgery/embalming.dm
@@ -12,7 +12,7 @@
 /datum/surgery_step/embalming
 	name = "embalming body"
 	implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 35)
-	chems_needed = list("drying_agent", "sterilizine")
+	chems_needed = list(/datum/reagent/drying_agent, /datum/reagent/space_cleaner/sterilizine)
 	require_all_chems = FALSE
 
 /datum/surgery_step/embalming/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/graft_synthtissue.dm b/code/modules/surgery/graft_synthtissue.dm
index 86b2a8e909..afe8c9d1d1 100644
--- a/code/modules/surgery/graft_synthtissue.dm
+++ b/code/modules/surgery/graft_synthtissue.dm
@@ -22,7 +22,7 @@
 	implements = list(TOOL_HEMOSTAT = 100, TOOL_SCREWDRIVER = 35, /obj/item/pen = 15)
 	repeatable = TRUE
 	time = 75
-	chems_needed = list("synthtissue")
+	chems_needed = list(/datum/reagent/synthtissue)
 	var/obj/item/organ/chosen_organ
 	var/health_restored = 10
 
@@ -41,7 +41,7 @@
 			chosen_organ = organs[chosen_organ]
 			if(!chosen_organ)
 				return -1
-			if(!target.reagents.has_reagent("synthtissue"))
+			if(!target.reagents.has_reagent(/datum/reagent/synthtissue))
 				to_chat(user, "<span class='notice'>There's no synthtissue available for use on [chosen_organ]</span>")
 				return -1
 			var/datum/reagent/synthtissue/Sf = locate(/datum/reagent/synthtissue) in target.reagents.reagent_list
@@ -58,7 +58,7 @@
 			health_restored += (Sf.data["grown_volume"]/10)
 
 	user.visible_message("[user] begins to graft synthtissue onto [chosen_organ].</span>")
-	target.reagents.remove_reagent("synthtissue", 10)
+	target.reagents.remove_reagent(/datum/reagent/synthtissue, 10)
 
 /datum/surgery_step/graft_synthtissue/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	user.visible_message("[user] successfully grafts synthtissue to [chosen_organ].", "<span class='notice'>You succeed in grafting 10u of the synthflesh to the [chosen_organ].</span>")
diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm
index 0a4bd270a8..8ea4ea855d 100644
--- a/code/modules/surgery/organs/appendix.dm
+++ b/code/modules/surgery/organs/appendix.dm
@@ -42,5 +42,5 @@
 /obj/item/organ/appendix/prepare_eat()
 	var/obj/S = ..()
 	if(inflamed)
-		S.reagents.add_reagent("bad_food", 5)
+		S.reagents.add_reagent(/datum/reagent/toxin/bad_food, 5)
 	return S
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index 65172a1545..93ed149a2b 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -32,7 +32,7 @@
 	. = ..()
 	if(!owner || . & EMP_PROTECT_SELF)
 		return
-	owner.reagents.add_reagent("bad_food", poison_amount / severity)
+	owner.reagents.add_reagent(/datum/reagent/toxin/bad_food, poison_amount / severity)
 	to_chat(owner, "<span class='warning'>You feel like your insides are burning.</span>")
 
 
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 5b74b58cd0..51784bdc61 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -247,5 +247,5 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
 		min_next_adrenaline = world.time + rand(250, 600) //anywhere from 4.5 to 10 minutes
 		to_chat(owner, "<span class='userdanger'>You feel yourself dying, but you refuse to give up!</span>")
 		owner.heal_overall_damage(15, 15)
-		if(owner.reagents.get_reagent_amount("ephedrine") < 20)
-			owner.reagents.add_reagent("ephedrine", 10)
+		if(owner.reagents.get_reagent_amount(/datum/reagent/medicine/ephedrine) < 20)
+			owner.reagents.add_reagent(/datum/reagent/medicine/ephedrine, 10)
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index 01559c83c3..59185ebaaf 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -33,14 +33,12 @@
 
 			if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
 				//handle liver toxin filtration
-				for(var/I in C.reagents.reagent_list)
-					var/datum/reagent/pickedreagent = I
-					if(istype(pickedreagent, /datum/reagent/toxin))
-						var/thisamount = C.reagents.get_reagent_amount(initial(pickedreagent.id))
-						if (thisamount <= toxTolerance && thisamount)
-							C.reagents.remove_reagent(initial(pickedreagent.id), 1)
-						else
-							damage += (thisamount*toxLethality)
+				for(var/datum/reagent/toxin/T in C.reagents.reagent_list)
+					var/thisamount = C.reagents.get_reagent_amount(T.type)
+					if (thisamount && thisamount <= toxTolerance)
+						C.reagents.remove_reagent(T.type, 1)
+					else
+						damage += (thisamount*toxLethality)
 
 			//metabolize reagents
 			C.reagents.metabolize(C, can_overdose=TRUE)
@@ -56,7 +54,7 @@
 
 /obj/item/organ/liver/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("iron", 5)
+	S.reagents.add_reagent(/datum/reagent/iron, 5)
 	return S
 
 //Just in case
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 6b0e4f01ae..91153655d3 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -69,7 +69,7 @@
 	var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
 	var/heat_damage_type = BURN
 
-	var/crit_stabilizing_reagent = "epinephrine"
+	var/crit_stabilizing_reagent = /datum/reagent/medicine/epinephrine
 
 
 
@@ -301,13 +301,13 @@
 		var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz])
 		if(bz_pp > BZ_trip_balls_min)
 			H.hallucination += 10
-			H.reagents.add_reagent("bz_metabolites",5)
+			H.reagents.add_reagent(/datum/reagent/bz_metabolites,5)
 			if(prob(33))
 				H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
 
 		else if(bz_pp > 0.01)
 			H.hallucination += 5
-			H.reagents.add_reagent("bz_metabolites",1)
+			H.reagents.add_reagent(/datum/reagent/bz_metabolites,1)
 
 
 	// Tritium
@@ -331,15 +331,15 @@
 			H.adjustFireLoss(nitryl_pp/4)
 		gas_breathed = breath_gases[/datum/gas/nitryl]
 		if (gas_breathed > gas_stimulation_min)
-			H.reagents.add_reagent("no2",1)
+			H.reagents.add_reagent(/datum/reagent/nitryl,1)
 
 		breath_gases[/datum/gas/nitryl]-=gas_breathed
 
 	// Stimulum
 		gas_breathed = breath_gases[/datum/gas/stimulum]
 		if (gas_breathed > gas_stimulation_min)
-			var/existing = H.reagents.get_reagent_amount("stimulum")
-			H.reagents.add_reagent("stimulum", max(0, 5 - existing))
+			var/existing = H.reagents.get_reagent_amount(/datum/reagent/stimulum)
+			H.reagents.add_reagent(/datum/reagent/stimulum, max(0, 5 - existing))
 		breath_gases[/datum/gas/stimulum]-=gas_breathed
 
 	// Miasma
@@ -459,7 +459,7 @@
 
 /obj/item/organ/lungs/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("salbutamol", 5)
+	S.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 5)
 	return S
 
 /obj/item/organ/lungs/plasmaman
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index a180bd947e..fcbed13d94 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -173,7 +173,7 @@
 	name = "appendix"
 	icon_state = "appendix"
 	icon = 'icons/obj/surgery.dmi'
-	list_reagents = list("nutriment" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	foodtype = RAW | MEAT | GROSS
 
 
diff --git a/code/modules/tgs/v3210/commands.dm b/code/modules/tgs/v3210/commands.dm
index 71d7e32366..e674fd4e78 100644
--- a/code/modules/tgs/v3210/commands.dm
+++ b/code/modules/tgs/v3210/commands.dm
@@ -19,7 +19,7 @@
 				TGS_ERROR_LOG("Custom command [command_name] can't be used as it is empty or contains illegal characters!")
 				warned_command_names[command_name] = TRUE
 			continue
-		
+
 		if(command_name_types[command_name])
 			if(warnings_only)
 				TGS_ERROR_LOG("Custom commands [command_name_types[command_name]] and [stc] have the same name, only [command_name_types[command_name]] will be available!")
@@ -55,24 +55,24 @@ The MIT License
 
 Copyright (c) 2017 Jordan Brown
 
-Permission is hereby granted, free of charge, 
-to any person obtaining a copy of this software and 
-associated documentation files (the "Software"), to 
-deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, 
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
 subject to the following conditions:
 
-The above copyright notice and this permission notice 
+The above copyright notice and this permission notice
 shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 1415604aff..73ba785ec2 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -107,7 +107,7 @@
 			visible_message("<span class='danger'>[user] has pressed one of the colorful buttons on [src] and the clown car spews out a cloud of laughing gas.</span>")
 			var/datum/reagents/R = new/datum/reagents(300)
 			R.my_atom = src
-			R.add_reagent("superlaughter", 50)
+			R.add_reagent(/datum/reagent/consumable/superlaughter, 50)
 			var/datum/effect_system/smoke_spread/chem/smoke = new()
 			smoke.set_up(R, 4)
 			smoke.attach(src)
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index 280bcb5ca2..0d0dd40b36 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -1,6 +1,7 @@
 /obj/machinery/vending/assist
 	products = list(/obj/item/assembly/prox_sensor = 7,
 					/obj/item/assembly/igniter = 6,
+					/obj/item/assembly/playback = 4,
 					/obj/item/assembly/signaler = 6,
 					/obj/item/wirecutters = 3,
 					/obj/item/stock_parts/cell/crap = 6,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 6144f4c57a..6116936880 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -134,7 +134,13 @@
 					/obj/item/clothing/head/christmashatg = 3,
 					/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
 					/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
-					/obj/item/clothing/shoes/winterboots/santaboots = 3)
+					/obj/item/clothing/shoes/winterboots/santaboots = 3,
+					/obj/item/clothing/head/cowboyhat = 3,
+					/obj/item/clothing/head/cowboyhat/black = 3,
+					/obj/item/clothing/head/cowboyhat/white = 3,
+					/obj/item/clothing/head/cowboyhat/pink = 3,
+					/obj/item/clothing/shoes/cowboyboots = 3,
+					/obj/item/clothing/shoes/cowboyboots/black = 3)
 	contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
 					/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
 					/obj/item/clothing/mask/balaclava = 3,
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
new file mode 100644
index 0000000000..f840f391fa
--- /dev/null
+++ b/code/modules/vending/kinkmate.dm
@@ -0,0 +1,48 @@
+/obj/machinery/vending/kink
+	name = "KinkMate"
+	desc = "A vending machine for all your unmentionable desires."
+	icon = 'icons/obj/citvending.dmi'
+	icon_state = "kink"
+	circuit = /obj/item/circuitboard/machine/kinkmate
+	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
+	vend_reply = "Have fun, you shameless pervert!"
+	products = list(
+				/obj/item/clothing/under/maid = 5,
+				/obj/item/clothing/under/janimaid = 5,
+				/obj/item/clothing/neck/petcollar = 5,
+				/obj/item/clothing/neck/petcollar/choker = 5,
+				/obj/item/clothing/neck/petcollar/leather = 5,
+				/obj/item/restraints/handcuffs/fake/kinky = 5,
+				/obj/item/clothing/glasses/sunglasses/blindfold = 4,
+				/obj/item/clothing/mask/muzzle = 4,
+				/obj/item/clothing/under/stripper_pink = 3,
+				/obj/item/clothing/under/stripper_green = 3,
+				/obj/item/clothing/under/corset = 3,
+				/obj/item/clothing/under/gear_harness = 10,
+				/obj/item/dildo/custom = 5,
+				/obj/item/electropack/shockcollar = 3,
+				/obj/item/assembly/signaler = 3
+				)
+	contraband = list(
+				/obj/item/clothing/neck/petcollar/locked = 2,
+				/obj/item/key/collar = 2,
+				/obj/item/clothing/head/kitty = 3,
+				/obj/item/clothing/head/rabbitears = 3,
+				/obj/item/clothing/under/keyholesweater = 2,
+				/obj/item/clothing/under/mankini = 2,
+				/obj/item/clothing/under/jabroni = 2,
+				/obj/item/dildo/flared/huge = 3,
+				/obj/item/reagent_containers/glass/bottle/crocin = 5,
+				/obj/item/reagent_containers/glass/bottle/camphor = 5
+				)
+	premium = list(
+				/obj/item/clothing/accessory/skullcodpiece/fake = 3,
+				/obj/item/reagent_containers/glass/bottle/hexacrocin = 10,
+				/obj/item/clothing/under/pants/chaps = 5
+				)
+	refill_canister = /obj/item/vending_refill/kink
+
+/obj/item/vending_refill/kink
+	machine_name 	= "KinkMate"
+	icon			= 'modular_citadel/icons/vending_restock.dmi'
+	icon_state 		= "refill_kink"
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index ac850efc66..d32af7de03 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -24,6 +24,12 @@
 					/obj/item/reagent_containers/glass/bottle/morphine = 4,
 					/obj/item/reagent_containers/glass/bottle/toxin = 3,
 					/obj/item/reagent_containers/syringe/antiviral = 6,
+					/obj/item/storage/hypospraykit/fire = 2,
+					/obj/item/storage/hypospraykit/toxin = 2,
+					/obj/item/storage/hypospraykit/o2 = 2,
+					/obj/item/storage/hypospraykit/brute = 2,
+					/obj/item/storage/hypospraykit/enlarge = 2,
+					/obj/item/reagent_containers/glass/bottle/vial/small = 5,
 					/obj/item/storage/briefcase/medical = 2)
 	contraband = list(/obj/item/reagent_containers/pill/tox = 3,
 					/obj/item/reagent_containers/pill/morphine = 4,
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index 5c092c3659..03241c4a86 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -14,6 +14,7 @@
 					/obj/item/seeds/chanter = 3,
 					/obj/item/seeds/chili = 3,
 					/obj/item/seeds/cocoapod = 3,
+					/obj/item/seeds/coconut = 3,
 					/obj/item/seeds/coffee = 3,
 					/obj/item/seeds/cotton = 3,
 					/obj/item/seeds/corn = 3,
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 208386a93b..6cf8136c50 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -24,6 +24,7 @@
 					/obj/item/ssword_kit = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF
+	refill_canister = /obj/item/vending_refill/security
 
 /obj/machinery/vending/security/pre_throw(obj/item/I)
 	if(istype(I, /obj/item/grenade))
@@ -33,3 +34,6 @@
 		var/obj/item/flashlight/F = I
 		F.on = TRUE
 		F.update_brightness()
+
+/obj/item/vending_refill/security
+	icon_state = "snackorange"
diff --git a/code/modules/vending/sovietvend.dm b/code/modules/vending/sovietvend.dm
new file mode 100644
index 0000000000..086b37e4ee
--- /dev/null
+++ b/code/modules/vending/sovietvend.dm
@@ -0,0 +1,31 @@
+/obj/machinery/vending/sovietvend
+	name = "KomradeVendtink"
+	desc = "Rodina-mat' zovyot!"
+	icon = 'icons/obj/citvending.dmi'
+	icon_state = "soviet"
+	vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
+	product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
+	products = list(
+		/obj/item/clothing/under/soviet = 20,
+		/obj/item/clothing/head/ushanka = 20,
+		/obj/item/clothing/shoes/jackboots = 20,
+		/obj/item/clothing/head/squatter_hat = 20,
+		/obj/item/clothing/under/squatter_outfit = 20,
+		/obj/item/clothing/under/russobluecamooutfit = 20,
+		/obj/item/clothing/head/russobluecamohat = 20
+		)
+	contraband = list(
+		/obj/item/clothing/under/syndicate/tacticool = 4,
+		/obj/item/clothing/mask/balaclava = 4,
+		/obj/item/clothing/suit/russofurcoat = 4,
+		/obj/item/clothing/head/russofurhat = 4,
+		/obj/item/clothing/suit/space/hardsuit/soviet = 3,
+		/obj/item/gun/energy/laser/LaserAK = 4
+		)
+	premium = list()
+
+	refill_canister = /obj/item/vending_refill/soviet
+
+/obj/item/vending_refill/soviet
+	machine_name 	= "sovietvend"
+	icon_state 		= "refill_soviet"
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 894aecc600..cd643e4220 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -335,6 +335,8 @@
 					/obj/item/clothing/head/nemes = 1,
 					/obj/item/clothing/head/pharaoh = 1,
 					/obj/item/storage/fancy/candle_box = 3)
+	premium = list(/obj/item/toy/plush/plushvar = 1,
+					/obj/item/toy/plush/narplush = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
 
 /obj/item/vending_refill/wardrobe/chap_wardrobe
diff --git a/code/modules/vore/eating/voreitems.dm b/code/modules/vore/eating/voreitems.dm
index 741782545a..05ab1e5f8b 100644
--- a/code/modules/vore/eating/voreitems.dm
+++ b/code/modules/vore/eating/voreitems.dm
@@ -35,7 +35,6 @@
 /*
 /datum/reagent/medicine/ickypak
 	name = "Ickypak"
-	id = "ickypak"
 	description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
 	reagent_state = LIQUID
 	color = "#0E900E"
@@ -57,6 +56,6 @@
 
 /datum/chemical_reaction/ickypak
 	name = "Ickypak"
-	id = "ickypak"
-	results = list("ickypak" = 2)
-	required_reagents = list("chlorine" = 2 , "oil" = 1) */
\ No newline at end of file
+	id = /datum/reagent/medicine/ickypak
+	results = list(/datum/reagent/medicine/ickypak = 2)
+	required_reagents = list(/datum/reagent/chlorine = 2 , /datum/reagent/oil = 1) */
\ No newline at end of file
diff --git a/code/modules/vore/resizing/sizechemicals.dm b/code/modules/vore/resizing/sizechemicals.dm
index f83ba2ce76..612e8c9fde 100644
--- a/code/modules/vore/resizing/sizechemicals.dm
+++ b/code/modules/vore/resizing/sizechemicals.dm
@@ -5,7 +5,6 @@
 
 /datum/reagent/medicine/macrocillin
 	name = "Macrocillin"
-	id = "macrocillin"
 	description = "Glowing yellow liquid."
 	reagent_state = LIQUID
 	color = "#FFFF00" // rgb: 255, 255, 0
@@ -17,13 +16,12 @@
 			M.sizescale(size)
 			M << "<font color='green'>You grow!</font>"
 			break
-	if(M.reagents.has_reagent("macrocillin"))
-		M.reagents.remove_reagent("macrocillin", 20)
+	if(M.reagents.has_reagent(/datum/reagent/medicine/macrocillin))
+		M.reagents.remove_reagent(/datum/reagent/medicine/macrocillin, 20)
 	..()
 
 /datum/reagent/medicine/microcillin
 	name = "Microcillin"
-	id = "microcillin"
 	description = "Murky purple liquid."
 	reagent_state = LIQUID
 	color = "#800080"
@@ -35,14 +33,13 @@
 			M.sizescale(size)
 			M << "<span class='alert'>You shrink!</span>"
 			break;
-	if(M.reagents.has_reagent("microcillin"))
-		M.reagents.remove_reagent("microcillin", 20)
+	if(M.reagents.has_reagent(/datum/reagent/medicine/microcillin))
+		M.reagents.remove_reagent(/datum/reagent/medicine/microcillin, 20)
 
 	..()
 
 /datum/reagent/medicine/normalcillin
 	name = "Normalcillin"
-	id = "normalcillin"
 	description = "Translucent cyan liquid."
 	reagent_state = LIQUID
 	color = "#00FFFF"
@@ -62,14 +59,13 @@
 		M.sizescale(SIZESCALE_SMALL)
 		M << "<font color='green'>You grow!</font>"
 
-	if(M.reagents.has_reagent("normalcillin"))
-		M.reagents.remove_reagent("normalcillin", 20)
+	if(M.reagents.has_reagent(/datum/reagent/medicine/normalcillin))
+		M.reagents.remove_reagent(/datum/reagent/medicine/normalcillin, 20)
 	..()
 
 
 /datum/reagent/medicine/sizeoxadone
 	name = "Sizeoxadone"
-	id = "sizeoxadone"
 	description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed."
 	reagent_state = LIQUID
 	color = "#1E90FF"
@@ -93,7 +89,6 @@
 
 /datum/reagent/medicine/ickypak
 	name = "Ickypak"
-	id = "ickypak"
 	description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
 	reagent_state = LIQUID
 	color = "#0E900E"
diff --git a/config/config.txt b/config/config.txt
index e71c2587b7..fafb3e5791 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -473,3 +473,15 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60
 ##	For reference, Goonstation uses a resolution of 21x15 for it's widescreen mode.
 ##	Do note that changing this value will affect the title screen. The title screen will have to be updated manually if this is changed.
 DEFAULT_VIEW 21x15
+
+### FAIL2TOPIC:
+### Automated IP bans for world/Topic() spammers
+## Enabled
+FAIL2TOPIC_ENABLED
+## Minimum wait time in deciseconds between valid requests 
+FAIL2TOPIC_RATE_LIMIT 10
+## Number of requests after breaching rate limit that triggers a ban
+FAIL2TOPIC_MAX_FAILS 5
+## Firewall rule name used on physical server
+FAIL2TOPIC_RULE_NAME _dd_fail2topic
+
diff --git a/config/game_options.txt b/config/game_options.txt
index 34c8ca48fd..060d782dbe 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -575,7 +575,16 @@ MONKEYCAP 64
 #Replaces standard extended/secret dichotomy with extended and calm/chaotic votes for dynamic.
 DYNAMIC_VOTING
 
-## Choose which Engine to start the round with, comment to remove an Engine from the rotation
-BOX_RANDOM_ENGINE Engine SM
-BOX_RANDOM_ENGINE Engine Tesla
-BOX_RANDOM_ENGINE Engine Singulo
\ No newline at end of file
+## Choose which Engine to start the round with. Weight is after the comma. Setting the weight to 0 removes the engine from rotation.
+BOX_RANDOM_ENGINE Box SM,3
+BOX_RANDOM_ENGINE Box Tesla,3
+BOX_RANDOM_ENGINE Box Singulo,3
+BOX_RANDOM_ENGINE Box SM 1x3,1
+BOX_RANDOM_ENGINE Box SM 5x5,1
+BOX_RANDOM_ENGINE Box SM 3x,0
+
+## Whether or not there's a mode tier list vote after the secret/extended vote.
+MODETIER_VOTING
+
+## Number of modes dropped by the modetier vote during mode selection, after vote.
+DROPPED_MODES 3
diff --git a/html/changelog.html b/html/changelog.html
index 21cade10d2..60412299cf 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -868,2067 +868,6 @@ _Kathrin's Box Beautification:_</li>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Added Departements Winter Coats to the loadout list.</li>
 			</ul>
-
-			<h2 class="date">04 November 2019</h2>
-			<h3 class="author">4dplanner, MMiracles updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Wizard shapeshift now converts damage taken while transformed</li>
-				<li class="bugfix">transform spell transfers damage correctly instead of healing most of the time</li>
-				<li class="bugfix">0% simplemob health maps to 0 carbon health, 100% simplemob to 100% carbon</li>
-				<li class="bugfix">transforming to a form with brute resistance no longer heals you</li>
-				<li class="bugfix">transforming back to a species with brute resistance no longer heals you</li>
-			</ul>
-			<h3 class="author">AdmiralPancakes1 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Cryo cell shortcuts: alt-click toggles the doors, ctrl-click toggles the power</li>
-			</ul>
-			<h3 class="author">Alonefromhell updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Ported Oracle UI, a framework for self-updating and neat UI's</li>
-				<li class="refactor">Paper now uses OUI</li>
-				<li class="refactor">Bins now use OUI</li>
-				<li class="bugfix">fixes tootip offset</li>
-			</ul>
-			<h3 class="author">AnalWerewolf updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Fritz plushie</li>
-				<li class="rscadd">Donor item</li>
-			</ul>
-			<h3 class="author">Anonymous updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">More crusader armor variants to pick from armament: Teutonic and Hospitaller.</li>
-			</ul>
-			<h3 class="author">Arturlang updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now use CTRL and ALT click on pumps and filters to toggle them on and off and max their output respectively</li>
-				<li class="rscadd">You can now use RPDs on windows and grilles.</li>
-				<li class="rscadd">The RD can now suplex a immovable rod. Good fucking luck.</li>
-				<li class="bugfix">Fixes high alert ERT suit sprites. You can see them now!</li>
-				<li class="rscadd">Traitor codewords are now highlighted for traitors.</li>
-				<li class="rscadd">You can now examine pumps filters and mixers to see if you can use CTRL and Alt click on them.</li>
-				<li class="bugfix">Fixes brain damage/trauma healing nanites so they actually work while there are only traumas.</li>
-				<li class="tweak">Advanced toxin filtration nanites now heal slimes</li>
-			</ul>
-			<h3 class="author">Bhijn updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">It's now possible to forcefully eject the occupants of a dogborg's sleeper by using a crowbar on them. This action is instant.</li>
-				<li class="tweak">Resist values for dogborg sleepers have been adjusted. The baseline has been decreased from 30 seconds to 15 seconds. Medihound sleepers have a resist timer of 3 seconds. Sechound sleepers retain a resist timer of 30 seconds.</li>
-				<li class="tweak">It now takes 10 full seconds to insert people into your sleeper. This should hopefully give people some more room to breathe and react to a dogborg attempting to sleeper someone either for no reason or in a way that violates law 2.</li>
-				<li class="bugfix">Warp whistles no longer grant permanent invulnerability and invisibility</li>
-				<li class="bugfix">You can now actually use the resist hotkey to resist out of handcuffs. Woah, revolutionary</li>
-				<li class="bugfix">the `!tgs poly` command now actually works</li>
-				<li class="rscadd">Poly now has a 0.01% chance per squawk to speak through the TGS relay.</li>
-				<li class="balance">The point production mode of radiation collectors has been reverted to the original behavior of using all of the stored power every process cycle instead of just 4% of it</li>
-				<li class="tweak">Radiation collectors now display the amount of power/research points they're producing per minute rather than per process cycle, which should hopefully clear up a lot of confusion.</li>
-				<li class="tweak">Radiation collectors also display what's happening to the gas within them, which should make it a lot more obvious as to how you get tritium.</li>
-				<li class="tweak">Security borgs and K9s are now only available during red alert or higher.</li>
-				<li class="server">Headmins or other folks with access to the server's config can choose the minimum alert level for secborgs to be chosen via the MINIMUM_SECBORG_ALERT config option. See the default game_options.txt for more info.</li>
-				<li class="bugfix">The server no longer attempts to check if the CID matches the IP of any bans, or if the IP matches any CIDs of any active bans, during client analyzation</li>
-				<li class="balance">Vampires can now only ventcrawl in bat form if their blood level is below the bad blood volume (224 blood total)</li>
-				<li class="balance">Vampires now only take 5 burn per mob life cycle while within chapel areas, down from the original 20 burn per life cycle.</li>
-				<li class="tweak">K9 pounces have received a minor rework. It now has an effective cooldown of 2.5 seconds, can now only deal up to 120 staminaloss, deals a maximum of 80 stamloss on hit, has a spoolup of half a second, and now has telegraphing in the form of a quiet noise.</li>
-				<li class="balance">K9s now only have 80 health</li>
-				<li class="balance">Secborgs (but not k9s) now have a hybrid taser. This can be toggled via server config.</li>
-				<li class="tweak">The disabler cooler upgrade now applies to all energy-based firearms for borgs</li>
-				<li class="rscadd">Dogborg jaws are now capable of incapacitating targets if using help intent. This deals a hard stun depending on how much staminaloss the target has, and whether or not they're resting. This behavior can be toggled via server config.</li>
-				<li class="balance">K9 jaws now have 15 force, up from their nerfed 10 force.</li>
-				<li class="balance">Borg flashes regained their ability to cause knockdown. This can be toggled via server config.</li>
-				<li class="server">The WEAKEN_SECBORG config option will disable the new dogborg jaws mechanic and make secborgs spawn with a standard disabler.</li>
-				<li class="server">The DISABLE_BORG_FLASH_KNOCKDOWN will disable the ability for borg flashes to knockdown.</li>
-				<li class="tweak">Jukeboxes now have 6 audio channels available to them, up from the previous accidental 2 and previously intended 5 channels.</li>
-				<li class="bugfix">Jukeboxes now work again on clients running versions higher than 512.1459.</li>
-				<li class="bugfix">People will no longer have their ears consumed by an eldritch god if multiple jukeboxes are active and the first jukebox in the jukebox list stops playing, then tries to play again</li>
-				<li class="tweak">Instead of the debug text for invalid jukebox behavior being printed to world, the debug text is now restricted to the runtime panel.</li>
-			</ul>
-			<h3 class="author">BurgerB updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Tweaked the UI of the loadout to be less cluttered due to an issue with formatting.</li>
-			</ul>
-			<h3 class="author">BurgerBB updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds the bonermeter; a device that measures arousal based statistics.</li>
-				<li class="refactor">Added a new input to the  electrostimulator that controls the strength of the shock. It accepts negative inputs which reduce arousal. Added a new output to the electrostimulator that displays the amount of arousal gained.</li>
-				<li class="balance">Rebalanced the electro-stimulator to be less spammy by giving it a 2.5 second enforced cooldown per circuit contraption. Increased the complexity of electro stimulator from 10 to 15.</li>
-				<li class="refactor">Reworked the Vent Clog event to spray smoke instead of foam, also made it shoot smoke over time instead through each vent instead of all at once.</li>
-				<li class="tweak">Increased the spawn area of the City of Cogs (Reebe). This does not affect the area in which builders can build.</li>
-				<li class="balance">Significantly tweaks the Wizard race transformation event to be less unreasonably troublesome.</li>
-				<li class="rscadd">Adds a new 0 cost trait that makes you immune* to Crocin and Hexacrocin</li>
-				<li class="tweak">Tweaks how slurring works so it's more of a gradual change into slurring instead of immediate.</li>
-				<li class="balance">Slurring is now directly proportional to your drunkenness, with other sources of slur being added on top of it.</li>
-				<li class="tweak">Bras are now separate from underwear, meaning you can mix and match bras if you're into that.</li>
-				<li class="tweak">Men can wear female accessory clothing, and females can wear men accessory clothing. It's not a fetish, mom, it's PROGRESSIVE.</li>
-				<li class="code_imp">Reorganized accessories into their own files to prevent a massive 1000 line file.</li>
-				<li class="server">i'm 10% sure that merging this PR will cause preference corruption sooooooooooo I just need to hear from @deathride58 or perhaps someone else on how much damage this could possibly do.</li>
-				<li class="tweak">Tweaked penis.</li>
-				<li class="balance">Rebalanced penis.</li>
-				<li class="rscadd">Added the following reagents to the common list of vent clog reagents: ~~Cooking Oil~~, ~~Frost Oil~~, Sodium Chloride, Corn Oil, Uranium, Carpet, Firefighting Foam, semen, femcum, tear juice, strange reagent, ~~spraytan~~.</li>
-				<li class="balance">Vent Clog smoke emits the same transparent smoke as a smoke machine, including how much it transfers. Vent Clogs also do not trigger in areas deemed "Safe" in code, such as in the dorms or trusted areas where dangerous things shouldn't occur.</li>
-				<li class="rscadd">Adds additional random brain damage text</li>
-				<li class="rscadd">Adds penis enlargement pills.</li>
-				<li class="rscadd">Adds Stun Circuit and Pneumatic Cannon Integrated Circuits</li>
-				<li class="bugfix">Fixed extinguisher and smoke circuits not accepting any reagents.</li>
-				<li class="rscadd">Adds a few important clockcult tips.</li>
-				<li class="rscadd">Added Mech Sensors, a brass-created trap that activates when a mech not controlled by a cultist crosses it.</li>
-				<li class="rscadd">Added power nullifiers, an emp trap that emps everything in a 3x3 area, with the center suffering a heavy EMP.</li>
-				<li class="tweak">Brass Skewers now deal 50 damage to mechs.</li>
-				<li class="balance">Ass slapping only works if you're actually behind the target. Ass slapping now respects disarm blocking. You can no longer face/ass slap someone on an intent other than help, unless they are also face/ass slapping.</li>
-				<li class="bugfix">Fixed ass and face slapping grammar.</li>
-				<li class="rscadd">Adds meh effects for ass and face slapping.</li>
-				<li class="tweak">"Unwillingly" eating food now sends a warning message instead of a notice. Unable to stuff food down your throat sends a danger message instead of a warning message.</li>
-				<li class="rscadd">Adds clockwork reflectors, a fragile anti-laser reflection shield object that can be constructed for 10 brass sheets. Upon firing on the object in the direction where it is shielded, it ricochets the bullet off of it relative to the shooting angle.</li>
-				<li class="tweak">Renames some windows in the build menu for consistency.</li>
-				<li class="balance">Clockwork Cult walls can no longer be deconstructed by RCDs when heated.</li>
-				<li class="rscadd">Adds several new toy loot to the arcade machine.</li>
-				<li class="balance">Rebalanced the arcade machine loot. Battlemachines now have a 0.5 second delay instead of a second delay between actions.</li>
-				<li class="bugfix">Fixed a bug that would not allow the one in a million pulse rifle to spawn.</li>
-				<li class="rscadd">Adds a new trait "Buns of Steel" that makes you immune to the effects of ass slapping, and temporarily makes the user's arm useless like a stun baton hit. It costs 0 points.</li>
-				<li class="balance">Ass slapping blowback from the Buns of Steel perk now deals 20 stamina damage instead of 50, and no brute damage.</li>
-				<li class="rscadd">Gamemode voting results are displayed at the end-round screen.</li>
-				<li class="balance">Cloning no longer gives you positive mutations, but a chance for a negative one. Cloning has a chance to "scramble" your visual DNA.</li>
-				<li class="balance">Chestbursters no longer give and remove your brain. They just disembowel and kill you now.</li>
-				<li class="bugfix">Fixes WarOps miscalculating players.</li>
-				<li class="balance">Activating the nuclear device during war-ops informs the crew of the nuke's position.</li>
-				<li class="rscadd">The alert level is displayed at the job selection screen.</li>
-				<li class="balance">Central Command informs you when a Meteor Storm is about to hit 5 to 10 minutes before it happens.</li>
-			</ul>
-			<h3 class="author">BurgerLUA updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Added a new framework for reagents. Reagents can now have a bool that determines if it can be detected by handheld medical analyzers. Currently only the changeling sting chemical does this.</li>
-				<li class="balance">Made changeling transformation string last between 10-15 minutes. Lowered the dna cost of changeling sting from 3 dna to 2 dna. Lowered the chemical cost from 50 to 10. Lowered the loudness from 2 to 1. Changeling sting transformation can be removed via high doses of calomel.</li>
-				<li class="bugfix">Fixed most reagents having a placeholder color.</li>
-				<li class="bugfix">Fixed autolathe wires not correctly shocking you when pulsed.</li>
-				<li class="balance">Rebalanced special jetpacks.</li>
-			</ul>
-			<h3 class="author">CalamaBanana updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added Deer taur</li>
-				<li class="rscadd">Added Elf ears to mammals</li>
-			</ul>
-			<h3 class="author">CameronWoof updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Medihounds now have rollerbeds for non-vore patient transport</li>
-				<li class="bugfix">The closed O2 crate now uses the same color scheme as the open one</li>
-				<li class="tweak">air alarms are green now instead of blue when the atmosphere is ideal</li>
-				<li class="tweak">Hexacrocin overdose no longer causes climaxes</li>
-				<li class="tweak">Altered the icons for inventory backplates. Sleek! Stylish! New!</li>
-				<li class="bugfix">Attaching a beaker that contains water to an IV stand no longer causes a visual glitch</li>
-				<li class="tweak">Fluid-producing sexual organs no longer start full</li>
-				<li class="tweak">Sexual organ fluid capacity decreased from 50 to 15</li>
-				<li class="tweak">Sexual organ production rate decreased from 5u to 0.035u per two seconds.</li>
-				<li class="tweak">Sexual fluid decals no longer contain reagents</li>
-				<li class="tweak">Sexual fluids cannot by synthesized (e.g., by the Odysseus)</li>
-			</ul>
-			<h3 class="author">CdrCross updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds the ability for cloning consoles to read and write record lists to the circuit board, and provides a template for giving other machines local circuit board memory.</li>
-			</ul>
-			<h3 class="author">Cebutris updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Hugs of the North Star! Get them from the arcades (if you're lucky) and hug your friends at INCREDIBLE hihg speeds!</li>
-				<li class="bugfix">Tea Aspera now properly contains tea powder</li>
-				<li class="tweak">Breasts no longer lactate by default, lactation is now a preference</li>
-			</ul>
-			<h3 class="author">Chayse updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Changed the Warden's compact combat shotgun to instead be a regular combat shotgun with a foldable stock and penalties for being folded.</li>
-				<li class="rscadd">Assorted space-worthy helmets can now act as masks for internals.</li>
-				<li class="refactor">Internals code can now check any item with the ALLOWSINTERNALS flag through the GET_INTERNAL_SLOTS define. For now this only checks head and mask slots, since those are the most realistically speaking usable ones.</li>
-				<li class="tweak">Medbay doors can now be opened by anyone from the inside without having to press the exit button.</li>
-				<li class="bugfix">Borgs now have the necessary dexterity to unbuckle people from themselves and from bucklable objects.</li>
-				<li class="bugfix">Fixes the Trek Uniform/Suit worn icons</li>
-				<li class="bugfix">AIs can now once more talk through holopads successfully</li>
-			</ul>
-			<h3 class="author">Code-Cygnet updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added new things - Mind trait, alcohol reagent, chemical reagent, drink sprite and recipe.</li>
-				<li class="imageadd">added commander_and_chief sprite to drinks.dmi</li>
-			</ul>
-			<h3 class="author">Coolgat3 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Changed player number checks to 20 from 24 for cult and clockcult, also made nukeops 28 required players instead of 30.</li>
-				<li class="tweak">Changed enemy minimum age from 14 to 7</li>
-				<li class="rscadd">Added the code for the semen donut and made it craftable</li>
-				<li class="imageadd">Added the donut sprites</li>
-				<li class="bugfix">Made the sec and warden berret offer as much protection like the helmet</li>
-				<li class="rscadd">Added berets for all the heads.</li>
-				<li class="imageadd">Added sprites for the berets.</li>
-				<li class="code_imp">Coded the berets to spawn in appropiate lockers.</li>
-				<li class="tweak">Raised the ripley's movement speed and lights range by 1, also lowered its armor to compensate.</li>
-				<li class="rscadd">Added combat gloves sprite</li>
-				<li class="imageadd">Added said sprite</li>
-				<li class="imageadd">added combat boots sprite</li>
-			</ul>
-			<h3 class="author">Coolgat3 / Avunia updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Made kindle put the target into stamcrit, which makes it an actually working, useful stun.</li>
-				<li class="rscadd">Added a stamina loss modifier to the vanguard spell which makes the user's stamina drain at a way slower rate. This doesn't make them immune to tasers, but it takes a few hits to actually get them to fall down.</li>
-				<li class="tweak">Made it so that clock culties don't start with a chameleon suit. Instead they start with an engineer suit which is pretty much the same sprite and looks. If this is not perfect, then I am willing to make a slightly more brass-colored version of the engineer suit sprite and call it a ratvarian engineer jumpsuit.</li>
-				<li class="balance">Increased the cost of vanguard, as it is now a spell that works somewhat like adrenals, minus the move speed, making your stamina drain really slow and making you unable to get knocked onto the ground by just a single taser shot.</li>
-				<li class="balance">Lowered the charge time of kindle, reason being that you can usually have only one active spell on you, or two at max if you decide to run two slabs, but the fact that kindle silences people for such a small amount of time makes up for it, in my opinion.</li>
-				<li class="server">Figured out that the consoles and their warp function actually work with the current code. The thing that makes them not work is when the gamemode is ran on debug mode, without the required players to actually support it. It also breaks the ark timer which is stuck on -1 seconds until activation. Whenever the gamemode starts properly, like any other gamemode, with player checks and all, everything seems to work just fine.</li>
-			</ul>
-			<h3 class="author">CydiaButt13 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Lamp Plushie to loadout</li>
-				<li class="imageadd">added plushie_lamp to plush icons</li>
-				<li class="code_imp">added Lamp Plush to loadout and icons and items</li>
-			</ul>
-			<h3 class="author">EgoSumStultus updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed blood chiller's inhand</li>
-				<li class="bugfix">FIXED SHIELF</li>
-				<li class="bugfix">fixed magpistol magazine sprites</li>
-				<li class="rscadd">Added the Femur Breaker</li>
-				<li class="rscadd">Adds male AI vox.</li>
-			</ul>
-			<h3 class="author">EmeraldSundisk updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds a gun range to Box Station</li>
-				<li class="rscadd">Provides some extra power grid connections</li>
-				<li class="rscdel">Sunglasses and Earmuffs removed from the Warden's Office - they can be found at the range instead</li>
-				<li class="tweak">Rearranges a few objects within the prison as to accommodate the new gun range</li>
-				<li class="rscadd">Adds a mass driver to Delta Station's chapel</li>
-				<li class="rscadd">Adds a second means of entry into the chapel</li>
-				<li class="tweak">Slightly expands the chapel to make room for the driver, slight adjustment to air systems</li>
-				<li class="tweak">Clears a path in the station exterior for the mass driver to work properly</li>
-				<li class="tweak">Nearby maintenance loot has been relocated to accommodate the chapel expansion, surrounding area has been "cleaned up" somewhat</li>
-				<li class="tweak">CentCom has noticed the lack of coffins in Delta Station's chapel and provided some, but in exchange for reducing the chapel morgue's capacity.</li>
-				<li class="tweak">Fixed a maintenance door the chaplain should have been able to open.</li>
-				<li class="bugfix">Fixes space areas outside the driver removal: CentCom Defense Analysts have ordered the maintenance hatch to the Mass Driver room be removed citing "security concerns".</li>
-				<li class="rscadd">Increases the number of plots to 9 (from 5)</li>
-				<li class="rscadd">Additional lighting placed directly outside the garden</li>
-				<li class="tweak">Cleans up the area to reflect use. Moves the seed extractor to a more central location</li>
-				<li class="tweak">Relocates the seed packs on botany's counter to the garden removal: Removes wooden barricades outside the garden</li>
-				<li class="config">Renames "Abandoned Garden" area designation to "Maintenance Garden", but does not replace the icon in Dream Maker</li>
-				<li class="rscadd">Expands the chapel mass driver room to make it easier to use</li>
-				<li class="rscadd">Rearranges the chapel backroom so there are now six coffins and burial garments roundstart</li>
-				<li class="tweak">Cleans up the Janitor's office</li>
-				<li class="tweak">Readjusts the station exterior so mass-driven coffins (hopefully) have less friction</li>
-				<li class="bugfix">Adds a fan to the chapel driver</li>
-				<li class="bugfix">The Janitor missed a few spots around the newly renovated Maintenance Garden</li>
-				<li class="bugfix">Readjusts positioning of Delta's QM keycard device</li>
-				<li class="bugfix">Cleaned up a few spots I missed in #9356, particularly around the janitor's office</li>
-				<li class="rscadd">Adds some potted plants around Box Station</li>
-				<li class="bugfix">The tile mentioned in #9409 should now be radiation-free.</li>
-			</ul>
-			<h3 class="author">Fermi updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixes tiny runaway decimals in reagents system.</li>
-				<li class="bugfix">SDGF: Fixes infinite clones.</li>
-				<li class="bugfix">fixed an angery PR</li>
-			</ul>
-			<h3 class="author">Fermis updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added a panda simplemob</li>
-				<li class="bugfix">fixes empathy exploit.</li>
-				<li class="rscadd">Added the secbat, a box to hold it and the ability to dispense it from the SecTech vendor.</li>
-				<li class="rscadd">Adds 3 new music tracks.</li>
-				<li class="tweak">tweaked Neurotoxin</li>
-				<li class="balance">added more depth to Neurotoxin</li>
-				<li class="bugfix">fixed the inability to create Neurotoxin</li>
-				<li class="bugfix">fixes fermichem reactions for tiny volumes work</li>
-				<li class="tweak">makes quantisation level for chemistry finer</li>
-				<li class="tweak">re-enables femichem explosions in grenades.</li>
-				<li class="tweak">adds nuance to the SDGF and hatmium explosions.</li>
-				<li class="bugfix">Fixes analyse function on ChemMasters to correctly display purity.</li>
-				<li class="bugfix">Fixes the custom transfer for buffer to beaker button.</li>
-				<li class="rscadd">Debug option: Generate Wikichems</li>
-				<li class="rscadd">graft synthtissue surgery, new reagent synthtissue</li>
-				<li class="tweak">neurine fixes brain objs merge: combines fermichem's lung damage with tg's</li>
-				<li class="rscadd">on_mob_dead(), bitflags and CHECK_MULTIPLE_BITFIELDS</li>
-				<li class="refactor">refactored fermichem vars, moved impure chems into their own reagents subtype</li>
-				<li class="bugfix">Fixes small residues of chems that won't go away!</li>
-				<li class="tweak">tweaked beaker health and allows use of syringes/droppers on chem_heaters</li>
-				<li class="soundadd">added a sound for when beakers take temperature damage.</li>
-				<li class="imageadd">added some icons for melting beakers</li>
-				<li class="refactor">refactored how beakers take damage</li>
-				<li class="bugfix">fixes how beakers would only take one instance of damage on pH damage</li>
-				<li class="bugfix">fixes Janitor grenades.</li>
-				<li class="bugfix">fixes reaction mechanics at low volumes</li>
-				<li class="bugfix">stops reactions constantly bubbling on the edge of reaction temperature</li>
-				<li class="bugfix">stops small amount reactions from occurring, and prevents disappearing tiny numbers</li>
-				<li class="tweak">Reduced minimum reaction volume from 1 to 0.01</li>
-				<li class="refactor">cleaned up Fermichem</li>
-				<li class="rscadd">Adds Jacqueline the Pumpqueen and her familiar Bartholomew for the spooky season</li>
-				<li class="soundadd">Adds a giggle</li>
-				<li class="imageadd">Adds cauldron, Jacq and Jacq o lanterns, and a costume for halloween! mapedit: adds a new landmark so Bartholomew can spawn somewhere sensible.</li>
-				<li class="bugfix">fixes food reactions and explosion runtimes,</li>
-				<li class="bugfix">fixes the too much yes problem</li>
-				<li class="bugfix">Heart, Tongue and stomach regen.</li>
-				<li class="bugfix">lung damage threshholds.</li>
-				<li class="bugfix">Graft synthtissue</li>
-				<li class="bugfix">Skeleton's burning for no reason</li>
-				<li class="bugfix">Organ freezing handling.</li>
-				<li class="bugfix">Fixes chemistry books to point to the right wiki, and keeps tg's just in case</li>
-				<li class="tweak">Changes top right wiki button location to go to both wikis</li>
-				<li class="bugfix">fixed Jacq's fondness for the AI</li>
-			</ul>
-			<h3 class="author">Ghom updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">minor clean up on hydroponics reagent containers.</li>
-				<li class="bugfix">fixes the perpetual lack of moisture that has affected genitalia descriptions since, like, forever.</li>
-				<li class="rscadd">implements the arousal state for mammary glands.</li>
-			</ul>
-			<h3 class="author">Ghommie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixes many possible situations of null icons for cit races' bodyparts.</li>
-				<li class="imagedel">Removes duplicate slimepeople' sprites.</li>
-				<li class="code_imp">Purges that draw_citadel_parts().</li>
-				<li class="code_imp">Fixes ISINRANGE_EX using the wrong relational operator.</li>
-				<li class="tweak">The kindle status effect stun duration now properly proportional to the owner's remaining health.</li>
-				<li class="tweak">Clockwork cult's kindle now affects silicons.</li>
-				<li class="tweak">Cyborg mounted disablers/tasers/lasers now slowly self-recharge off the cyborg user's power cell instead of draining from it directly.</li>
-				<li class="tweak">Borg rechargers now properly recharge the borg module's energy guns.</li>
-				<li class="bugfix">Prevents a couple more special/mounted guns from being preserved on cryo</li>
-				<li class="balance">Halved borg energy guns self-recharge delay and increased their cell capacity by 3/4</li>
-				<li class="bugfix">Fixes chemical patches always checking the suit slot even if the targetted limb was the head.</li>
-				<li class="bugfix">Skeleton, nightmare and golem races are once again available to get chemical patches applied onto.</li>
-				<li class="rscadd">Adds two cartons of space milk to the space skellie pirates cutter's fridge.</li>
-				<li class="refactor">Refactored implants to not be located inside mobs codewise, akin to organs.</li>
-				<li class="bugfix">Fixed gps tracking implants.</li>
-				<li class="bugfix">Fixed item not being dumped out of storage implants onto the owner's turf upon removal.</li>
-				<li class="bugfix">Fixes cult potentially stalling if the target is erased from existence without being sacced.</li>
-				<li class="balance">Nukes the stunprod's 3 seconds delay.</li>
-				<li class="bugfix">Fixes teleprods.</li>
-				<li class="bugfix">Stops pulls of resting mobs breaking off whenever you swap turfs with someone else because of crawling delays.</li>
-				<li class="bugfix">fixes IAA.</li>
-				<li class="balance">EMPs now flick off stunbatons, they can be turned back on immediately by the user anyway.</li>
-				<li class="balance">Stunbatons now very slowly consume charge whilst kept on, at a rate of 4/1000th of a standard batoning charge cost per tick.</li>
-				<li class="balance">Softened up the charge cost checks to stop the above update from practically reducing the maximum uses of a stun baton by one. Now, should the remaining charge be lower than the hit cost, the resulting stun will be be proportional to the remaining charge divided by the hitcost, within a limit under which the stun batoning just won't happen.</li>
-				<li class="balance">Buffs condensed capsaicin, a yet another feature previously dunked by stam combat.</li>
-				<li class="balance">speeds up pepper spray puffs.</li>
-				<li class="balance">Buffed krav maga leg sweep stun and stamina damage. On the other hand, it's now unable to be used on already lying targets.</li>
-				<li class="bugfix">fixes eyestabbing people with cutlery while being a pacifist.</li>
-				<li class="bugfix">Reduces goonchat lag from being blasted by pellets and bullets repeatedly whilst wearing armor by properly removing the armor protection texts this times.</li>
-				<li class="spellcheck">also reduced the size of armor protection messages in general. they clog up the chat box.</li>
-				<li class="bugfix">Fixes stunbatons icon not properly updating on cell removal and insertion.</li>
-				<li class="tweak">Allows lower charge cells to be used with stun batons, and thus single use crapshots batons.</li>
-				<li class="balance">Adds in a 7 seconds delay to the jackhammer dismantling a superheated clockwork wall.</li>
-				<li class="tweak">escape pods emergency suits storage can now be busted open by emags or excessive damage.</li>
-				<li class="bugfix">Fixes alt click bypassing the escape pods' suits storage lock.</li>
-				<li class="bugfix">Fixes emags wasting charges on un-emaggable & co stuff.</li>
-				<li class="code_imp">Ported some radials code updates.</li>
-				<li class="rscadd">Ported the RCL wiring menu and a comfier RCD interface.</li>
-				<li class="tweak">A milder combat stance message will show up if the user switch combat mode on while on help intent.</li>
-				<li class="spellcheck">Properly rewords the extinguisher's instructions on how to empty it on the floor since it was changed to be a screwdriver action instead of Alt Click a while ago.</li>
-				<li class="rscadd">Reskinnable PDAs. A related game preference.</li>
-				<li class="refactor">Refactoring the pda, pda painter, obj reskinning and chameleon pda a bit to support this feature.</li>
-				<li class="imageadd">more PDA sprites and ported reskins.</li>
-				<li class="refactor">turned virtual reality into a component datum, which is then applied to spawned virtual mobs. This fixes mob transformations (such as wabbajack and monkeyizing) breaking the previously hardcoded behaviour and trapping you in VR, also enabling a more concrete virtual reality inception experience.</li>
-				<li class="bugfix">Fixes power cells being unable to be rigged. Also prevents them from starting processing on init if they don't self recharge.</li>
-				<li class="bugfix">Fixes many, little or otherwise, issues with the stunbaton status refactor.</li>
-				<li class="bugfix">The sacrificial target icon will now display onto the cult objective ui alert once again.</li>
-				<li class="bugfix">Stopping borgs from sprinting into negative cell charge.</li>
-				<li class="tweak">The default amount of z-levels reserved specifically for space ruin generation has been increased from 1 to 2</li>
-				<li class="tweak">Moving some tablecrafting recipes to the appropriate categories: Kitty ears and lizard cloche hats to "clothing"; Hot dogs to "Sandwichs"; Cuban carb, fish and chips and fish fingers to "Fish".</li>
-				<li class="bugfix">Fixes the not-a-sandwich recipe being M.I.A.</li>
-				<li class="rscadd">Adding in peanuts, peanut butter, peanut butter toasts and sandwiches, and the PB&J sandwich. The peanuts contain a little bit of extractable cooking oil (similarly to soy beans) and can be microwaved or dried in a drying rack to make roasted peanuts, which can be mixed in a all-in-one-grinder for peanut butter, required to make those sandwiches.</li>
-				<li class="balance">Buffed wizard and artificier's Magic Missile, wizard and xeno queen's Repulse and juggernaut's Gauntlet Echo.</li>
-				<li class="bugfix">Fixes flashlights being unable to be used for rudimentary eyes and mouth exams.</li>
-				<li class="rscadd">Adds in a grey jumpsuit to the loadout choices, restricted to Assistants.</li>
-				<li class="bugfix">Fixes CWC construct shells being visible as ghost role to latejoiners.</li>
-				<li class="imageadd">new sprites for the flechette gun, its magazines and the toy ray gun</li>
-				<li class="tweak">Merges the end-of-shift and its shuttle autocall announcements into one.</li>
-				<li class="bugfix">Prevents the end-of-shift shuttle from being recalled (even if to no avail).</li>
-				<li class="bugfix">Fixes being able to teleport papers to your location with TK.</li>
-				<li class="bugfix">Fixed some monkey-code shenanigeans making items sometimes disappear from pickpocketing.</li>
-				<li class="imageadd">New sprites for the some pda cartridges.</li>
-				<li class="tweak">The crew monitor's entry for the Quartermaster will now appear bolded, while HoP's will be of the same color of the service/unknown/other jobs.</li>
-				<li class="bugfix">emergency pods' storage will now properly work.</li>
-				<li class="bugfix">The PDA skin preference will now properly save up.</li>
-				<li class="tweak">Changed the default PDA icon var to match the default PDA skin preference.</li>
-				<li class="bugfix">Fixing the `(pointless) badassary` category appearing between the `dangerous and conspicious` and `stealthy and inconspicious` categories.</li>
-				<li class="bugfix">Combat gloves plus now properly use the combat gloves sprite.</li>
-				<li class="bugfix">Fixes the space ninja's energy netting.</li>
-				<li class="rscadd">Adding one pAI to the wizard shuttle and ERT prep room</li>
-				<li class="bugfix">Fixes the rocket launcher being unreloadable.</li>
-				<li class="balance">Buffed its accuracy a bit.</li>
-				<li class="tweak">Replaced the grenade launcher emagged minesweeper loot with the rocket launcher like it was originally supposed to be.</li>
-				<li class="imageadd">Tweaked the :b: emoji.</li>
-				<li class="rscadd">Rubber Toolboxes.</li>
-				<li class="rscadd">Porting in two bar signs: Cyber Sylph's and Meow Mix.</li>
-				<li class="bugfix">Fixing stamina damage melee weaponry being unusable by pacifists, and still damaging objects and triggering electrified grilles when thrown.</li>
-				<li class="refactor">refactored underwears to allow custom color preferences, instead of manually colored sprites.</li>
-				<li class="rscdel">The aforementioned manually colored pieces. Some of your char preferences may have been resetted as result.</li>
-				<li class="rscadd">More underwear choices, including: Bowling shirts, long johns, a tank top, fishnets, more bee socks, bee t-shirt and bee boxers (original PR for the latter three by nemvar from /tg/station).</li>
-				<li class="tweak">random bodies will now have random underwear again.</li>
-				<li class="bugfix">Dressers will now properly change undergarment again.</li>
-				<li class="tweak">Toned down many species' female chest sprites to fit the smaller cups.</li>
-				<li class="bugfix">Fixed some body parts sprites inconsistencies, such as the W/E female and male chest sprites being the same in some species, and jellypeople's legs being one tile off on W/E</li>
-				<li class="bugfix">Fixing baklava pies a bit.</li>
-				<li class="tweak">Sweaters now cover groins too.</li>
-				<li class="balance">Improved the zelus flask to be more viable for bottle smashing than the average barman's selection.</li>
-				<li class="code_imp">Very slight bottle smashing code clean up, stupid const vars.</li>
-				<li class="bugfix">Fixes krav maga gloves, wizard spells knockdowns.</li>
-				<li class="tweak">Added in an alert pop up to the cult convertees, on top of the older "click here to become a blood cultist" chat message.</li>
-				<li class="tweak">The convertee's screen will now flash red to fit in the aforementioned message's fluff.</li>
-				<li class="spellcheck">Made said message less verbose.</li>
-				<li class="rscadd">Towels. Crafted with 3 sheets of cloth, they can be worn on head, suit and belt slots even without uniform, or laid flat on the floor. Sprites from Baystation and Aurora Station.</li>
-				<li class="rscadd">You can combat mode right click people while wielding rags and towels to pat out their flames (to no use for rags) or otherwise drying them out.</li>
-				<li class="balance">toned down the stamina costs of some of the bulkier weapons.</li>
-				<li class="code_imp">repathed hypereutactic blades to be a subtype of dual sabers. Way less copypasta.</li>
-				<li class="bugfix">Fixing CX Shredder guns not accepting standard flechette mags.</li>
-				<li class="bugfix">Fixing missing magpistol magazines icon states.</li>
-				<li class="rscadd">sort of overhauled darkmode/lightmode to /vg/station's, also reincluding the pre-existing black'n'white theme.</li>
-				<li class="bugfix">Fixed LOOC color, fixed .userlove and .love span classes being a bit too blurry on dark mode.</li>
-				<li class="rscadd">The syndicate base's bathroom is now fitted with a shower, and a special towel.</li>
-				<li class="bugfix">Fixed many issues with towels.</li>
-				<li class="tweak">The dry people off with rags/towels action can only be done if the object is NOT moist with reagents now. Also cleans banana creaming.</li>
-				<li class="rscadd">Towels deal more damage while soaked with reagents.</li>
-				<li class="rscadd">You can now squeeze rags/towels with Alt-Click.</li>
-				<li class="rscdel">deleted an old and crappier towel sprite that got in the way.</li>
-				<li class="bugfix">Fixes Pubby's disposal conveyor belts and lack of a second lawyer spawner.</li>
-				<li class="code_imp">Cleaned up the absolute state of the arousal module.</li>
-				<li class="refactor">refactored exhibitionism into a quirk.</li>
-				<li class="tweak">arousal states won't persist after death.</li>
-				<li class="bugfix">Fixes testicles size adjective thing.</li>
-				<li class="bugfix">undergarments toggling now works instead of just making underwear disappear and not come back.</li>
-				<li class="tweak">The "Always visible" genitals setting will now display them above clothes.</li>
-				<li class="bugfix">combat pushes will now properly stop targets from using firearms, and will disarm the firearm if performed a second time, and also slow down people by 15%, and won't push people on tables blocked by shutters or other dense object anymore.</li>
-				<li class="bugfix">Fixes CHECK_BITFIELD macro.</li>
-				<li class="bugfix">Fixes hypovials being unable to transfer out liquids or be refilled by large dispensers like water tanks.</li>
-				<li class="bugfix">Fixes chem-masters machineries not dispensing newly made pills inside loaded in pill bottles.</li>
-				<li class="rscadd">Stunswords now fit in the captain's sabre sheat.</li>
-				<li class="rscadd">reworked ninja's stealth mode. Increased invisibility, but engaging in combat, attacking or throwing things, bumping people will temporarily lower it.</li>
-				<li class="rscadd">Ninja shoes are even stealthier.</li>
-				<li class="code_imp">cleaned up some 2014 tier processing code horror.</li>
-				<li class="tweak">the oxyloss fullscreen overlays now also take in consideration 1/5 of the user stamina loss.</li>
-				<li class="rscadd">When you're jogging, you will only slip on water if you have more than 20% staminaloss, for real this time.</li>
-				<li class="imageadd">Different cuffs now come with different worn overlays instead of a generic one.</li>
-				<li class="bugfix">High luminosity eyes can now be properly deactivated and won't illuminate your surroundings again until turned back on.</li>
-				<li class="bugfix">Fixes freshly cloned people starting with undershirts. Fixes random characters possibly rolling with undergarments of the opposite gender (Doesn't affect preferences' freedom of choice).</li>
-				<li class="balance">MRE menu 3 has cuban nachos instead of a chili now.</li>
-				<li class="bugfix">Removed the illustration overlay from MREs, looks pretty weird otherwise.</li>
-				<li class="rscadd">MRE menu 4, vegetarian.</li>
-				<li class="bugfix">fixes a few bad touchs on combat mode pushing.</li>
-				<li class="bugfix">Fixes clock cult Abscond scripture not dragging pulled mobs into Reebe. Also fixes blood cult tele runes teleporting you from the source turf to the source turf.</li>
-				<li class="bugfix">fixes clock cult mass recall.</li>
-				<li class="bugfix">Fixes underwear colors a bit.</li>
-				<li class="bugfix">Fixes Blood Cult conversion prompts</li>
-				<li class="rscdel">Removes an obnoxious temporary overlay var.</li>
-				<li class="bugfix">colorable socks can be colored again.</li>
-				<li class="bugfix">Fixed undergarments color preferences resetting each round.</li>
-				<li class="bugfix">Fixed a few dozen suits' body coverage inconsistencies. These changes shouldn't affect armor and utility vests for most.</li>
-				<li class="bugfix">Fixed clown shoes and work boots.</li>
-				<li class="bugfix">Fixed some overlay bug that happens when legcuffed and then handcuffed.</li>
-				<li class="balance">Slowed down police baton and tele baton speed by 75%, should be still be faster than the legacy speed (2 seconds) by 0.6 seconds. Telescopic batons' stamina cost per swing is now on par with police batons, ergo more expensive.</li>
-				<li class="bugfix">Fixed undershirts n socks colors prefs.</li>
-				<li class="bugfix">You can now alt-click to rotate machinery such as the tachyon-droppler array or emitters again.</li>
-				<li class="bugfix">Sofas can't be wielded and transformed back into plain chairs anymore.</li>
-				<li class="rscadd">Enables emojis for PDA messages.</li>
-				<li class="balance">Removes revenant blight's shabby toxin damage in favor of mood maluses, and a dangerous necropolis curse if not cured in time. Remember</li>
-				<li class="tweak">Blood cult altar, forge and archives now use radial menus.</li>
-				<li class="bugfix">Fixed some machineries' UIs.</li>
-				<li class="tweak">blood and clock cultists messages from metabolizing</li>
-				<li class="bugfix">Fixed advanced medical scanners borg upgrades.</li>
-				<li class="bugfix">Fixes certain borg upgrades being unapplicable on dogborg counterparts of the target cyborg type.</li>
-				<li class="bugfix">Fixed people being shovable hrough windows, windoors and the such.</li>
-				<li class="rscadd">You can now shove people into disposal bins.</li>
-				<li class="refactor">refactored altdisarm(), ergo the "shoving people around" proc.</li>
-				<li class="tweak">war ops is now lowpop friendly and doesn't require roughly 54 starting players anymore.</li>
-				<li class="rscadd">Singularity beacons now also moderately increases the odds meteor waves, while lowering their estimeed arrival countdown.</li>
-				<li class="bugfix">non-alphanumeric graffiti decals will no longer display as "letter".</li>
-				<li class="balance">Nerfs cyborg disabler and its internal power cell to hold 25 disabler beam shots rather than 43/44, just like a normal disabler.</li>
-				<li class="bugfix">Adds some missing species_traits for cloth, clockwork and cult golems.</li>
-				<li class="rscadd">Added towel linen bins, found in dormitory restrooms. Also enhanced the bedsheet bins found in some stations' dormitories</li>
-				<li class="imageadd">Resprited bedsheet bins in 3/4 perspective</li>
-				<li class="tweak">Made SDGF ghost poll message less verbose, made the experimental cloner's complaint with the former, and added ghost poll ignore options for both.</li>
-				<li class="bugfix">fixing some related onmob sprites issues with the above accessory.</li>
-				<li class="bugfix">Teleprods work on non-carbons mobs now.</li>
-				<li class="bugfix">Fixed tracking implant teleport issues.</li>
-				<li class="balance">Increased stunbatons power cell depletion rate when left on by 50%.</li>
-				<li class="bugfix">Gorlex Marauders are pleased to announce non-slip grooves were given to their .50 sniper rifles, and thus shouldn't accidentally flop on the floor like pocket spaghettis whenever taken out of a bag anymore.</li>
-				<li class="bugfix">Silicons can now operate teleporter, medical and security records console from a distance again.</li>
-				<li class="bugfix">Fixed custom say emotes conflict with drunk memes.</li>
-				<li class="bugfix">Fixes identity transfer (envy knife, changeling transformation, making a vr avatar) not copying digitigrade legs.</li>
-				<li class="bugfix">Fixes temporary transformation sting triggering heart attacks on heartless humans.</li>
-				<li class="bugfix">Fixed mobs folded inside bluespace bodybags getting their clothing and items deleted when passing through a recycler.</li>
-				<li class="bugfix">The alien-bursting-from-your-thorax and the xeno "hud" embryo stage images will now properly delete them once the embryo egg lifecycle is complete.</li>
-				<li class="bugfix">Fixed artificier lesser magic missile.</li>
-				<li class="bugfix">Phantom thief masks will now fancy your combat mode yet again.</li>
-				<li class="bugfix">Fixed gulag teleporter stripping the user of stuff it really shouldn't (like storage implant bags).</li>
-				<li class="bugfix">fixing cydonian armor a bit.</li>
-				<li class="imageadd">Resprited wooden and critter crates.</li>
-				<li class="imageadd">Improved the Cyber Sylph' good yet cumbersome bar sign a little.</li>
-				<li class="bugfix">Cyborgs can now use camera consoles on the edge of their widescreen. These consoles are also TK friendly now.</li>
-				<li class="imageadd">Updated gang dominator sprites.</li>
-				<li class="bugfix">Miner borgs can again have installed PKA mods.</li>
-				<li class="bugfix">Fixed invisible blackberry n strawberry chocolate cake slices.</li>
-				<li class="bugfix">Nuke ops / adminbus combat mechs will no longer spawn with tracking beacons.</li>
-				<li class="imageadd">Arcade machine directional sprites.</li>
-				<li class="tweak">lowered the arcade's random plush / other prizes ratio from 1 : 2.5 circa to 1 : 5. Dehydratated carps and the awakened plush can not be achieved this way anymore.</li>
-				<li class="imageadd">Added armrests overlays to sofas and tweaked their sprites a little.</li>
-				<li class="bugfix">Fixed dogborg sleepers. Just don't tell me what is exactly fixed, cause I don't want to find out.</li>
-				<li class="bugfix">Buffed the deep space familiar gorilla against runtimes.</li>
-				<li class="imageadd">Updated ratvarian computer sprites.</li>
-				<li class="bugfix">Fixed storage implant transplant.</li>
-				<li class="bugfix">Refactored how Jacqueen teleportation destination is selected, preventing them from teleporting on off-station holopads.</li>
-			</ul>
-			<h3 class="author">Ghommie && Kevinz000 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Lichdom and necromantic stone skeletons are now of the spaceproof kind too.</li>
-				<li class="tweak">skeletons now also like dairy products.</li>
-				<li class="rscdel">Halloween roundstart skeletons and zombies are no more spaceproof.</li>
-				<li class="rscadd">You can choose to set your species to zombie or skeleton through the pride mirror yet again, Alas they are not of the spaceproof kind either.</li>
-			</ul>
-			<h3 class="author">Ghommie (Credits to Kmc2000 for the original PR) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Porting in MRE boxes from Yogstation. But be careful, eating possibly expired MREs found in maintenance comes with an unrealistically large (actually small) chance of food poisoning. Otherwise just bail out and order actually safe-to-eat MREs from cargo for 2000 credits.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by Dennok) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Now areas_in_z get areas spawned by templates and blueprints.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by Dreamweaver) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Nanotrasen has received word of a high-tech research facility that may contain advancements in bluespace-based research. Any crew members who become aware of its whereabouts are to report it to CentCom immediately and are restricted from sharing said info.</li>
-				<li class="refactor">The turf reservation system now dynamically creates new z levels if the current reserved levels are full.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by JJRcop) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Ports in more emojis, including : flushed :</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by LaKiller8) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Goonchat options should now save properly.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by Vile Beggar) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Warden now has an added drill hat in his locker. You can change the loudness setting of it by using a screwdriver on it. Use wirecutters on it for a surprise.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by coiax) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="refactor">atom/var/container_type has been moved into datum/reagents/var/reagents_holder_flags. There should be no visible changes to effects.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by nemvar) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Botanists can now get beeplushies (or cultivator and bucket) as an heirloom.</li>
-				<li class="bugfix">Clowns and mimes will now properly pick either a can of paint or their brand as heirloom now.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PR by tralezab) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixes an issue with spontaneous appendicitis picking incompatible mob biotypes.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PRs by Tortellini Tony and BuffEngineering) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">E-cigs will continue to display their setting after being emagged.</li>
-				<li class="bugfix">Vapes now come out of the mouth. fix Fixes an E-cig initialize() runtime.</li>
-			</ul>
-			<h3 class="author">Ghommie (Original PRs by nemvar and Rowell) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added beekini bras and panties, thigh-high and knee-high bee socks.</li>
-			</ul>
-			<h3 class="author">Ghommie (by Arkatos) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed an issue with a Lizardwine drink crafting, where a final product would contain unwated 100u of Ethanol.</li>
-			</ul>
-			<h3 class="author">Ghommie (by Floyd / Qustinnus, Arathian) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The robotocist now has robe to show his love for toasters</li>
-			</ul>
-			<h3 class="author">Ghommie (by nemvar) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Dwarfs are now more robust.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by 4dplanner) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">thrown objects (but not mobs) no longer hit the thrower</li>
-				<li class="bugfix">mirror shield rebound no longer depends on the original thrower's momentum</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by 81Denton, kriskog and nemvar) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="spellcheck">Sleepers now show a message if players try to unscrew the maintenance hatch while they're occupied or open. Fixed typos in sleeper/organ harvester messages.</li>
-				<li class="tweak">Sleepers and dna scanners can now be pried open with crowbars.</li>
-				<li class="tweak">You can open and close sleepers and dna scanners by alt-clicking them.</li>
-				<li class="bugfix">The scanner's hatch now must be closed (on top of being unoccupied), just like sleepers, before being screwdriverable. This fixes a tricky door stuck issue with the machine.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by AffectedArc07 and Shazbot) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Added 8 new sock styles</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by AffectedArc07) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Religion is now a globalvar instead of being a subsystem for some reason</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by AnturK) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Supermatter now melt walls if it finds itself in one.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Anturk) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Recipe for fabled secret sauce can now be found in the deepest reaches of space.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Barhandar updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Pumpkin meteors on Halloween now replace catastrophic meteor waves, instead of ALL OF THEM.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by CrazyClown12) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">The chloral hydrate inside of the sleepy pen is no longer slower acting than chloral hydrate made in chemistry.</li>
-				<li class="tweak">The chloral hydrate inside of cookies synthesised by emagged borgs is no longer slower acting than chloral hydrate made in chemistry.</li>
-				<li class="balance">Slight tirizene buff.</li>
-				<li class="rscdel">Delayed chloral hydrate</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Denton) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Nanotrasen has started shipping more types of bedsheets to its stations.</li>
-				<li class="rscadd">Added in Runtime, Pirate and Gondola bedsheets. The second one can also be found in some pirate ships, while the last can be crafted from gondola hides.</li>
-				<li class="balance">You can no longer reveal the 'illegal tech' research node by deconstructing .357 speedloaders, riot dart boxes, syndicate cigarettes, syndicate playing cards or syndicate balloons.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Mickyan) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed being unable to smother people using the damp rag</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by MrDoomBringer) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">morgues have had their proton packs removed and as such no longer suck in ghosts on closing.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by MrDoomBringer, AnturK and YPOQ) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Explosions will no longer damage wizards in rod form, the supermatter monitoring radio and megafauna GPS.</li>
-				<li class="bugfix">Supplypods no longer detonate their contents.</li>
-				<li class="bugfix">Fixed silicon items (e.g. cyborg modules) being destroyed by explosion epicenters.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Naksu) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">get_area() is now a define rather than a proc.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Nicjh) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Abductor console's select disguise option now uses a radial</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by ShizCalev) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Pineapple haters/lovers will get/no longer get pineapple pizzas respectively from infinite pizza boxes.</li>
-				<li class="bugfix">As a non-human mob, hovering your cursor over an inventory slot while holding an object in your active hand shouldn't runtime now.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Skoglol) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">New helper proc for alt-click turf listing, bypasses any interaction overrides.</li>
-				<li class="code_imp">Ghosts and revenants now use the new proc.</li>
-				<li class="bugfix">Ghosts can no longer toggleopen sleepers, adjust skateboard speed or close laptops</li>
-				<li class="bugfix">Revenant can now alt-click turf to list contents.</li>
-				<li class="tweak">Revenant now slightly less nosy, use shift click to examine.</li>
-				<li class="tweak">Alt-clicking the same turf again no longer closes the turf listing tab.</li>
-				<li class="bugfix">Reduced ventcrawl lag greatly.</li>
-				<li class="bugfix">Mining bags will no longer drop ore into backpack.</li>
-				<li class="bugfix">Mining bags in backpack no longer interferes with other mining bags.</li>
-				<li class="bugfix">Fixes some storage size circumventions.</li>
-				<li class="tweak">Moved machine and computer frames below objects, parts are now always on top.</li>
-				<li class="tweak">Moved structures (chairs, closets, windows, cult altars etc etc) below objects.</li>
-				<li class="tweak">Moves mineral doors to airlock layers</li>
-				<li class="tweak">morgue/crematorium trays' layers shouldn't overlap bodybags' anymore.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by SpaceManiac) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Disassembling a chem dispenser for the first time will no longer always yield a fully-charged cell.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Swindly) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Arm-mounted implants that contain more than one item use a radial menu instead of a list menu.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by Tlaltecuhtli) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Other people's clothes burning no longer spam you</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by XDTM) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Reagents now stop their passive effects (for example, stun immunity) if the liver stops working while they're active.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by YPOQ) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixing roffle waffle, mushroom halluginogen and some invalid reagents.</li>
-				<li class="bugfix">Fixes clockwork armor not actually having armor.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by cacogen) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The font size of all text in the chat window now scales</li>
-				<li class="tweak">High volume (megaphone/head of staff headset) is a slightly smaller</li>
-				<li class="tweak">Admins have slightly larger OOC text</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by coiax) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Randomly coloured gloves and randomly coloured glowsticks now have slightly different typepaths, but otherwise function the same.</li>
-				<li class="code_imp">The Squeak subsystem has been renamed to Minor Mapping.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by duckay) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added better names and descriptions for blueshirt officer gear.</li>
-				<li class="rscadd">Added the above gear to the premium selection of the sectech</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by harmonyn) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Resisting out of bucklecuffs takes more/less time depending on the handcuffs you used, i.e., fake handcuffs will not bucklecuff someone for ages.</li>
-				<li class="tweak">fake handcuffs shouldn't no longer demoralize restrained criminals scums.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by monster860) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixes advanced proccall</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by mrhugo13 on tgstation13) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The Syndicate has decided to equip their Syndicate leaders operative (Aswell as their clown counterparts) with the new Combat Glove Plus! The new Combat Glove Plus does everything the old boring Combat Gloves does but with the added extra of learning Krav Maga upon wearing them, any other Syndicate operative who wants to get in on the action will have to pay 5tc.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by nemvar) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Some drinks have new icons or slightly altered icons. In particular Wizz Fizz, Bug Spray, Jack Rose, Champagne and Applejack.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by ninjanomnom) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Orbiting is a little more aggressive about staying in orbit. The wisp as a result now correctly follows you over shuttle moves.</li>
-				<li class="bugfix">Gaps between sounds in some looping sound effects should no longer happen as much under heavy server lag.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by variableundefined) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Cancel button to assault pod destination selector.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PR by wesoda25) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">disembowelment no longer works on mobs that aren't dead or in critical condition</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Akrilla, Arkatos and Denton) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Sprays cans have a cap on how dark you can make objects. Art is uneffected.</li>
-				<li class="bugfix">Fixed a bug where you could get cyborg spraycans via pyrite extracts.</li>
-				<li class="rscadd">Added an infinite spraycan for admins to spawn.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Denton and Skoglol) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Reorganized the syndicate uplinks. Items are now mostly alphabetical, some misplaced items moved to more fitting categories. Bundles, random item and TC have been moved into a new category called "Bundles and Telecrystals". Gloves of the North Star and Box of Throwing Weapons have been moved to Conspicuous and Dangerous Weapons. Combat Gloves Plus have been moved to Stealthy and Inconspicuous Weapons. Moved all implants into the Implants category.</li>
-				<li class="tweak">Added a new category to the uplink: Grenades and Explosives.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Floyd/Qustinnus, optimumtact, Denton and coiax) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now select what your pills will look like when making pills from the Chem Master</li>
-				<li class="rscadd">Red pills can make you think.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Jujumatic and PKPenguin321, respectively) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Minesweeper Arcade machines. The higher the difficulty setting, the better the prizes will be.</li>
-				<li class="rscadd">Also keep your eye out for another new (and rare) arcade game!</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Kmc2000 and actioninja) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added darkmode! You can opt-in to this by clicking the new toggle darkmode button just beside the settings one.</li>
-				<li class="rscadd">Byond members will now have a new setting for their Antag OOC color, instead of using their OOC one. (Antag OOC still locked under admin discretion though)</li>
-				<li class="rscdel">Default black'n'white windows style.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Mickyan, Anturk, ShizCalev, nemvar and Naksu) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">After rigorous mandatory art training for the crew, many new graffiti styles are now available</li>
-				<li class="bugfix">Cleaned up some crayon and spraycan code for futureproofing.</li>
-				<li class="bugfix">Spraypainting blast doors no longer makes them see-through.</li>
-				<li class="balance">Paint remover now works on blast doors and the like.</li>
-				<li class="rscadd">Most objects can now be colored using a spray can.</li>
-				<li class="spellcheck">Added visible message to spraying objects and windows.</li>
-				<li class="rscadd">Colored lights now shine in different colours.</li>
-				<li class="rscdel">Removed individual buttons text in crayon/spraycan UI, speeding it up.</li>
-				<li class="bugfix">Text mode buffer is actually visible in the UI.</li>
-				<li class="tweak">Last letter of a text mode buffer no longer rotates out to be replaced with "a", allowing the text mode to be used for individual symbols.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Naksu and XDTM) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Transferring quirks now properly removes the roundstart trait from the person losing the quirk.</li>
-				<li class="bugfix">Roundstart traits no longer block the removal of other sources of that trait.</li>
-				<li class="code_imp">status traits are now a datum var, the accessors are now defines rather than functions.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Naksu and coiax, loser) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Cleaned up saycode</li>
-				<li class="bugfix">Taking mutadone while having the communication disorder brain trauma will no longer spam your chat with messages.</li>
-				<li class="rscadd">IPCs now come with a subtype of robotic tongue without the omnilingual ability, instead of innately having robotic voice spans.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Nichlas0010 and ShizCalev) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">AI core display screen can now be set in character preferences.</li>
-				<li class="bugfix">AI core display screen will now be restore when revived.</li>
-				<li class="spellcheck">Corrected some inconsistent capitalization in the player preferences screen.</li>
-				<li class="imageadd">Readded some forgotten AI sprites.</li>
-				<li class="bugfix">Fixed Hades AI death animation not playing.</li>
-				<li class="tweak">the AI icon-selection menu now uses a radial.</li>
-				<li class="imageadd">Added in the death icon_states for the "TechDemon" AI screen.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by ShizCalev and bobbahbrown) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Headsets now dynamically show in their description how to speak on any channels they can use when held or worn.</li>
-				<li class="code_imp">Radio channels names and keys now use defines.</li>
-				<li class="tweak">The head arrival announcement will now be broadcast to the supply for the quartermaster.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by ShizCalev) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed a bug that allowed you to teleport an ID in your possession to a PDA anywhere ingame.</li>
-				<li class="bugfix">Fixed an exploit allowing you to steal ID's/pens from PDA's not in your possession.</li>
-				<li class="bugfix">Fixed an exploit allowing you unlimited control of a PDA's interface even if it wasn't near you/in your possession.</li>
-				<li class="bugfix">Fixed Pride Mirror exploits.</li>
-				<li class="tweak">Corgi collars can now be removed!</li>
-				<li class="tweak">Updated the corgi & parrot inventory panels to use the same formatting as other mobs</li>
-				<li class="bugfix">Fixed corgi inventory panels not closing properly.</li>
-				<li class="bugfix">Fixed the parrot inventory panel not closing properly if you're not able to interact with it.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by ShizCalev, MrDoombringer, AnturK, bgobandit, 81Denton and actioninja) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Failsafe codes for uplinks are now available for purchase.</li>
-				<li class="rscadd">Nuke Ops now have the ability to purchase a usable RPG, the PML-9, as well as a couple different types of rockets for it. you can also suicide rocket jump with them!</li>
-				<li class="spellcheck">Improved Uplink item descriptions and formatting.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by ShizCalev, coiax and Tlaltecuhtli) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Caks will no longer override the bonus reagents provided in a donut when frosting them.</li>
-				<li class="bugfix">Caks can no longer create frosted frosted jelly donuts.</li>
-				<li class="bugfix">Jelly donuts will no longer lose their vitamins when they're frosted.</li>
-				<li class="bugfix">Fixed chaos donuts potentially doubling the amount of reagents added when microwaved with something else.</li>
-				<li class="bugfix">Donuts now always contain 1 sprinkles as was stated on the wiki. Frosted donuts have a chance at adding an extra sprinkle.</li>
-				<li class="code_imp">Improved the code for ensuring that security members enjoy donuts and security-themed alcoholic drinks.</li>
-				<li class="balance">neurotoxin doesnt insta stun but gives you limb paralysis overtime and heart attacks if it stays in for too long and it is also alcholic</li>
-				<li class="balance">beepsky smash now summons imaginary beepskys that deal stamina damage instead of outright stunning</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Time-Green and Qustinnus) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">loot crates can't explode after unlocking anymore</li>
-				<li class="bugfix">jumping into loot crates no longers causes them to go boom</li>
-				<li class="bugfix">You can now deconstruct abandoned crates with a welder without making them go boom. After unlocking them, of course.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by Tlaltecuhtli and nicbn) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">alt click to eject beakers from chem masters + chem dispensers + grinders + chem heaters</li>
-				<li class="rscadd">hit chem master + chem dispenser + chem heaters with a beaker and if its loaded with another it swaps em</li>
-				<li class="rscadd">All-In-One Blender UI uses a radial menu now. You can see the contents and reagents by examining.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by XDTM, 4dplanner, nemvar and, yes, myself) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Merged tinfoil hat kind of protection into the anti_magic component.</li>
-				<li class="rscadd">Tinfoil hats can also be warped up from excessive dampening of mindray/though control/psicotronic anomalies, or by simply being microwaved in an oven, and become useless.</li>
-				<li class="rscadd">Immortality Talisman and Paranormal Hardsuit helmets now come with tinfoil protection too (minus the paranoia and limited charges).</li>
-				<li class="balance">Genetics/Slime/Alien Telepathy and Slime Link are now stopped by tinfoil protection.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by XDTM, optimumtact, Nichlas0010 and monster860) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added Quantum Keycards, devices that can link to a quantum pad, and can be used on any other quantum pad to teleport to its linked pad. spellchecking: Renamed "Bluespace Teleportation Tech" tech node to "Bluespace Travel".</li>
-				<li class="tweak">Moved roasting sticks from the "Bluespace Travel" to "Practical Bluespace".</li>
-				<li class="rscadd">Spraying holy water on tiles will now prevent cult-based teleportation from using them as a destination point.</li>
-				<li class="tweak">Quantum, wormhole and magic teleportation is no longer disrupted by bags of holding.</li>
-				<li class="bugfix">You are now also blocked from teleporting IN to no-teleport areas, not just out of them.</li>
-				<li class="tweak">Quantum teleportation now makes pretty rainbow sparks instead of the normal ones.</li>
-				<li class="bugfix">Non-bluespace teleportation (spells etc.) no longer makes sparks.</li>
-				<li class="bugfix">Fixed teleportation deleting mob spawners like golem shells and ashwalker eggs.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by carshalash, GranpaWalton, BebeYoshi & Hexmaniacosanna, Fire Chance, Ordonis, Krysonism and OnlineGirlfriend) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Reduced booze power of Mead, Red Mead, and Irish Cream.</li>
-				<li class="tweak">Increased booze power of Grappa.</li>
-				<li class="rscadd">Added a new premium drink to the soda machine called "Grey Bull" which gives temporary shock resistance</li>
-				<li class="rscadd">A new drink called Blank Paper was added to the bar menu, it was made by a mime and it represents a new start.</li>
-				<li class="rscadd">Adds a variety of fine alcoholic beverages for discerning patrons of the bar: Wizz Fizz, Bug Spray, Champagne, Applejack, Jack Rose, Turbo, Old Timer, Rubberneck, Duplex, Trappist Beer, Blazaam and Planet Cracker!</li>
-				<li class="rscadd">Also more nonalcoholic drinks: Cream Soda, Lemonade and Red Queen.</li>
-				<li class="rscadd">Packs of a novel artificial sweetener have been added to the kitchen vendor.</li>
-				<li class="rscadd">Bottles of trappist beer and champagne are now available in the premium seection of the booze-o-mat.</li>
-				<li class="rscadd">Juicing parsnips now yields parsnip juice.</li>
-				<li class="rscadd">Maintenance peaches.</li>
-				<li class="bugfix">Grape soda now cools you down like other sodas.</li>
-				<li class="tweak">tweaked the Arnold Palmer recipe, it now uses lemonade.</li>
-				<li class="imageadd">Added new drink, bottle, vomit and peach can sprites.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by grandpawalton and Mickyan) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">the contents on the smartfridge icon now change depending on how many items it contains</li>
-				<li class="bugfix">opening the maintenance panel of smartfridges now correctly updates the icon</li>
-				<li class="bugfix">Screwing a disk compartmentalizer no longer makes it look like a smartfridge.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by nicbn and coiax) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Microwave UI uses a radial menu now. You can see the contents by examining.</li>
-				<li class="rscadd">Microwaves have a single wire accessible when open, the activation wire. When cut, the microwave will no longer function, when pulsed, the microwave will turn on.</li>
-				<li class="rscadd">Stabilized dark purple extracts now cook items in your hands, rather than dropping the cooked item on the floor.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by ninjanomnom and nemvar) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Trays now scatter their contents when used for attacks, like they are supposed to.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by ninjanomnom, coiax, yoyobatty) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed slaughter demons not getting a speed boost when exiting a pool of blood. Fixed slaughter demon giblets not being visible.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by subject217, AarontheIdiot, pireamaineach, Gousaid67 and SouDescolado) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Removed plasmamen species speedmod in favor of a slowdown for envirosuits.</li>
-				<li class="rscadd">Nanotrasen has began deploying departementalized enviro plasmasuits to the station! plasmamens can now benefit from some of the bonuses aswell as the color pattern of their job, while allowing others to easily determine their profession!</li>
-				<li class="bugfix">Benevolent Nanotrasen makes gulag available for everyone! (Plasmamen retain their equipment and don't die.)</li>
-				<li class="rscdel">Removes code that theoretically limits plasmamen from being clowns and mimes, but actually doesn't.</li>
-			</ul>
-			<h3 class="author">Ghommie (original PRs by zeroisthebiggay, AnturK, MrDoomBringer, Cobby, ATHATH, optimumtact, GranpaWalton, Skoglol) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Blob overminds, sentient diseases, etc. can no longer dump out boxes. Sorry gamers.</li>
-				<li class="rscadd">Sentient Disease now has almost all symptoms at its disposal.</li>
-				<li class="code_imp">Adding single-symptom disease abilities is super easy now.</li>
-				<li class="bugfix">Sentient Disease can now hear (not sure if this was a bug or intentional).</li>
-				<li class="rscadd">Sentient Disease is a linguist and knows all languages. Still cannot speak.</li>
-				<li class="tweak">Gives Sentient Diseases a medical hud to observe their victims further with.</li>
-				<li class="bugfix">Fixes and moves around some on_stage_change() and Start()-related things for virus symptoms and (sentient) diseases.</li>
-				<li class="bugfix">The inorganic biology symptom should work properly now when bought by a sentient disease.</li>
-				<li class="bugfix">Oxyloss icon no-longer shows up when someone has the self respiration symptom</li>
-				<li class="tweak">The self respiration now makes you not contract diseases through the air and not breathe in smoke</li>
-				<li class="bugfix">Sentient diseases can no longer pick two cures that react and disappear when eaten.</li>
-				<li class="balance">Sentient disease cures are now consistently harder, will only pick cures from tier 6 and up.</li>
-				<li class="bugfix">Disease cures should now stay the same for all infected mobs.</li>
-				<li class="rscadd">The regenerative coma symptom has a new resistance 4 threshold effect! Said threshold effect will give hosts of the symptom's virus the TRAIT_STABLECRIT trait if its threshold is met.</li>
-				<li class="bugfix">An obscure, probably never reported before bug that may or may not exist involving sentient diseases and the self-respiration symptom should be fixed now (if it even existed in the first place).</li>
-				<li class="balance">The cooldown time between each removal or addition of a symptom for sentient diseases has been brought down from an agonizingly long 2 minutes to a more reasonable 1 minute.</li>
-			</ul>
-			<h3 class="author">Ghommie (original pr by Dennok on tgstation) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Now you don't lose your pulled thing on the z level edge.</li>
-			</ul>
-			<h3 class="author">GrayRachnid updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added windoors to all the flaps on delta.</li>
-				<li class="balance">rebalanced k9dogborgs</li>
-			</ul>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Magnetic pistols now fit in boot pockets - jackboots, workboots, etc.</li>
-				<li class="tweak">literally every pistol subtype fits in shoes now. go wild.</li>
-			</ul>
-			<h3 class="author">Hippie Circuit Port updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added all Atmospheric Circuits</li>
-				<li class="rscadd">Added the ability to color data disks</li>
-				<li class="rscadd">Added Selection and Storage Examiner Circuits</li>
-				<li class="rscadd">Added Smoke, Extinguisher, and Beaker Connector Circuits</li>
-				<li class="rscadd">Added Inserter, Renamer, Redescriber, and Repaint Circuits</li>
-				<li class="rscadd">Added MMI Tank and pAI Connector Circuits (The possibilities are endless!)</li>
-			</ul>
-			<h3 class="author">Improving and Balancing Cyborgs updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added Crew Pinpointer to Security Borg</li>
-				<li class="rscadd">Added Crew Monitor to Medical Borg</li>
-				<li class="rscadd">Added Crew Pinpointer to MediHound Borg</li>
-				<li class="tweak">Made the Disabler_Cooler compatible with both Security Borg and K9 Borg</li>
-				<li class="tweak">Changed the Warning Text upon selecting Security or K9 module</li>
-			</ul>
-			<h3 class="author">ItzGabby updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Bat Species parts for more leeway for character customization.</li>
-				<li class="code_imp">Alphabetized decor wing selection window in character creator for simplicity.</li>
-			</ul>
-			<h3 class="author">JTGSZ updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Added one more gang boss slot bringing total to 4 from 3</li>
-				<li class="bugfix">Fixed Gang Boss being able to be deconverted</li>
-				<li class="tweak">Gave Qualifies_for_Rank Check back its checks in job controller.</li>
-				<li class="rscadd">Optional species based clothing restrictions</li>
-				<li class="tweak">Gang Dominator excessive wall check tweaked to 25 open turfs</li>
-				<li class="bugfix">Gang Dominator no longer functions off-station.</li>
-				<li class="rscadd">Adds more control over species based offsets.</li>
-				<li class="bugfix">qualifies_for_rank now checks latejoin menu</li>
-				<li class="rscadd">Added Halloween Dwarves, for Halloween... Yep.</li>
-				<li class="bugfix">Can flip pipes once more.</li>
-				<li class="bugfix">barricade girder walls use PlaceOnTop instead of new</li>
-			</ul>
-			<h3 class="author">Linzolle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">ability to quickly max sensors</li>
-				<li class="bugfix">atmos helmet visual bug</li>
-				<li class="bugfix">supply display are now properly on the wall</li>
-				<li class="tweak">consistency in hop and cap berets</li>
-				<li class="tweak">slime people now enjoy eating toxic food and it will not disgust them</li>
-				<li class="bugfix">hos trenchcloak now properly has a sprite on digi characters</li>
-				<li class="rscdel">duplicate definition of hos and sec skirts</li>
-				<li class="bugfix">Krav Maga leg sweep now works properly.</li>
-				<li class="rscadd">shoes can have a different icon used for their item and mob icons</li>
-				<li class="bugfix">combat gloves plus having no mob icon</li>
-				<li class="rscadd">inhands sprite for rainbow knife</li>
-				<li class="tweak">colour of highlight on the regular knife when held in the right hand</li>
-				<li class="rscadd">mining shuttle console can now be printed after computer consoles have been researched</li>
-				<li class="rscadd">can now carry people on your back by aggressive grabbing them while they are laying down and then dragging their sprite onto yours.</li>
-				<li class="tweak">dragging people who are prone is now much slower, and carrying them will allow you to move faster at the cost of taking 5 seconds to lift them up onto your back.</li>
-				<li class="tweak">pacifists can now aggressive grab (cannot table slam people though)</li>
-				<li class="bugfix">blood on your body floating a bit to your right if you're a taur</li>
-				<li class="bugfix">some suits having no icon on tauric characters</li>
-				<li class="tweak">front facing CMO hardsuit icon for naga taurs</li>
-				<li class="tweak">colour of medical cross on CMO hardsuit for taurs</li>
-				<li class="bugfix">taur body and jumpsuit showing through mining suits</li>
-				<li class="tweak">all chaplain suits can hold the same items in suit storage</li>
-				<li class="code_imp">improvement to organisation for chaplain suits</li>
-				<li class="bugfix">blood halberd not going back to 17 force after unwielding</li>
-				<li class="spellcheck">unnecessary 's at the end of blood rites healing</li>
-				<li class="rscadd">QoL to blood rites, examine the ritual aura to view how many blood charges are left</li>
-				<li class="code_imp">surgery cleanup</li>
-				<li class="tweak">dissection available round-start</li>
-				<li class="rscadd">better dissection surgeries from RnD, gives more points</li>
-				<li class="rscadd">abductors can now see what glands do</li>
-				<li class="code_imp">antagonist abductors now have a surgeon trait that teaches them every surgery rather than having it just check if they're an abductor</li>
-				<li class="rscadd">muscled veins surgery</li>
-				<li class="bugfix">having one of your hands used up if you fireman carry but the person being carried dismounts any way other than you dropping them</li>
-				<li class="rscadd">Four colour variants of ankle coverings. Select them on the loadout screen.</li>
-				<li class="imageadd">ankle coverings</li>
-				<li class="tweak">allows for shoes that don't cover your feet to be taken into account for footstep sound effects and glass shards</li>
-				<li class="rscadd">Tend Wounds surgery. Heal in the field, with better healing the more damage the patient has.</li>
-				<li class="rscdel">Reconstruction replaced by Tend Wounds</li>
-				<li class="balance">made Revival more accessible, more viable alternative to cloning.</li>
-				<li class="bugfix">advanced surgery tools can't perform lobectomy or coronary bypass</li>
-				<li class="rscadd">Decorative and insect wings can now be coloured individually, similar to horns.</li>
-				<li class="bugfix">people getting assigned wings if their savefile is old.</li>
-				<li class="rscdel">wings that take the hair colour. Unnecessary if you can just set the colour.</li>
-				<li class="tweak">Cannot make horns pure black. Trying to do so will set it to a default value.</li>
-				<li class="bugfix">decorative angel wings being invisible</li>
-				<li class="bugfix">abductors now actually work</li>
-				<li class="tweak">abductor scientist has their own greet message now</li>
-				<li class="bugfix">unable to read paper on airlocks</li>
-				<li class="tweak">ai can see paper (still just shows stars)</li>
-				<li class="rscadd">Target head and throw a hat at someone to toss it onto their head, knocking whatever they're wearing off if they are wearing a hat. Some headgear can't be knocked off this way.</li>
-			</ul>
-			<h3 class="author">MediHound updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Made Cyborgs be affected by Ion Storm Law Changes like AIs</li>
-			</ul>
-			<h3 class="author">MrJWhit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">rebalance melee stamloss</li>
-			</ul>
-			<h3 class="author">Multicam Config updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="config">removed whether or not the stuff for multicam was checking the useless var and instead now checks the CONFIG_GET flag.</li>
-				<li class="admin">Admins now have a verb in the Server tab to turn AI multicam on and off.</li>
-			</ul>
-			<h3 class="author">Naksu updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">default radiation insulation is now handled by atom vars rather than a component, components can still be used.</li>
-				<li class="code_imp">squeezed a little bit more perf out of atmos</li>
-			</ul>
-			<h3 class="author">Nero1024 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="soundadd">Bare feet will now make the correct footstep sounds.</li>
-				<li class="soundadd">Other mobs will make the correct footstep sounds.</li>
-				<li class="soundadd">Crawling/dragging sounds for downed/incapacitated mobs</li>
-			</ul>
-			<h3 class="author">Onule & Nemvar (ported by Ghommie) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">New Revenant icons</li>
-			</ul>
-			<h3 class="author">Original by Citinited, port by Sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now use an airlock electronics on a locker to add a lock, and can screwdriver an unlocked locker to remove its lock.</li>
-				<li class="rscadd">You can now remove the locks on broken or emagged lockers.</li>
-				<li class="tweak">Removing the lock from a personal locker now wipes that locker's ID details.</li>
-				<li class="tweak">Broken lockers have had their appearance changed.</li>
-			</ul>
-			<h3 class="author">Owai-Seek updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">custodial cruiser cargo crate</li>
-				<li class="tweak">removed light replacer from power designs and moved to misc designs</li>
-				<li class="tweak">added pimpin ride to custodial locator</li>
-				<li class="tweak">added additional items to janibelt whitelist</li>
-				<li class="tweak">made plant DNA manipulator unwrenchable</li>
-				<li class="balance">reduced janitor premium supply costs</li>
-				<li class="bugfix">fixed them strawberries</li>
-				<li class="rscadd">false codpiece</li>
-				<li class="rscadd">crocin/camphor bottles</li>
-				<li class="tweak">updated kinkmate item list</li>
-			</ul>
-			<h3 class="author">PersianXerxes updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="code_imp">Adds the clockwork_warp_allowed flag to the Captain's Office area, set to FALSE the same way it is for the chapel and armory.</li>
-				<li class="tweak">Relocates cult catwalks outside the Reebe dressing room.</li>
-			</ul>
-			<h3 class="author">Poojawa updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Digitigrade legs are now able to wear shoes and look fancy, Uniforms to come.</li>
-				<li class="tweak">Xenos are only digitigrade now, mammals and aquatics have the option.</li>
-				<li class="rscadd">Fire Alarms are visible in low light situations</li>
-				<li class="bugfix">fixed vore prefs saving inconsistently, new characters might have a previous slot's prefs tacked on.</li>
-				<li class="bugfix">fixed mammals not having the option for digilegs. Sprites are fucky until body-part related sprites are done.</li>
-				<li class="refactor">improved vore sound responsiveness to preference choices.</li>
-				<li class="balance">removed morphine from Medihound sleeper chemical list</li>
-				<li class="bugfix">fixed preference setting being broken</li>
-				<li class="refactor">Medihound sleepers are Initialized properly, and icons update correctly now on eject</li>
-				<li class="tweak">Air alarm All clear color changed from green to blue</li>
-				<li class="balance">APCs are harder to destroy.</li>
-				<li class="rscadd">Added Digitigrade versions of everything appliciable in suit.dmi</li>
-				<li class="imageadd">Snowflake Icons weren't modified, and were given NO_MUTANTRACE_VARIATION</li>
-				<li class="imageadd">naga and quad Taurs literally don't freeze their ass off in space anymore.</li>
-				<li class="bugfix">Digitigrade legs will toggle on/off properly on character menue</li>
-				<li class="bugfix">The misleading "normal" has been removed from species options</li>
-				<li class="balance">Added sanity checks to emag usage</li>
-				<li class="bugfix">fixed vtech, but it still doesn't work because of overriding jog/sprint mechanics from combat reworks.</li>
-				<li class="bugfix">Puppy jaws properly store if you're emagged, they are also toggle-able for stealth like the tongue.</li>
-				<li class="bugfix">Digitigrade legs should properly fucking update for the last fucking time. Fucking snowflake code. refractor: Got rid of snowflake sechound cuffs, gave them normal zipties like regular secborgs.</li>
-				<li class="bugfix">dogborg sleepers actually extinguish people who are on fire, in case you don't have time to lick them out.</li>
-				<li class="bugfix">Taur suits should fix themselves properly when worn by other people.</li>
-				<li class="rscadd">Added the Yogs/Oracle ported latejoin menu</li>
-				<li class="rscadd">All markings, tails, ears, and snouts for Citadel races are color matrixed!</li>
-				<li class="imageadd">all markings are on a per-limb basis, including Digitigrade legs!</li>
-				<li class="imageadd">a bunch of tails were blessed with tail wagging sprites, Fish, Sharks, Fennecs, Wahs, raccoons, and others.</li>
-				<li class="imageadd">Tiger markings + tail added, skunk tails improved via sprites from Virgo</li>
-				<li class="tweak">tweaked some sprites to look better, but they absolutely could use a few extra passes for quality</li>
-				<li class="rscadd">HumanScissors in the Tools folder will permit anyone to contribute matrix'd markings to the sprite sheet, however Mam_markings is very, very full. Be careful.</li>
-				<li class="tweak">Character preview was both optimized for taurs and bad-touched for better updating. I don't know if it'll be bad, but hey its better.</li>
-				<li class="rscadd">Added Dark Medihound and Pup Dozer from Virgo</li>
-				<li class="tweak">Clone pods no longer announce the name of the clone</li>
-				<li class="bugfix">fixed flavor text appearing when your face is hidden but you're not an Unknown</li>
-				<li class="bugfix">Tauric suits now apply an (placeholder) blood overlay, as well as their shield overlay.</li>
-				<li class="balance">Ashwalkers now have lungs. They cannot breath station air without suffocation effects, but are completely fine on their homeworld.</li>
-				<li class="balance">Carbon mobs now have a maximum tolerance to oxygen of 50kPa.</li>
-				<li class="balance">Deluxe synthetic lungs have a very high bonus to O2 tolerance.</li>
-				<li class="bugfix">Digitigrade legs returned to normal, since digi leg markings overlay them anyway.</li>
-				<li class="bugfix">commented out lizard mam_snout entries, because too many abominations</li>
-				<li class="bugfix">Vore Panel restored to have various interactions available again. Semi-untested but should work as advertised.</li>
-				<li class="tweak">Vore Panel has more feedback.</li>
-				<li class="rscadd">is_wet var to bellies, toggled in the panel, will remove flesh sounding struggles and the internal loop. JSON version updated.</li>
-				<li class="rscadd">Feeding var. You will need to enable feeding to recieve any feed vore actions, but you can now feed yourself to mobs that have this set. TODO, Dogborg sleeper feeding.</li>
-				<li class="rscadd">vore mode button now required to be enabled to perform vore actions. It's the mouth icon!</li>
-				<li class="bugfix">Ash Drake vore fixed for actual reals this time</li>
-				<li class="bugfix">Mobs shouldn't spam the released contents announcement anymore on qdel or death. Only if triggered</li>
-				<li class="tweak">Hostile mob code now properly ignores targets in bellies</li>
-				<li class="rscadd">Your belly can quietly growl if you're starving now.</li>
-				<li class="bugfix">Normal blood splattering isn't offset due to tauric mode</li>
-				<li class="rscadd">Added plasma man suit icons for taurs</li>
-				<li class="rscadd">Added bee butt for insects to have stripes</li>
-				<li class="tweak">adjusted random spawn sprite accessories, humans won't be demi by default and lizard/mammal spawns will randomly get digitigrade legs</li>
-				<li class="bugfix">sprite adjustments for tentacles, as well as a misspelling.</li>
-				<li class="bugfix">Humans once again use ears and tail_human, as intended. This is to prevent garish randomness</li>
-				<li class="bugfix">istype for species is actually correct and usable now, it'll be a factor for monkey form expansions.</li>
-				<li class="bugfix">Hair functions are de-gendered and more easily selectable now.</li>
-				<li class="bugfix">Slimes can *wag, select markings and snouts, and yes it works.</li>
-				<li class="bugfix">Slimepeople extra parts now respect their hair_alpha in terms of being somewhat see-through. it shouldn't stand out as badly now!</li>
-				<li class="bugfix">Hunger noises are now toggled per character</li>
-				<li class="bugfix">Ashwalker den is habitable by ashwalkers again</li>
-				<li class="rscadd">Medical belts now have overlays! Now you can see if a belt is useful or just flatout empty.</li>
-				<li class="bugfix">fixed hypo MK IIs not being able to be put on medical belts</li>
-				<li class="bugfix">fixed Navy officer uniforms that failed to spawn</li>
-				<li class="code_imp">Loadout items will be forcefully added to backpacks or at your feet instead of left behind at title screen</li>
-				<li class="tweak">hypospray kits hold 12 now, but only vials and sprays themselves</li>
-				<li class="bugfix">labcoats can carry MK II hyposprays on them now.</li>
-				<li class="rscadd">Vore Mobs are a thing now, not just ash drakes</li>
-				<li class="rscdel">Removed hunger sound stuff. never taking requests from Coolgat3 ever again. refractor: Simple Mobs use the same system regular human mobs do, itjustworks.png</li>
-				<li class="tweak">Character Window settings unsnowflaked and normalized. I have no fucking clue how to make them work with taurs still tho, sorry.</li>
-				<li class="imageadd">added rotating background images for better clarity and contrast than just SOLID FUCKING BLACK. Images from Virgo/Polaris/Eris</li>
-				<li class="balance">Defib users automatically stop pulling when they attempt to perform a defib shock</li>
-				<li class="imageadd">added muzzled varients of space helmets and full masks</li>
-				<li class="imageadd">added knight_grey to taur suits, all paranormal ERT now have tauric versions enabled</li>
-				<li class="bugfix">Lava knights have digitigrade and tauric versions now</li>
-				<li class="rscadd">Added a glass version of the gas mask, because it was in the files and looked nice. does everything regular ones do except make you an unknown</li>
-				<li class="rscadd">Added custom species names! Examining people will now display their species name unless they're an Unknown or have their face hidden. like flavor text. Set it in your character window!</li>
-				<li class="code_imp">changed how health scanners print messages, wrapping it in msg for one to_chat instead of printing every line to_chat.</li>
-				<li class="server">Discord bot will now report when a round ends and give the vague news ticker that a sister-station would have received for the game mode and result of the round.</li>
-				<li class="bugfix">fixed medical hardsuit overlay issue. I thought it was going to work well but fuck byond.</li>
-				<li class="bugfix">None body markings shouldn't give rgb hell, but it also should reset properly anyway. ree.</li>
-				<li class="bugfix">Sorted some sprites to better sooth my byond icon limit anxiety.</li>
-				<li class="bugfix">Box Cryopods expanded to 6 public. Permabrig cryo fixed.</li>
-				<li class="bugfix">Delta Cryopods expanded to 6 public. Permabrig cryo fixed.</li>
-				<li class="bugfix">MetaStation Crypods expanded to 6 public, relocated above sparring ring. Permabrig cryo fixed</li>
-				<li class="bugfix">PubbyStation gained one more cryopod, Permabrig's cryo fixed.</li>
-				<li class="rscadd">Omega given one more crypod as well.</li>
-				<li class="rscadd">Gulag was given a cryopod.</li>
-				<li class="tweak">Box and Meta's cryo rooms are now a new room entirely.</li>
-				<li class="rscadd">Added erect states for all phallic bodyparts</li>
-				<li class="bugfix">YOUR DICK ACTUALLY STANDS UP NOW, YOU'RE WELCOME.</li>
-				<li class="bugfix">skintone locked genitals match the new skintone colorations.</li>
-				<li class="rscadd">added two new vaginal types and descriptions.</li>
-				<li class="bugfix">fixed borg defib runtimes</li>
-				<li class="bugfix">fixed heart attacks being nonlethal</li>
-				<li class="rscadd">Ported Oracle's cloning set up, you're now visible like cryo when being cloned, though it's a mystery until you have skin on your meat puppet existance</li>
-				<li class="balance">Recyclers are unable to destroy the indestructible any longer.</li>
-				<li class="bugfix">Kiara's toy sabre now actually is the correct item + icon states</li>
-				<li class="bugfix">Generic armor for taurs fixed, there isn't actually any sprites for 'em, so. Full sprites overlay over bodies, but I really can't be bothered to do all the offset fixes otherwise.</li>
-				<li class="rscadd">Large maps have had a patient room transformed into micro chemistry stations with nothing else in them. They've been labelled 'Apothecary' rooms and are accessible by doctors.</li>
-				<li class="rscadd">females now have female defined sprites</li>
-				<li class="bugfix">Slime legs have had their excess pixels adjusted</li>
-				<li class="bugfix">Mammal normal legs are more in line with human legs now</li>
-				<li class="bugfix">fixed species like abductors and golems getting the fat tiddy or pingas</li>
-				<li class="bugfix">Atmos and Station alerts should be more alerting.</li>
-				<li class="rscadd">Added visible and hidden testicles</li>
-				<li class="rscadd">Added multi-boob support. Now you can have two or three pairs of breasts.</li>
-				<li class="bugfix">fixed missing vagina and breast sprites</li>
-				<li class="bugfix">fixed prosthetic hands being invisible</li>
-				<li class="bugfix">male foxes exist again</li>
-				<li class="bugfix">female chest markings improved from being too dark in comparison to their other colors, blending better</li>
-				<li class="bugfix">Markings behave better on non-organic limbs.</li>
-				<li class="tweak">tweaked the name of Sublter to distinguish its use</li>
-				<li class="tweak">Gave a hint for vore posting.</li>
-				<li class="rscadd">Readded Ninja speech modifications with their mask</li>
-				<li class="rscadd">Pacifists can eat people for heal belly or noisy. Digestive modes are auto-swapped to noisy</li>
-				<li class="rscadd">Added an underwear toggle button under 'Object' tab</li>
-				<li class="tweak">Genitals now layer under underwear. Hide these if they're too obnoxious.</li>
-				<li class="rscadd">Added digitigrade socks of all known ones anyway.</li>
-				<li class="tweak">tweaked the Genital character creation layout to look better</li>
-				<li class="bugfix">fixed having balls/womb when you don't have the linked organ at character creation</li>
-				<li class="bugfix">fixed being able to squeeze semen directly from your balls. Probably.</li>
-				<li class="rscadd">NT Newscasters have had repeated reports of gang activity and are now looking into it.</li>
-				<li class="rscadd">NT Psykers keep mumbling about last words of someone who died. Somehow they even have a newsletter for this...</li>
-				<li class="bugfix">Gangster greeting messages are a batch message rather than 5 laggy to_chats</li>
-				<li class="imageadd">RCL now show what color is currently in use</li>
-				<li class="rscadd">Added RGB blood effects, know whose blood this is by color!</li>
-				<li class="rscadd">Added Synthetics blood, and a machine that produces it. A universal donor for medical to heal people with. Make it via medical protolathe!</li>
-				<li class="bugfix">With hearts, slimepeople shouldn't die from the effects of not having a heart.</li>
-				<li class="bugfix">Plasma vessels from xenomorphs will restore blood if you're on resin.</li>
-				<li class="server">Poly's speech now echos to the chat bot.</li>
-				<li class="rscadd">Added new wings to Insects and separated fluff from old ones, they're Insect's new body markings now without being per-limb (for now).</li>
-				<li class="rscadd">Horns are now available to mammals, and they have their own color.</li>
-				<li class="rscadd">Legs are no longer a binary hack code, but actually something that can be changed. Framework for tauric adaptations.</li>
-				<li class="rscdel">Purged Modular Citadel's sprite_accessories.</li>
-				<li class="bugfix">improved the quality of a number of sprites.</li>
-				<li class="tweak">Moths are now all insects. Avians and Aquatics are all anthromorphics. Just as planned.</li>
-				<li class="rscadd">Anthromorphs can choose their preferred gibbing meat. I guess. Snowflakes are weird.</li>
-				<li class="bugfix">Additional Gentlemen names.</li>
-				<li class="rscadd">Medical huds are now calibrated for Radioactive wavelengths.</li>
-				<li class="balance">Engineering equipment, blue space, and common storage containers are radiation protected</li>
-				<li class="bugfix">fixed suit storage not cleaning radiation levels of everything stuffed into them.</li>
-				<li class="bugfix">QM is able to hire/fire people to their department now.</li>
-				<li class="bugfix">cryopod UI isn't complete shit anymore</li>
-				<li class="bugfix">Cryopods purge silicon gear more efficiently now. Same with ghosts.</li>
-				<li class="balance">Med Sprays are now more aligned with patch mechanics</li>
-				<li class="balance">Chemistry is encouraged to be more varied in their healing, as well as careful in its application</li>
-				<li class="tweak">Active NPC priority set much higher priority for the MC, with the intent on making NPC combat more interesting</li>
-				<li class="bugfix">Clarified access descriptions of some jobs</li>
-				<li class="bugfix">fixed missing deco wing states</li>
-				<li class="bugfix">fixed a few things related to vore content</li>
-			</ul>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Bottles in PanD.E.M.I.C 2200 can now be replaced with an inhand bottle directly</li>
-				<li class="tweak">Ejecting a bottle from the PanD.E.M.I.C 2200 puts it directly into the user's hand</li>
-				<li class="tweak">Alt-clicking the PanD.E.M.I.C 2200 ejects the current bottle</li>
-				<li class="bugfix">neural nanites only work/drain if you have brain damage or traumas the nanites can fix</li>
-				<li class="tweak">Pod people can no longer get fat from standing in the light</li>
-				<li class="tweak">PanD.E.M.I.C 2200 now ejects onto itself instead of onto user if user's hands are full</li>
-				<li class="rscadd">Added configs for a bunch of Dynamic rule parameters.</li>
-				<li class="config">Added defaults for all the configs (WIP).</li>
-				<li class="config">Added dynamic midround/latejoin antag injection to the config.</li>
-				<li class="balance">Made starlight condensation not kill slime people.</li>
-				<li class="balance">Added not-killing-slime-people to the transmission threshold of plasma fixation and radioactive resonance.</li>
-				<li class="tweak">Made the clone scanner lock while it's scanning.</li>
-			</ul>
-			<h3 class="author">R3dtail updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added 16 saltprimaryobject items Added 4 saltsecondarysubject items</li>
-				<li class="rscadd">Added a new carpet.  Red!  Also added said carpet to the Premium Carpet crate from the cargo supply console.  Trilby said she'd take care of the crafting recipe.</li>
-			</ul>
-			<h3 class="author">Raptorizer updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Doubled peach spawn rate</li>
-				<li class="tweak">tweaked numbers/variables</li>
-				<li class="balance">rebalanced numbers/variables</li>
-				<li class="spellcheck">removed unneeded code</li>
-			</ul>
-			<h3 class="author">Seris02 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Abductor Replication Lab ruin and advanced tools</li>
-				<li class="rscadd">Added looc hotkey</li>
-				<li class="tweak">made the autoprocess button relevant</li>
-				<li class="tweak">changes so that spooktober starts earlier</li>
-				<li class="bugfix">fixed the dark blue lum major effect</li>
-			</ul>
-			<h3 class="author">Sirich96 and Dennok (ported by Ghommie) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added new Teleporter Station sprites</li>
-				<li class="rscadd">Added teleport station calibration animation.</li>
-			</ul>
-			<h3 class="author">Sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Pentetic Jelly, new chemical made through mixing 1:1 slime jelly and pentetic acid.</li>
-				<li class="tweak">Anatomic panacea now gives pent jelly instead of pent acid. Medbeams now have TRUE tox healing to heal TOXINLOVER as well.</li>
-				<li class="balance">Changed bible heal proc, halving the healed damage and increasing brain damage 5x in exchange for a much wider array of items to protect you from it.</li>
-				<li class="tweak">Moved around some chems from emag list into upgrades.</li>
-				<li class="balance">Added some fun chems to dispensers.</li>
-				<li class="bugfix">Gave dispensers old tg functionality.</li>
-				<li class="rscadd">Leather, cardboard, bronze & bone golems!</li>
-				<li class="rscadd">Bone hurting juice and interactions with plasmamen, skeletons & bone golems!</li>
-				<li class="rscadd">Ported addition of new CAS cards.</li>
-				<li class="bugfix">Ported a fix for CAS.</li>
-				<li class="rscadd">Added the ability to alter your genitalia as a slimeperson more than addition/removal.</li>
-				<li class="bugfix">fixed genitalia removal proc in alter form.</li>
-				<li class="balance">Ported the inability for non-station AI to interact with station z-level.</li>
-				<li class="balance">HoS mains can now peacefully sleep in their office.</li>
-				<li class="tweak">Podpeople now have customization options.</li>
-				<li class="bugfix">Removed the human check for cult conversion of captain/chaplain minds.</li>
-				<li class="balance">Roundstart carbon jetpacks now have full_speed FALSE.</li>
-				<li class="tweak">Adds plasteel to medical and security techfabs.</li>
-				<li class="rscadd">Added public autolathes to all maps.</li>
-				<li class="tweak">density = 0</li>
-				<li class="balance">hugboxing mining loot</li>
-				<li class="balance">ling blade now has 40 armor pen</li>
-				<li class="rscadd">fun</li>
-				<li class="rscdel">bad stuff</li>
-				<li class="balance">mech bad</li>
-				<li class="balance">rebalances strained muscles</li>
-				<li class="rscadd">added in the assistant response team</li>
-				<li class="bugfix">fixed up access on the centcom hangar button</li>
-				<li class="balance">storage tweaks for belt briefcase</li>
-				<li class="imageadd">codersprite for belt briefcase</li>
-				<li class="rscadd">added pharaoh gear to chaplain vendor</li>
-				<li class="spellcheck">fixed typos in pharaoh items</li>
-				<li class="rscadd">made laser minigun not shitcode and also craftable</li>
-				<li class="soundadd">added new fire sounds for the laser minigun</li>
-				<li class="rscadd">holy lasrifle, hypertool, divine lightblade, and blessed baseball bat. Four new holy weapons!</li>
-				<li class="balance">stamina and force tweaks for most holy weapons.</li>
-				<li class="tweak">prayer beads no longer deconvert after a 10 second timer, now just inject holy water for delayed effect</li>
-				<li class="tweak">cultist runes are now destroyed with a bible or a null rod</li>
-				<li class="tweak">bo-staff now functions as a nerfed sleepy carp staff</li>
-				<li class="bugfix">fixed kevinz code to add in non-null rod child items as holy weapons</li>
-				<li class="bugfix">fixing chems for strained muscles</li>
-				<li class="bugfix">narsie no longer asks for consent</li>
-				<li class="bugfix">removed reflect from divine lightblade</li>
-				<li class="bugfix">teleporting a locker is bad</li>
-			</ul>
-			<h3 class="author">Sishen1542, original by @Tlaltecuhtli updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">alt clicking the emitter now rotates it instead of only flipping</li>
-			</ul>
-			<h3 class="author">Sishen1542, original by @zxaber updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Utility mechs no longer automatically get beacons.</li>
-				<li class="balance">Tracking beacons no longer delete themselves when EMPing a mech, and instead have a ten-second cooldown in-between EMPs. They also now do heavy EMP damage rather than light.</li>
-				<li class="balance">Mechs that take EMP damage lose the use of their weapons and equipment temporarily. Movement and abilities are not effected.</li>
-				<li class="balance">Mechs taking EMP damage no longer roll for a random malfunction.</li>
-			</ul>
-			<h3 class="author">Sishen1542, original by Arkatos updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Action buttons can now be dragged onto each other to swap places</li>
-			</ul>
-			<h3 class="author">Sishen1542, original by NewSta updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">updated the miasma canister sprites</li>
-			</ul>
-			<h3 class="author">Sishen1542, original by Skoglol updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Heaters/freezers now support ctrl clicking to turn on and alt clicking to min/max target temperature.</li>
-			</ul>
-			<h3 class="author">Sishen1542, original by XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Using the wrong surgery tool during surgery no longer attacks the patient, if on help or disarm intent.</li>
-				<li class="rscadd">Surgery steps are now shown in detail only to the surgeon and anyone standing adjacent to them; the patient and people watching from further away get a more vague/ambiguous description.</li>
-			</ul>
-			<h3 class="author">Skoglol updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now alt click storage (bags, boxes, etc) to open it.</li>
-			</ul>
-			<h3 class="author">Skully) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Nudity Permit, a completely invisible uniform that still has pockets and such, to loadout options. It is more or less a direct port from the RP server.</li>
-			</ul>
-			<h3 class="author">SkullyRoberts updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Penis autosurgeon as rare maint loot.</li>
-			</ul>
-			<h3 class="author">TerraGS / Skoglol updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds toggleable light and blinking charge indicator to kinetic crusher</li>
-				<li class="rscadd">Kinetic crusher can now be one-hand carried. You'll still need two hand to use it.</li>
-			</ul>
-			<h3 class="author">Thalpy updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixes message_admins in SDZF</li>
-				<li class="tweak">Alkaline buffer recipe so people don't get grumpy and expanded the pH range</li>
-				<li class="bugfix">fixes buffers</li>
-				<li class="bugfix">fixes broken compiler because a var changed name</li>
-				<li class="bugfix">impure travis var anger</li>
-				<li class="rscadd">Added the ability to dispense smartdarts from the chemmaster.</li>
-				<li class="tweak">Tweaks medolier amd chembags to allow quickpickups of smartdarts, lets the latter soak in beakers (on the floor)</li>
-				<li class="bugfix">fixed rounding errors with smartdart mixes.</li>
-				<li class="imageadd">added modified smartdartgun icon.</li>
-				<li class="bugfix">1. Kev asked that there were no antag datums used, so that's been changed. 2. Tricks can no longer turn someone into a dullahan, instead you have to spend candies to get that. I felt it was too mean to turn people into that, I didn't realise you couldn't revert it. 3. Barth will no longer as for impossible items. 4. Barth will no longer as for the same item multiple times. 5. Barth will now accept broader things, rather than asking for something, when meaning something specific. 6. Jacq will now no longer poof off the z level. 7. Jacq will (hopefully) stop spooking the AI by teleporting into there 8. Jacq will now try to teleport to a location with someone nearby. 9. Barth will tell you where Jacq is currently when you speak to him. 10. You can trade 2 candies for a Jacq Tracq (tm) 11. Jacq should stop getting mad and cover the station in gas when killed. 12. Fixed Jacq not singing (the link died). 13. Slightly changed wording so that people will hopefully get to know her. 14. Jacq no longer disappears when you're getting to know her.</li>
-			</ul>
-			<h3 class="author">Toriate updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">All regular crates are now 3/4ths ToriCrates iamgeadd: Unused plastic crate sprite added</li>
-				<li class="rscadd">Blood freezer crates now have unique sprites.</li>
-				<li class="rscadd">RPD now has inhands</li>
-				<li class="imageadd">New sprites for RCDs and RPDs, inhands included</li>
-				<li class="imageadd">Updated the sprites of all the regular crates</li>
-			</ul>
-			<h3 class="author">Trilbyspaceclone updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">cakes!</li>
-				<li class="imageadd">Made some sprites! -Love them really came out well</li>
-				<li class="rscadd">new economics</li>
-				<li class="tweak">cargo and robotics relationships</li>
-				<li class="balance">unbalanced something</li>
-				<li class="bugfix">fixed a maybe oversight</li>
-				<li class="rscdel">Fun</li>
-				<li class="tweak">costs of suit voucher</li>
-				<li class="balance">Unblances miner vender</li>
-				<li class="bugfix">spare cheaper brute kit</li>
-				<li class="tweak">harm from hentie</li>
-				<li class="balance">rebalanced goliaths stun to be less auto death</li>
-				<li class="rscadd">Armor to blob shields</li>
-				<li class="tweak">block weaken state to 70% from 75%</li>
-				<li class="bugfix">restores the deathriplys missing armor</li>
-				<li class="rscadd">new lockable colalr</li>
-				<li class="tweak">armor</li>
-				<li class="bugfix">missing hopes and dreams</li>
-				<li class="code_imp">orgized the weapon file to be more cat brain friendly</li>
-				<li class="imageadd">This means sprite right?</li>
-				<li class="rscdel">Many engi flags on non-engi things</li>
-				<li class="code_imp">changed some code to be organized at a glance</li>
-				<li class="balance">25% < --- 50% For NPC blocking bullshit ided: Yes</li>
-				<li class="rscadd">mag gun uses cells</li>
-				<li class="balance">kev things their to op</li>
-				<li class="rscadd">syndicate phobia</li>
-				<li class="tweak">other phobia's</li>
-				<li class="bugfix">laser carbine</li>
-				<li class="tweak">makes collars only locked via key</li>
-				<li class="tweak">charging</li>
-				<li class="rscadd">Combat inducers for COMBAT!</li>
-				<li class="code_imp">made it look nice</li>
-				<li class="rscadd">golden swag boxes</li>
-				<li class="rscadd">Crafting suitcases</li>
-				<li class="rscadd">more bountys</li>
-				<li class="rscdel">Nitryl bounty</li>
-				<li class="rscadd">better stocks</li>
-				<li class="rscadd">more evil blood fluff text</li>
-				<li class="rscadd">Added more mime names</li>
-				<li class="tweak">replaces a sink with a autolathen</li>
-				<li class="balance">2 -> 3</li>
-				<li class="rscadd">MASON SUIT!</li>
-				<li class="rscadd">adds the sec jetpack to sec hardsuit storge</li>
-				<li class="rscadd">Added a few jet packs to the space queens men</li>
-				<li class="tweak">volume of jet packs</li>
-				<li class="rscadd">Bad Idea</li>
-				<li class="rscadd">bio mass meat</li>
-				<li class="rscadd">more box options</li>
-				<li class="bugfix">a lack of replaceable boxes</li>
-				<li class="bugfix">clothing needing a emag</li>
-				<li class="tweak">4 - > 5</li>
-				<li class="tweak">5->6</li>
-				<li class="tweak">4tc - > 2tc</li>
-				<li class="tweak">mulligan costs 4 - > 3</li>
-				<li class="tweak">Tuberculosis 12tc - > 8tc</li>
-				<li class="tweak">15 - >10</li>
-				<li class="bugfix">both bags have the same name</li>
-				<li class="tweak">5 - > 2</li>
-				<li class="tweak">3 -> 1</li>
-				<li class="tweak">2 < - 4</li>
-				<li class="tweak">1->2 and ultra</li>
-				<li class="rscadd">shield + crafting</li>
-				<li class="tweak">hierophant movment and melee attack</li>
-				<li class="rscadd">More plushies</li>
-				<li class="tweak">attack verbs and descs</li>
-				<li class="rscadd">bone satchles</li>
-				<li class="balance">rebalanced stunslugs</li>
-				<li class="rscadd">colored boxes, and more types</li>
-				<li class="tweak">harm and such</li>
-				<li class="balance">item classes</li>
-				<li class="bugfix">resonators being so shitty</li>
-				<li class="bugfix">Game braking bug critical: bug fix</li>
-				<li class="rscadd">items to syndie surgery bags</li>
-				<li class="rscadd">SNOW CONES</li>
-				<li class="rscadd">carts buy-able cargo</li>
-				<li class="tweak">selling/time to craft</li>
-				<li class="bugfix">crafting problems, and red stamp exsplote</li>
-				<li class="rscadd">gives paper work sprites that are nicer</li>
-				<li class="rscadd">origami</li>
-				<li class="rscadd">gang tower shield</li>
-				<li class="tweak">costs of boots</li>
-				<li class="rscadd">organ box</li>
-				<li class="rscadd">Medical breifcaseses</li>
-				<li class="rscadd">New cargo crate for tech-slugs!</li>
-				<li class="rscadd">Ammo to each fitting crate</li>
-				<li class="bugfix">Cat-code</li>
-				<li class="spellcheck">fixed a few typos - Again my bad</li>
-				<li class="bugfix">fixed airless place</li>
-				<li class="rscadd">baklava</li>
-				<li class="balance">makes uplink kits more usefull for the risk</li>
-				<li class="code_imp">Changes some files to be better</li>
-				<li class="balance">As all things are not</li>
-				<li class="bugfix">fixing cat code that dosnt work, my bad</li>
-				<li class="bugfix">Arcades stealing from noodles</li>
-				<li class="rscadd">rapier</li>
-				<li class="tweak">speedy quirk</li>
-				<li class="spellcheck">Ironic</li>
-				<li class="bugfix">A bunch of minor issues with xenobiology are no more!</li>
-				<li class="bugfix">I didn't code it right it in the first place</li>
-				<li class="rscadd">new nodes</li>
-				<li class="balance">points and node gear</li>
-				<li class="rscadd">stuff n things</li>
-				<li class="rscadd">gear harness and a conflict merg</li>
-				<li class="rscdel">Nudity permits</li>
-				<li class="bugfix">nothing</li>
-				<li class="rscadd">Donner item</li>
-				<li class="rscadd">Luna's Gauntlets</li>
-				<li class="balance">rebalanced lingy dingy powery gamey</li>
-				<li class="tweak">melee and block harm</li>
-				<li class="bugfix">sprites*</li>
-				<li class="tweak">holster doing holster things</li>
-				<li class="rscadd">Donor item</li>
-				<li class="rscadd">Joy, Happiness, Honk</li>
-				<li class="bugfix">small mix up in terms</li>
-				<li class="rscadd">Promiscuous Organs crate, pills to lewd crate and testicles to maints</li>
-				<li class="bugfix">Made unholy water healtoxinlover</li>
-				<li class="rscadd">Zelus Oil, brass flasks</li>
-				<li class="rscadd">Added new chairs</li>
-				<li class="admin">Bugtesting zone upgrades for easy bug/game testing</li>
-				<li class="rscadd">more cargo to cargo</li>
-				<li class="rscadd">More loadout gear</li>
-				<li class="bugfix">Poojawa power creep</li>
-				<li class="bugfix">Not my work not my credit</li>
-				<li class="rscadd">Emitter gun</li>
-				<li class="bugfix">suit storage nulling anti magic item protection</li>
-				<li class="balance">rebalanced steal goals restrictions</li>
-				<li class="spellcheck">fixed a few misleading goals</li>
-				<li class="bugfix">ports a fix</li>
-				<li class="bugfix">oversight in benos</li>
-				<li class="bugfix">QM rooms not getting Key Aunths</li>
-				<li class="rscadd">new books/cooking</li>
-				<li class="spellcheck">less bad wording in slime</li>
-				<li class="rscadd">strawbarries and such</li>
-				<li class="rscadd">amazing things like tea of catnip, catnip and plant</li>
-				<li class="tweak">glue uplinks</li>
-				<li class="rscadd">RPDs to drones</li>
-				<li class="rscadd">Armor and such</li>
-				<li class="rscadd">flavor</li>
-				<li class="bugfix">maybe a runtime</li>
-				<li class="rscadd">chameloen clothing</li>
-				<li class="rscadd">tons of peach themed items</li>
-				<li class="spellcheck">caje</li>
-				<li class="rscadd">New book - Unused</li>
-				<li class="code_imp">organized files</li>
-				<li class="imageadd">redid brass tools to look better*</li>
-				<li class="bugfix">/cursed from a item path</li>
-				<li class="rscadd">Almost all clothing and most weaponds can be sold for pocket change</li>
-				<li class="tweak">Cargo costs of packets and selling</li>
-				<li class="balance">Lowered mat selling as well as most if not all bountys</li>
-				<li class="code_imp">Adds more files for easy finding/adding in packs</li>
-				<li class="bugfix">oops not being blacklisted</li>
-				<li class="code_imp">removes some cit-modular things</li>
-				<li class="bugfix">Missing sprites with bad ones</li>
-				<li class="tweak">emag charge amount</li>
-				<li class="rscadd">Reebe QoL aka creep in gear</li>
-				<li class="bugfix">???</li>
-				<li class="server">HEY MADE THE REEBEEE WAY SMALLER - Making it less lagging hopefully</li>
-				<li class="rscadd">Surgerys and spays in bags</li>
-				<li class="tweak">earthbloods stam regen</li>
-				<li class="imageadd">Red to Blue/Black crosses as questioned by Bhijn</li>
-				<li class="bugfix">clean bot not cleaning basic cleanables</li>
-				<li class="rscadd">new traitor bundle</li>
-				<li class="rscadd">trash</li>
-				<li class="imageadd">eye bleed :add: misstakes</li>
-				<li class="rscdel">Removed old things!</li>
-				<li class="bugfix">UI memes</li>
-				<li class="rscadd">Blue space blood bag</li>
-				<li class="tweak">blood costs</li>
-				<li class="rscadd">Beebal and Honeybalm plants</li>
-				<li class="tweak">Costs of crates and paperwork</li>
-				<li class="rscadd">Adds 2 more crates hacked only</li>
-				<li class="rscadd">Added two seed packets of cotten to ash walkers base</li>
-			</ul>
-			<h3 class="author">Tupinambis updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Changes large parts of the nuclear operative base, including the addition of a new barracks where the ops spawn, a personal bedroom for the leader, the rearrangement of numerous rooms, some added fluff, a slightly more roomy bar, a larger hanger, a kitchen, and various other small changes to make the base feel just a bit more alive. This was achieved by completely redoing the base from scratch so there was room to work with, as a result potential bugs could crop, please do report them.</li>
-				<li class="bugfix">The drop pod chamber was airless. This seems like an oversight, and has been filled with air.</li>
-				<li class="rscadd">Cryo Sleepers have been added to Perma on all four maps in rotation. the bathroom windoor and window have switched places to accommodate this change.</li>
-				<li class="rscadd">You can now choose the pre-exisiting "loader" sprite as an appearance for your engineering borg.</li>
-				<li class="tweak">A vast majority of references to humans within ion laws have been replaced with crew. AI modules have received similar treatment</li>
-				<li class="rscadd">Adds a syndicate themed emergency shuttle that costs 20000 credits, and can ONLY be purchased when the communications console is emagged. This shuttle features a fully stocked medbay with self serve sleepers, plenty of room that can fit highpop, a fully featured bridge, ballistic auto turrets, and an armory, EVA prep room, and bar, all of which are only accessible by either an agent ID or through hacking.
--EVA prep features 2 syndicate hardsuits and 3 syndicate softsuits. -Armory features 5 stetchkins with spare ammo, and 2 riot c-20r's.
-![image](https://user-images.githubusercontent.com/42078130/48306551-0b786380-e500-11e8-821a-e59ac4eee0ea.png)</li>
-				<li class="balance">Lone operatives no longer spawn with a syndicate hardsuit and a bulldog. They instead spawn with a black and red EVA suit and an extra 15 TC (40 in total) ![image](https://user-images.githubusercontent.com/42078130/48308065-c44e9a80-e520-11e8-8d60-cec8ff23d61d.png)</li>
-				<li class="rscadd">The tesla engine has been replaced with a supermatter engine, and pubby engineering has been redesigned to accommodate this change.</li>
-				<li class="rscdel">The tesla engine has been completely removed along with any related components</li>
-				<li class="bugfix">RD and R&D vents are now actually connected to the air distribution.</li>
-				<li class="rscadd">New engineering hivebot. Has a bit more health but otherwise aesthetic.</li>
-				<li class="tweak">Oldstation no longer has an excessive amounts of hivebots within it, however the bots that remain are individually a larger threat.</li>
-				<li class="balance">Hivebots are now more robust, with a higher melee damage output and health.</li>
-				<li class="server">Remove this ruin from the blacklist or this PR is pointless.</li>
-				<li class="bugfix">the air injectors for the SM engine waste and for toxins waste should now receive power</li>
-				<li class="tweak">Adds a mixed clothing closet to Deltastation Dorms.</li>
-				<li class="tweak">Adds a bottle of unstable mutagen to Botany, on account of its distance from Chemistry.</li>
-				<li class="bugfix">Omegastation should no longer have any turf with missing textures, as those spots have been replaced with playing covered in a sandy turf decal.</li>
-				<li class="tweak">Removed all living eggs from the xeno ruin because people self antag. Honk.</li>
-				<li class="rscadd">Adds a new security level between Blue and Red (Amber). The shuttle call time at this level is 8 minutes.</li>
-				<li class="tweak">Blue security level now has a shuttle call time of 12 minutes.</li>
-				<li class="tweak">The security level increase/decrease texts have been modified to accommodate the change.</li>
-				<li class="imageadd">Adds a code Amber sprite for the fire alarms</li>
-				<li class="tweak">Removed the plushes from the toy crate, giving them their own.</li>
-				<li class="tweak">Plushes are now less likely to spawn out of arcades</li>
-				<li class="imagedel">Removes a moth plush from the game.</li>
-				<li class="balance">added a small fire delay (3 ticks) to automatic shotguns</li>
-				<li class="balance">Reduced buckshot brute damage by 20%. (12.5 -> 10 brute per pellet) (75 -> 60 brute at close range)</li>
-				<li class="balance">Reduced rubbershot stamina damage by 40% (25 -> 15 stamina per pellet) (150 -> 90 stamina at close range)</li>
-				<li class="balance">Reduced beanbag stamina damage by 12.5% (80 -> 70 stamina per shot)</li>
-				<li class="balance">Engivend RCDs now vend upgraded RCDs</li>
-				<li class="imageadd">Beautified and stylized the cyborg HUD sprites, animated and cleaned up some of the old, modernized APC hacking and Doomsday sprites,</li>
-				<li class="tweak">moved cyborg language select above the radio icon, instead of above the picture icon.</li>
-			</ul>
-			<h3 class="author">Twaticus & Poojawa updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added new carpets from TauCetiStation!</li>
-				<li class="rscadd">More Liquid carpet chemicals, mix carpet with certain reagents to get different colors!</li>
-				<li class="refactor">Tablets have a better means of being assembled codewise. nothing's different on player end.</li>
-			</ul>
-			<h3 class="author">UntoldTactics updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Rewords the click here prompt given when an attempted conversion is done on an offer rune (for blood cult)</li>
-			</ul>
-			<h3 class="author">UristMcAstronaut updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">allows a pai to activate its holoform while in a pai connector without getting derped.</li>
-			</ul>
-			<h3 class="author">Useroth updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">the collars are now aware of their proper overlay sprites</li>
-				<li class="bugfix">The space hotel dorms are now properly boltable with the buttons inside.</li>
-				<li class="bugfix">Makes the booze-o-mat hacked by default. Alternative to https://github.com/Citadel-Station-13/Citadel-Station-13/pull/8350.</li>
-				<li class="bugfix">After the PR which raised the ammo capacity of said magazines, due to the code, they ended up with an invalid icon state. Fixed through changing the icon state name in the icon file.</li>
-				<li class="rscadd">Taeclowndo shoes which grant the four following abilities: - Conjuring a cream pie right into their hand. Every three seconds. - Making a banana peel appear out of thin air at the tile of the clown's choice. Every ten seconds. - Mega HoNk. A touch-ranged, very small AOE ability, with effect equal to being honked by a Honkerblast on a clown mech, with the effects halved for anyone who isn't its direct target. Every ten seconds. - Bluespace Banana Pie. You don't throw this one... not right away at least. This baby can fit an entire body inside. Good for disposal of evidence. 25 second-long action, 45 second cooldown. Also produces a "[victim's name] cream pie". The body drops out of the pie if you splat it somewhere or destroy the pie. If you eat it, it will chestburst out of you a'la monkey cube.
-It's a 14 TC item for traitor clowns and a 12 TC item for clown-ops.</li>
-				<li class="tweak">The tentacle now directly puts the item in your hands, instead of toggling your throwing and tossing it at you. Tentacles suffer from ranged inaccuracies as if they were guns, I think it's enough of an inconvenience.</li>
-				<li class="tweak">Makes the netting much less clunky. If there's only one target you can net while you press the button, it will just net that target instead of bringing up a list of mobs.</li>
-				<li class="tweak">Energy nets now revive and fully heal capturees (even dead ones, after calculating points). If someone's got a scan and wants to get cloned, they can always kill themselves still.</li>
-				<li class="tweak">Capture points are added on capture, rather than round-end, so it no longer matters whether your captures kill themselves in the holding facility or not.</li>
-				<li class="balance">Makes the nets a bit more sturdy. (previously it took mere two welder hits to break one)</li>
-				<li class="balance">Makes stungloves actually stun people (currently comparably with stunbatons, adjustable). Because electrocute_act(25, H) did fuck all, stunwise, and on top of that, people in insulated gloves were completely unaffected.</li>
-				<li class="balance">Reduced the stunglove electrocute_act value to 15 due to above. Could possibly be lowered further.</li>
-			</ul>
-			<h3 class="author">Weblure updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added the relevant Beepsky animations from TG's aibots.dmi file to Cit's aibots.dmi file.</li>
-			</ul>
-			<h3 class="author">WhiteHusky updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Sleepers now show blood level and type.</li>
-				<li class="tweak">Changed the styling of arousal messages to use pink-ish colors.</li>
-				<li class="bugfix">The orgasm moodlet message new-lines properly.</li>
-				<li class="bugfix">Flavor text with special characters will not get partially unescaped.</li>
-				<li class="bugfix">Canceling when setting flavor text does not clear it anymore.</li>
-				<li class="tweak">Checking yourself shouldn't freeze the client anymore.</li>
-			</ul>
-			<h3 class="author">XDTM updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added the experimental dissection surgery, which can be performed once per corpse to gain techweb points.</li>
-				<li class="rscadd">Rarer specimens are more valuable, so xenos and rare species are more efficient subjects.</li>
-				<li class="rscadd">Added two new surgery procedures, under the Experimental Surgery techweb node.</li>
-				<li class="rscadd">Ligament Hook makes it so you can attach limbs manually (like skeletons) but makes dismemberment more likely as well.</li>
-				<li class="rscadd">Ligament Reinforcement prevents dismemberment, but makes limbs easier to disable through damage.</li>
-				<li class="tweak">Golem limbs can now be disabled, although they are still undismemberable.</li>
-			</ul>
-			<h3 class="author">YPOQ updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Stealth implants work again</li>
-			</ul>
-			<h3 class="author">Yakumo Chen updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Made stealth implant boxes flimsier</li>
-				<li class="balance">Autocloning now requires tier 4 parts</li>
-				<li class="rscdel">Removes autoscan</li>
-				<li class="balance">Scanning people now requires someone to operate the cloning computer regardless of part level.</li>
-				<li class="balance">removed antimagic component from holymelon</li>
-			</ul>
-			<h3 class="author">YakumoChen updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">AEGs brought more in line with current radiation system. Try not to get EMP'd.</li>
-				<li class="tweak">Jetpacks no longer last twice as long between air refills.</li>
-				<li class="rscdel">Reverted laser miniguns.</li>
-				<li class="rscadd">Adds beanbag slugs to the sec protolathe at round start</li>
-				<li class="bugfix">Brings shotgun ammo availability back in like between seclathe and autolathe.</li>
-			</ul>
-			<h3 class="author">Zargserg updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Lungs maximum toxin threshold is 0.5% of the atmosphere.</li>
-				<li class="bugfix">Permanently contaminated atmosphere does not murder crew anymore.</li>
-			</ul>
-			<h3 class="author">ZeroNetAlpha updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Cleans up autoylathe code and brings it back in line with the regular autolathe.</li>
-				<li class="bugfix">Fixes autoylathe interface not updating propperly.</li>
-				<li class="tweak">Silicons are now consumable by scrub pups.</li>
-			</ul>
-			<h3 class="author">actioninja updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">APC UI autoupdates correctly</li>
-			</ul>
-			<h3 class="author">bluespace bio bags updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added bluespace bio bags and put it in the tech web, in the node applied bluespace</li>
-				<li class="imageadd">added a crappy icon for bluespace bio bags</li>
-			</ul>
-			<h3 class="author">chef updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added main hallway approach to monastery</li>
-				<li class="rscadd">Added Maintenance hallway approach, with some maint loot</li>
-				<li class="tweak">moved the docking arm for the white ship</li>
-				<li class="tweak">changed placement of some grills and windows</li>
-			</ul>
-			<h3 class="author">coiax updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="admin">When the nuclear disk stays stationary long enough to trigger an increase for the lone op event chance, admins will be notified every five increments.</li>
-			</ul>
-			<h3 class="author">dapnee updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Plasmaglass tables, spears, tiny plasmaglass shards</li>
-				<li class="bugfix">Plasmaglass structures now drop plasmaglass shards instead of nothing</li>
-				<li class="rscadd">Trim lines!</li>
-				<li class="bugfix">You can now make plasmaglass tables again.</li>
-			</ul>
-			<h3 class="author">deathride58 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="admin">When a gamemode fails pre_setup, it will now send a message in admin IRC and in ingame admin chat, instead of only being viewable in the logs.</li>
-				<li class="balance">Portal guns now spawn without firing pins.</li>
-				<li class="balance">Reduced the default/baseline nanite pool amount from 100 nanites to 25 nanites, and reduced the maximum nanite amount from 500 nanites to 125 nanites. The safety threshold was reduced from 50 nanites to 12 nanites.</li>
-				<li class="balance">Most of Lavaland's mobs are now on crack.</li>
-				<li class="balance">Blood drunk miners now move once every two ticks, rather than once every three ticks.</li>
-				<li class="balance">Bubblegum now has a maximum movement speed of once every three ticks. Buffed from the original value of once per 5 ticks.</li>
-				<li class="balance">The minimum time for the Colossus to attack again after firing a random shot is two deciseconds, Sped up from the original value of three seconds. The minimum time for the Colossus to attack again after performing a blast is now one second, with the original value being two seconds. The minimum time for it to attack again after performing its alternating shot pattern is now two seconds, original value being four seconds.</li>
-				<li class="balance">Ashdrakes now move once every five ticks, rather than once every ten ticks.</li>
-				<li class="balance">Heirophant chasers now move once every two ticks rather than three ticks by default, and the chaser cooldown has been reduced from 10 seconds to 5 seconds. The cooldown for the Heirophant's major attacks has also been sped up to 4 seconds from the original value of 6 seconds.</li>
-				<li class="balance">The Legion (megafauna) now moves at two ticks per second rather than three ticks. It additionally now actually moves faster while charging. The cooldown timer for it's special attacks has been reduced from 2 seconds to 1 second. Additionally, The Legion's view range has been decreased from 13 tiles to 10 tiles.</li>
-				<li class="balance">All megafauna now have a default view range of 4 tiles, decreased from the original of 5 tiles, and an aggro'd view range of 15 tiles, decreased from the original of 18</li>
-				<li class="balance">Goliaths now move once every ten ticks, sped up from the original value of 40(!!!) ticks. Additionally, their cooldown for their tentacles has been reduced from 12 seconds to 6 seconds. To compensate, their cooldown now only decreases by 5 deciseconds every time they're attacked, rather than 10 deciseconds, their melee damage has been reduced to 18 per hit from 25 per hit, and their vision range has been decreased from 5 tiles unaggroed, 9 tiles when aggroed, to 4 tiles and 7 tiles respectively. Ancient goliaths have a default attack cooldown of 8 seconds, sped up from the original value of 12 seconds.</li>
-				<li class="balance">Legion (the common mob) now has a cooldown of 1.5 seconds on their skull attack, sped up from the original value of 2 seconds. Additionally, their view range has been decreased from 5 tiles, 9 tiles when aggroed, to 4 tiles, 7 tiles when aggroed.</li>
-				<li class="bugfix">Stamina no longer regenerates at hyper speeds.</li>
-				<li class="tweak">To accommodate for upstream's stamina changes, knockdown() now applies staminaloss only to the chest.</li>
-				<li class="tweak">adjuststaminaloss() now has a new argument that allows you to specify a zone to apply staminaloss to. This defaults to the chest</li>
-				<li class="tweak">apply_damage() is now capable of healing carbon mobs and human mobs.</li>
-				<li class="tweak">Since the head has the same exact effects as the chest when disabled, and doesn't really make much sense to be affected by stamina, the head no longer has stamina.</li>
-				<li class="tweak">The chest now has a stamina cap of 200 stamina due to the above.</li>
-				<li class="tweak">Footsteps now sound mostly the same as they did before the hard sync</li>
-				<li class="bugfix">Jukeboxes now properly remove themselves from the active jukebox list when destroyed</li>
-				<li class="rscadd">Server operators and badmins can now make the server play like TG by toggling the stamina buffer on/off using the DISABLE_STAMBUFFER config option.</li>
-				<li class="bugfix">Airlock wires now work as they did prior to the hard sync</li>
-				<li class="balance">The thing you're currently grabbing is now taken into account when left-click disarming. Things you have grabbed now roughly have a 45% chance to be disarmed.</li>
-				<li class="balance">Disarm push rolls are now determined by the target's staminaloss rather than a flat number.</li>
-				<li class="balance">When you're in combat mode, pushing someone who isn't in combat mode is a guaranteed knockdown. Hard counter to stam regen squeezing in melee combat.</li>
-				<li class="balance">Failed disarm push attempts now deals light staminaloss to the target so long as both the attacker and target are standing. The total stamloss dealt to the target is random, clocking in at a very inefficient 1-5 stamloss per unsuccessful push attempt.</li>
-				<li class="tweak">Disarm pushes now play the thudswoosh sound regardless if they're successful or not. Had it not been for copyright, I would've used L4D's melee sound.</li>
-				<li class="tweak">Disarm push attempts are now logged</li>
-				<li class="bugfix">Autostand no longer makes you invulnerable to dropping items when being knocked down with a force greater than 80</li>
-				<li class="bugfix">You can no longer abuse an href exploit to return from the labor camp before obtaining enough points to satisfy your point goal.</li>
-				<li class="bugfix">Norko's donor item is now listed in the right category</li>
-				<li class="rscadd">The medihound sleeper now has a non-vore variant. This will be used by default. The old voracious variant will only appear if both the person being sleeper'd and the medihound have the voracious hound sleepers pref enabled. Sprites by Toriate</li>
-				<li class="tweak">"Allow medihound sleeper" is now labelled "Voracious medihound sleepers", and is now off by default</li>
-				<li class="bugfix">AOOC no longer prints to players in the lobby</li>
-				<li class="bugfix">Human tails and human ears now save again. Humans now use mam_tail and mam_ears for their snowflake bits instead of tg's equivalent, just as they did prior to human tail and ear saving breaking</li>
-				<li class="bugfix">Disarm pushes no longer deal staminaloss to resting targets</li>
-				<li class="bugfix">You can no longer force a hard stamcritted spaceman to stand by clicking them with help intent. Get more creative if you want to torture someone that's in hard stamcrit.</li>
-				<li class="tweak">The revolution gamemode now waits until the 20 minute mark before checking for win conditions.</li>
-				<li class="balance">You can no longer resist/move out of grabs while you're resting. Disarming your way out still works, though.</li>
-				<li class="rscadd">Stamina damage now has diminishing returns on people who are in hard staminacrit with the addition of a new multiplier. When you take staminaloss while in hard staminacrit, you'll be under the effects of the new multiplier, which reduces the amount of staminaloss you take from all sources of staminaloss. The diminishing returns multiplier will steadily return to 1 once you're out of staminacrit.</li>
-				<li class="rscadd">You can now scramble while resting. You can do this by dragging your spaceman onto an adjacent turf. This works even if you're in staminacrit, but the timer depends entirely on your staminaloss.</li>
-				<li class="bugfix">Fully augged cyborg people now heal stamina damage properly.</li>
-				<li class="bugfix">Job EXP is now tracked properly for all roles.</li>
-				<li class="balance">Nightmares and shadowpeople have had their light threshold for being considered in darkness reduced. Nightmares can no longer stand unharmed next to a light fixture during a nightshift 100% unharmed. The threshold is high enough so that APC lights on their own won't harm a nightmare, but being on the edge of a light source will.</li>
-				<li class="balance">The detective revolver's .38 bullets are now non-lethal again, but now require 3 shots to hard stamcrit</li>
-				<li class="rscadd">The current lethal variant of the .38 bullets can still be printed at sec protolathes.</li>
-				<li class="rscadd">You can now access ghost roles from the latejoin menu.</li>
-				<li class="rscadd">Eyeblur now scales depending on how much actual eyeblur you actually have.</li>
-				<li class="balance">Ebows now induce 50 drowsiness on whatever they hit.</li>
-				<li class="balance">Telepads have been buffed across the board. T1 parts on a launchpad still grants you a range of 15 tiles, but T4 parts now grant you a pretty large 60 tile range (up from their original 18 tile range). Briefcase launchpads were also buffed, they now have a range of 20 tiles, up from their previous laughable 8 tiles.</li>
-				<li class="tweak">The grace period for the revolution win condition check has been reduced from 20 minutes to 10 minutes. You don't need to wait nearly as long for the round to end if no heads join in.</li>
-				<li class="tweak">You can now select plural and neuter as your gender. They're labelled "non-binary" and "object" in the character customization menu, respectively.</li>
-				<li class="tweak">A lot more light sources now use the same nonbinary colored lighting philosophies as flashlights and light fixtures!</li>
-				<li class="tweak">Flashlights mounted to guns and helmets now retain the same color and power as their original light. Lavaland's caves will reflect a fluorescent blue as you shine your KA around, and sec's helmets are now capable of illuminating maint in that fancy fluorescent blue.</li>
-				<li class="tweak">Cameras now shine a fluorescent blue when lit up by an AI</li>
-				<li class="tweak">Glowing goo now actually glows green.</li>
-				<li class="tweak">Candles had their power reduced from 1 to 0.8.</li>
-				<li class="tweak">Lighters now shine a little further, and are now properly colored.</li>
-				<li class="tweak">PDAs now shine an incandescent yellow to match their sprite.</li>
-				<li class="tweak">Welding tools now shine an appropriate color</li>
-				<li class="tweak">Hardhats now shine an incandescent yellow.</li>
-				<li class="tweak">Plasmaman helmets now shine an incandescent yellow.</li>
-				<li class="tweak">Microwaves no longer overpower literally every single light in the game, instead having a power of 0.9.</li>
-				<li class="tweak">Borgs now have incandescent yellow lights to match their sprites</li>
-				<li class="tweak">Bots now shine a fluorescent blue light</li>
-				<li class="tweak">Airlock light overlays are now on the above lighting layer. This means airlock lights can actually be seen in the dark now.</li>
-				<li class="bugfix">The mob spawners list no longer leaves null entries behind when a spawner has a job description defined. The latejoin menu will no longer show ghost roles that are filled, and the spawners menu actually works again.</li>
-				<li class="rscadd">The voting system now actually tracks who voted for what. This means it's now possible to change your vote, and it's possible to see what you voted for.</li>
-				<li class="balance">Using help intent on someone that's in hard stamcrit will now make them heal 15 stamloss.</li>
-				<li class="tweak">Auto fit viewport is now enabled by default for new players. One less question off the FAQ</li>
-				<li class="rscadd">The Khajiit favorite, Skooma, was added as a chemistry recipe that can be produced with cooperation between chemistry and either cargo or service. If you want to spoil the recipe for yourself, take a look at the PR for it!</li>
-				<li class="rscadd">When the shuttle leaves for centcom, a vote will be started to select the next map instead of the map being randomly chosen via biased voting methods</li>
-				<li class="server">If a server operator wishes to re-enable the biased TG preference voting system, you can do so by toggling the TGSTYLE_MAPROTATION config flag on in the config.txt. Keep in mind that doing so will bring you great misfortune.</li>
-				<li class="balance">Cacti in lavaland now have 6u of vitfro instead of just 4u. This lessens the gap between cacti and first aid kits, the third rarest and second rarest readily available healing methods for ashwalkers, respectively.</li>
-				<li class="bugfix">the "genitals use skintone" option now appears in the character appearance menu when appropriate again.</li>
-				<li class="rscadd">Clicking your stamina bar will now show your exact stamina along with info regarding your stamina buffer</li>
-				<li class="bugfix">The bug where ghost role spawners leave null entries in glob.mob_spawners has actually been fixed</li>
-				<li class="bugfix">The Kitchen Gun (TM) is no longer invisible.</li>
-				<li class="balance">The majority of cult spells no longer have exclamation marks at the end of their invocations. This means they will no longer be bound to the rules of shouting. Which means sec officers will no longer be able to hear culties sacrificing the captain from the complete opposite side of the maintenance tunnel the sacrifice is happening in. However, things like EMP pulses and runeless teleportation still have the effect due to their inherent loud nature.</li>
-				<li class="balance">The stun blood spell now instantly causes hard stamcrit. However, to offset this, it now also only has one charge and has a higher cost.</li>
-				<li class="balance">The Gloves of the North Star now restore 2/3 of the stamina used up by punches when harm intent punching. With aggressive play and good stamina buffer management, this makes it entirely plausible to roughly double your stamina regeneration per mob life process tick.</li>
-				<li class="balance">Revs can no longer remember the name of the person who flashed them when deconverted. This brings it in-line with the other conversion antag deconversions.</li>
-				<li class="bugfix">The bug where you can sometimes get permanently stuck in stamcrit should HOPEFULLY be fixed. I'm unable to reproduce the bug myself, but let's hope.</li>
-				<li class="balance">The night vision trait now grants you darksight for an entire 1:1 screen, but the alpha of the lighting plane with the trait has been increased from 245 to 250 to balance it out</li>
-				<li class="bugfix">It's now actually possible to click the stamina hud button</li>
-				<li class="bugfix">The stamina hud button now displays your stamina buffer correctly</li>
-				<li class="balance">Bone spears now have a reach of 2 tiles.</li>
-				<li class="bugfix">You can no longer phase through solid objects via scrambling</li>
-				<li class="bugfix">The syndicate mask now works properly as intended.</li>
-				<li class="balance">Stamina is no longer affected by health at all.</li>
-				<li class="rscadd">You can now right-click yourself in help intent in combat mode to instantly get up from resting. This will cost stamina equal to your entire stamina buffer. Manage your stamina well, and you'll be able to shrug off a single stray golden bolt</li>
-				<li class="rscadd">The new player panel now displays your currently selected character's name</li>
-				<li class="balance">Flashes no longer knockdown. Instead, they deal eyeblur and have increased confusion</li>
-				<li class="server">The server's tagline is now a config option. People can now stop confusing us with BR cit</li>
-				<li class="rscadd">Attack animations will now rotate your character slightly, similar to Goon.</li>
-				<li class="rscadd">Throwing items will now perform the attack animation and play a sound</li>
-				<li class="rscadd">flashlights will now make sounds when toggled on/off</li>
-				<li class="rscadd">Things in disposals will now emit sounds every single time they hit corners. This increases immersion.</li>
-				<li class="bugfix">Air alarms now actually emit the proper light color when their status is okay.</li>
-				<li class="rscadd">Backpacks and other storage items will now jiggle and squish when you interact with them, similar to the animations seen on Goon.</li>
-				<li class="balance">Mops no longer have a delay on their cleaning, making them an actually viable alternative to all of the janitor's other cleaning tools</li>
-				<li class="balance">To balance this, mops now take stamina to clean tiles. Standard mops take 5 stamina to use, while advanced mops take 2 stamina.</li>
-				<li class="tweak">Oh and also mops make fancy new sounds and play animations when used now</li>
-				<li class="balance">Pump-action shotguns now take 2 stamina per pump instead of 5 stamina per pump. This also applies to bolt-action rifles, as bolt racking counts as pumping.</li>
-				<li class="tweak">Pickpocketing items will now place them in your hands if possible</li>
-				<li class="rscadd">Combat mode is now displayed in examine text</li>
-				<li class="rscadd">Combat mode now makes a visible message when enabled if you haven't touched your combat mode button in the last ten seconds. It's done this way to avoid chat spam from those who know how to pull off stam regen squeezing.</li>
-				<li class="balance">All knockdown sources will now force people to be dismounted from ridden vehicles.</li>
-				<li class="rscadd">When an item is thrown, it will now be rotated and displaced.</li>
-				<li class="rscadd">Shards of glass will now be rotated when spawned.</li>
-				<li class="rscadd">Bullet casings will now be rotated when they're ejected from a gun.</li>
-				<li class="rscadd">Bottles now have random rotations and pixel offsets when smashed via throwing.</li>
-				<li class="rscadd">Picking up an item will now reset its rotation.</li>
-				<li class="rscadd">Glasses thrown onto tables by bartenders will now have their rotation reset.</li>
-				<li class="balance">Slime speed potions can now only increase the speed of vehicles to be on par with sprinting speed. They can no longer make a scooter roll around ten times faster than a speeding blue hedgehog.</li>
-				<li class="rscdel">Changelings will no longer recieve team objectives</li>
-				<li class="balance">Changelings no longer start off with hivemind communication as an innate ability. Hivemind communication now requires 1 dna point, on par with syndicate encryption keys, which are 2 TC.</li>
-				<li class="code_imp">Hivemind link now relies on hivemind communication just like the hivemind download/upload abilities.</li>
-				<li class="bugfix">It's now only possible to zoom a gun if it's in one of your hands</li>
-				<li class="bugfix">Mobs without clients no longer cause runtimes when their eyeblur updates</li>
-				<li class="rscadd">Blood tests have been added. If a changeling has a sufficient number of loud abilities, you will be able to test their blood by heating up a sample of it. However, if the changeling has a large amount of loud abilities, attempts to test their blood will have explosive results.</li>
-				<li class="rscadd">Changelings now make a very obvious noise when readapting. This is to prevent the cheese strat of simply readapting when you get caught to avoid detection.</li>
-				<li class="tweak">The blood splatter effect that happens when you get attacked will now always make you lose blood depending on the damage you've taken. The effect now also scales with item damage, meaning tiny little papercuts will no longer be able to cause a massive blood splatter.</li>
-				<li class="rscadd">The blood reagent will now cover items and spacemen in blood when applied to objects and mobs.</li>
-				<li class="tweak">Helmets, masks, and neck items are all now valid targets to get splattered when you get covered in blood. Groovy.</li>
-				<li class="tweak">The temperature notification will now take into consideration both the ambient temperature and your body temperature, increasing the responsiveness of the temperature notification and making it much more realistic.</li>
-				<li class="tweak">Shuttle transit borders are now 10 tiles wide instead of 8 tiles, hopefully repairing the immersions that get shattered by the ability to see normal space where the transit areas end.</li>
-				<li class="rscadd">Instead of transit turfs simply teleporting things to space, transit is now handled in a somewhat realistic manner. Transit turfs now act like normal space turfs, though exiting the transit area or being present in the transit area after the shuttle moves out of transit will teleport you to space and throw you in the direction the shuttle was moving in.</li>
-				<li class="tweak">Reservation areas are now able to designate a border turf.</li>
-				<li class="bugfix">The sprint hotkey will no longer cause you to get permanently stuck sprinting if the server lags. Just tap shift again if you get stuck</li>
-				<li class="rscadd">You can now hear sounds in the real world while inside of a VR sleeper.</li>
-				<li class="rscadd">You can now make nameless characters. Nameless characters will spawn in with their name set as their job title followed by a unique five digit number. The "Name" option in the character setup menu will be replaced with a "Default designation" option for nameless characters, and the default designation will be used in place of a job title for assistants and other jobs that don't require dress codes.</li>
-				<li class="admin">The out-of-game round end notification is now a little more verbose. It'll now display the round type, end result of the round, and the survival rate.</li>
-				<li class="bugfix">Xenos can no longer strip items off of people to be capable of using any item in the game.</li>
-				<li class="bugfix">also, items from pockets get placed into your hands properly now</li>
-				<li class="bugfix">A mob's last words are now properly tracked and recorded on death. The first death of the round will now actually display the victim's last words on the round end screen.</li>
-				<li class="bugfix">Divine shenanigans can no longer result in someone becoming immune to staminaloss</li>
-				<li class="bugfix">Fixed body_markings in bodyparts being assigned as a list when in reality, it's a string and literally everything expects it to be a string and uses it as a string. This should mean that markings no longer have completely fucked up caches for character preview and other things.</li>
-				<li class="tweak">Since apparently the game is literally unplayable if items are not in the exact center of a turf, the maximum pixel variance of thrown objects has been reduced by four pixels to make things a smidge more clearer for those that dont know what a turf is.</li>
-				<li class="bugfix">Bartender glasses should HOPEFULLY no longer be tilted when landing on a table. Why the fuck is after_throw called via a timer.</li>
-				<li class="rscadd">Changeling screeches now have their own unique sounds, and are much easier to recognize.</li>
-				<li class="rscadd">Most synthetic emotes are now available to humans. *ping</li>
-				<li class="rscadd">You can now merp</li>
-				<li class="balance">The TEG will now only produce a meaningful amount of power if the hot pipe contains gas that's actively combusting</li>
-				<li class="admin">Added the "add PB bypass" and "revoke PB bypass" verbs, which allow admins to let a specific ckey to bypass the panic bunker for the rest of the round</li>
-				<li class="rscadd">Jogging is no longer treated exactly the same as sprinting for water slips. When you're jogging, you will only slip on water if you have more than 20% staminaloss.</li>
-				<li class="tweak">The atmospherics turf subsystem now has double the wait time, which should free up server processing power for other tasks.</li>
-				<li class="bugfix">The IRC now actually displays the actual survival rate</li>
-				<li class="rscadd">Bloodcult conversions are now consensual. Convertees are given a ten second timer to accept or wait out. This should drastically improve the quality of those that get converted into bloodcult.</li>
-				<li class="rscadd">All sacrifices now count as a third of a cultist for the end-game narsie summon.</li>
-				<li class="bugfix">Nameless captains will no longer proc a "Captain Captain on deck!" message. Instead, it'll be a much more boring but much more sensical  "Captain on deck!" message.</li>
-				<li class="bugfix">Transit turfs on the centcom z-level now function properly again at keeping mobs within the areas defined by their boundaries.</li>
-				<li class="bugfix">The title screen is also positioned correctly again.</li>
-				<li class="tweak">Ghost role eligibility for both event and spawner ghost roles is now affected by DNR status. If you suicide, ghost, or cryo out, you will be unable to qualify for any ghost roles</li>
-				<li class="tweak">Cryo now applies DNR status no matter how long the round has been going on</li>
-				<li class="tweak">Suicide is now properly admin logged as it is supposed to be. Ghosting while alive is now also logged.</li>
-				<li class="bugfix">Sparks and igniters will now actually heat areas rather than cooling them, as was intended.</li>
-				<li class="tweak">To alleviate some potential complaints, RPDs now have a cooldown before they can create sparks, and both RPDs and emitters produce less sparks.</li>
-				<li class="tweak">Conversion runes will now mute the victim temporarily while they're deciding whether to convert or be sacrificed.</li>
-				<li class="bugfix">Conversion runes no longer require a third cultist to sacrifice if the victim refuses conversion</li>
-				<li class="bugfix">Staminaloss targeted at the head now properly redirects to the chest.</li>
-				<li class="tweak">Sprinting no longer takes stam when you're being pulled or when you're in zero gravity. Other sources of involuntary movement are not affected.</li>
-				<li class="code_imp">In an attempt to improve performance during highpop, mouse movements will now only call onmousemove() while a user is in combat mode</li>
-				<li class="tweak">Ballistic projectiles are now the only projectiles capable of emitting dinks.</li>
-				<li class="admin">Panic bunker toggling and bypassing is now logged in admin IRC</li>
-				<li class="tweak">OOC and LOOC now use separate toggles. You can now use LOOC while OOC is globally toggled off, and admins now have the option to toggle LOOC off separately from OOC</li>
-				<li class="code_imp">also revamped and reorganized relevant looc adminverb code</li>
-				<li class="bugfix">The endgame narsie summon rune no longer requires 24 total sacrifices, and will now properly account for cultists that surround it</li>
-				<li class="tweak">The succumb verb is now available in the IC tab</li>
-				<li class="tweak">Lighting now uses a linear algorithm to calculate falloff instead of an inverse-square algorithm.</li>
-				<li class="code_imp">get_hearers_in_view() now actually caches the results of view() instead of calling view() twice</li>
-				<li class="code_imp">Goonchat's JS no longer contains checks related to a completely unused message filtering function, which should improve clientside performance quite a bit</li>
-				<li class="rscadd">The storage hud now properly takes into account the viewer's view size, meaning storage items with a large amount of storage slots will properly stretch across the bottom of the screen when running in widescreen.</li>
-				<li class="rscadd">Action buttons are now able to fill the entire screen in widescreen and other weird view sizes.</li>
-				<li class="rscdel">Omegastation's job changes will no longer be included at compile time.</li>
-				<li class="code_imp">The client update portion of /mob/Login() now double-checks to make sure client.player_details exists and is of the proper type. This should hopefully fix the "cannot read null.player_details" runtimes that can spontaneously cause clients to get kicked out and forced back to the lobby.</li>
-				<li class="rscadd">You can now quickly use unequipped items on objects by simply click-dragging the item onto the object with an empty active hand. Doing so will place the item in your hand, and then use that item on the object.</li>
-				<li class="code_imp">In an attempt to improve the performance of /mob/Stat(), various time-related procs now use defines instead of being procs that call procs that call other procs that call even more procs.</li>
-				<li class="bugfix">If a living mob has vore initialized but doesnt have voreprefs initialized, then client login will force voreprefs to load.</li>
-				<li class="bugfix">Hopefully fixed paper crash 2: electric boogaloo</li>
-				<li class="refactor">Added unomos, which is basically listmos except gas mixtures only use one single list for handling their gasses. This is a significant performance improvement that also offers a mild memory improvement under normal circumstances.</li>
-				<li class="balance">Locomotion circuits are now restricted to jogging speed</li>
-				<li class="balance">MMI circuits and pAI circuits both now have 60 complexity, up from their original 29.</li>
-				<li class="tweak">Biogenerators now have a sane limit for production</li>
-				<li class="bugfix">Fixed a fairly huge server crash exploit</li>
-				<li class="bugfix">Shield blobs no longer become completely invulnerable to all forms of damage after reaching a """weakened""" state</li>
-				<li class="tweak">Taken care of what appeared to have been an oversight where shield blobs don't recover their armor after becoming weakened.</li>
-				<li class="bugfix">Nerfed concatenators by limiting the amount of characters they're able to output</li>
-				<li class="tweak">The timer for stripping an item off of a spaceman is no longer interrupted by your active held item changing. This means you no longer have to worry about filling both of your hands when you're stripping items off of someone.</li>
-				<li class="rscadd">Ported the zulie cloak and blackredgold coat donor items from RP.</li>
-				<li class="balance">Normal mops now only use 2 stamina to mop a tile, nerfed from their previous value of 5 stamina per tile mopped.</li>
-				<li class="balance">Advanced mops now only use 1 stamina to mop turfs, from their former value of 2 stam.</li>
-				<li class="tweak">The femur breaker now uses `*scream` instead of forced speech. This means that the femur breaker will no longer spam deadchat with "AAAAAAAAAHHHHHHHHHH!!"</li>
-				<li class="tweak">The femur breaker will now guarantee that the victim falls into crit, which will make it harder to perform torture scenes with it since the victim can just succumb.</li>
-				<li class="bugfix">Fixed another runtime in warp whistles.</li>
-				<li class="bugfix">Spamming forged packets no longer crashes the server.</li>
-				<li class="bugfix">Things that access job_preferences now explicitly access keys, which means it no longer attempts to access invalid indices and runtimes as a result.</li>
-				<li class="balance">The taser's electrode has been reworked. Instead of being a strong knockdown that deals a heavy amount of stamloss, it now causes a weak knockdown, applies a debilitating status effect for 5 seconds, and deals 35 stamloss on hit up to a maximum 50 total stamloss.</li>
-				<li class="balance">Roundstart turrets now have a nonlethal projectile that gets used when they're set to stun and the target is resting</li>
-				<li class="tweak">Hybrid tasers now have disablers set as their default mode.</li>
-				<li class="rscadd">There is now a 1% chance for the station's announcer to be the medibot voice instead of the classic TG announcer.</li>
-				<li class="rscadd">The map config system has been expanded to allow mappers to specify the map type, announcer voice, ingame year, and how often a given map can be voted at roundend.</li>
-				<li class="bugfix">The map vote system now takes into account map playercount limits properly.</li>
-				<li class="bugfix">Examining a spaceman, and other things that use get_examine_string(), will now actually properly show when an item is blood-stained.</li>
-				<li class="bugfix">Plasmaman tongues no longer have a maxHealth of "alien", and no longer cause the organ's on_life to always runtime.</li>
-				<li class="bugfix">Shooting a simplemob no longer causes runtimes prior to the blood effect being created.</li>
-				<li class="bugfix">Removing a filter from an object that lacks filters no longer causes runtimes.</li>
-			</ul>
-			<h3 class="author">deathride58 (Original PR by actioninja) updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Disarm pushing (combat mode right click in disarm intent) will now actually push mobs away. Knockdowns from disarm pushing are no longer rng based on the target's staminaloss. Knockdowns from disarm pushing now only happen when you push someone into another mob, a table, or a wall. Pushes will now also temporarily stop targets from using firearms, and will disarm the firearm if performed a second time. Pushes still deal staminaloss to standing targets, and won't deal a single ounce of staminaloss to resting targets.</li>
-				<li class="rscdel">You can no longer displace mobs that are in harm intent by simply walking into them. Mobs that aren't in help intent have to be disarm pushed to actually be moved.</li>
-			</ul>
-			<h3 class="author">dtfe3 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Increased music maxlines from 300 to 600</li>
-				<li class="tweak">Made it so any oxygen tank can be used instead of only red ones.</li>
-				<li class="tweak">Watcher wing Trophy's effect lasts 1 second instead of 0.5</li>
-				<li class="rscadd">Pink Panties</li>
-				<li class="rscadd">Twintails</li>
-				<li class="rscadd">Schoolgirl outfits for the loadout menu!</li>
-				<li class="tweak">Now the fox ears are located in front of hair meaning they now behave much like cat ears, that being they are on-top of the hair layer.</li>
-			</ul>
-			<h3 class="author">izzyinbox updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">adds VoG orgasm command using words "orgasm", "cum", "squirt", "climax"</li>
-				<li class="rscadd">adds VoG dab command using words "dab" and "mood"</li>
-				<li class="rscadd">Generic dog body marking sprite</li>
-				<li class="imageadd">colormatrix dog sprites</li>
-				<li class="tweak">lowered the player age for command jobs to 1/3 of their previous setting</li>
-				<li class="rscadd">*bark emote</li>
-			</ul>
-			<h3 class="author">jtgsz updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">ported gang mode</li>
-			</ul>
-			<h3 class="author">kappa-sama updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscdel">Removed racism</li>
-				<li class="tweak">Teleporter calibration actually matters to all roundstart players</li>
-				<li class="balance">Slows down teleportation with the console/hub/teleporter setup if you care for your species.</li>
-				<li class="balance">Dedicated non-humans can now get hulk without having to become human.</li>
-				<li class="bugfix">seed</li>
-				<li class="tweak">added obj/item/key to wallet whitelist</li>
-				<li class="tweak">blood cult ritual daggers fit in jack/combat boots</li>
-				<li class="tweak">voidcells can now unlock alien tech</li>
-				<li class="balance">rebalanced tech trees (not really)</li>
-				<li class="rscadd">hugbox (/s)</li>
-				<li class="tweak">ashwalker spawn text now tells them "i" "c" not to leave lavaland</li>
-				<li class="bugfix">you can no longer have infinite ebows</li>
-				<li class="bugfix">kevinz forgot to nerf miasma research and cargo value after making it produce like 100x as much lmao</li>
-			</ul>
-			<h3 class="author">kevinz000 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Hierophant now goes sicko mode, but hey, at least you can't be multi-hit by melee waves!</li>
-				<li class="rscadd">Racking shotguns is now more threatening.</li>
-				<li class="balance">Medibots no longer kill slimes when trying to heal their toxins.</li>
-				<li class="rscadd">The Syndicate started selling claymores to their agents.</li>
-				<li class="balance">Nerfed VTEC modules.</li>
-				<li class="bugfix">Neurotoxin no longer stuns non-carbons.</li>
-				<li class="rscadd">peacekeeper cyborgs now get a megaphone</li>
-				<li class="bugfix">Fixes storage bugs regarding reaching into things you shouldn't be able to reach into.</li>
-				<li class="code_imp">BYOND 513 preliminary support added.</li>
-				<li class="balance">Trashbags now only allow accessing the first 3 items. 5 for bluespace ones. experimental: Storage now allows for limiting of random access</li>
-			</ul>
-			<h3 class="author">kiwedespars updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">regenerative materia to hallucination sting</li>
-				<li class="rscadd">mindbreaker toxin as an actual chemical to hallucination sting</li>
-			</ul>
-			<h3 class="author">lolman360 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">NT has authorized shipments or Cotton to Megaseed Servitors. It's time to start picking, liggers.</li>
-				<li class="imageadd">missing durathread sprites</li>
-				<li class="rscadd">Added durathread jumpskirt</li>
-				<li class="imageadd">Duraskirt sprites and rolled down jumpsuit sprites.</li>
-				<li class="bugfix">Fixes an undocumented change to the naming of Plasmamen.</li>
-				<li class="tweak">chainsaw kind of weapons and the mecha drill and the CLAMP can now be used with 100% accuracy for surgery</li>
-				<li class="refactor">surgery tools now work on defines</li>
-				<li class="balance">advanced surgerytools can now switch types instead of  just being faster</li>
-				<li class="bugfix">fixes bug with new surgerytools examine</li>
-			</ul>
-			<h3 class="author">nicc updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Exo-suit</li>
-				<li class="rscadd">SEVA suit</li>
-				<li class="rscadd">Flags for Goliath resistance and weakness</li>
-				<li class="rscadd">suit voucher</li>
-				<li class="rscadd">temp suit sprites</li>
-				<li class="rscadd">*dab</li>
-				<li class="balance">teg less gay maybe</li>
-			</ul>
-			<h3 class="author">ninjanomnom and WhoneedSpacee updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Some rpg affixes now have special effects</li>
-				<li class="rscadd">New RPGLoot modifiers: Vampirism which heals you when you attack, Pyromantic which sets things you hit on fire. Shrapnel which causes projectiles fired from a gun to fire projectiles in a radius when they hit something. Finally, Summoning which summons mobs that sometimes aid you in combat.</li>
-			</ul>
-			<h3 class="author">original by @randolfthemeh and @twaticus, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">jumpskirts</li>
-				<li class="rscadd">more jumpskirts</li>
-				<li class="rscadd">jumpskirt/suit prefs</li>
-			</ul>
-			<h3 class="author">original by Bumtickley00, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Suit storage units will now also remove radiation from mobs.</li>
-			</ul>
-			<h3 class="author">original by GuyonBroadway, SkowronX, and Arizon5. port by sishen1542 and kerse updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Clockwork cultists may now summon forth Neovgre, the ratvrarian super weapon. This powerful mech can be summoned when applications scripture has been unlocked, boasts superior offensive and defensive capabilities, however once a pilot enters he cannot leave and is doomed to die with the mech.</li>
-				<li class="imageadd">Sexy Sprite work courtesy or SkowronX from /tg/</li>
-				<li class="imageadd">brass edits by Arizon5</li>
-				<li class="soundadd">steamy laser by kerse</li>
-			</ul>
-			<h3 class="author">original by Skoglol, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Added lots of new virus cures, made cure difficulty scale more consistently. Cures are now picked from a list of possible cures per resistance level, multiple diseases at the same level no longer always share a cure. Looking at you table salt.</li>
-				<li class="admin">Dynamic gamemode now more auto-deadmin friendly.</li>
-			</ul>
-			<h3 class="author">original by TheChosenEvilOne, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Ported dynamic mode from /vg/, originally made by @DeityLink, @Kurfursten and @ShiftyRail</li>
-			</ul>
-			<h3 class="author">original by Tlaltecuhtli, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">rcd disk that gives rcd computer frame and machine frame designs</li>
-				<li class="rscadd">upgraded rcd in CE lockers</li>
-				<li class="tweak">moved deconstruction to the upgrade disk, ashwalker rcd comes upgraded</li>
-			</ul>
-			<h3 class="author">original by actioninja, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID</li>
-				<li class="tweak">mining vendor now reads from ID in hand or on person instead of requiring an inserted ID</li>
-				<li class="bugfix">ORM is functional again (for real this time)</li>
-				<li class="tweak">ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions</li>
-				<li class="tweak">Same for gulag consoles</li>
-			</ul>
-			<h3 class="author">original by redmoogle, port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added support for 3 new gasses; Tritium, Pluoxium, and BZ</li>
-			</ul>
-			<h3 class="author">original by: WJohnston, Antur, Arcane, plapatin, sprites by cogwerks and edited by mrdoombringer. port by sishen1542 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">THE GOOSE IS LOOSE</li>
-			</ul>
-			<h3 class="author">r4d6 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added decoratives angel wings for Mammalians only</li>
-				<li class="rscadd">Added blindfolds to the Loadout list</li>
-				<li class="rscadd">Added Decorative Wings for Humans, Felinids, Slimepersons and Lizardpeoples.</li>
-				<li class="tweak">Change the SEVA suit & Exo-suit's descriptions</li>
-				<li class="bugfix">Batteries are now Rad-Proof like the other stock parts</li>
-			</ul>
-			<h3 class="author">tigercat2000@Paradise updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed invalid characters breaking chat output for that message</li>
-			</ul>
-			<h3 class="author">tinfoil hat wearer updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added a new alien technology disk to scientist and roboticist uplinks that allows them to research the heavily-guarded secrets of the Grays.</li>
-				<li class="tweak">Alientech is now the only Hidden alien research. To compensate for this, alien_bio and alien_engi have had their research costs doubled and now require advanced surgery tools and experimental tools respectively to research. Their export price is also halved.</li>
-				<li class="balance">roboticists now have brainwashing disks AND alien technology added to their role-restricted uplink section. alien technology gives them brainwashing at a much later date, so brainwashing is the much cheaper option for instant power. makes logical sense because doctors get it as well because they do surgery, and roboticists can now either choose to brainwash people for less price but less power or emag borgs for higher prices, limited uses, but higher power.</li>
-			</ul>
-			<h3 class="author">ursamedium updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Gas icons changed.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>
diff --git a/html/changelogs/AutoChangeLog-pr-10112.yml b/html/changelogs/AutoChangeLog-pr-10112.yml
new file mode 100644
index 0000000000..f09d8fa9ef
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10112.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - refactor: "Refactored that mess of a code for alternate worn clothing sprites for digitigrade and taurs."
+  - bugfix: "Fixed some issues with the aforementioned feature you may or may not have experienced because it was pretty lame."
diff --git a/html/changelogs/AutoChangeLog-pr-10189.yml b/html/changelogs/AutoChangeLog-pr-10189.yml
new file mode 100644
index 0000000000..5889e127d2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10189.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - rscadd: "Dynamic storytellers, a new voting paradigm for dynamic"
+  - rscadd: "Support for approval voting and condorcet (ranked choice) voting in server votes"
diff --git a/html/changelogs/AutoChangeLog-pr-10191.yml b/html/changelogs/AutoChangeLog-pr-10191.yml
new file mode 100644
index 0000000000..c1366727bd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10191.yml
@@ -0,0 +1,5 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - rscadd: "Custom holoforms have been added for pAIs and AIs. oh and cyborg holograms of specific modules too."
+  - balance: "pais are no longer indestructible-flagged while in card form. pai radios now short out if they are forcefully collapsed from damage."
diff --git a/html/changelogs/AutoChangeLog-pr-10224.yml b/html/changelogs/AutoChangeLog-pr-10224.yml
new file mode 100644
index 0000000000..b7d07abe5c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10224.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - tweak: "made it so trait blacklisting removes random positives instead of removing everything"
diff --git a/html/changelogs/AutoChangeLog-pr-10238.yml b/html/changelogs/AutoChangeLog-pr-10238.yml
new file mode 100644
index 0000000000..dda40c86c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10238.yml
@@ -0,0 +1,7 @@
+author: "SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie)"
+delete-after: True
+changes: 
+  - code_imp: "It is now possible to set a different most-base-turf per z-level."
+  - spellcheck: "Removed unlawful reference to Disney's Star Wars franchise in map logging."
+  - tweak: "Moved mapping related errors to their own log file."
+  - bugfix: "Destruction on Lavaland will no longer reveal space in rare situations."
diff --git a/html/changelogs/AutoChangeLog-pr-10255.yml b/html/changelogs/AutoChangeLog-pr-10255.yml
new file mode 100644
index 0000000000..ebaccd0af6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10255.yml
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes: 
+  - bugfix: "Christmas clothes that where missing stuff should work again"
diff --git a/html/changelogs/AutoChangeLog-pr-10256.yml b/html/changelogs/AutoChangeLog-pr-10256.yml
new file mode 100644
index 0000000000..eb14f716cc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10256.yml
@@ -0,0 +1,4 @@
+author: "Putnam"
+delete-after: True
+changes: 
+  - rscadd: "Alcohol intolerance trait, which forces vomiting on any alcohol ingestion"
diff --git a/html/changelogs/AutoChangeLog-pr-10270.yml b/html/changelogs/AutoChangeLog-pr-10270.yml
new file mode 100644
index 0000000000..b47a249f9a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10270.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed the secret sauce recipe being randomized every round."
diff --git a/html/changelogs/AutoChangeLog-pr-10278.yml b/html/changelogs/AutoChangeLog-pr-10278.yml
new file mode 100644
index 0000000000..76ada12f20
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10278.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "Fermi plushie can be made once again"
diff --git a/html/changelogs/AutoChangeLog-pr-10285.yml b/html/changelogs/AutoChangeLog-pr-10285.yml
new file mode 100644
index 0000000000..89b0bbae43
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10285.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed singularity pulls duping rods out of engine floors."
diff --git a/html/changelogs/AutoChangeLog-pr-10309.yml b/html/changelogs/AutoChangeLog-pr-10309.yml
new file mode 100644
index 0000000000..a59ebff156
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10309.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - rscadd: "disabler sechuds"
diff --git a/html/changelogs/AutoChangeLog-pr-10317.yml b/html/changelogs/AutoChangeLog-pr-10317.yml
new file mode 100644
index 0000000000..7db50240e3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10317.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "issues with mapping done my Trilby"
diff --git a/html/changelogs/AutoChangeLog-pr-10319.yml b/html/changelogs/AutoChangeLog-pr-10319.yml
new file mode 100644
index 0000000000..88235aab8e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10319.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - rscadd: "adds coconut"
+  - rscadd: "adds a coconut bong"
diff --git a/html/changelogs/AutoChangeLog-pr-10329.yml b/html/changelogs/AutoChangeLog-pr-10329.yml
new file mode 100644
index 0000000000..e5d78ddf96
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10329.yml
@@ -0,0 +1,5 @@
+author: "Naksu"
+delete-after: True
+changes: 
+  - code_imp: "reagent IDs have been removed in favor using reagent typepaths where applicable"
+  - bugfix: "mechas, borg hyposprays etc no longer display internal reagent ids to the player"
diff --git a/html/changelogs/AutoChangeLog-pr-10330.yml b/html/changelogs/AutoChangeLog-pr-10330.yml
new file mode 100644
index 0000000000..b2a46ef605
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10330.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Adds new features for nanites"
diff --git a/html/changelogs/AutoChangeLog-pr-10345.yml b/html/changelogs/AutoChangeLog-pr-10345.yml
new file mode 100644
index 0000000000..a95653cdda
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10345.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - tweak: "allows bandoliers to hold any ammo type as long as it has a casing"
diff --git a/html/changelogs/AutoChangeLog-pr-10349.yml b/html/changelogs/AutoChangeLog-pr-10349.yml
new file mode 100644
index 0000000000..fad3179c6e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10349.yml
@@ -0,0 +1,6 @@
+author: "KathrinBailey"
+delete-after: True
+changes: 
+  - rscadd: "Empty engineering lockers for mappers."
+  - rscadd: "Industrial welding tools to the engineer welding locker."
+  - rscdel: "Removed the multitool, airlock painter, mechanical toolbox, brown sneakers, hazard vest and airlock painter from the CE's locker."
diff --git a/html/changelogs/AutoChangeLog-pr-10350.yml b/html/changelogs/AutoChangeLog-pr-10350.yml
new file mode 100644
index 0000000000..580f1d68cf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10350.yml
@@ -0,0 +1,7 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - rscadd: "Ghost cafe mobs can now ghostize"
+  - rscadd: "Ghost cafe now has a cremator"
+  - rscadd: "Ghost cafe mobs are now eligible for ghost roles"
+  - refactor: "Ghost roles now use an element for eligibility purposes"
diff --git a/html/changelogs/AutoChangeLog-pr-10356.yml b/html/changelogs/AutoChangeLog-pr-10356.yml
new file mode 100644
index 0000000000..1016b559ee
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10356.yml
@@ -0,0 +1,5 @@
+author: "Bhijn"
+delete-after: True
+changes: 
+  - rscadd: "Added a preference to make the sprint hotkey be a toggle instead of a hold bind"
+  - rscadd: "Added a preference to bind the sprint hotkey to space instead of shift."
diff --git a/html/changelogs/AutoChangeLog-pr-10358.yml b/html/changelogs/AutoChangeLog-pr-10358.yml
new file mode 100644
index 0000000000..a578e6e336
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10358.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - server: "Cleans out the last years of changlogs"
diff --git a/html/changelogs/AutoChangeLog-pr-10361.yml b/html/changelogs/AutoChangeLog-pr-10361.yml
new file mode 100644
index 0000000000..0224bdcb49
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10361.yml
@@ -0,0 +1,4 @@
+author: "CameronWoof"
+delete-after: True
+changes: 
+  - rscadd: "Ghost Cafe patrons now spawn with chameleon kits. Dress up! Be fancy!"
diff --git a/html/changelogs/AutoChangeLog-pr-10362.yml b/html/changelogs/AutoChangeLog-pr-10362.yml
new file mode 100644
index 0000000000..f92e16302a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10362.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "rouge cases of #$39; in bottle/pill/patch/condiments"
diff --git a/html/changelogs/AutoChangeLog-pr-10366.yml b/html/changelogs/AutoChangeLog-pr-10366.yml
new file mode 100644
index 0000000000..ec8d234edd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10366.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - balance: "Beakers are generally more useful now, with slight capacity increases."
+  - tweak: "Transfer amounts are different now. Adjust your muscle memory to compensate."
diff --git a/html/changelogs/AutoChangeLog-pr-10368.yml b/html/changelogs/AutoChangeLog-pr-10368.yml
new file mode 100644
index 0000000000..e6486f2815
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10368.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - balance: "ore redemption machines actually get affected by lasers again kthx"
diff --git a/html/changelogs/AutoChangeLog-pr-10369.yml b/html/changelogs/AutoChangeLog-pr-10369.yml
new file mode 100644
index 0000000000..c292d948fb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10369.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "crusher trophy drop chance on mining mobs increased to 1 in 4 (from 1 in 20)"
diff --git a/html/changelogs/AutoChangeLog-pr-10370.yml b/html/changelogs/AutoChangeLog-pr-10370.yml
new file mode 100644
index 0000000000..6674fd2e17
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10370.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - bugfix: "Blood-drunk buff from blood-drunk eye crusher trophy is less likely to cripple its user."
diff --git a/html/changelogs/AutoChangeLog-pr-10371.yml b/html/changelogs/AutoChangeLog-pr-10371.yml
new file mode 100644
index 0000000000..e4322d70f1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10371.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - rscadd: "loot crates in cargo contraband"
diff --git a/html/changelogs/AutoChangeLog-pr-10372.yml b/html/changelogs/AutoChangeLog-pr-10372.yml
new file mode 100644
index 0000000000..6bb60c3d8d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10372.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "Forcefield projectors now fit on toolbelts."
+  - imageadd: "New sprites for ATMOS holofan and forcefield projectors!"
diff --git a/html/changelogs/AutoChangeLog-pr-10374.yml b/html/changelogs/AutoChangeLog-pr-10374.yml
new file mode 100644
index 0000000000..376f49a4d4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10374.yml
@@ -0,0 +1,4 @@
+author: "Bhijn helped"
+delete-after: True
+changes: 
+  - bugfix: "Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%"
diff --git a/html/changelogs/AutoChangeLog-pr-10378.yml b/html/changelogs/AutoChangeLog-pr-10378.yml
new file mode 100644
index 0000000000..c7ab7d42c1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10378.yml
@@ -0,0 +1,4 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes: 
+  - rscadd: "Adds a sign outside MetaStation's custodial closet"
diff --git a/html/changelogs/AutoChangeLog-pr-10379.yml b/html/changelogs/AutoChangeLog-pr-10379.yml
new file mode 100644
index 0000000000..9623f815d6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10379.yml
@@ -0,0 +1,4 @@
+author: "Ryll/Shaps, ported by Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "Point-blanking people with shotguns actually throws them backwards!"
diff --git a/html/changelogs/AutoChangeLog-pr-10380.yml b/html/changelogs/AutoChangeLog-pr-10380.yml
new file mode 100644
index 0000000000..4604329137
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10380.yml
@@ -0,0 +1,6 @@
+author: "Unit2E & JMoldy, ported by Hatterhat"
+delete-after: True
+changes: 
+  - balance: "the powerfist now punches people away at high velocity depending on setting."
+  - rscadd: "the powerfist now leaks the gas it uses onto the tile you're on."
+  - tweak: "Adds weak punch variations for empty and near-empty punching."
diff --git a/html/changelogs/AutoChangeLog-pr-10383.yml b/html/changelogs/AutoChangeLog-pr-10383.yml
new file mode 100644
index 0000000000..c6787bbafe
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10383.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - bugfix: "megafauna can hear again"
diff --git a/html/changelogs/AutoChangeLog-pr-10384.yml b/html/changelogs/AutoChangeLog-pr-10384.yml
new file mode 100644
index 0000000000..315a62dadd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10384.yml
@@ -0,0 +1,6 @@
+author: "Tlaltecuhtli, Nemvar, Trilby, Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "russian surplus crate, sec ammo crate, meat/veggie/fruit crate, rped crate, bomb suit crate, bio suit crate, parrot crate, chem crate, db crate"
+  - tweak: "lowered price of some crates which are overpriced for no reason aka the tablet crate and the mech circuits crates, track implant crate has also track .38 ammo"
+  - bugfix: "sectech vendor has a refill pack"
diff --git a/html/changelogs/AutoChangeLog-pr-10388.yml b/html/changelogs/AutoChangeLog-pr-10388.yml
new file mode 100644
index 0000000000..fd06a5db3f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10388.yml
@@ -0,0 +1,4 @@
+author: "CameronWoof"
+delete-after: True
+changes: 
+  - rscadd: "Robots can now check the crew manifest from anywhere with the \"View Crew Manifest\" verb."
diff --git a/html/changelogs/AutoChangeLog-pr-10399.yml b/html/changelogs/AutoChangeLog-pr-10399.yml
new file mode 100644
index 0000000000..cbdb00630c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10399.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "Cargo passive gen is now 500 down from 750."
diff --git a/html/changelogs/AutoChangeLog-pr-10401.yml b/html/changelogs/AutoChangeLog-pr-10401.yml
new file mode 100644
index 0000000000..2aa8d91244
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10401.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added 3 SM Engine variations."
diff --git a/html/changelogs/AutoChangeLog-pr-10403.yml b/html/changelogs/AutoChangeLog-pr-10403.yml
new file mode 100644
index 0000000000..321789a546
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10403.yml
@@ -0,0 +1,5 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added a way to make opaque plastic flaps
+change: Change the already existing flap recipe to show that they are see-through"
diff --git a/html/changelogs/AutoChangeLog-pr-10412.yml b/html/changelogs/AutoChangeLog-pr-10412.yml
new file mode 100644
index 0000000000..b838dbb680
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10412.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes: 
+  - bugfix: "fixes matchboxes runtiming every time they spawn"
diff --git a/html/changelogs/AutoChangeLog-pr-10413.yml b/html/changelogs/AutoChangeLog-pr-10413.yml
new file mode 100644
index 0000000000..6d6378675b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10413.yml
@@ -0,0 +1,4 @@
+author: "nik707"
+delete-after: True
+changes: 
+  - tweak: "engraving light_power from 1 to 0.3"
diff --git a/html/changelogs/AutoChangeLog-pr-10420.yml b/html/changelogs/AutoChangeLog-pr-10420.yml
new file mode 100644
index 0000000000..b719eca84c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10420.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Increases plasma usage in radiation collectors"
diff --git a/html/changelogs/AutoChangeLog-pr-10427.yml b/html/changelogs/AutoChangeLog-pr-10427.yml
new file mode 100644
index 0000000000..5f4fe73988
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10427.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "tweaks some values around with beaker transfer amounts, adds a transfer value verb (altclick)"
diff --git a/html/changelogs/AutoChangeLog-pr-10428.yml b/html/changelogs/AutoChangeLog-pr-10428.yml
new file mode 100644
index 0000000000..2cd635d0a2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10428.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - balance: "Devastating bombs kills bomb armor'd mobs again"
diff --git a/html/changelogs/AutoChangeLog-pr-10429.yml b/html/changelogs/AutoChangeLog-pr-10429.yml
new file mode 100644
index 0000000000..cc83f8abb6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10429.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - tweak: "Adds missing but needed flags to MASON RIG"
diff --git a/html/changelogs/AutoChangeLog-pr-10430.yml b/html/changelogs/AutoChangeLog-pr-10430.yml
new file mode 100644
index 0000000000..4fd03a5b2b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10430.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "nuclear fist buffed."
diff --git a/html/changelogs/AutoChangeLog-pr-10432.yml b/html/changelogs/AutoChangeLog-pr-10432.yml
new file mode 100644
index 0000000000..a0b40baa45
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10432.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - bugfix: "missing sprites with crushed cans"
diff --git a/html/changelogs/AutoChangeLog-pr-10433.yml b/html/changelogs/AutoChangeLog-pr-10433.yml
new file mode 100644
index 0000000000..036e74a804
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10433.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "cogscarabs are now fulltile-hitbox."
diff --git a/html/changelogs/AutoChangeLog-pr-10435.yml b/html/changelogs/AutoChangeLog-pr-10435.yml
new file mode 100644
index 0000000000..6b684a57a5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10435.yml
@@ -0,0 +1,5 @@
+author: "FantasticFwoosh, ported by Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "Both reagent universal enzyme & sacks of flour are now available for their respective costs from the biogenerator."
+  - rscadd: "New crafting recipies for donut boxes, eggboxes & candle boxes have been added to cardboard recipes for the collective benefit of service personnel and the station."
diff --git a/html/changelogs/AutoChangeLog-pr-10437.yml b/html/changelogs/AutoChangeLog-pr-10437.yml
new file mode 100644
index 0000000000..ee454f47b9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10437.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!"
diff --git a/html/changelogs/AutoChangeLog-pr-10439.yml b/html/changelogs/AutoChangeLog-pr-10439.yml
new file mode 100644
index 0000000000..92b151b883
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10439.yml
@@ -0,0 +1,4 @@
+author: "LetterN"
+delete-after: True
+changes: 
+  - rscadd: "Doppler logs"
diff --git a/html/changelogs/AutoChangeLog-pr-10440.yml b/html/changelogs/AutoChangeLog-pr-10440.yml
new file mode 100644
index 0000000000..e942f4056f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10440.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - rscadd: "Added a sort of \"game mode ban\" by way of having people rank their game modes favorite to least favorite after the secret/extended vote."
+  - bugfix: "Turns out the schulze scoring was written wrong and it was setting things to 0 that shouldn't have been, so that's fixed."
diff --git a/html/changelogs/AutoChangeLog-pr-10442.yml b/html/changelogs/AutoChangeLog-pr-10442.yml
new file mode 100644
index 0000000000..f407ae9e15
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10442.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - tweak: "Halfs the nutriments in sugar"
diff --git a/html/changelogs/AutoChangeLog-pr-10452.yml b/html/changelogs/AutoChangeLog-pr-10452.yml
new file mode 100644
index 0000000000..e51b9ff752
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10452.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Lattices can be examined yet again."
diff --git a/html/changelogs/AutoChangeLog-pr-10457.yml b/html/changelogs/AutoChangeLog-pr-10457.yml
new file mode 100644
index 0000000000..203842b0b6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10457.yml
@@ -0,0 +1,5 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added a playback device"
+  - bugfix: "Made the Voice Analyzer actually care about languages"
diff --git a/html/changelogs/AutoChangeLog-pr-10459.yml b/html/changelogs/AutoChangeLog-pr-10459.yml
new file mode 100644
index 0000000000..77de8eb193
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10459.yml
@@ -0,0 +1,4 @@
+author: "Putnam"
+delete-after: True
+changes: 
+  - rscadd: "Cold-blooded quirk"
diff --git a/html/changelogs/AutoChangeLog-pr-10463.yml b/html/changelogs/AutoChangeLog-pr-10463.yml
new file mode 100644
index 0000000000..70e97975ce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10463.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - config: "Random engines are now weighted."
diff --git a/html/changelogs/AutoChangeLog-pr-10467.yml b/html/changelogs/AutoChangeLog-pr-10467.yml
new file mode 100644
index 0000000000..7fa379f088
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10467.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - bugfix: "cardboard box speed"
diff --git a/html/changelogs/AutoChangeLog-pr-10472.yml b/html/changelogs/AutoChangeLog-pr-10472.yml
new file mode 100644
index 0000000000..9404d70b7b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10472.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - bugfix: "fixed the missing icons from Dermal Button nanites"
diff --git a/html/changelogs/AutoChangeLog-pr-10473.yml b/html/changelogs/AutoChangeLog-pr-10473.yml
new file mode 100644
index 0000000000..f1821a3cce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10473.yml
@@ -0,0 +1,4 @@
+author: "Bhijn"
+delete-after: True
+changes: 
+  - bugfix: "server_hop can no longer be used to remotely lobotomize a spaceman"
diff --git a/html/changelogs/AutoChangeLog-pr-10474.yml b/html/changelogs/AutoChangeLog-pr-10474.yml
new file mode 100644
index 0000000000..ae7b5b3fcb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10474.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Traitor objectives don't take a dump when they try to add an assassinate anymore"
+  - admin: "Objective removal with antag panel no longer commented out silently while still being an option that gives useful feedback on stuff it's not doing in any respect"
diff --git a/html/changelogs/AutoChangeLog-pr-10482.yml b/html/changelogs/AutoChangeLog-pr-10482.yml
new file mode 100644
index 0000000000..e97c8870d4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10482.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - code_imp: "modular_citadel file movement"
diff --git a/html/changelogs/AutoChangeLog-pr-10483.yml b/html/changelogs/AutoChangeLog-pr-10483.yml
new file mode 100644
index 0000000000..1f016b1591
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10483.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Limb damage works now"
diff --git a/html/changelogs/AutoChangeLog-pr-10485.yml b/html/changelogs/AutoChangeLog-pr-10485.yml
new file mode 100644
index 0000000000..6bf082f8ba
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10485.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes: 
+  - tweak: "replaced the sprites with new ones requested."
diff --git a/html/changelogs/AutoChangeLog-pr-10486.yml b/html/changelogs/AutoChangeLog-pr-10486.yml
new file mode 100644
index 0000000000..448bbc162c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10486.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - tweak: "changed where the observe verb is."
diff --git a/html/changelogs/AutoChangeLog-pr-10489.yml b/html/changelogs/AutoChangeLog-pr-10489.yml
new file mode 100644
index 0000000000..4e393bd4b1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10489.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - tweak: "the way chameleon clothes update on change"
+  - bugfix: "chameleon cloak icon"
diff --git a/html/changelogs/AutoChangeLog-pr-10498.yml b/html/changelogs/AutoChangeLog-pr-10498.yml
new file mode 100644
index 0000000000..986abc77c2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10498.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - tweak: "tableslamming has 0.4 second cooldown instead of 0.8"
diff --git a/html/changelogs/AutoChangeLog-pr-10503.yml b/html/changelogs/AutoChangeLog-pr-10503.yml
new file mode 100644
index 0000000000..b067aa6c55
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10503.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - bugfix: "fixed SM's piping"
diff --git a/html/changelogs/AutoChangeLog-pr-9856.yml b/html/changelogs/AutoChangeLog-pr-9856.yml
new file mode 100644
index 0000000000..697c1c78f5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9856.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - rscadd: "Refactored code to allow all living mobs to use shields and not only humans."
+  - tweak: "Monkys will now retaliate against aliens attacking them (as if they even posed a threat to start with)."
diff --git a/html/changelogs/AutoChangeLog-pr-9878.yml b/html/changelogs/AutoChangeLog-pr-9878.yml
new file mode 100644
index 0000000000..ef9c704003
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9878.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - tweak: "add a click cooldown to the overly spammable table slamming."
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index e13ce10347..51e9453087 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi
index 39e2ea0584..43c9d20a93 100644
Binary files a/icons/mob/actions/actions_items.dmi and b/icons/mob/actions/actions_items.dmi differ
diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi
index a73da3aa0c..7452d63134 100644
Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 2188952740..bebfb7c2e0 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/feet_digi.dmi b/icons/mob/feet_digi.dmi
index e0a9cd462d..028dc67e72 100644
Binary files a/icons/mob/feet_digi.dmi and b/icons/mob/feet_digi.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 365ed5afd9..6bba2fc7fb 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/equipment/toolbox_lefthand.dmi b/icons/mob/inhands/equipment/toolbox_lefthand.dmi
index 801df7abb8..c0caf78855 100644
Binary files a/icons/mob/inhands/equipment/toolbox_lefthand.dmi and b/icons/mob/inhands/equipment/toolbox_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/toolbox_righthand.dmi b/icons/mob/inhands/equipment/toolbox_righthand.dmi
index f38ddfc9a4..1d016e35a9 100644
Binary files a/icons/mob/inhands/equipment/toolbox_righthand.dmi and b/icons/mob/inhands/equipment/toolbox_righthand.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 019ae09517..a4ff676bd0 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/mask_muzzled.dmi b/icons/mob/mask_muzzled.dmi
index 59c669ea72..92e6149bb1 100644
Binary files a/icons/mob/mask_muzzled.dmi and b/icons/mob/mask_muzzled.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 5b84dad999..dec1c372b5 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi
index 58dd2f5700..a0f6e6ab08 100644
Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ
diff --git a/icons/mob/taur_canine.dmi b/icons/mob/taur_canine.dmi
index 15d6214446..d266d1f135 100644
Binary files a/icons/mob/taur_canine.dmi and b/icons/mob/taur_canine.dmi differ
diff --git a/icons/mob/taur_hooved.dmi b/icons/mob/taur_hooved.dmi
index 63e604b430..71aec5444a 100644
Binary files a/icons/mob/taur_hooved.dmi and b/icons/mob/taur_hooved.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index e0789a1eeb..f0c2cde93d 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index fb2f4ab0d6..778b718fe6 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi
index e568d70310..9173a3ceaa 100644
Binary files a/icons/mob/uniform_digi.dmi and b/icons/mob/uniform_digi.dmi differ
diff --git a/icons/obj/bongs.dmi b/icons/obj/bongs.dmi
new file mode 100644
index 0000000000..406cce3817
Binary files /dev/null and b/icons/obj/bongs.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index b3cc31fc6d..f94106dd55 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 4ec45666c4..245b44e56b 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 728d244b5f..3c8a1332a9 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 5d243f93b8..6831c17e56 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 2dcd8b9a06..e6474e7899 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index d3bdc1b1ea..93acc07453 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi
index 469b1e1aff..712ea11a3b 100644
Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index a57719fb3a..e746d8f43d 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index 8695d03b3c..43e231cbab 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 4886cb8441..cb3870dc61 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 8fee8fcf9f..4a6b8964e5 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/modular_citadel/code/datums/components/material_container.dm b/modular_citadel/code/datums/components/material_container.dm
deleted file mode 100644
index a7c50e37c5..0000000000
--- a/modular_citadel/code/datums/components/material_container.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/datum/material/plastic
-	name = "Plastic"
-	id = MAT_PLASTIC
-	sheet_type = /obj/item/stack/sheet/plastic
\ No newline at end of file
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 8adc7c0745..4449ca801a 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -179,7 +179,7 @@
 
 /datum/status_effect/chem/astral_insurance/tick(mob/living/carbon/M)
 	. = ..()
-	if(owner.reagents.has_reagent("astral"))
+	if(owner.reagents.has_reagent(/datum/reagent/fermi/astral))
 		return
 	if(owner.mind == originalmind) //If they're home, let the chem deal with deletion.
 		return
@@ -284,15 +284,15 @@
 	var/mob/living/carbon/M = owner
 
 	//chem calculations
-	if(!owner.reagents.has_reagent("enthrall") && !owner.reagents.has_reagent("enthrallTest"))
+	if(!owner.reagents.has_reagent(/datum/chemical_reaction/fermi/enthrall) && !owner.reagents.has_reagent(/datum/reagent/fermi/enthrall/test))
 		if (phase < 3 && phase != 0)
 			deltaResist += 3//If you've no chem, then you break out quickly
 			if(prob(5))
 				to_chat(owner, "<span class='notice'><i>Your mind starts to restore some of it's clarity as you feel the effects of the drug wain.</i></span>")
 	if (mental_capacity <= 500 || phase == 4)
-		if (owner.reagents.has_reagent("mannitol"))
+		if (owner.reagents.has_reagent(/datum/reagent/medicine/mannitol))
 			mental_capacity += 5
-		if (owner.reagents.has_reagent("neurine"))
+		if (owner.reagents.has_reagent(/datum/reagent/medicine/neurine))
 			mental_capacity += 10
 
 	//mindshield check
@@ -369,7 +369,7 @@
 			if(lewd && prob(1) && !customEcho)
 				to_chat(owner, "<span class='love'><i>[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.",  "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].</i></span>")
 		if (4) //mindbroken
-			if (mental_capacity >= 499 && (owner.getOrganLoss(ORGAN_SLOT_BRAIN) <=0 || HAS_TRAIT(M, TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent("MKUltra"))
+			if (mental_capacity >= 499 && (owner.getOrganLoss(ORGAN_SLOT_BRAIN) <=0 || HAS_TRAIT(M, TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent(/datum/reagent/fermi/enthrall))
 				phase = 2
 				mental_capacity = 500
 				customTriggers = list()
@@ -739,18 +739,18 @@
 		deltaResist*= 0.5-(((2/200)*M.arousalloss)/1)//more aroused you are, the weaker resistance you can give, the less you are, the more you gain. (+/- 0.5)
 
 	//chemical resistance, brain and annaphros are the key to undoing, but the subject has to to be willing to resist.
-	if (owner.reagents.has_reagent("mannitol"))
+	if (owner.reagents.has_reagent(/datum/reagent/medicine/mannitol))
 		deltaResist *= 1.25
-	if (owner.reagents.has_reagent("neurine"))
+	if (owner.reagents.has_reagent(/datum/reagent/medicine/neurine))
 		deltaResist *= 1.5
 	if (!(owner.client?.prefs.cit_toggles & NO_APHRO) && M.canbearoused && lewd)
-		if (owner.reagents.has_reagent("anaphro"))
+		if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiac))
 			deltaResist *= 1.5
-		if (owner.reagents.has_reagent("anaphro+"))
+		if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiacplus))
 			deltaResist *= 2
-		if (owner.reagents.has_reagent("aphro"))
+		if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiac))
 			deltaResist *= 0.75
-		if (owner.reagents.has_reagent("aphro+"))
+		if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiacplus))
 			deltaResist *= 0.5
 	//Antag resistance
 	//cultists are already brainwashed by their god
diff --git a/modular_citadel/code/game/machinery/Sleeper.dm b/modular_citadel/code/game/machinery/Sleeper.dm
deleted file mode 100644
index 4cf04524b2..0000000000
--- a/modular_citadel/code/game/machinery/Sleeper.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/obj/machinery/sleeper
-	min_health = 30
diff --git a/modular_citadel/code/game/machinery/displaycases.dm b/modular_citadel/code/game/machinery/displaycases.dm
deleted file mode 100644
index f660475cfc..0000000000
--- a/modular_citadel/code/game/machinery/displaycases.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/obj/structure/displaycase/clown
-	desc = "In the event of clown, honk glass."
-	alert = 1
-	start_showpiece_type = /obj/item/bikehorn
-	req_access = list(ACCESS_CENT_GENERAL)
diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm
deleted file mode 100755
index e75ba17801..0000000000
--- a/modular_citadel/code/game/machinery/vending.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-/obj/machinery/vending/medical
-	products = list(/obj/item/reagent_containers/syringe = 12,
-					/obj/item/reagent_containers/dropper = 3,
-					/obj/item/healthanalyzer = 4,
-					/obj/item/sensor_device = 2,
-					/obj/item/pinpointer/crew = 2,
-					/obj/item/reagent_containers/medspray/sterilizine = 1,
-					/obj/item/stack/medical/gauze = 8,
-					/obj/item/reagent_containers/pill/patch/styptic = 5,
-					/obj/item/reagent_containers/medspray/styptic = 2,
-					/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
-					/obj/item/reagent_containers/medspray/silver_sulf = 2,
-					/obj/item/reagent_containers/pill/insulin = 10,
-					/obj/item/reagent_containers/pill/salbutamol = 2,
-					/obj/item/reagent_containers/glass/bottle/charcoal = 4,
-					/obj/item/reagent_containers/glass/bottle/epinephrine = 4,
-					/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
-					/obj/item/reagent_containers/glass/bottle/morphine = 4,
-					/obj/item/reagent_containers/glass/bottle/toxin = 3,
-					/obj/item/reagent_containers/syringe/antiviral = 6,
-					/obj/item/storage/hypospraykit/fire = 2,
-					/obj/item/storage/hypospraykit/toxin = 2,
-					/obj/item/storage/hypospraykit/o2 = 2,
-					/obj/item/storage/hypospraykit/brute = 2,
-					/obj/item/storage/hypospraykit/enlarge = 2,
-					/obj/item/reagent_containers/glass/bottle/vial/small = 5)
-
-/obj/machinery/vending/wardrobe/chap_wardrobe
-	premium = list(/obj/item/toy/plush/plushvar = 1,
-					/obj/item/toy/plush/narplush = 1)
-
-#define STANDARD_CHARGE 1
-#define CONTRABAND_CHARGE 2
-#define COIN_CHARGE 3
-
-/obj/machinery/vending/kink
-	name = "KinkMate"
-	desc = "A vending machine for all your unmentionable desires."
-	icon = 'icons/obj/citvending.dmi'
-	icon_state = "kink"
-	circuit = /obj/item/circuitboard/machine/kinkmate
-	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
-	vend_reply = "Have fun, you shameless pervert!"
-	products = list(
-				/obj/item/clothing/under/maid = 5,
-				/obj/item/clothing/under/janimaid = 5,
-				/obj/item/clothing/neck/petcollar = 5,
-				/obj/item/clothing/neck/petcollar/choker = 5,
-				/obj/item/clothing/neck/petcollar/leather = 5,
-				/obj/item/restraints/handcuffs/fake/kinky = 5,
-				/obj/item/clothing/glasses/sunglasses/blindfold = 4,
-				/obj/item/clothing/mask/muzzle = 4,
-				/obj/item/clothing/under/stripper_pink = 3,
-				/obj/item/clothing/under/stripper_green = 3,
-				/obj/item/clothing/under/corset = 3,
-				/obj/item/clothing/under/gear_harness = 10,
-				/obj/item/dildo/custom = 5,
-				/obj/item/electropack/shockcollar = 3,
-				/obj/item/assembly/signaler = 3
-				)
-	contraband = list(
-				/obj/item/clothing/neck/petcollar/locked = 2,
-				/obj/item/key/collar = 2,
-				/obj/item/clothing/head/kitty = 3,
-				/obj/item/clothing/head/rabbitears = 3,
-				/obj/item/clothing/under/keyholesweater = 2,
-				/obj/item/clothing/under/mankini = 2,
-				/obj/item/clothing/under/jabroni = 2,
-				/obj/item/dildo/flared/huge = 3,
-				/obj/item/reagent_containers/glass/bottle/crocin = 5,
-				/obj/item/reagent_containers/glass/bottle/camphor = 5
-				)
-	premium = list(
-				/obj/item/clothing/accessory/skullcodpiece/fake = 3,
-				/obj/item/reagent_containers/glass/bottle/hexacrocin = 10,
-				/obj/item/clothing/under/pants/chaps = 5
-				)
-	refill_canister = /obj/item/vending_refill/kink
-
-/obj/machinery/vending/sovietvend
-	name = "KomradeVendtink"
-	desc = "Rodina-mat' zovyot!"
-	icon = 'icons/obj/citvending.dmi'
-	icon_state = "soviet"
-	vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
-	product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
-	products = list(
-		/obj/item/clothing/under/soviet = 20,
-		/obj/item/clothing/head/ushanka = 20,
-		/obj/item/clothing/shoes/jackboots = 20,
-		/obj/item/clothing/head/squatter_hat = 20,
-		/obj/item/clothing/under/squatter_outfit = 20,
-		/obj/item/clothing/under/russobluecamooutfit = 20,
-		/obj/item/clothing/head/russobluecamohat = 20
-		)
-	contraband = list(
-		/obj/item/clothing/under/syndicate/tacticool = 4,
-		/obj/item/clothing/mask/balaclava = 4,
-		/obj/item/clothing/suit/russofurcoat = 4,
-		/obj/item/clothing/head/russofurhat = 4,
-		/obj/item/clothing/suit/space/hardsuit/soviet = 3,
-		/obj/item/gun/energy/laser/LaserAK = 4
-		)
-	premium = list()
-
-	refill_canister = /obj/item/vending_refill/soviet
-
-
-#undef STANDARD_CHARGE
-#undef CONTRABAND_CHARGE
-#undef COIN_CHARGE
-
-
-/obj/item/vending_refill/kink
-	machine_name 	= "KinkMate"
-	icon			= 'modular_citadel/icons/vending_restock.dmi'
-	icon_state 		= "refill_kink"
-
-/obj/item/vending_refill/soviet
-	machine_name 	= "sovietvend"
-	icon_state 		= "refill_soviet"
diff --git a/modular_citadel/code/game/objects/items/circuitboards/machine_circuitboards.dm b/modular_citadel/code/game/objects/items/circuitboards/machine_circuitboards.dm
deleted file mode 100644
index e70028f5eb..0000000000
--- a/modular_citadel/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/obj/item/circuitboard/machine/kinkmate
-	name = "Kinkmate Vendor (Machine Board)"
-	build_path = /obj/machinery/vending/kink
-	req_components = list(/obj/item/vending_refill/kink = 3)
-
-/obj/item/circuitboard/machine/autoylathe
-	name = "Autoylathe (Machine Board)"
-	build_path = /obj/machinery/autoylathe
-	req_components = list(
-		/obj/item/stock_parts/matter_bin = 3,
-		/obj/item/stock_parts/manipulator = 1,
-		/obj/item/stack/sheet/glass = 1)
diff --git a/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm b/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm
deleted file mode 100644
index b7843727df..0000000000
--- a/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-/obj/structure/chair/alt_attack_hand(mob/living/user)
-	if(Adjacent(user) && istype(user))
-		if(!item_chair || !user.can_hold_items() || !has_buckled_mobs() || buckled_mobs.len > 1 || dir != user.dir || flags_1 & NODECONSTRUCT_1)
-			return TRUE
-		if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
-			to_chat(user, "<span class='warning'>You can't do that right now!</span>")
-			return TRUE
-		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
-			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
-			return TRUE
-		var/mob/living/poordude = buckled_mobs[1]
-		if(!istype(poordude))
-			return TRUE
-		user.visible_message("<span class='notice'>[user] pulls [src] out from under [poordude].</span>", "<span class='notice'>You pull [src] out from under [poordude].</span>")
-		var/C = new item_chair(loc)
-		user.put_in_hands(C)
-		poordude.Knockdown(20)//rip in peace
-		user.adjustStaminaLoss(5)
-		unbuckle_all_mobs(TRUE)
-		qdel(src)
-		return TRUE
diff --git a/modular_citadel/code/game/objects/structures/tables_racks.dm b/modular_citadel/code/game/objects/structures/tables_racks.dm
deleted file mode 100644
index 69dbe4e1cb..0000000000
--- a/modular_citadel/code/game/objects/structures/tables_racks.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/obj/structure/table/alt_attack_hand(mob/user)
-	if(user && Adjacent(user) && !user.incapacitated())
-		if(istype(user) && user.a_intent == INTENT_HARM)
-			user.visible_message("<span class='warning'>[user] slams [user.p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
-			playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
-		else
-			user.visible_message("<span class='notice'>[user] slaps [user.p_their()] hands on [src].</span>", "<span class='notice'>You slap your hands on [src].</span>")
-			playsound(src, 'sound/weapons/tap.ogg', 50, 1)
-		user.do_attack_animation(src)
-		return TRUE
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index 8d70464a2d..d5daf24f8a 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -8,7 +8,7 @@
 	var/orgasm_verb = "cumming" //present continous
 	var/fluid_transfer_factor = 0 //How much would a partner get in them if they climax using this?
 	var/size = 2 //can vary between num or text, just used in icon_state strings
-	var/fluid_id = null
+	var/datum/reagent/fluid_id = null
 	var/fluid_max_volume = 50
 	var/fluid_efficiency = 1
 	var/fluid_rate = CUM_RATE
diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index 105f5e157d..73d03eff3b 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -6,7 +6,7 @@
 	zone = BODY_ZONE_CHEST
 	slot = ORGAN_SLOT_BREASTS
 	size = "c" //refer to the breast_values static list below for the cups associated number values
-	fluid_id = "milk"
+	fluid_id = /datum/reagent/consumable/milk
 	fluid_rate = MILK_RATE
 	shape = "pair"
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_FUID_PRODUCTION
@@ -44,7 +44,7 @@
 			desc += " You estimate that they're [uppertext(size)]-cups."
 
 	if(CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION) && aroused_state)
-		desc += " They're leaking [fluid_id]."
+		desc += " They're leaking [initial(fluid_id.name)]."
 	var/string
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm
index 547674a5f1..a911eefe01 100644
--- a/modular_citadel/code/modules/arousal/organs/testicles.dm
+++ b/modular_citadel/code/modules/arousal/organs/testicles.dm
@@ -11,7 +11,7 @@
 	var/size_name = "average"
 	shape = "Single"
 	var/sack_size = BALLS_SACK_SIZE_DEF
-	fluid_id = "semen"
+	fluid_id = /datum/reagent/consumable/semen
 	masturbation_verb = "massage"
 	layer_index = TESTICLES_LAYER_INDEX
 
diff --git a/modular_citadel/code/modules/arousal/organs/womb.dm b/modular_citadel/code/modules/arousal/organs/womb.dm
index 9dfe811571..7f91310e3e 100644
--- a/modular_citadel/code/modules/arousal/organs/womb.dm
+++ b/modular_citadel/code/modules/arousal/organs/womb.dm
@@ -6,5 +6,5 @@
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = ORGAN_SLOT_WOMB
 	genital_flags = GENITAL_INTERNAL|GENITAL_FUID_PRODUCTION
-	fluid_id = "femcum"
+	fluid_id = /datum/reagent/consumable/femcum
 	linked_organ_slot = ORGAN_SLOT_VAGINA
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 3e7eb39823..427a4ac61d 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -101,4 +101,34 @@
 /datum/gear/santahatg
 	name = "Green Santa Hat"
 	category = SLOT_HEAD
-	path = /obj/item/clothing/head/christmashatg
\ No newline at end of file
+	path = /obj/item/clothing/head/christmashatg
+
+/datum/gear/cowboyhat
+	name = "Cowboy Hat, Brown"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/cowboyhat
+
+/datum/gear/cowboyhat/black
+	name = "Cowboy Hat, Black"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/cowboyhat/black
+
+/datum/gear/cowboyhat/white
+	name = "Cowboy Hat, White"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/cowboyhat/white
+
+/datum/gear/cowboyhat/pink
+	name = "Cowboy Hat, Pink"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/cowboyhat/pink
+
+/datum/gear/cowboyhat/sec
+	name = "Cowboy Hat, Security"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/cowboyhat/sec
+	restricted_desc = "Security"
+	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
+
+
+
diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm
index 7b3bee6638..3531e69cfd 100644
--- a/modular_citadel/code/modules/client/loadout/shoes.dm
+++ b/modular_citadel/code/modules/client/loadout/shoes.dm
@@ -71,4 +71,14 @@
 /datum/gear/santaboots
 	name = "Santa Boots"
 	category = SLOT_SHOES
-	path= /obj/item/clothing/shoes/winterboots/santaboots
\ No newline at end of file
+	path= /obj/item/clothing/shoes/winterboots/santaboots
+
+/datum/gear/cowboyboots
+	name = "Cowboy Boots, Brown"
+	category = SLOT_SHOES
+	path = /obj/item/clothing/shoes/cowboyboots
+
+/datum/gear/cowboyboots/black
+	name = "Cowboy Boots, Black"
+	category = SLOT_SHOES
+	path = /obj/item/clothing/shoes/cowboyboots/black
\ No newline at end of file
diff --git a/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm b/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm
index c6b153fd36..ade6cee3ba 100644
--- a/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm
+++ b/modular_citadel/code/modules/clothing/suits/polychromic_cloaks.dm
@@ -13,7 +13,7 @@
 	secondary_color = "#FFFFFF"
 	tertiary_color = "#808080"
 
-/obj/item/clothing/neck/cloak/polychromic/worn_overlays(isinhands, icon_file)	//this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
+/obj/item/clothing/neck/cloak/polychromic/worn_overlays(isinhands, icon_file, style_flags = NONE)	//this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
 	. = ..()
 	if(hasprimary | hassecondary | hastertiary)
 		if(!isinhands)	//prevents the worn sprites from showing up if you're just holding them
diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm
index c7fd84bd80..4b9dd131ca 100644
--- a/modular_citadel/code/modules/clothing/suits/suits.dm
+++ b/modular_citadel/code/modules/clothing/suits/suits.dm
@@ -11,7 +11,7 @@
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
 	icon_state = "hostrench"
 	item_state = "hostrench"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	body_parts_covered = CHEST|ARMS|LEGS
 
 /obj/item/clothing/suit/hooded/cloak/david
@@ -20,11 +20,11 @@
 	desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids"
 	hoodtype = /obj/item/clothing/head/hooded/cloakhood/david
 	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/hooded/cloakhood/david
 	name = "red cloak hood"
 	icon_state = "golhood"
 	desc = "conceal your face in shame with this nanotrasen brand hood"
 	flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
diff --git a/modular_citadel/code/modules/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/under/trek_under.dm
index 5cd0620a9d..683167f325 100644
--- a/modular_citadel/code/modules/clothing/under/trek_under.dm
+++ b/modular_citadel/code/modules/clothing/under/trek_under.dm
@@ -14,7 +14,7 @@
 	desc = "Oooh... right."
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
-	force_alternate_icon = TRUE
+	mutantrace_variation = NONE
 	item_state = ""
 	can_adjust = FALSE	//to prevent you from "wearing it casually"
 
@@ -95,10 +95,9 @@
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	icon_state = "trek_ds9_coat"
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
-	force_alternate_icon = TRUE
 	item_state = "trek_ds9_coat"
 	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	permeability_coefficient = 0.50
 	allowed = list(
 		/obj/item/flashlight, /obj/item/analyzer,
@@ -140,11 +139,9 @@
 	desc = "A uniform jacket from the United Federation. Set phasers to awesome."
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
-	force_alternate_icon = TRUE
 	icon_state = "fedcoat"
 	item_state = "fedcoat"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-
+	mutantrace_variation = NONE
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|GROIN|ARMS
 	allowed = list(
@@ -207,7 +204,6 @@
 	desc = "A modern uniform jacket from the United Federation."
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
-	force_alternate_icon = TRUE
 	icon_state = "fedmodern"
 	item_state = "fedmodern"
 	body_parts_covered = CHEST|GROIN|ARMS
@@ -240,7 +236,6 @@
 	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
 	icon_state = "fedcapofficer"
 	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
-	force_alternate_icon = TRUE
 	item_state = "fedcapofficer"
 
 	//Variants
diff --git a/modular_citadel/code/modules/clothing/under/turtlenecks.dm b/modular_citadel/code/modules/clothing/under/turtlenecks.dm
index fd13da11e9..84cfa97a59 100644
--- a/modular_citadel/code/modules/clothing/under/turtlenecks.dm
+++ b/modular_citadel/code/modules/clothing/under/turtlenecks.dm
@@ -16,7 +16,7 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/structure/closet/secure_closet/CMO/PopulateContents()	//This is placed here because it's a very specific addition for a very specific niche
 	..()
@@ -29,7 +29,7 @@
 	item_state = "bl_suit"
 	item_color = "tactifool"
 	has_sensor = TRUE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 
 /obj/item/clothing/under/syndicate/tacticool
@@ -47,7 +47,7 @@
 	can_adjust = TRUE
 	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/bb_sweater/black
 	name = "black sweater"
diff --git a/modular_citadel/code/modules/clothing/under/under.dm b/modular_citadel/code/modules/clothing/under/under.dm
index dcc6323f62..40db06ba56 100644
--- a/modular_citadel/code/modules/clothing/under/under.dm
+++ b/modular_citadel/code/modules/clothing/under/under.dm
@@ -13,7 +13,7 @@
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
 	item_state = "r_suit"
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/rank/captain/femformal
 	name ="captain's female formal outfit"
@@ -26,4 +26,4 @@
 	can_adjust = FALSE
 	sensor_mode = SENSOR_COORDS  //it's still a captain's suit nerd
 	random_sensor = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index 3d88dae26c..eaf128626d 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -1,7 +1,7 @@
 
 //For custom items.
 
-// Unless there's a digitigrade version make sure you add mutantrace_variation = NO_MUTANTRACE_VARIATION to all clothing/under and shoes - Pooj
+// Unless there's a digitigrade version make sure you add mutantrace_variation = NONE to all clothing/under and shoes - Pooj
 // Digitigrade stuff is uniform_digi.dmi and digishoes.dmi in icons/mob
 
 /obj/item/custom/ceb_soap
@@ -85,7 +85,7 @@
 	item_state = "darkcarapace"
 	blood_overlay_type = "armor"
 	dog_fashion = /datum/dog_fashion/back
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
 
@@ -118,7 +118,7 @@
 	icon_state = "labred"
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	item_state = "labred"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/toggle/labcoat/labredblack
 	name = "Black and Red Coat"
@@ -127,7 +127,7 @@
 	icon_state = "labredblack"
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	item_state = "labredblack"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/toy/plush/carrot
 	name = "carrot plushie"
@@ -233,7 +233,7 @@
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	item_state = "hos-g"
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/reagent_containers/food/drinks/flask/russian
 	name = "russian flask"
@@ -277,14 +277,14 @@
 	fitted = NO_FEMALE_UNIFORM
 	alternate_worn_layer = ABOVE_SHOES_LAYER
 	can_adjust = 0
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/sneakers/pink
 	icon = 'icons/obj/custom.dmi'
 	icon_state = "pink"
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	item_state = "pink"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/neck/tie/bloodred
 	name = "Blood Red Tie"
@@ -301,7 +301,7 @@
 	icon_state = "puffydress"
 	item_state = "puffydress"
 	body_parts_covered = CHEST|GROIN|LEGS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/vermillion
 	name = "vermillion clothing"
@@ -311,11 +311,11 @@
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/bb_sweater/black/naomi
 	name = "worn black sweater"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?"
 
 /obj/item/clothing/neck/petcollar/naomi
@@ -345,7 +345,7 @@
 	icon_state = "rdcoat"
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	item_state = "rdcoat"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/custom/leechjar
 	name = "Jar of Leeches"
@@ -379,7 +379,7 @@
 	desc = "Comfy Lucky Jackboots with the word Luck on them."
 	item_state = "luckyjack"
 	icon_state = "luckyjack"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/lunasune
 	name = "Divine Robes"
@@ -388,7 +388,7 @@
 	desc = "Heavenly robes of the kitsune Luna Pumpkin,you can feel radiance coming from them."
 	item_state = "Divine_robes"
 	icon_state = "Divine_robes"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/leoskimpy
 	name = "Leon's Skimpy Outfit"
@@ -397,7 +397,7 @@
 	desc =  "A rather skimpy outfit."
 	item_state = "shark_cloth"
 	icon_state = "shark_cloth"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/mimeoveralls
 	name = "Mime's Overalls"
@@ -406,7 +406,7 @@
 	desc = "A less-than-traditional mime's attire, completed by a set of dorky-looking overalls."
 	item_state = "moveralls"
 	icon_state = "moveralls"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/hooded/cloak/zuliecloak
 	name = "Project: Zul-E"
@@ -418,7 +418,7 @@
 	hoodtype = /obj/item/clothing/head/hooded/cloakhood/zuliecloak
 	body_parts_covered = CHEST|GROIN|ARMS
 	slot_flags = SLOT_WEAR_SUIT | ITEM_SLOT_NECK //it's a cloak. it's cosmetic. so why the hell not? what could possibly go wrong?
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/hooded/cloakhood/zuliecloak
 	name = "NT Special Issue"
@@ -428,7 +428,7 @@
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	flags_inv = HIDEEARS|HIDEHAIR
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/blackredgold
 	name = "Multicolor Coat"
@@ -438,7 +438,7 @@
 	icon_state = "redgoldjacket"
 	item_state = "redgoldjacket"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/kimono
 	name = "Blue Kimono"
@@ -448,7 +448,7 @@
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/commjacket
 	name = "Dusty Commisar's Cloak"
@@ -458,7 +458,7 @@
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/under/mw2_russian_para
 	name = "Russian Paratrooper Jumper"
@@ -467,7 +467,7 @@
 	item_state = "mw2_russian_para"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/gloves/longblackgloves
 	name = "Luna's Gauntlets"
@@ -484,7 +484,7 @@
 	item_state = "trendy_fit"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/blueberet
 	name = "Atmos Beret"
@@ -518,7 +518,7 @@
 	item_state = "mikubikini"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/mikujacket
 	name = "starlight singer jacket"
@@ -527,7 +527,7 @@
 	item_state = "mikujacket"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/mikuhair
 	name = "starlight singer hair"
@@ -536,7 +536,7 @@
 	item_state = "mikuhair"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	flags_inv = HIDEHAIR
 
 /obj/item/clothing/gloves/mikugloves
@@ -546,7 +546,7 @@
 	item_state = "mikugloves"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/shoes/sneakers/mikuleggings
 	name = "starlight singer leggings"
@@ -555,4 +555,4 @@
 	item_state = "mikuleggings"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index 7e7a77538a..d0ad0d3232 100644
--- a/modular_citadel/code/modules/mob/cit_emotes.dm
+++ b/modular_citadel/code/modules/mob/cit_emotes.dm
@@ -70,113 +70,124 @@
 		message = "makes a very loud noise."
 	. = ..()
 
-/datum/emote/sound/carbon/snap
-	key = "snap"
-	key_third_person = "snaps"
-	muzzle_ignore = TRUE
-	restraint_check = TRUE
-	emote_type = EMOTE_AUDIBLE
-	sound = 'sound/effects/snap01.ogg'
-	mob_type_allowed_typecache = list(/mob/living/carbon/)
-
-
 /datum/emote/living/snap
 	key = "snap"
 	key_third_person = "snaps"
 	message = "snaps their fingers."
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/snap/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/snap.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/snap.ogg', 50, 1, -1)
 
 /datum/emote/living/snap2
 	key = "snap2"
 	key_third_person = "snaps twice"
 	message = "snaps twice."
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/snap2/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/snap2.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/snap2.ogg', 50, 1, -1)
 
 /datum/emote/living/snap3
 	key = "snap3"
 	key_third_person = "snaps thrice"
 	message = "snaps thrice."
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/snap3/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/snap3.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/snap3.ogg', 50, 1, -1)
 
 /datum/emote/living/awoo
 	key = "awoo"
 	key_third_person = "lets out an awoo"
 	message = "lets out an awoo!"
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/awoo/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/awoo.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/awoo.ogg', 50, 1, -1)
 
 /datum/emote/living/nya
 	key = "nya"
 	key_third_person = "lets out a nya"
 	message = "lets out a nya!"
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/nya/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/nya.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/nya.ogg', 50, 1, -1)
 
 /datum/emote/living/weh
 	key = "weh"
 	key_third_person = "lets out a weh"
 	message = "lets out a weh!"
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/weh/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/weh.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/weh.ogg', 50, 1, -1)
 
 /datum/emote/living/peep
 	key = "peep"
 	key_third_person = "peeps like a bird"
 	message = "peeps like a bird!"
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/peep/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/peep.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/peep.ogg', 50, 1, -1)
 
 /datum/emote/living/dab
 	key = "dab"
@@ -190,41 +201,49 @@
 	key_third_person = "lets out a tiny squeak"
 	message = "lets out a tiny squeak!"
 	emote_type = EMOTE_AUDIBLE
-	mob_type_allowed_typecache = list(/mob/living/carbon)
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/mothsqueak.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/mothsqueak.ogg', 50, 1, -1)
 
 /datum/emote/living/merp
 	key = "merp"
 	key_third_person = "merps"
 	message = "merps!"
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/merp/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		playsound(user, 'modular_citadel/sound/voice/merp.ogg', 50, 1, -1)
-	. = ..()
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	playsound(user, 'modular_citadel/sound/voice/merp.ogg', 50, 1, -1)
 
 /datum/emote/living/bark
 	key = "bark"
 	key_third_person = "barks"
 	message = "barks!"
 	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/bark/run_emote(mob/living/user, params)
-	if(ishuman(user))
-		if(user.nextsoundemote >= world.time)
-			return
-		user.nextsoundemote = world.time + 7
-		var/sound = pick('modular_citadel/sound/voice/bark1.ogg', 'modular_citadel/sound/voice/bark2.ogg')
-		playsound(user, sound, 50, 1, -1)
-	. = ..()
\ No newline at end of file
+	if(!(. = ..()))
+		return
+	if(user.nextsoundemote >= world.time)
+		return
+	user.nextsoundemote = world.time + 7
+	var/sound = pick('modular_citadel/sound/voice/bark1.ogg', 'modular_citadel/sound/voice/bark2.ogg')
+	playsound(user, sound, 50, 1, -1)
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
index a1466f58d4..98de5eed14 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
@@ -424,12 +424,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	if(A)
 		if(isliving(A))
 			var/mob/living/L = A
-			var/blocked = 0
-			if(ishuman(A))
-				var/mob/living/carbon/human/H = A
-				if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
-					blocked = 1
-			if(!blocked)
+			if(!L.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
 				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
 				L.Knockdown(iscarbon(L) ? 60 : 45, override_stamdmg = CLAMP(pounce_stamloss, 0, pounce_stamloss_cap-L.getStaminaLoss())) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice.
 				playsound(src, 'sound/weapons/Egloves.ogg', 50, 1)
diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 8cb56803b1..4ae3e5c488 100644
--- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -4,7 +4,7 @@
 	id = "10mminc"
 	build_type = PROTOLATHE
 	materials = list(MAT_PLASMA = 50000, MAT_METAL = 18000)
-	reagents_list = list("plasma" = 120, "napalm" = 240)
+	reagents_list = list(/datum/reagent/toxin/plasma = 120, /datum/reagent/napalm = 240)
 	build_path = /obj/item/ammo_box/magazine/m10mm/fire
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -25,7 +25,7 @@
 	id = "10mmhp"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 40000, MAT_GLASS = 50000)
-	reagents_list = list("sonic_powder" = 280)
+	reagents_list = list(/datum/reagent/sonic_powder = 280)
 	build_path = /obj/item/ammo_box/magazine/m10mm/hp
 	category = list("Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
diff --git a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
index 89e086687a..2c527ac713 100644
--- a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -43,7 +43,7 @@ obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
 			body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
 		update_icon()
 
-obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file)
+obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(isinhands)
 		var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body")
diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
index 735c0890af..47de736c3b 100644
--- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
+++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm
@@ -99,7 +99,7 @@
 	. = ..()
 	. += "<span class='notice'>Alt-click to change firing modes.</span>"
 
-/obj/item/gun/energy/pumpaction/worn_overlays(isinhands, icon_file)	//ammo counter for inhands
+/obj/item/gun/energy/pumpaction/worn_overlays(isinhands, icon_file, style_flags = NONE)	//ammo counter for inhands
 	. = ..()
 	var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
 	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index 65c652434b..0985b758c6 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -131,7 +131,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 
 /datum/reagent/fermi/enthrall
 	name = "MKUltra"
-	id = "enthrall"
 	description = "A forbidden deep red mixture that increases a person's succeptability to another's words. When taken by the creator, it will enhance the draw of their voice to those affected by it."
 	color = "#660015" // rgb: , 0, 255
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
@@ -149,7 +148,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 
 /datum/reagent/fermi/enthrall/test
 	name = "MKUltraTest"
-	id = "enthrallTest"
 	description = "A forbidden deep red mixture that makes you like Fermis a little too much. Unobtainable and due to be removed from the wiki."
 	data = list("creatorID" = "honkatonkbramblesnatch", "creatorGender" = "Mistress", "creatorName" = "Fermis Yakumo")
 	creatorID  = "honkatonkbramblesnatch"//ckey
@@ -158,7 +156,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	purity = 1
 
 /datum/reagent/fermi/enthrall/test/on_new()
-	id = "enthrall"
 	..()
 	creator = get_mob_by_key(creatorID)
 
@@ -171,7 +168,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 /datum/reagent/fermi/enthrall/on_mob_add(mob/living/carbon/M)
 	. = ..()
 	if(M.client?.prefs.cit_toggles & NEVER_HYPNO) // Just in case people are opting out of this
-		holder.remove_reagent(id, 10000000)
+		holder.del_reagent(type)
 		return
 	if(!ishuman(M))//Just to make sure screwy stuff doesn't happen.
 		return
@@ -221,7 +218,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 
 			if(LAZYLEN(seen))
 				return
-			M.reagents.remove_reagent(id, volume)
+			M.reagents.del_reagent(type)
 			FallInLove(M, pick(seen))
 			return
 
@@ -230,7 +227,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 			if(M.has_status_effect(STATUS_EFFECT_INLOVE))
 				return
 			if((C in viewers(7, get_turf(M))) && (C.client))
-				M.reagents.remove_reagent(id, volume)
+				M.reagents.del_reagent(type)
 				FallInLove(C, M)
 			return
 	if (M.ckey == creatorID && creatorName == M.real_name)//If you yourself drink it, it supresses the vocal effects, for stealth. NEVERMIND ADD THIS LATER I CAN'T GET IT TO WORK
@@ -282,7 +279,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 //Creates a gas cloud when the reaction blows up, causing everyone in it to fall in love with someone/something while it's in their system.
 /datum/reagent/fermi/enthrallExplo//Created in a gas cloud when it explodes
 	name = "Gaseous MKUltra"
-	id = "enthrallExplo"
 	description = "A forbidden deep red gas that overwhelms a foreign body, causing the person they next lay their eyes on to become more interesting. Studies have shown that people are 66% more likely to make friends with this in the air. Produced when MKUltra explodes."
 	color = "#2C051A" // rgb: , 0, 255
 	metabolization_rate = 0.1
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
index c72b702a97..87615ccb68 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
@@ -39,7 +39,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 //Clone serum #chemClone
 /datum/reagent/fermi/SDGF //vars, mostly only care about keeping track if there's a player in the clone or not.
 	name = "synthetic-derived growth factor"
-	id = "SDGF"
 	description = "A rapidly diving mass of Embryonic stem cells. These cells are missing a nucleus and quickly replicate a host’s DNA before growing to form an almost perfect clone of the host. In some cases neural replication takes longer, though the underlying reason underneath has yet to be determined."
 	color = "#a502e0" // rgb: 96, 0, 255
 	var/playerClone = FALSE
@@ -49,9 +48,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	var/list/candies = list()
 	var/pollStarted = FALSE
 	var/startHunger
-	impure_chem 			= "SDGFtox"
+	impure_chem 			= /datum/reagent/impure/SDGFtox
 	inverse_chem_val 		= 0.5
-	inverse_chem		= "SDZF"
+	inverse_chem		= /datum/reagent/impure/SDZF
 	can_synth = TRUE
 
 
@@ -122,8 +121,8 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				SM.nutrition = startHunger/2
 
 				//Transfer remaining reagent to clone. I think around 30u will make a healthy clone, otherwise they'll have clone damage, blood loss, brain damage and hunger.
-				SM.reagents.add_reagent("SDGFheal", volume)
-				M.reagents.remove_reagent(id, volume)
+				SM.reagents.add_reagent(/datum/reagent/fermi/SDGFheal, volume)
+				M.reagents.remove_reagent(type, volume)
 				log_game("FERMICHEM: [volume]u of SDGFheal has been transferred to the clone")
 				SSblackbox.record_feedback("tally", "fermi_chem", 1, "Sentient clones made")
 				return ..()
@@ -141,7 +140,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 							M.adjustBruteLoss(-1, 0)
 							M.adjustFireLoss(-1, 0)
 							M.heal_bodypart_damage(1,1)
-							M.reagents.remove_reagent(id, 1)//faster rate of loss.
+							M.reagents.remove_reagent(type, 1)//faster rate of loss.
 				else //If there's no ghosts, but they've made a large amount, then proceed to make flavourful clone, where you become fat and useless until you split.
 					switch(current_cycle)
 						if(21)
@@ -185,7 +184,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 							log_game("FERMICHEM: [M] ckey: [M.key] has created a mindless clone of themselves")
 							SSblackbox.record_feedback("tally", "fermi_chem", 1, "Braindead clones made")
 						if(87 to INFINITY)
-							M.reagents.remove_reagent(id, volume)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
+							M.reagents.remove_reagent(type, volume)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
 
 
 	..()
@@ -265,18 +264,17 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 			SM.set_species(mutation)
 
 		//Transfer remaining reagent to clone. I think around 30u will make a healthy clone, otherwise they'll have clone damage, blood loss, brain damage and hunger.
-		SM.reagents.add_reagent("SDGFheal", volume)
-		M.reagents.remove_reagent(id, volume)
-
+		SM.reagents.add_reagent(/datum/reagent/fermi/SDGFheal, volume)
+		log_combat(M, M, "SDGF clone-vived", src)
+		M.reagents.del_reagent(type)
 		SM.updatehealth()
 		SM.emote("gasp")
-		log_combat(M, M, "SDGF clone-vived", src)
+		return
 	..()
 
 //Unobtainable, used in clone spawn.
 /datum/reagent/fermi/SDGFheal
 	name = "synthetic-derived healing factor"
-	id = "SDGFheal"
 	description = "Leftover SDGF is transferred into the resulting clone, which quickly heals up the stresses from suddenly splitting. Restores blood, nutrition, and repaires brain and clone damage quickly. Only obtainable from using excess SDGF, and only enters the cloned body."
 	metabolization_rate = 0.8
 	can_synth = FALSE
@@ -292,7 +290,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 //Unobtainable, used if SDGF is impure but not too impure
 /datum/reagent/impure/SDGFtox
 	name = "Synthetic-derived apoptosis factor"
-	id = "SDGFtox"
 	description = "Impure synthetic-derived growth factor causes certain cells to undergo cell death, causing clone damage, and damaging blood cells."//i.e. tell me please, figure it's a good way to get pinged for bugfixes.
 	metabolization_rate = 1
 	can_synth = FALSE
@@ -305,7 +302,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 //Fail state of SDGF
 /datum/reagent/impure/SDZF
 	name = "synthetic-derived zombie factor"
-	id = "SDZF"
 	description = "A horribly peverse mass of Embryonic stem cells made real by the hands of a failed chemist. Emulates normal synthetic-derived growth factor, but produces a hostile zombie at the end of it."
 	color = "#a502e0" // rgb: 96, 0, 255
 	metabolization_rate = 0.2 * REAGENTS_METABOLISM
@@ -338,7 +334,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 			M.adjustToxLoss(1, 0)// the warning!
 
 		if(86)//mean clone time!
-			if (!M.reagents.has_reagent("pen_acid"))//Counterplay is pent.)
+			if (!M.reagents.has_reagent(/datum/reagent/medicine/pen_acid))//Counterplay is pent.)
 				message_admins("(non-infectious) SDZF: Zombie spawned at [M] [COORD(M)]!")
 				M.nutrition = startHunger - 500//YOU BEST BE RUNNING AWAY AFTER THIS YOU BADDIE
 				M.next_move_modifier = 1
@@ -352,7 +348,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				ZI.name = M.real_name
 				ZI.desc = "[M]'s clone, gone horribly wrong."
 				log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying zombie instead")
-				M.reagents.remove_reagent(id, 20)
+				M.reagents.remove_reagent(type, 20)
 
 			else//easier to deal with
 				to_chat(M, "<span class='notice'>The pentetic acid seems to have stopped the decay for now, clumping up the cells into a horrifying tumour!</span>")
@@ -362,12 +358,12 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				S.name = "Living teratoma"
 				S.real_name = "Living teratoma"//horrifying!!
 				S.rabid = 1//Make them an angery boi
-				M.reagents.remove_reagent(id, volume)
+				M.reagents.remove_reagent(type, volume)
 				to_chat(M, "<span class='warning'>A large glob of the tumour suddenly splits itself from your body. You feel grossed out and slimey...</span>")
 				log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying teratoma instead")
 				SSblackbox.record_feedback("tally", "fermi_chem", 1, "Zombie clones made!")
 
 		if(87 to INFINITY)
 			M.adjustToxLoss(2, 0)
-			M.reagents.remove_reagent(id, 1)
+			M.reagents.remove_reagent(type, 1)
 	..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
index d7ff42a9eb..a8ac66ef20 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
@@ -15,7 +15,6 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 
 /datum/reagent/fermi/astral // Gives you the ability to astral project for a moment!
 	name = "Astrogen"
-	id = "astral"
 	description = "An opalescent murky liquid that is said to distort your soul from your being."
 	color = "#A080H4" // rgb: , 0, 255
 	taste_description = "your mind"
@@ -41,7 +40,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 	if(origin.mind && origin.mind != originalmind)
 		to_chat(originalmind.current, "<span class='warning'><b><i>There's a foreign presence in your body blocking your return!</b></i></span>")
 		return ..()
-	if(origin.reagents.has_reagent("astral") )
+	if(origin.reagents.has_reagent(/datum/reagent/fermi/astral) )
 		var/datum/reagent/fermi/astral/As = locate(/datum/reagent/fermi/astral) in origin.reagents.reagent_list
 		if(As.current_cycle < 10)
 			to_chat(originalmind.current, "<span class='warning'><b><i>The intensity of the astrogen in your body is too much allow you to return to yourself yet!</b></i></span>")
@@ -54,7 +53,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 /datum/reagent/fermi/astral/reaction_turf(turf/T, reac_volume)
 	if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
 		var/turf/open/floor/F = T
-		F.PlaceOnTop(/turf/open/floor/fakespace)
+		F.PlaceOnTop(/turf/open/floor/fakespace, flags = CHANGETURF_INHERIT_AIR)
 	..()
 
 /datum/reagent/fermi/astral/reaction_obj(obj/O, reac_volume)
@@ -90,7 +89,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 		if(prob(50))
 			to_chat(G, "<span class='warning'>The high conentration of Astrogen in your blood causes you to lapse your concentration for a moment, bringing your projection back to yourself!</b></span>")
 			do_teleport(G, M.loc)
-	M.reagents.remove_reagent(id, current_cycle/10, FALSE)//exponent
+	metabolization_rate = current_cycle/10 //exponential
 	sleepytime+=5
 	if(G)//This is a mess because of how slow qdel is, so this is all to stop runtimes.
 		if(G.mind)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
index 5f3fc61fa7..6262dc1a28 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
@@ -11,7 +11,6 @@
 
 /datum/reagent/fermi/eigenstate
 	name = "Eigenstasium"
-	id = "eigenstate"
 	description = "A strange mixture formed from a controlled reaction of bluespace with plasma, that causes localised eigenstate fluxuations within the patient"
 	taste_description = "wiggly cosmic dust."
 	color = "#5020F4" // rgb: 50, 20, 255
@@ -69,7 +68,7 @@
 /datum/reagent/fermi/eigenstate/on_mob_delete(mob/living/M) //returns back to original location
 	do_sparks(5,FALSE,M)
 	to_chat(M, "<span class='userdanger'>You feel your wavefunction collapse!</span>")
-	if(!M.reagents.has_reagent("stabilizing_agent"))
+	if(!M.reagents.has_reagent(/datum/reagent/stabilizing_agent))
 		do_teleport(M, location_return, 0, asoundin = 'sound/effects/phasein.ogg') //Teleports home
 		do_sparks(5,FALSE,M)
 	qdel(Eigenstate)
@@ -169,7 +168,7 @@
 
 	if(prob(20))
 		do_sparks(5,FALSE,M)
-	SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[id]_overdose")//holdover until above fix works
+	SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[type]_overdose")//holdover until above fix works
 	..()
 
 /datum/reagent/fermi/eigenstate/reaction_turf(turf/T, reac_volume)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 6732fb06a5..b6b9c0bf34 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -20,15 +20,14 @@
 
 /datum/reagent/fermi/breast_enlarger
 	name = "Succubus milk"
-	id = "breast_enlarger"
 	description = "A volatile collodial mixture derived from milk that encourages mammary production via a potent estrogen mix."
 	color = "#E60584" // rgb: 96, 0, 255
 	taste_description = "a milky ice cream like flavour."
 	overdose_threshold = 17
 	metabolization_rate = 0.25
-	impure_chem 			= "BEsmaller" //If you make an inpure chem, it stalls growth
+	impure_chem 			= /datum/reagent/fermi/BEsmaller //If you make an inpure chem, it stalls growth
 	inverse_chem_val 		= 0.35
-	inverse_chem		= "BEsmaller" //At really impure vols, it just becomes 100% inverse
+	inverse_chem		= /datum/reagent/fermi/BEsmaller //At really impure vols, it just becomes 100% inverse
 	can_synth = FALSE
 	var/message_spam = FALSE
 
@@ -44,7 +43,7 @@
 			M.Knockdown(50)
 			M.Stun(50)
 			B.throw_at(T2, 8, 1)
-		M.reagents.remove_reagent(id, volume)
+		M.reagents.del_reagent(type)
 		return
 	var/mob/living/carbon/human/H = M
 	if(!H.getorganslot(ORGAN_SLOT_BREASTS) && H.emergent_genital_call())
@@ -78,7 +77,7 @@
 		B.cached_size = 0
 		B.prev_size = 0
 		to_chat(H, "<span class='warning'>Your chest feels warm, tingling with newfound sensitivity.</b></span>")
-		H.reagents.remove_reagent(id, 5)
+		H.reagents.remove_reagent(type, 5)
 		B.Insert(H)
 
 	//If they have them, increase size. If size is comically big, limit movement and rip clothes.
@@ -122,7 +121,6 @@
 
 /datum/reagent/fermi/BEsmaller
 	name = "Modesty milk"
-	id = "BEsmaller"
 	description = "A volatile collodial mixture derived from milk that encourages mammary reduction via a potent estrogen mix. Produced by reacting impure Succubus milk."
 	color = "#E60584" // rgb: 96, 0, 255
 	taste_description = "a milky ice cream like flavour."
@@ -140,7 +138,6 @@
 
 /datum/reagent/fermi/BEsmaller_hypo
 	name = "Rectify milk" //Rectify
-	id = "BEsmaller_hypo"
 	color = "#E60584"
 	taste_description = "a milky ice cream like flavour."
 	metabolization_rate = 0.25
@@ -179,15 +176,14 @@
 //Since someone else made this in the time it took me to PR it, I merged them.
 /datum/reagent/fermi/penis_enlarger // Due to popular demand...!
 	name = "Incubus draft"
-	id = "penis_enlarger"
 	description = "A volatile collodial mixture derived from various masculine solutions that encourages a larger gentleman's package via a potent testosterone mix, formula derived from a collaboration from Fermichem  and Doctor Ronald Hyatt, who is well known for his phallus palace." //The toxic masculinity thing is a joke because I thought it would be funny to include it in the reagents, but I don't think many would find it funny? dumb
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
 	overdose_threshold = 17 //ODing makes you male and removes female genitals
 	metabolization_rate = 0.5
-	impure_chem 			= "PEsmaller" //If you make an inpure chem, it stalls growth
+	impure_chem 			= /datum/reagent/fermi/PEsmaller //If you make an inpure chem, it stalls growth
 	inverse_chem_val 		= 0.35
-	inverse_chem		= "PEsmaller" //At really impure vols, it just becomes 100% inverse and shrinks instead.
+	inverse_chem		= /datum/reagent/fermi/PEsmaller //At really impure vols, it just becomes 100% inverse and shrinks instead.
 	can_synth = FALSE
 	var/message_spam = FALSE
 
@@ -203,7 +199,7 @@
 			M.Knockdown(50)
 			M.Stun(50)
 			P.throw_at(T2, 8, 1)
-		M.reagents.remove_reagent(id, volume)
+		M.reagents.del_reagent(type)
 		return
 	var/mob/living/carbon/human/H = M
 	if(!H.getorganslot(ORGAN_SLOT_PENIS) && H.emergent_genital_call())
@@ -228,7 +224,7 @@
 		P.length = 1
 		to_chat(H, "<span class='warning'>Your groin feels warm, as you feel a newly forming bulge down below.</b></span>")
 		P.prev_length = 1
-		H.reagents.remove_reagent(id, 5)
+		H.reagents.remove_reagent(type, 5)
 		P.Insert(H)
 
 	P.modify_size(0.1)
@@ -271,7 +267,6 @@
 
 /datum/reagent/fermi/PEsmaller // Due to cozmo's request...!
 	name = "Chastity draft"
-	id = "PEsmaller"
 	description = "A volatile collodial mixture derived from various masculine solutions that encourages a smaller gentleman's package via a potent testosterone mix. Produced by reacting impure Incubus draft."
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
@@ -293,7 +288,6 @@
 
 /datum/reagent/fermi/PEsmaller_hypo
 	name = "Rectify draft"
-	id = "PEsmaller_hypo"
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
 	description = "A medicine used to treat organomegaly in a patient's penis."
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index b3ee8f5b7f..e9c5733584 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -3,13 +3,12 @@
 
 /datum/reagent/fermi
 	name = "Fermi" //This should never exist, but it does so that it can exist in the case of errors..
-	id = "fermi"
 	taste_description	= "affection and love!"
 	can_synth = FALSE
 	value = 20
-	impure_chem 			= "fermiTox"// What chemical is metabolised with an inpure reaction
+	impure_chem 			= /datum/reagent/impure/fermiTox // What chemical is metabolised with an inpure reaction
 	inverse_chem_val 		= 0.25		// If the impurity is below 0.5, replace ALL of the chem with inverse_chemupon metabolising
-	inverse_chem			= "fermiTox"
+	inverse_chem			= /datum/reagent/impure/fermiTox
 
 
 //This should process fermichems to find out how pure they are and what effect to do.
@@ -32,7 +31,6 @@
 
 /datum/reagent/fermi/hatmium //for hatterhat
 	name = "Hat growth serium"
-	id = "hatmium"
 	description = "A strange substance that draws in a hat from the hat dimention."
 	color = "#7c311a" // rgb: , 0, 255
 	taste_description = "like jerky, whiskey and an off aftertaste of a crypt."
@@ -80,7 +78,6 @@
 
 /datum/reagent/fermi/furranium
 	name = "Furranium"
-	id = "furranium"
 	description = "OwO whats this?"
 	color = "#f9b9bc" // rgb: , 0, 255
 	taste_description = "dewicious degenyewacy"
@@ -170,13 +167,12 @@
 
 /datum/reagent/fermi/nanite_b_gone
 	name = "Nanite bane"
-	id = "nanite_b_gone"
 	description = "A stablised EMP that is highly volatile, shocking small nano machines that will kill them off at a rapid rate in a patient's system."
 	color = "#708f8f"
 	overdose_threshold = 15
-	impure_chem 			= "nanite_b_goneTox" //If you make an inpure chem, it stalls growth
+	impure_chem 			= /datum/reagent/fermi/nanite_b_goneTox //If you make an inpure chem, it stalls growth
 	inverse_chem_val 		= 0.25
-	inverse_chem		= "nanite_b_goneTox" //At really impure vols, it just becomes 100% inverse
+	inverse_chem		= /datum/reagent/fermi/nanite_b_goneTox //At really impure vols, it just becomes 100% inverse
 	taste_description = "what can only be described as licking a battery."
 	pH = 9
 	value = 90
@@ -214,7 +210,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/nanite_b_goneTox
 	name = "Electromagnetic crystals"
-	id = "nanite_b_goneTox"
 	description = "Causes items upon the patient to sometimes short out, as well as causing a shock in the patient, if the residual charge between the crystals builds up to sufficient quantities"
 	metabolization_rate = 0.5
 	chemical_flags = REAGENT_INVISIBLE
@@ -237,7 +232,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/fermiAcid
 	name = "Acid vapour"
-	id = "fermiAcid"
 	description = "Someone didn't do like an otter, and add acid to water."
 	taste_description = "acid burns, ow"
 	color = "#FFFFFF"
@@ -280,7 +274,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/fermiTest
 	name = "Fermis Test Reagent"
-	id = "fermiTest"
 	description = "You should be really careful with this...! Also, how did you get this?"
 	chemical_flags = REAGENT_FORCEONNEW
 	can_synth = FALSE
@@ -290,7 +283,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 	if(LAZYLEN(holder.reagent_list) == 1)
 		return
 	else
-		holder.remove_reagent("fermiTest", volume)//Avoiding recurrsion
+		holder.del_reagent(type)//Avoiding recurrsion
 	var/location = get_turf(holder.my_atom)
 	if(cached_purity < 0.34 || cached_purity == 1)
 		var/datum/effect_system/foam_spread/s = new()
@@ -303,10 +296,10 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 	if(cached_purity >= 0.67)
 		for (var/datum/reagent/reagent in holder.reagent_list)
 			if (istype(reagent, /datum/reagent/fermi))
-				var/datum/chemical_reaction/fermi/Ferm  = GLOB.chemical_reagents_list[reagent.id]
+				var/datum/chemical_reaction/fermi/Ferm  = GLOB.chemical_reagents_list[reagent.type]
 				Ferm.FermiExplode(src, holder.my_atom, holder, holder.total_volume, holder.chem_temp, holder.pH)
 			else
-				var/datum/chemical_reaction/Ferm  = GLOB.chemical_reagents_list[reagent.id]
+				var/datum/chemical_reaction/Ferm  = GLOB.chemical_reagents_list[reagent.type]
 				Ferm.on_reaction(holder, reagent.volume)
 	for(var/mob/M in viewers(8, location))
 		to_chat(M, "<span class='danger'>The solution reacts dramatically, with a meow!</span>")
@@ -315,7 +308,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/acidic_buffer
 	name = "Acidic buffer"
-	id = "acidic_buffer"
 	description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another."
 	color = "#fbc314"
 	pH = 0
@@ -323,7 +315,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 //Consumes self on addition and shifts pH
 /datum/reagent/fermi/acidic_buffer/on_new(datapH)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return ..()
 	data = datapH
 	if(LAZYLEN(holder.reagent_list) == 1)
@@ -333,19 +325,18 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 	for(var/mob/M in seen)
 		to_chat(M, "<span class='warning'>The beaker fizzes as the pH changes!</b></span>")
 	playsound(get_turf(holder.my_atom), 'sound/FermiChem/bufferadd.ogg', 50, 1)
-	holder.remove_reagent(id, volume, ignore_pH = TRUE)
+	holder.remove_reagent(type, volume, ignore_pH = TRUE)
 	..()
 
 /datum/reagent/fermi/basic_buffer
 	name = "Basic buffer"
-	id = "basic_buffer"
 	description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another."
 	color = "#3853a4"
 	pH = 14
 	can_synth = TRUE
 
 /datum/reagent/fermi/basic_buffer/on_new(datapH)
-	if(holder.has_reagent("stabilizing_agent"))
+	if(holder.has_reagent(/datum/reagent/stabilizing_agent))
 		return ..()
 	data = datapH
 	if(LAZYLEN(holder.reagent_list) == 1)
@@ -355,14 +346,13 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 	for(var/mob/M in seen)
 		to_chat(M, "<span class='warning'>The beaker froths as the pH changes!</b></span>")
 	playsound(get_turf(holder.my_atom), 'sound/FermiChem/bufferadd.ogg', 50, 1)
-	holder.remove_reagent(id, volume, ignore_pH = TRUE)
+	holder.remove_reagent(type, volume, ignore_pH = TRUE)
 	..()
 
 //Turns you into a cute catto while it's in your system.
 //If you manage to gamble perfectly, makes you have cat ears after you transform back. But really, you shouldn't end up with that with how random it is.
 /datum/reagent/fermi/secretcatchem //Should I hide this from code divers? A secret cit chem?
 	name = "secretcatchem" //an attempt at hiding it
-	id = "secretcatchem"
 	description = "An illegal and hidden chem that turns people into cats. It's said that it's so rare and unstable that having it means you've been blessed. If used on someone in crit, it will turn them into a cat permanently, until the cat is killed."
 	taste_description = "hairballs and cream"
 	color = "#ffc224"
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
index fa4f48172b..8668ef76f0 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
@@ -1,14 +1,13 @@
 /datum/reagent/fermi/yamerol
 	name = "Yamerol"
-	id = "yamerol"
 	description = "For when you've trouble speaking or breathing, just yell YAMEROL! A chem that helps soothe any congestion problems and at high concentrations restores damaged lungs and tongues!"
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
 	pH = 8.6
 	overdose_threshold = 35
-	impure_chem 			= "yamerol_tox"
+	impure_chem 			= /datum/reagent/impure/yamerol_tox
 	inverse_chem_val 		= 0.4
-	inverse_chem		= "yamerol_tox"
+	inverse_chem		= /datum/reagent/impure/yamerol_tox
 	can_synth = TRUE
 
 /datum/reagent/fermi/yamerol/on_mob_life(mob/living/carbon/C)
@@ -34,7 +33,7 @@
 			qdel(T)
 			nT.Insert(C)
 			to_chat(C, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")
-			holder.remove_reagent(src.id, "10")
+			holder.remove_reagent(type, 10)
 	..()
 
 /datum/reagent/fermi/yamerol/overdose_process(mob/living/carbon/C)
@@ -50,7 +49,7 @@
 				T = new()
 			T.Insert(C)
 			to_chat(C, "<span class='notice'>You feel your tongue reform in your mouth.</span>")
-			holder.remove_reagent(src.id, "10")
+			holder.remove_reagent(type, 10)
 		else
 			if((oT.name == "fluffy tongue") && (purity == 1))
 				var/obj/item/organ/tongue/T
@@ -62,19 +61,18 @@
 				qdel(oT)
 				T.Insert(C)
 				to_chat(C, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")
-				holder.remove_reagent(src.id, "10")
+				holder.remove_reagent(type, 10)
 
 		if(!C.getorganslot(ORGAN_SLOT_LUNGS))
 			var/obj/item/organ/lungs/yamerol/L = new()
 			L.Insert(C)
 			to_chat(C, "<span class='notice'>You feel the yamerol merge in your chest.</span>")
-			holder.remove_reagent(src.id, "10")
+			holder.remove_reagent(type, 10)
 	C.adjustOxyLoss(-3)
 	..()
 
 /datum/reagent/impure/yamerol_tox
 	name = "Yamer oh no"
-	id = "yamerol_tox"
 	description = "A dangerous, cloying toxin that stucks to a patient’s respiratory system, damaging their tongue, lungs and causing suffocation."
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
@@ -96,7 +94,6 @@
 
 /datum/reagent/synthtissue
 	name = "Synthtissue"
-	id = "synthtissue"
 	description = "Synthetic tissue used for grafting onto damaged organs during surgery, or for treating limb damage. Has a very tight growth window between 305-320, any higher and the temperature will cause the cells to die. Additionally, growth time is considerably long, so chemists are encouraged to leave beakers with said reaction ongoing, while they tend to their other duties."
 	pH = 7.6
 	metabolization_rate = 0.05 //Give them time to graft
@@ -143,7 +140,7 @@
 		if(data["grown_volume"] > 175) //I don't think this is even possible, but damn to I want to see if someone can (bare in mind it takes 2s to grow 0.05u)
 			if(volume >= 14)
 				if(C.regenerate_organs(only_one = TRUE))
-					C.reagents.remove_reagent(id, 15)
+					C.reagents.remove_reagent(type, 15)
 					to_chat(C, "<span class='notice'>You feel something reform inside of you!</span>")
 
 	data["injected_vol"] -= metabolization_rate
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
index c8ebde11d9..87f9d71ce2 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1,6 +1,5 @@
 /datum/reagent/syndicateadrenals
 	name = "Syndicate Adrenaline"
-	id = "syndicateadrenals"
 	description = "Regenerates your stamina and increases your reaction time."
 	color = "#E62111"
 	overdose_threshold = 6
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index fcde3a8b79..31e319edd3 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -9,19 +9,19 @@
 /datum/chemical_reaction/proc/FermiFinish(datum/reagents/holder, var/atom/my_atom, reactVol)
 	if(clear_conversion == REACTION_CLEAR_IMPURE | REACTION_CLEAR_INVERSE)
 		for(var/id in results)
-			var/datum/reagent/R = my_atom.reagents.has_reagent("[id]")
+			var/datum/reagent/R = my_atom.reagents.has_reagent(id)
 			if(R.purity == 1)
 				continue
 
 			var/cached_volume = R.volume
 			if(clear_conversion == REACTION_CLEAR_INVERSE && R.inverse_chem)
 				if(R.inverse_chem_val > R.purity)
-					my_atom.reagents.remove_reagent(R.id, cached_volume, FALSE)
+					my_atom.reagents.remove_reagent(R.type, cached_volume, FALSE)
 					my_atom.reagents.add_reagent(R.inverse_chem, cached_volume, FALSE, other_purity = 1)
 
 			else if (clear_conversion == REACTION_CLEAR_IMPURE && R.impure_chem)
 				var/impureVol = cached_volume * (1 - R.purity)
-				my_atom.reagents.remove_reagent(R.id, (impureVol), FALSE)
+				my_atom.reagents.remove_reagent(R.type, (impureVol), FALSE)
 				my_atom.reagents.add_reagent(R.impure_chem, impureVol, FALSE, other_purity = 1)
 				R.cached_purity = R.purity
 				R.purity = 1
@@ -76,14 +76,15 @@
 	var/datum/effect_system/smoke_spread/chem/s = new()
 	R.my_atom = my_atom //Give the gas a fingerprint
 
-	for (var/datum/reagent/reagent in R0.reagent_list) //make gas for reagents, has to be done this way, otherwise it never stops Exploding
-		R.add_reagent(reagent.id, reagent.volume/3) //Seems fine? I think I fixed the infinite explosion bug.
+	for (var/A in R0.reagent_list) //make gas for reagents, has to be done this way, otherwise it never stops Exploding
+		var/datum/reagent/R2 = A
+		R.add_reagent(R2.type, R2.volume/3) //Seems fine? I think I fixed the infinite explosion bug.
 
-		if (reagent.purity < 0.6)
-			ImpureTot = (ImpureTot + (1-reagent.purity)) / 2
+		if (R2.purity < 0.6)
+			ImpureTot = (ImpureTot + (1-R2.purity)) / 2
 
 	if(pH < 4) //if acidic, make acid spray
-		R.add_reagent("fermiAcid", (volume/3))
+		R.add_reagent(/datum/reagent/impure/fermiTox, (volume/3))
 	if(R.reagent_list)
 		s.set_up(R, (volume/5), my_atom)
 		s.start()
@@ -103,9 +104,9 @@
 
 /datum/chemical_reaction/fermi/eigenstate
 	name = "Eigenstasium"
-	id = "eigenstate"
-	results = list("eigenstate" = 1)
-	required_reagents = list("bluespace" = 1, "stable_plasma" = 1, "sugar" = 1)
+	id = /datum/reagent/fermi/eigenstate
+	results = list(/datum/reagent/fermi/eigenstate = 1)
+	required_reagents = list(/datum/reagent/bluespace = 1, /datum/reagent/stable_plasma = 1, /datum/reagent/consumable/caramel = 1)
 	mix_message = "the reaction zaps suddenly!"
 	//FermiChem vars:
 	OptimalTempMin 		= 350 // Lower area of bell curve for determining heat based rate reactions
@@ -137,9 +138,9 @@
 //serum
 /datum/chemical_reaction/fermi/SDGF
 	name = "Synthetic-derived growth factor"
-	id = "SDGF"
-	results = list("SDGF" = 3)
-	required_reagents = list("stable_plasma" = 1.5, "clonexadone" = 1.5, "uranium" = 1.5, "synthflesh" = 1.5)
+	id = /datum/reagent/fermi/SDGF
+	results = list(/datum/reagent/fermi/SDGF = 3)
+	required_reagents = list(/datum/reagent/stable_plasma = 1.5, /datum/reagent/medicine/clonexadone = 1.5, /datum/reagent/uranium = 1.5, /datum/reagent/medicine/synthflesh = 1.5)
 	mix_message = "the reaction gives off a blorble!"
 	required_temp = 1
 	//FermiChem vars:
@@ -178,9 +179,9 @@
 
 /datum/chemical_reaction/fermi/breast_enlarger
 	name = "Sucubus milk"
-	id = "breast_enlarger"
-	results = list("breast_enlarger" = 8)
-	required_reagents = list("salglu_solution" = 1, "milk" = 1, "synthflesh" = 2, "silicon" = 3, "aphro" = 3)
+	id = /datum/reagent/fermi/breast_enlarger
+	results = list(/datum/reagent/fermi/breast_enlarger = 8)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/drug/aphrodisiac = 3)
 	mix_message = "the reaction gives off a mist of milk."
 	//FermiChem vars:
 	OptimalTempMin 			= 200
@@ -203,8 +204,8 @@
 	var/datum/reagent/fermi/breast_enlarger/BE = locate(/datum/reagent/fermi/breast_enlarger) in my_atom.reagents.reagent_list
 	var/cached_volume = BE.volume
 	if(BE.purity < 0.35)
-		holder.remove_reagent(src.id, cached_volume)
-		holder.add_reagent("BEsmaller", cached_volume)
+		holder.remove_reagent(type, cached_volume)
+		holder.add_reagent(/datum/reagent/fermi/BEsmaller, cached_volume)
 
 
 /datum/chemical_reaction/fermi/breast_enlarger/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
@@ -218,9 +219,9 @@
 
 /datum/chemical_reaction/fermi/penis_enlarger
 	name = "Incubus draft"
-	id = "penis_enlarger"
-	results = list("penis_enlarger" = 8)
-	required_reagents = list("blood" = 5, "synthflesh" = 2, "carbon" = 2, "aphro" = 2, "salglu_solution" = 1)
+	id = /datum/reagent/fermi/penis_enlarger
+	results = list(/datum/reagent/fermi/penis_enlarger = 8)
+	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/drug/aphrodisiac = 2, /datum/reagent/medicine/salglu_solution = 1)
 	mix_message = "the reaction gives off a spicy mist."
 	//FermiChem vars:
 	OptimalTempMin 			= 200
@@ -252,14 +253,14 @@
 	var/datum/reagent/fermi/penis_enlarger/PE = locate(/datum/reagent/fermi/penis_enlarger) in my_atom.reagents.reagent_list
 	var/cached_volume = PE.volume
 	if(PE.purity < 0.35)
-		holder.remove_reagent(src.id, cached_volume)
-		holder.add_reagent("PEsmaller", cached_volume)
+		holder.remove_reagent(type, cached_volume)
+		holder.add_reagent(/datum/reagent/fermi/PEsmaller, cached_volume)
 
 /datum/chemical_reaction/fermi/astral
 	name = "Astrogen"
-	id = "astral"
-	results = list("astral" = 5)
-	required_reagents = list("eigenstate" = 1, "plasma" = 3, "synaptizine" = 1, "aluminium" = 5)
+	id = /datum/reagent/fermi/astral
+	results = list(/datum/reagent/fermi/astral = 5)
+	required_reagents = list(/datum/reagent/fermi/eigenstate = 1, /datum/reagent/toxin/plasma = 3, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/aluminium = 5)
 	//FermiChem vars:
 	OptimalTempMin 			= 700
 	OptimalTempMax			= 800
@@ -278,12 +279,12 @@
 	PurityMin 				= 0.25
 
 
-/datum/chemical_reaction/fermi/enthrall/ //check this
+/datum/chemical_reaction/fermi/enthrall //check this
 	name = "MKUltra"
-	id = "enthrall"
-	results = list("enthrall" = 5)
-	required_reagents = list("cocoa" = 1, "bluespace" = 1, "mindbreaker" = 1, "psicodine" = 1, "happiness" = 1)
-	required_catalysts = list("blood" = 1)
+	id = /datum/reagent/fermi/enthrall
+	results = list(/datum/reagent/fermi/enthrall = 5)
+	required_reagents = list(/datum/reagent/consumable/coco = 1, /datum/reagent/bluespace = 1, /datum/reagent/toxin/mindbreaker = 1, /datum/reagent/medicine/psicodine = 1, /datum/reagent/drug/happiness = 1)
+	required_catalysts = list(/datum/reagent/blood = 1)
 	mix_message = "the reaction gives off a burgundy plume of smoke!"
 	//FermiChem vars:
 	OptimalTempMin 			= 780
@@ -325,7 +326,8 @@
 
 //So slimes can play too.
 /datum/chemical_reaction/fermi/enthrall/slime
-	required_catalysts = list("jellyblood" = 1)
+	id = "enthrall2"
+	required_catalysts = list(/datum/reagent/blood/jellyblood = 1)
 
 /datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom)
 	var/datum/reagent/blood/jellyblood/B = locate(/datum/reagent/blood/jellyblood) in my_atom.reagents.reagent_list//The one line change.
@@ -350,16 +352,16 @@
 	var/turf/T = get_turf(my_atom)
 	var/datum/reagents/R = new/datum/reagents(1000)
 	var/datum/effect_system/smoke_spread/chem/s = new()
-	R.add_reagent("enthrallExplo", volume)
+	R.add_reagent(/datum/reagent/fermi/enthrallExplo, volume)
 	s.set_up(R, volume/2, T)
 	s.start()
 	my_atom.reagents.clear_reagents()
 
 /datum/chemical_reaction/fermi/hatmium // done
 	name = "Hat growth serum"
-	id = "hatmium"
-	results = list("hatmium" = 5)
-	required_reagents = list("ethanol" = 1, "nutriment" = 3, "cooking_oil" = 2, "iron" = 1, "gold" = 3)
+	id = /datum/reagent/fermi/hatmium
+	results = list(/datum/reagent/fermi/hatmium = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/iron = 1, /datum/reagent/gold = 3)
 	//mix_message = ""
 	//FermiChem vars:
 	OptimalTempMin 	= 500
@@ -392,9 +394,9 @@
 
 /datum/chemical_reaction/fermi/furranium
 	name = "Furranium"
-	id = "furranium"
-	results = list("furranium" = 5)
-	required_reagents = list("aphro" = 1, "moonsugar" = 1, "silver" = 2, "salglu_solution" = 1)
+	id = /datum/reagent/fermi/furranium
+	results = list(/datum/reagent/fermi/furranium = 5)
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/moonsugar = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
 	mix_message = "You think you can hear a howl come from the beaker."
 	//FermiChem vars:
 	OptimalTempMin 	= 350
@@ -413,7 +415,8 @@
 	PurityMin		= 0.3
 
 /datum/chemical_reaction/fermi/furranium/organic
-	required_reagents = list("aphro" = 1, "catnip" = 1, "silver" = 2, "salglu_solution" = 1)
+	id = "furranium_organic"
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/pax/catnip = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
 
 //FOR INSTANT REACTIONS - DO NOT MULTIPLY LIMIT BY 10.
 //There's a weird rounding error or something ugh.
@@ -421,9 +424,9 @@
 //Nano-b-gone
 /datum/chemical_reaction/fermi/nanite_b_gone//done test
 	name = "Naninte bain"
-	id = "nanite_b_gone"
-	results = list("nanite_b_gone" = 4)
-	required_reagents = list("synthflesh" = 1, "uranium" = 1, "iron" = 1, "salglu_solution" = 1)
+	id = /datum/reagent/fermi/nanite_b_gone
+	results = list(/datum/reagent/fermi/nanite_b_gone = 4)
+	required_reagents = list(/datum/reagent/medicine/synthflesh = 1, /datum/reagent/uranium = 1, /datum/reagent/iron = 1, /datum/reagent/medicine/salglu_solution = 1)
 	mix_message = "the reaction gurgles, encapsulating the reagents in flesh before the emp can be set off."
 	required_temp = 450//To force fermireactions before EMP.
 	//FermiChem vars:
@@ -443,9 +446,9 @@
 
 /datum/chemical_reaction/fermi/acidic_buffer//done test
 	name = "Acetic acid buffer"
-	id = "acidic_buffer"
-	results = list("acidic_buffer" = 10) //acetic acid
-	required_reagents = list("salglu_solution" = 1, "ethanol" = 3, "oxygen" = 3, "water" = 3)
+	id = /datum/reagent/fermi/acidic_buffer
+	results = list(/datum/reagent/fermi/acidic_buffer = 10) //acetic acid
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/consumable/ethanol = 3, /datum/reagent/oxygen = 3, /datum/reagent/water = 3)
 	//FermiChem vars:
 	OptimalTempMin 	= 250
 	OptimalTempMax 	= 500
@@ -470,10 +473,10 @@
 
 /datum/chemical_reaction/fermi/basic_buffer//done test
 	name = "Ethyl Ethanoate buffer"
-	id = "basic_buffer"
-	results = list("basic_buffer" = 5)
-	required_reagents = list("lye" = 1, "ethanol" = 2, "water" = 2)
-	required_catalysts = list("sacid" = 1) //vagely acetic
+	id = /datum/reagent/fermi/basic_buffer
+	results = list(/datum/reagent/fermi/basic_buffer = 5)
+	required_reagents = list(/datum/reagent/lye = 1, /datum/reagent/consumable/ethanol = 2, /datum/reagent/water = 2)
+	required_catalysts = list(/datum/reagent/toxin/acid = 1) //vagely acetic
 	//FermiChem vars:
 	OptimalTempMin 	= 250
 	OptimalTempMax 	= 500
@@ -502,10 +505,10 @@
 //ChemReactionVars:
 /datum/chemical_reaction/fermi/secretcatchem //DONE
 	name = "secretcatchem"
-	id = "secretcatchem"
-	results = list("secretcatchem" = 5)
-	required_reagents = list("stable_plasma" = 1, "sugar" = 1, "cream" = 1, "clonexadone" = 1)//Yes this will make a kitty if you don't lucky guess. It'll eat all your reagents too.
-	required_catalysts = list("SDGF" = 1)
+	id = /datum/reagent/fermi/secretcatchem
+	results = list(/datum/reagent/fermi/secretcatchem = 5)
+	required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/consumable/caramel = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/medicine/clonexadone = 1)//Yes this will make a kitty if you don't lucky guess. It'll eat all your reagents too.
+	required_catalysts = list(/datum/reagent/fermi/SDGF = 1)
 	required_temp = 500
 	mix_message = "the reaction gives off a meow!"
 	mix_sound = "modular_citadel/sound/voice/merowr.ogg"
@@ -536,8 +539,8 @@
 	HIonRelease 		+= (rand(-25, 25)/100)
 	RateUpLim 			+= (rand(1, 1000)/100)
 	PurityMin 			+= (rand(-1, 1)/10)
-	var/additions = list("aluminium", "silver", "gold", "plasma", "silicon", "uranium", "milk")
-	required_reagents[pick(additions)] = rand(1, 5)//weird
+	var/picked = pick(/datum/reagent/aluminium, /datum/reagent/silver, /datum/reagent/gold, /datum/reagent/toxin/plasma, /datum/reagent/silicon, /datum/reagent/uranium, /datum/reagent/consumable/milk)
+	required_reagents[picked] = rand(1, 5)//weird
 
 /datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)
 	SSblackbox.record_feedback("tally", "catgirlium")//log
@@ -555,9 +558,9 @@
 
 /datum/chemical_reaction/fermi/yamerol//done test
 	name = "Yamerol"
-	id = "yamerol"
-	results = list("yamerol" = 3)
-	required_reagents = list("perfluorodecalin" = 1, "salbutamol" = 1, "water" = 1)
+	id = /datum/reagent/fermi/yamerol
+	results = list(/datum/reagent/fermi/yamerol = 3)
+	required_reagents = list(/datum/reagent/medicine/perfluorodecalin = 1, /datum/reagent/medicine/salbutamol = 1, /datum/reagent/water = 1)
 	//FermiChem vars:
 	OptimalTempMin 	= 300
 	OptimalTempMax 	= 500
diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
index f6b70eb7b6..b907c27329 100644
--- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
+++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
@@ -1,7 +1,6 @@
 //body bluids
 /datum/reagent/consumable/semen
 	name = "Semen"
-	id = "semen"
 	description = "Sperm from some animal. I bet you'll drink this out of a bucket someday."
 	taste_description = "something salty"
 	taste_mult = 2 //Not very overpowering flavor
@@ -45,7 +44,6 @@
 
 /datum/reagent/consumable/femcum
 	name = "Female Ejaculate"
-	id = "femcum"
 	description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business."
 	taste_description = "something with a tang" // wew coders who haven't eaten out a girl.
 	taste_mult = 2
@@ -93,7 +91,6 @@
 
 /datum/reagent/drug/aphrodisiac
 	name = "Crocin"
-	id = "aphro"
 	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
 	taste_description = "strawberry roofies"
 	taste_mult = 2 //Hide the roofies in stronger flavors
@@ -112,7 +109,6 @@
 
 /datum/reagent/drug/aphrodisiacplus
 	name = "Hexacrocin"
-	id = "aphro+"
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
 					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a \
 					permanent increase in libido (commonly referred to as 'bimbofication')."
@@ -167,7 +163,6 @@
 
 /datum/reagent/drug/anaphrodisiac
 	name = "Camphor"
-	id = "anaphro"
 	description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\
 					, reducing libido and calming them. Non-habit forming and not addictive."
 	taste_description = "dull bitterness"
@@ -182,7 +177,6 @@
 
 /datum/reagent/drug/anaphrodisiacplus
 	name = "Hexacamphor"
-	id = "anaphro+"
 	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
 	taste_description = "tranquil celibacy"
 	color = "#D9D9D9"//rgb(217, 217, 217)
@@ -206,32 +200,32 @@
 //recipes
 /datum/chemical_reaction/aphro
 	name = "crocin"
-	id = "aphro"
-	results = list("aphro" = 6)
-	required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "water" = 1)
+	id = /datum/reagent/drug/aphrodisiac
+	results = list(/datum/reagent/drug/aphrodisiac = 6)
+	required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/oxygen = 2, /datum/reagent/water = 1)
 	required_temp = 400
 	mix_message = "The mixture boils off a pink vapor..."//The water boils off, leaving the crocin
 
 /datum/chemical_reaction/aphroplus
 	name = "hexacrocin"
-	id = "aphro+"
-	results = list("aphro+" = 1)
-	required_reagents = list("aphro" = 6, "phenol" = 1)
+	id = /datum/reagent/drug/aphrodisiacplus
+	results = list(/datum/reagent/drug/aphrodisiacplus = 1)
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 6, /datum/reagent/phenol = 1)
 	required_temp = 400
 	mix_message = "The mixture rapidly condenses and darkens in color..."
 
 /datum/chemical_reaction/anaphro
 	name = "camphor"
-	id = "anaphro"
-	results = list("anaphro" = 6)
-	required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "sulfur" = 1)
+	id = /datum/reagent/drug/anaphrodisiac
+	results = list(/datum/reagent/drug/anaphrodisiac = 6)
+	required_reagents = list(/datum/reagent/carbon = 2, /datum/reagent/hydrogen = 2, /datum/reagent/oxygen = 2, /datum/reagent/sulfur = 1)
 	required_temp = 400
 	mix_message = "The mixture boils off a yellow, smelly vapor..."//Sulfur burns off, leaving the camphor
 
 /datum/chemical_reaction/anaphroplus
 	name = "pentacamphor"
-	id = "anaphro+"
-	results = list("anaphro+" = 1)
-	required_reagents = list("anaphro" = 5, "acetone" = 1)
+	id = /datum/reagent/drug/anaphrodisiacplus
+	results = list(/datum/reagent/drug/anaphrodisiacplus = 1)
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 5, /datum/reagent/acetone = 1)
 	required_temp = 300
 	mix_message = "The mixture thickens and heats up slighty..."
diff --git a/modular_citadel/icons/mob/widerobot.dmi b/modular_citadel/icons/mob/widerobot.dmi
index 7e9da953c9..43a6863ece 100644
Binary files a/modular_citadel/icons/mob/widerobot.dmi and b/modular_citadel/icons/mob/widerobot.dmi differ
diff --git a/sound/effects/bonghit.ogg b/sound/effects/bonghit.ogg
new file mode 100644
index 0000000000..45a0dec1b6
Binary files /dev/null and b/sound/effects/bonghit.ogg differ
diff --git a/sound/weapons/klonk.ogg b/sound/weapons/klonk.ogg
new file mode 100644
index 0000000000..471f3ad8b7
Binary files /dev/null and b/sound/weapons/klonk.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 91792e92ff..ee76228cbb 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -43,6 +43,7 @@
 #include "code\__DEFINES\diseases.dm"
 #include "code\__DEFINES\DNA.dm"
 #include "code\__DEFINES\donator_groupings.dm"
+#include "code\__DEFINES\dynamic.dm"
 #include "code\__DEFINES\events.dm"
 #include "code\__DEFINES\exports.dm"
 #include "code\__DEFINES\fantasy_affixes.dm"
@@ -108,6 +109,7 @@
 #include "code\__DEFINES\typeids.dm"
 #include "code\__DEFINES\vehicles.dm"
 #include "code\__DEFINES\voreconstants.dm"
+#include "code\__DEFINES\vote.dm"
 #include "code\__DEFINES\vv.dm"
 #include "code\__DEFINES\wall_dents.dm"
 #include "code\__DEFINES\wires.dm"
@@ -118,6 +120,7 @@
 #include "code\__HELPERS\areas.dm"
 #include "code\__HELPERS\AStar.dm"
 #include "code\__HELPERS\cmp.dm"
+#include "code\__HELPERS\custom_holoforms.dm"
 #include "code\__HELPERS\dates.dm"
 #include "code\__HELPERS\dna.dm"
 #include "code\__HELPERS\donator_groupings.dm"
@@ -227,6 +230,7 @@
 #include "code\controllers\configuration\entries\dbconfig.dm"
 #include "code\controllers\configuration\entries\donator.dm"
 #include "code\controllers\configuration\entries\dynamic.dm"
+#include "code\controllers\configuration\entries\fail2topic.dm"
 #include "code\controllers\configuration\entries\game_options.dm"
 #include "code\controllers\configuration\entries\general.dm"
 #include "code\controllers\subsystem\acid.dm"
@@ -243,6 +247,7 @@
 #include "code\controllers\subsystem\dcs.dm"
 #include "code\controllers\subsystem\disease.dm"
 #include "code\controllers\subsystem\events.dm"
+#include "code\controllers\subsystem\fail2topic.dm"
 #include "code\controllers\subsystem\fire_burning.dm"
 #include "code\controllers\subsystem\garbage.dm"
 #include "code\controllers\subsystem\icon_smooth.dm"
@@ -469,6 +474,8 @@
 #include "code\datums\elements\_element.dm"
 #include "code\datums\elements\cleaning.dm"
 #include "code\datums\elements\earhealing.dm"
+#include "code\datums\elements\ghost_role_eligibility.dm"
+#include "code\datums\elements\wuv.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\getrev.dm"
 #include "code\datums\helper_datums\icon_snapshot.dm"
@@ -528,6 +535,7 @@
 #include "code\datums\wires\airlock.dm"
 #include "code\datums\wires\apc.dm"
 #include "code\datums\wires\autolathe.dm"
+#include "code\datums\wires\autoylathe.dm"
 #include "code\datums\wires\emitter.dm"
 #include "code\datums\wires\explosive.dm"
 #include "code\datums\wires\microwave.dm"
@@ -585,6 +593,7 @@
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_latejoin.dm"
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm"
 #include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
+#include "code\game\gamemodes\dynamic\dynamic_storytellers.dm"
 #include "code\game\gamemodes\extended\extended.dm"
 #include "code\game\gamemodes\gangs\dominator.dm"
 #include "code\game\gamemodes\gangs\dominator_countdown.dm"
@@ -662,6 +671,7 @@
 #include "code\game\machinery\syndicatebeacon.dm"
 #include "code\game\machinery\syndicatebomb.dm"
 #include "code\game\machinery\teleporter.dm"
+#include "code\game\machinery\toylathe.dm"
 #include "code\game\machinery\transformer.dm"
 #include "code\game\machinery\turnstile.dm"
 #include "code\game\machinery\washing_machine.dm"
@@ -1443,6 +1453,7 @@
 #include "code\modules\assembly\igniter.dm"
 #include "code\modules\assembly\infrared.dm"
 #include "code\modules\assembly\mousetrap.dm"
+#include "code\modules\assembly\playback.dm"
 #include "code\modules\assembly\proximity.dm"
 #include "code\modules\assembly\shock_kit.dm"
 #include "code\modules\assembly\signaler.dm"
@@ -1606,6 +1617,7 @@
 #include "code\modules\clothing\clothing.dm"
 #include "code\modules\clothing\ears\_ears.dm"
 #include "code\modules\clothing\glasses\_glasses.dm"
+#include "code\modules\clothing\glasses\disablerglasses.dm"
 #include "code\modules\clothing\glasses\engine_goggles.dm"
 #include "code\modules\clothing\glasses\hud.dm"
 #include "code\modules\clothing\glasses\phantomthief.dm"
@@ -2031,6 +2043,7 @@
 #include "code\modules\mining\mint.dm"
 #include "code\modules\mining\money_bag.dm"
 #include "code\modules\mining\ores_coins.dm"
+#include "code\modules\mining\point_bank.dm"
 #include "code\modules\mining\satchel_ore_boxdm.dm"
 #include "code\modules\mining\shelters.dm"
 #include "code\modules\mining\equipment\explorer_gear.dm"
@@ -2114,6 +2127,7 @@
 #include "code\modules\mob\living\say.dm"
 #include "code\modules\mob\living\status_procs.dm"
 #include "code\modules\mob\living\taste.dm"
+#include "code\modules\mob\living\update_icons.dm"
 #include "code\modules\mob\living\ventcrawling.dm"
 #include "code\modules\mob\living\brain\brain.dm"
 #include "code\modules\mob\living\brain\brain_item.dm"
@@ -2220,6 +2234,7 @@
 #include "code\modules\mob\living\carbon\monkey\monkey_defense.dm"
 #include "code\modules\mob\living\carbon\monkey\punpun.dm"
 #include "code\modules\mob\living\carbon\monkey\update_icons.dm"
+#include "code\modules\mob\living\silicon\custom_holoform.dm"
 #include "code\modules\mob\living\silicon\damage_procs.dm"
 #include "code\modules\mob\living\silicon\death.dm"
 #include "code\modules\mob\living\silicon\examine.dm"
@@ -2251,6 +2266,7 @@
 #include "code\modules\mob\living\silicon\pai\personality.dm"
 #include "code\modules\mob\living\silicon\pai\say.dm"
 #include "code\modules\mob\living\silicon\pai\software.dm"
+#include "code\modules\mob\living\silicon\pai\update_icon.dm"
 #include "code\modules\mob\living\silicon\robot\death.dm"
 #include "code\modules\mob\living\silicon\robot\emote.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
@@ -2723,6 +2739,7 @@
 #include "code\modules\research\stock_parts.dm"
 #include "code\modules\research\designs\AI_module_designs.dm"
 #include "code\modules\research\designs\autobotter_designs.dm"
+#include "code\modules\research\designs\autoylathe_designs.dm"
 #include "code\modules\research\designs\biogenerator_designs.dm"
 #include "code\modules\research\designs\bluespace_designs.dm"
 #include "code\modules\research\designs\computer_part_designs.dm"
@@ -3015,6 +3032,7 @@
 #include "code\modules\vending\engineering.dm"
 #include "code\modules\vending\engivend.dm"
 #include "code\modules\vending\games.dm"
+#include "code\modules\vending\kinkmate.dm"
 #include "code\modules\vending\liberation.dm"
 #include "code\modules\vending\liberation_toy.dm"
 #include "code\modules\vending\magivend.dm"
@@ -3027,6 +3045,7 @@
 #include "code\modules\vending\security.dm"
 #include "code\modules\vending\snack.dm"
 #include "code\modules\vending\sovietsoda.dm"
+#include "code\modules\vending\sovietvend.dm"
 #include "code\modules\vending\sustenance.dm"
 #include "code\modules\vending\toys.dm"
 #include "code\modules\vending\wardrobes.dm"
@@ -3059,15 +3078,9 @@
 #include "modular_citadel\code\_onclick\hud\screen_objects.dm"
 #include "modular_citadel\code\_onclick\hud\sprint.dm"
 #include "modular_citadel\code\_onclick\hud\stamina.dm"
-#include "modular_citadel\code\datums\components\material_container.dm"
 #include "modular_citadel\code\datums\components\souldeath.dm"
 #include "modular_citadel\code\datums\status_effects\chems.dm"
 #include "modular_citadel\code\datums\status_effects\debuffs.dm"
-#include "modular_citadel\code\datums\wires\autoylathe.dm"
-#include "modular_citadel\code\game\machinery\displaycases.dm"
-#include "modular_citadel\code\game\machinery\Sleeper.dm"
-#include "modular_citadel\code\game\machinery\toylathe.dm"
-#include "modular_citadel\code\game\machinery\vending.dm"
 #include "modular_citadel\code\game\machinery\wishgranter.dm"
 #include "modular_citadel\code\game\objects\cit_screenshake.dm"
 #include "modular_citadel\code\game\objects\items.dm"
@@ -3076,12 +3089,9 @@
 #include "modular_citadel\code\game\objects\items\balls.dm"
 #include "modular_citadel\code\game\objects\items\boombox.dm"
 #include "modular_citadel\code\game\objects\items\stunsword.dm"
-#include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\headset.dm"
 #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"
-#include "modular_citadel\code\game\objects\structures\tables_racks.dm"
-#include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
 #include "modular_citadel\code\modules\admin\admin.dm"
 #include "modular_citadel\code\modules\admin\chat_commands.dm"
 #include "modular_citadel\code\modules\admin\holder2.dm"
@@ -3178,6 +3188,5 @@
 #include "modular_citadel\code\modules\reagents\objects\clothes.dm"
 #include "modular_citadel\code\modules\reagents\objects\items.dm"
 #include "modular_citadel\code\modules\reagents\reagents\cit_reagents.dm"
-#include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\interface\skin.dmf"
 // END_INCLUDE
diff --git a/tgui/src/interfaces/point_bank.ract b/tgui/src/interfaces/point_bank.ract
new file mode 100644
index 0000000000..837a66427a
--- /dev/null
+++ b/tgui/src/interfaces/point_bank.ract
@@ -0,0 +1,60 @@
+<ui-display>
+	<ui-section>
+		Current stored points: {{data.totalPoints}}
+            <div class="display tabular">
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    -All
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    -1000
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    -100
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    -10
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    -1
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        Transfer Points
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    +1
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    +10
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    +100
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    +1000
+		    	    </ui-button>
+                </section>
+                <section class="cell">
+			        <ui-button action='Claim'>
+		    		    +All
+		    	    </ui-button>
+                </section>
+            </div>
+	</ui-section>
+</ui-display>