diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
index 3a7fb09aa5f6..a751740c08a2 100644
--- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -1859,15 +1859,8 @@
 	pixel_y = -32;
 	pixel_x = 32
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	desc = "A cup with a strange flag emblazoned on it.";
-	pixel_y = 4;
-	pixel_x = 9
-	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	desc = "A cup with a strange flag emblazoned on it.";
-	pixel_y = -2
-	},
+/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/reagent_containers/food/drinks/bottle/wine{
 	pixel_y = 10;
 	pixel_x = -9
diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
index d17c4f371728..82c054f8fabf 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -1480,7 +1480,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{
 	pixel_y = 12;
 	pixel_x = -7
 	},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
index 15350793fad4..3efc7429d803 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -150,7 +150,7 @@
 	pixel_x = -5;
 	pixel_y = 12
 	},
-/obj/item/clothing/head/helmet/chaplain/ancient{
+/obj/item/clothing/head/witchunter{
 	pixel_y = 13;
 	pixel_x = -5
 	},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
new file mode 100644
index 000000000000..f4f938f0b7b4
--- /dev/null
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -0,0 +1,7757 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"ac" = (
+/obj/structure/curtain,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"ae" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/donut_box,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"am" = (
+/obj/effect/turf_decal/road/stop,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"ap" = (
+/obj/structure/table_frame,
+/obj/effect/decal/cleanable/glass,
+/obj/item/shard,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"as" = (
+/obj/machinery/door/airlock/command{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "sec"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/adminstrative)
+"av" = (
+/obj/structure/fence/door{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ax" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"aA" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"aE" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 8
+	},
+/obj/machinery/light/broken/directional/south,
+/obj/effect/decal/cleanable/glass,
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"aL" = (
+/obj/item/camera,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"aM" = (
+/obj/item/documents/nanotrasen,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/stock_parts/cell/gun/upgraded,
+/obj/structure/safe,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"aW" = (
+/obj/machinery/door/airlock/outpost,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/overmap_encounter/planetoid/cave/explored)
+"bd" = (
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"bh" = (
+/obj/effect/turf_decal/trimline/opaque/lime/filled/warning{
+	dir = 1
+	},
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"bi" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+	dir = 10
+	},
+/obj/structure/sign/poster/official/safety_report{
+	pixel_x = -32
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"bl" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"bm" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "foreman";
+	name = "Office Lockdown";
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"bn" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"br" = (
+/obj/item/stack/rods,
+/obj/structure/disposalpipe/broken{
+	dir = 1
+	},
+/obj/structure/disposalpipe/broken{
+	dir = 8
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"bs" = (
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"bx" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/machinery/button/door{
+	id = "sec";
+	pixel_y = -22;
+	name = "Security Lockdown";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/adminstrative)
+"bz" = (
+/obj/structure/table/wood,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"bE" = (
+/obj/structure/closet/crate/trashcart,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/item/storage/bag/trash,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/mop,
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"bH" = (
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"bQ" = (
+/obj/effect/turf_decal/trimline/opaque/lime/corner,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"ca" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"ce" = (
+/obj/machinery/conveyor{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/cave/explored)
+"ch" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"cm" = (
+/obj/structure/table/wood,
+/obj/machinery/light/directional/east,
+/obj/effect/spawner/lootdrop/waste/trash,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"co" = (
+/obj/structure/flora/ausbushes/fullgrass/hell,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"cu" = (
+/obj/effect/turf_decal/siding/white/corner,
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "bubblegumfoot"
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"cx" = (
+/obj/structure/sink{
+	pixel_y = 10
+	},
+/obj/item/storage/pill_bottle{
+	pixel_x = 5;
+	pixel_y = -4
+	},
+/obj/item/storage/pill_bottle{
+	pixel_x = 12;
+	pixel_y = -2
+	},
+/obj/item/storage/pill_bottle{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/pill/morphine{
+	pixel_x = -15
+	},
+/obj/item/reagent_containers/pill/morphine{
+	pixel_x = -10;
+	pixel_y = 5
+	},
+/obj/structure/mirror{
+	icon_state = "mirror_broke";
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"cy" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"cz" = (
+/obj/effect/turf_decal/box/corners,
+/obj/structure/crate_shelf,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"cD" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"cE" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/rust,
+/area/ruin/lavaland/factory/warehouse)
+"cL" = (
+/obj/structure/flora/rock/pile,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"cO" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"cR" = (
+/obj/machinery/button/door{
+	id = "sec";
+	name = "Security Lockdown";
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"cU" = (
+/obj/structure/flora/rock/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"cX" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"cZ" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"dc" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"dk" = (
+/obj/item/stack/rods,
+/obj/item/stack/cable_coil/cut/yellow,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/lava/explored)
+"dl" = (
+/obj/machinery/shower{
+	pixel_y = -5;
+	dir = 1
+	},
+/obj/structure/curtain,
+/obj/item/bikehorn/rubberducky,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"dm" = (
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "foreman"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/overmap_encounter/planetoid/cave/explored)
+"du" = (
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"dA" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/item/storage/bag/ore,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"dH" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"dL" = (
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"dS" = (
+/obj/structure/flora/ausbushes/grassybush/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"dY" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"ei" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"el" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"en" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/obj/machinery/door/airlock,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"ev" = (
+/obj/effect/gibspawner/human,
+/obj/effect/decal/remains/human,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"ex" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 6
+	},
+/obj/structure/bed,
+/obj/item/bedsheet/hos,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"ey" = (
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/adminstrative)
+"eD" = (
+/obj/item/shard,
+/obj/effect/decal/cleanable/glass,
+/obj/item/stack/rods,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "foreman"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/manager_office)
+"eE" = (
+/obj/item/trash/can,
+/obj/item/trash/can/food/beans{
+	pixel_x = 5;
+	pixel_y = 10
+	},
+/obj/item/trash/can/food/beans{
+	pixel_x = -4;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"eG" = (
+/obj/effect/turf_decal/siding{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"eH" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 6
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"eI" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"eO" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"eR" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"eT" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "foreman"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"eU" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"eW" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"fc" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"fg" = (
+/obj/item/reagent_containers/food/drinks/flask/gold,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/item/clothing/gloves/color/captain/nt,
+/obj/item/storage/belt/sabre,
+/obj/item/clothing/under/nanotrasen/captain/skirt,
+/obj/structure/closet/cabinet,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"fm" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"fq" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/stand_clear,
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"fr" = (
+/obj/effect/turf_decal/ntlogo{
+	dir = 4
+	},
+/obj/item/stock_parts/cell/gun/empty,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"fs" = (
+/obj/item/shovel,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"ft" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"fB" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"fE" = (
+/turf/template_noop,
+/area/template_noop)
+"ga" = (
+/mob/living/simple_animal/hostile/human/syndicate/ranged/space,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"gc" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 1
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"gg" = (
+/obj/structure/flora/tree/dead/barren,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"gj" = (
+/obj/item/radio/intercom/directional/north,
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"gk" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/item/modular_computer/laptop,
+/obj/item/stack/arcadeticket,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"go" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"gs" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"gt" = (
+/obj/machinery/vending/snack/orange,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"gu" = (
+/obj/item/stack/cable_coil/cut/yellow,
+/obj/structure/salvageable/machine,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"gG" = (
+/obj/effect/turf_decal/siding{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"gI" = (
+/obj/effect/turf_decal/siding/white,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"gJ" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/stack/rods,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"gL" = (
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"gO" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/item/reagent_containers/food/drinks/beer/light,
+/obj/item/reagent_containers/food/drinks/beer/light,
+/obj/item/reagent_containers/food/drinks/beer/light,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/storage/box/ingredients/vegetarian,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"gT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ha" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/office,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"hb" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/machinery/door/airlock{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"hf" = (
+/obj/effect/turf_decal/ntlogo{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"hh" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"hm" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"hu" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/stand_clear,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"hv" = (
+/obj/machinery/light/broken/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/lavaland/factory/manager_office)
+"hw" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"hy" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"hJ" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"hT" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"hY" = (
+/obj/structure/flora/ausbushes/sparsegrass/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"hZ" = (
+/obj/structure/floodlight_frame,
+/obj/effect/decal/cleanable/glass,
+/obj/item/light/tube/broken,
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ia" = (
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/lavaland/factory/manager_office)
+"ih" = (
+/obj/structure/frame/machine,
+/obj/item/stack/ore/salvage/scrapmetal{
+	pixel_x = -10;
+	pixel_y = 2
+	},
+/obj/item/stack/ore/salvage/scrapmetal{
+	pixel_x = -10;
+	pixel_y = 2
+	},
+/obj/item/stack/cable_coil/cut/random,
+/obj/structure/sign/poster/official/moth/hardhats{
+	pixel_y = 32
+	},
+/obj/item/circuitboard/machine/stacking_machine,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"ii" = (
+/obj/item/chair{
+	dir = 8
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"io" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	start_empty = 1
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ip" = (
+/obj/structure/flora/ausbushes/ywflowers/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"iE" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"iP" = (
+/turf/closed/wall/r_wall,
+/area/ruin/lavaland/factory/warehouse)
+"iR" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"iS" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"iU" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 5
+	},
+/obj/structure/sign/poster/official/nanotrasen_logo{
+	pixel_y = 32
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"iW" = (
+/obj/structure/flora/ausbushes/ywflowers/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"jb" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"jf" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"ji" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"jk" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"jm" = (
+/obj/structure/flora/rock/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"jr" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner,
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"ju" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 5
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"jx" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"jz" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"jC" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"jE" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/machinery/door/airlock,
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"jG" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"jJ" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"jM" = (
+/obj/structure/sink{
+	pixel_y = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"jP" = (
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"jQ" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/lobby)
+"jV" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4
+	},
+/obj/structure/rack,
+/obj/item/clothing/head/hardhat{
+	pixel_y = 5;
+	pixel_x = -2
+	},
+/obj/item/clothing/head/hardhat{
+	pixel_x = 10;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"jW" = (
+/obj/machinery/button/door{
+	id = "management";
+	name = "Office Lockdown";
+	dir = 8;
+	pixel_x = 22
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"jX" = (
+/obj/structure/flora/rock/lava,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"ka" = (
+/obj/structure/lattice,
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"kj" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"ku" = (
+/obj/structure/railing{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/light/broken/directional/north,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"kv" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"kx" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"kz" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "drip1"
+	},
+/obj/item/spear,
+/obj/item/bodypart/l_arm,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"kB" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12
+	},
+/obj/structure/mirror{
+	pixel_x = 28
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"kD" = (
+/obj/structure/flora/tree/dead/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"kG" = (
+/obj/effect/decal/cleanable/ash/large,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"kJ" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"kO" = (
+/obj/structure/flora/ausbushes/ywflowers/hell,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"kT" = (
+/obj/effect/decal/cleanable/generic,
+/obj/item/stack/cable_coil/cut/yellow,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/lava/explored)
+"kV" = (
+/obj/structure/rack,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"kY" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"lc" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/obj/structure/crate_shelf,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"lf" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 5
+	},
+/obj/structure/guncase,
+/obj/item/gun/energy/e_gun,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"lj" = (
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/adminstrative)
+"lo" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"lq" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"lr" = (
+/obj/item/stack/cable_coil/cut/yellow,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"lv" = (
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"lw" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 5
+	},
+/obj/machinery/light/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"ly" = (
+/obj/structure/flora/tree/dead/tall/grey,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"lB" = (
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 10
+	},
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"lQ" = (
+/obj/structure/table_frame,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"lR" = (
+/obj/effect/decal/cleanable/blood/gibs/core,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stamp/qm{
+	pixel_x = 7;
+	pixel_y = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"lU" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/grille/broken,
+/obj/machinery/door/poddoor/shutters{
+	id = "foreman"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/manager_office)
+"md" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/obj/structure/flippedtable{
+	dir = 4
+	},
+/obj/effect/mob_spawn/human/miner,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/effect/decal/cleanable/blood/gibs/bubblegum,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"mi" = (
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/cave/explored)
+"mk" = (
+/obj/machinery/computer/mech_bay_power_console{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"mn" = (
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"mv" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"mG" = (
+/obj/machinery/door/airlock/glass,
+/obj/machinery/door/poddoor/shutters{
+	id = "sec"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"mK" = (
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 8
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"mL" = (
+/obj/structure/flora/ash/cacti,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"mM" = (
+/obj/item/clothing/head/beret/qm,
+/obj/item/clothing/under/rank/cargo/qm,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/structure/closet/cabinet,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"mQ" = (
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "floor5"
+	},
+/obj/machinery/light/built/directional/south,
+/obj/item/light/tube/broken,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"mS" = (
+/obj/structure/flora/rock/pile/lava,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"mT" = (
+/obj/structure/flora/ausbushes/ywflowers/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"mU" = (
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"mY" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"nf" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"nh" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/structure/table,
+/obj/machinery/reagentgrinder,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"nk" = (
+/obj/structure/toilet{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/vomit/old,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"nm" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"ns" = (
+/obj/structure/flora/ausbushes/fullgrass/hell,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"nv" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"nA" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"nD" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"nG" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"nH" = (
+/obj/structure/flippedtable,
+/obj/item/gun/energy/e_gun,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"nK" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"nL" = (
+/obj/effect/turf_decal/siding/white,
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"nO" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"nP" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria,
+/obj/item/storage/bag/tray/cafeteria{
+	pixel_y = 2
+	},
+/obj/item/storage/bag/tray/cafeteria{
+	pixel_y = 4
+	},
+/obj/item/storage/bag/tray/cafeteria{
+	pixel_y = 6
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"nT" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/turf/open/floor/carpet/nanoweave/red,
+/area/ruin/lavaland/factory/adminstrative)
+"nV" = (
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"oc" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -10;
+	pixel_y = 12
+	},
+/obj/item/paper_bin{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/obj/item/pen{
+	pixel_y = 4;
+	pixel_x = 5
+	},
+/obj/item/folder/blue{
+	pixel_x = -10;
+	pixel_y = -5
+	},
+/obj/effect/turf_decal/corner/opaque/red/border,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"of" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/item/storage/wallet/random,
+/obj/item/instrument/guitar,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"oh" = (
+/obj/structure/salvageable/protolathe,
+/obj/structure/lattice,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"oi" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/trash/can/food{
+	icon_state = "lemon-lime"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"ok" = (
+/obj/structure/toilet{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"ol" = (
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 4
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"om" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "gibbl2"
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"or" = (
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"os" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/white{
+	dir = 6
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"oz" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"oE" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/rust,
+/area/overmap_encounter/planetoid/lava/explored)
+"oI" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/machinery/light/directional/east,
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/obj/item/reagent_containers/food/snacks/meat/slab,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"oJ" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/item/wrench,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"oL" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"oO" = (
+/obj/structure/table/wood,
+/obj/item/newspaper{
+	desc = "An issue of The Griffon from 497 FS, a newspaper often found circulating aboard Nanotrasen Space Stations. Most of the articles have been ripped out.";
+	name = "torn up newspaper"
+	},
+/obj/item/photo/old{
+	desc = "A worn out photo. You can barely make out a few figures. They're all smiling.";
+	name = "worn out photo";
+	pixel_x = -5
+	},
+/obj/item/cane,
+/obj/item/flashlight/lamp/green{
+	pixel_x = -6;
+	pixel_y = 13
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/adminstrative)
+"pb" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"pc" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"pn" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"po" = (
+/obj/machinery/door/airlock/command,
+/obj/machinery/door/poddoor/shutters{
+	id = "management"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"pp" = (
+/obj/structure/toilet{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"pq" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/glass/twenty,
+/obj/item/stack/sheet/metal/twenty,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"pt" = (
+/obj/structure/fence{
+	dir = 4
+	},
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"pw" = (
+/obj/structure/flora/rock/pile,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"pH" = (
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"pI" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"pL" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"pP" = (
+/obj/item/stack/ore/salvage/scrapgold,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"pV" = (
+/obj/machinery/power/floodlight,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"pX" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"qe" = (
+/obj/machinery/conveyor{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"qm" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"qn" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/flippedtable{
+	dir = 8
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"qo" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"qs" = (
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"qu" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/item/storage/bag/ore,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"qz" = (
+/obj/item/stack/ore/salvage/scrapmetal{
+	pixel_x = -10;
+	pixel_y = 2
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"qH" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"qK" = (
+/obj/effect/turf_decal/trimline/opaque/beige/arrow_cw{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/disposalpipe/segment{
+	dir = 1
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"qM" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating/rust,
+/area/overmap_encounter/planetoid/lava/explored)
+"qP" = (
+/obj/effect/decal/cleanable/garbage,
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"qS" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/bookcase/random,
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"qV" = (
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/lava/explored)
+"qX" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/machinery/light/directional/west,
+/obj/item/poster/random_contraband,
+/obj/item/toy/eightball,
+/obj/item/toy/cards/deck/tarot,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"rh" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/chair/sofa/brown/corpo/right{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"rj" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"rB" = (
+/obj/structure/flora/ausbushes/fernybush/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"rF" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken/directional/west,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"rI" = (
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"rO" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "floor3"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"rV" = (
+/obj/effect/mob_spawn/human/doctor,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "floor4"
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"se" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"sf" = (
+/obj/structure/table/reinforced,
+/obj/item/megaphone/cargo,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"sj" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"sm" = (
+/obj/machinery/disposal/deliveryChute{
+	dir = 8
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"sn" = (
+/obj/structure/chair/greyscale{
+	dir = 8
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"so" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"sp" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ss" = (
+/obj/item/shard,
+/obj/effect/decal/cleanable/glass,
+/obj/structure/railing,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"su" = (
+/turf/open/floor/plating/asteroid/basalt/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"sv" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/stand_clear,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"sD" = (
+/obj/effect/turf_decal/road/stop{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/item/shard,
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"sE" = (
+/obj/structure/toilet{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/machinery/light/small/directional/east,
+/mob/living/simple_animal/hostile/viscerator,
+/mob/living/simple_animal/hostile/viscerator,
+/mob/living/simple_animal/hostile/viscerator,
+/obj/effect/gibspawner/human,
+/obj/item/clothing/under/rank/cargo/tech,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"sG" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"sQ" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 9
+	},
+/obj/structure/closet/secure_closet/security,
+/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun,
+/obj/item/clothing/suit/armor/vest,
+/obj/item/clothing/head/helmet/sec,
+/obj/item/clothing/glasses/hud/security/sunglasses,
+/obj/item/radio/headset/headset_sec/alt,
+/obj/item/restraints/handcuffs,
+/obj/item/flashlight/seclite,
+/obj/machinery/button/door{
+	id = "sec";
+	pixel_y = 22;
+	name = "Security Lockdown"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"sT" = (
+/obj/structure/sink{
+	pixel_y = 10
+	},
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"sU" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 4
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"sV" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"sZ" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/dorms)
+"td" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"tg" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 1
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"th" = (
+/obj/item/rack_parts/shelf,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"ti" = (
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"tj" = (
+/obj/item/toy/plush/nukeplushie,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"tm" = (
+/obj/structure/sign/departments/engineering,
+/turf/closed/wall/r_wall,
+/area/ruin/lavaland/factory/warehouse)
+"tq" = (
+/obj/structure/closet/crate/engineering/electrical,
+/obj/item/circuitboard/machine/cell_charger,
+/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/cell/high/empty,
+/obj/item/stock_parts/cell/high/empty,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"ts" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"tu" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ty" = (
+/obj/machinery/light/broken/directional/east,
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/lavaland/factory/manager_office)
+"tH" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"tN" = (
+/obj/effect/turf_decal/trimline/opaque/lime/corner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"tR" = (
+/obj/structure/flora/ausbushes/genericbush/hell,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"tS" = (
+/obj/machinery/mineral/unloading_machine{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"tT" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"tV" = (
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"uc" = (
+/obj/structure/flora/ausbushes/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"ud" = (
+/obj/effect/turf_decal/ntlogo{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"ui" = (
+/obj/structure/flora/ash/leaf_shroom,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"us" = (
+/obj/machinery/door/airlock/freezer{
+	dir = 1;
+	name = "bathroom"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"ux" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "gibarm"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "drip1"
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"uz" = (
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Bathroom";
+	id_tag = "sgi_bolt"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"uE" = (
+/turf/closed/wall/r_wall,
+/area/ruin/lavaland/factory/manager_office)
+"uH" = (
+/obj/structure/closet/crate/secure/engineering{
+	name = "ripley crate"
+	},
+/obj/item/mecha_parts/chassis/ripley,
+/obj/item/circuitboard/mecha/ripley/main,
+/obj/item/circuitboard/mecha/ripley/peripherals,
+/obj/item/mecha_parts/part/ripley_left_arm,
+/obj/item/mecha_parts/part/ripley_left_leg,
+/obj/item/mecha_parts/part/ripley_right_arm,
+/obj/item/mecha_parts/part/ripley_right_leg,
+/obj/item/mecha_parts/part/ripley_torso,
+/obj/item/mecha_parts/mecha_equipment/drill,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"uJ" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"uL" = (
+/obj/effect/decal/cleanable/generic,
+/obj/structure/closet/crate/medical,
+/obj/item/reagent_containers/glass/bottle/morphine,
+/obj/item/reagent_containers/syringe,
+/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/clothing/neck/stethoscope,
+/obj/item/storage/firstaid/medical,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"uV" = (
+/obj/machinery/door/airlock/command{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"uW" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/item/storage/fancy/cigarettes/cigpack_cannabis,
+/obj/item/lighter/greyscale,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"ve" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"vj" = (
+/obj/structure/mirror,
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/dorms)
+"vp" = (
+/obj/effect/turf_decal/trimline/opaque/lime/corner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"vv" = (
+/obj/effect/turf_decal/box/corners,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"vw" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"vx" = (
+/obj/structure/flora/ausbushes/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"vy" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"vB" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/obj/structure/closet/crate/large,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"vC" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"vE" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"vG" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"vH" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"vN" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"vP" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/chair/comfy/beige,
+/mob/living/simple_animal/hostile/human/nanotrasen/elite{
+	name = "Manager";
+	environment_smash = 0;
+	health = 200;
+	maxHealth = 200
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"vQ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"vS" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"wi" = (
+/obj/structure/flora/ausbushes/genericbush/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"wk" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"wl" = (
+/obj/structure/flora/ash/cacti,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"wt" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"wM" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"wO" = (
+/obj/structure/flora/ash/leaf_shroom,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"wP" = (
+/obj/machinery/conveyor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/overmap_encounter/planetoid/cave/explored)
+"wR" = (
+/obj/structure/table/wood,
+/obj/item/radio/intercom/table{
+	dir = 4;
+	pixel_x = 4
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"wU" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "foreman"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/manager_office)
+"xb" = (
+/obj/structure/flora/ausbushes/fernybush/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"xi" = (
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"xj" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/waterbottle/empty{
+	pixel_x = -7
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/empty,
+/obj/item/reagent_containers/food/drinks/waterbottle/empty{
+	pixel_x = 7;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/empty{
+	pixel_y = 5;
+	pixel_x = -7
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/empty{
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/empty{
+	pixel_x = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"xm" = (
+/obj/effect/decal/cleanable/ash,
+/obj/structure/disposalpipe/segment{
+	dir = 1
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"xw" = (
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "floor6"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"xz" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"xB" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"xC" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/weldingtool/largetank,
+/obj/item/clothing/glasses/welding,
+/obj/structure/sign/poster/official/safety_eye_protection{
+	pixel_x = -32
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"xY" = (
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 10
+	},
+/obj/item/ammo_casing/shotgun/buckshot{
+	icon_state = "buckshot-empty";
+	pixel_x = 10;
+	pixel_y = 11;
+	projectile_type = null
+	},
+/obj/machinery/button/door{
+	id = "sec";
+	pixel_y = -22;
+	name = "Security Lockdown";
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"xZ" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 10
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"yi" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"yo" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/obj/effect/decal/cleanable/blood/gibs/down,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"yq" = (
+/obj/structure/displaycase/noalert{
+	start_showpiece_type = /obj/item/gun/energy/e_gun/hades
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"yw" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/structure/sign/warning/incident,
+/turf/closed/wall/r_wall,
+/area/ruin/lavaland/factory/warehouse)
+"yy" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/robot_debris/down,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"yF" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"yG" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/mob/living/simple_animal/hostile/human/syndicate/melee/space,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"yK" = (
+/obj/effect/turf_decal/trimline/opaque/beige/line{
+	dir = 5
+	},
+/obj/machinery/door/airlock/mining{
+	dir = 4;
+	name = "Warehouse"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"yN" = (
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"yP" = (
+/obj/structure/flora/tree/dead/tall,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"yQ" = (
+/turf/closed/indestructible/titanium,
+/area/ruin/lavaland/factory/manager_office)
+"yU" = (
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"yX" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"yY" = (
+/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"zf" = (
+/obj/structure/bed/double{
+	dir = 1
+	},
+/obj/item/bedsheet/double/captain{
+	dir = 1
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/adminstrative)
+"zg" = (
+/obj/structure/flora/ausbushes/fernybush/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"zh" = (
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/broken/directional/north,
+/obj/machinery/door/poddoor/crusher{
+	name = "Malfunctioning Presser"
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"zj" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/ammo_casing/shotgun/buckshot{
+	icon_state = "buckshot-empty";
+	pixel_x = 5;
+	pixel_y = -13;
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"zk" = (
+/obj/machinery/light/directional/east,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"zl" = (
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/kitchen/knife/combat/survival,
+/obj/structure/closet/crate/secure/gear,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"zs" = (
+/obj/structure/table/wood,
+/obj/item/modular_computer/laptop/preset/civilian/rilena,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/adminstrative)
+"zx" = (
+/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"zz" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/obj/item/ammo_box/magazine/smgm9mm{
+	start_empty = 1
+	},
+/obj/item/gun/ballistic/automatic/smg/proto,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"zC" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"zD" = (
+/obj/machinery/door/airlock/command/glass,
+/obj/machinery/door/poddoor/shutters{
+	id = "sec"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"zI" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"zJ" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/built/directional/north,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"zO" = (
+/obj/effect/decal/cleanable/glass,
+/obj/structure/table_frame,
+/obj/item/stack/sheet/plasteel,
+/obj/machinery/door/poddoor/shutters{
+	id = "foreman"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/manager_office)
+"zQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/clothing/mask/gas/explorer,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Ac" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"Ai" = (
+/obj/structure/table_frame,
+/obj/effect/decal/cleanable/blood/gibs/old,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"Al" = (
+/obj/structure/filingcabinet/double,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"An" = (
+/obj/structure/fence{
+	dir = 4
+	},
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Ao" = (
+/obj/structure/girder/reinforced,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"AB" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"AC" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "warehouse";
+	name = "Warehouse Shutters";
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"AE" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"AG" = (
+/obj/effect/decal/cleanable/plastic,
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"AI" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"AM" = (
+/obj/effect/turf_decal/road/stop{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"AP" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/light/small/directional/east,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"AT" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"AW" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/salvageable/computer{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Ba" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Bd" = (
+/obj/effect/turf_decal/trimline/opaque/red/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"Be" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/smes/engineering,
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"Bh" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"Bo" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/titanium,
+/area/overmap_encounter/planetoid/lava/explored)
+"Br" = (
+/obj/item/trash/can/food{
+	icon_state = "ice_tea_can";
+	pixel_x = -7;
+	pixel_y = 10
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"Bs" = (
+/obj/effect/turf_decal/box/corners,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Bv" = (
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/floodlight,
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"By" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/secure_data/laptop{
+	dir = 4;
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"BA" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window{
+	dir = 8
+	},
+/obj/structure/windoor_assembly{
+	dir = 4;
+	name = "broken windoor"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"Cc" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"Ci" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Ck" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"Cu" = (
+/obj/structure/flora/ausbushes/hell,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"CG" = (
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"CP" = (
+/obj/machinery/door/airlock/command{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"CT" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/machinery/light/directional/west,
+/obj/item/kitchen/knife/hunting,
+/obj/item/clothing/suit/hooded/cloak/goliath,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"CW" = (
+/obj/structure/girder/reinforced,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"CX" = (
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Dd" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "gibmid2"
+	},
+/obj/item/toy/cards/deck,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Df" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Dk" = (
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"Dt" = (
+/obj/item/rack_parts/shelf,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Dz" = (
+/obj/structure/lattice,
+/obj/structure/salvageable/machine,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"DB" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"DE" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"DK" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"DP" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"DT" = (
+/obj/machinery/door/airlock{
+	name = "Restroom"
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "sec"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"DY" = (
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Eb" = (
+/obj/effect/decal/cleanable/blood{
+	icon_state = "gib3"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"Ee" = (
+/obj/effect/turf_decal/trimline/opaque/lime/filled/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Eg" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/engineering{
+	name = "mining crate"
+	},
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/mining_scanner,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Ek" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"El" = (
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "foreman"
+	},
+/turf/open/floor/plasteel/dark,
+/area/overmap_encounter/planetoid/cave/explored)
+"Ev" = (
+/obj/item/storage/toolbox/electrical,
+/obj/structure/table,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"EC" = (
+/obj/structure/bed{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 10
+	},
+/obj/item/bedsheet/hos{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"EK" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"EP" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"EQ" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken/directional/west,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"EU" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"EW" = (
+/obj/structure/crate_shelf,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Fe" = (
+/obj/effect/decal/cleanable/generic,
+/obj/structure/railing,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Fk" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Fm" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/clothing/head/hardhat{
+	pixel_y = 5;
+	pixel_x = -2
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Fs" = (
+/obj/item/trash/plate,
+/obj/item/trash/can/food/beans{
+	pixel_x = -4;
+	pixel_y = 7
+	},
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"Fv" = (
+/obj/effect/turf_decal/corner/opaque/red/border,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"Fw" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Fx" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"FC" = (
+/obj/structure/flora/rock/pile,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"FH" = (
+/obj/effect/decal/cleanable/ash,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"FJ" = (
+/obj/item/toy/cards/singlecard{
+	icon_state = "syndicate_hand3"
+	},
+/obj/machinery/light/broken/directional/east,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"FM" = (
+/obj/effect/turf_decal/trimline/opaque/beige/arrow_cw,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"FY" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 9
+	},
+/obj/machinery/button/door{
+	id = "sec";
+	pixel_y = 22;
+	name = "Security Lockdown"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"FZ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/ore/salvage/scrapmetal/five,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Ga" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Gc" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"Gj" = (
+/obj/structure/table,
+/obj/machinery/jukebox/boombox,
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Gn" = (
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "management";
+	pixel_y = 22;
+	name = "Door Buzzer"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/lavaland/factory/manager_office)
+"Go" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Gp" = (
+/obj/item/trash/sosjerky,
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"Gw" = (
+/mob/living/simple_animal/bot/secbot/ed209/rockplanet{
+	faction = list("Deathsquad");
+	name = "\improper  ED-209 Robot"
+	},
+/turf/open/floor/circuit/red,
+/area/ruin/lavaland/factory/manager_office)
+"Gy" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"GC" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"GE" = (
+/obj/item/trash/chips,
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"GJ" = (
+/obj/structure/flora/ausbushes/fullgrass/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"GK" = (
+/obj/machinery/door/airlock/outpost,
+/turf/open/floor/plasteel/dark,
+/area/overmap_encounter/planetoid/cave/explored)
+"GL" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken/directional/north,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"GO" = (
+/obj/structure/fence,
+/turf/open/floor/concrete/slab_1/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"GP" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/broken,
+/obj/structure/disposalpipe/broken{
+	dir = 1
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"GR" = (
+/obj/effect/turf_decal/siding/white/corner,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"GS" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/champagne{
+	pixel_y = 20;
+	pixel_x = -5
+	},
+/obj/item/storage/bag/tray,
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/commemorative{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/commemorative{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"GT" = (
+/obj/structure/flora/ausbushes/grassybush/hell,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"GW" = (
+/obj/structure/flora/ausbushes/sparsegrass/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Ha" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Hc" = (
+/obj/machinery/mineral/processing_unit{
+	input_dir = 8;
+	output_dir = 1
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Hl" = (
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Ho" = (
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Hp" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"Hs" = (
+/obj/structure/salvageable/computer,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"HA" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/human/syndicate/ranged/space,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"HJ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/structure/dresser,
+/obj/item/toy/figure/assistant{
+	pixel_x = -10;
+	pixel_y = 12
+	},
+/obj/item/toy/figure/cargotech{
+	pixel_y = 12
+	},
+/obj/item/toy/figure/ian{
+	pixel_y = 5
+	},
+/obj/item/toy/figure/tali{
+	pixel_x = 10;
+	pixel_y = 12
+	},
+/obj/item/toy/figure/syndie{
+	pixel_x = -10;
+	pixel_y = 5
+	},
+/obj/item/toy/figure/head_of_personnel{
+	pixel_y = 5;
+	pixel_x = 10
+	},
+/obj/machinery/button/door{
+	id = "foreman";
+	pixel_y = 22;
+	name = "Office Lockdown"
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"HK" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"HL" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"HO" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"HS" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Id" = (
+/obj/structure/table/wood,
+/obj/machinery/fax/ruin,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"Ie" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"If" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 1
+	},
+/obj/structure/flippedtable{
+	dir = 4
+	},
+/obj/item/reagent_containers/food/drinks/bottle/molotov,
+/obj/item/lighter/greyscale{
+	pixel_x = -8;
+	pixel_y = -7
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Ij" = (
+/obj/item/storage/cans/sixbeer,
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"Il" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"In" = (
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Iz" = (
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"IG" = (
+/obj/structure/table,
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/paper_bin{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/obj/item/pen{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"II" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/ammo_casing/shotgun/buckshot{
+	icon_state = "buckshot-empty";
+	pixel_x = -3;
+	pixel_y = -10;
+	projectile_type = null
+	},
+/obj/item/ammo_casing/shotgun/buckshot{
+	icon_state = "buckshot-empty";
+	pixel_x = 7;
+	pixel_y = 9;
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"IJ" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"IO" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"IQ" = (
+/obj/machinery/door/airlock/security,
+/obj/machinery/door/poddoor/shutters{
+	id = "sec"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"IX" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Jc" = (
+/mob/living/simple_animal/hostile/human/syndicate/ranged/space,
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"Jd" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Jk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/mecha_wreckage/ripley,
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Jt" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"JM" = (
+/obj/structure/table/glass,
+/obj/item/phone,
+/obj/structure/sign/poster/contraband/space_cola{
+	pixel_y = 32
+	},
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"JO" = (
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/lavaland/factory/manager_office)
+"JQ" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"JT" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/obj/machinery/door/airlock{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Kc" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/obj/structure/closet/crate/internals,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/storage/toolbox/emergency,
+/obj/item/storage/toolbox/emergency,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Kg" = (
+/obj/machinery/photocopier,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"Km" = (
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"Kp" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"KB" = (
+/obj/effect/decal/cleanable/plastic,
+/obj/structure/railing,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"KI" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/gibspawner/human,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"KK" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"KM" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"KS" = (
+/obj/item/stack/rods,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"KX" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/manager_office)
+"La" = (
+/obj/structure/flora/ausbushes/sparsegrass/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"Lb" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 6
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Lq" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/corner,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"Lv" = (
+/turf/open/floor/carpet/nanoweave/blue,
+/area/ruin/lavaland/factory/lobby)
+"LB" = (
+/obj/item/stack/cable_coil/cut/yellow,
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"LE" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"LF" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"LI" = (
+/obj/structure/flora/ausbushes/sparsegrass/hell,
+/obj/structure/flora/rock/pile,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"LK" = (
+/obj/effect/turf_decal/industrial/stand_clear,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"LL" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"LP" = (
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"LR" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"LS" = (
+/obj/effect/turf_decal/ntlogo,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"LU" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/obj/item/chair{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"LW" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/item/kitchen/knife/shiv,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"LX" = (
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"LZ" = (
+/turf/open/lava/smooth,
+/area/overmap_encounter/planetoid/lava/explored)
+"Mb" = (
+/obj/structure/railing{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
+	dir = 6
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ruin/lavaland/factory/lobby)
+"Md" = (
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"Me" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Mk" = (
+/obj/structure/flora/ash/fern,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"Mm" = (
+/obj/structure/ore_box,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"Mp" = (
+/obj/item/wallframe/apc,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Mq" = (
+/obj/structure/salvageable/computer,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"MC" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"ME" = (
+/obj/machinery/vending/cola/shamblers,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"MF" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/structure/table,
+/obj/item/kitchen/fork{
+	pixel_x = -10;
+	pixel_y = 3
+	},
+/obj/item/kitchen/fork{
+	pixel_x = -8;
+	pixel_y = 2
+	},
+/obj/item/kitchen/fork{
+	pixel_x = -6;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 10;
+	pixel_y = 2
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_y = 10;
+	pixel_x = 2
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"MH" = (
+/turf/closed/mineral/volcanic,
+/area/overmap_encounter/planetoid/cave/explored)
+"MJ" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"ML" = (
+/obj/structure/bed/roller,
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "xfloor1"
+	},
+/obj/item/reagent_containers/hypospray/medipen{
+	icon_state = "medipen0";
+	pixel_y = 10;
+	list_reagents = null
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"MY" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"MZ" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Ne" = (
+/obj/structure/flora/tree/dead/tall,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"Nj" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Nr" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"NA" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/light/broken/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"NE" = (
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/closed/mineral/volcanic,
+/area/overmap_encounter/planetoid/cave/explored)
+"NG" = (
+/obj/structure/flippedtable,
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/gibspawner/human/bodypartless,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"NM" = (
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"NP" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"Oc" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_y = 10;
+	pixel_x = -6
+	},
+/obj/item/toy/figure/captain{
+	pixel_x = 10
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"Oe" = (
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Om" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"Op" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "armorblood"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "drip5"
+	},
+/obj/effect/decal/cleanable/robot_debris,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Oq" = (
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 8
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Or" = (
+/obj/structure/closet/crate/freezer,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/obj/item/reagent_containers/food/drinks/waterbottle/large,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Ou" = (
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Ox" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/item/kirbyplants/photosynthetic,
+/obj/structure/sign/poster/official/soft_cap_pop_art{
+	pixel_y = -32
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"OE" = (
+/obj/structure/flora/ausbushes/fullgrass/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"OG" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "gibbl1"
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"OO" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/adminstrative)
+"OS" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Pb" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 5
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Pf" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 4
+	},
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"Pg" = (
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+"Ph" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Pi" = (
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"Pk" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/obj/structure/closet/wall/white/directional/west{
+	name = "shower locker"
+	},
+/obj/item/soap/nanotrasen,
+/obj/item/towel,
+/obj/item/towel,
+/obj/item/towel,
+/obj/item/soap/nanotrasen,
+/obj/item/soap/nanotrasen,
+/obj/item/soap/nanotrasen,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Pp" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	id = "foreman"
+	},
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/manager_office)
+"Pt" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Pv" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/item/stamp/hos{
+	pixel_x = 10;
+	pixel_y = -8
+	},
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"PE" = (
+/obj/effect/mob_spawn/human/corpse/charredskeleton,
+/obj/item/clothing/neck/cloak/qm,
+/obj/structure/closet/crate/grave/loot,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"PH" = (
+/obj/structure/table,
+/obj/item/stack/ore/salvage/scraptitanium,
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"PK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mob_spawn/human/engineer,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"PL" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"PQ" = (
+/obj/structure/chair/greyscale{
+	dir = 4
+	},
+/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"PR" = (
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "management"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ruin/lavaland/factory/manager_office)
+"PT" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Qa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Qc" = (
+/turf/open/floor/carpet/nanoweave,
+/area/ruin/lavaland/factory/manager_office)
+"Qh" = (
+/obj/machinery/mech_bay_recharge_port{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Qw" = (
+/obj/structure/flora/rock/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"QA" = (
+/obj/item/folder/yellow{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/structure/fluff/paper/stack{
+	dir = 1
+	},
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"QB" = (
+/obj/structure/lattice,
+/obj/item/stack/cable_coil/cut/yellow,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"QG" = (
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 1
+	},
+/obj/item/pen/fourcolor,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"QK" = (
+/obj/effect/turf_decal/trimline/opaque/lime/filled/warning,
+/obj/effect/turf_decal/siding{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"QM" = (
+/obj/structure/table/wood,
+/obj/item/cutting_board,
+/obj/item/kitchen/knife,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"QR" = (
+/obj/structure/flora/ausbushes/grassybush/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"Rd" = (
+/obj/item/stack/rods,
+/obj/item/stack/rods,
+/obj/item/stack/rods,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/cave/explored)
+"Re" = (
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Bathroom";
+	id_tag = "sgi_bolt"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"Rj" = (
+/obj/item/stack/ore/salvage/scrapmetal{
+	pixel_x = -15;
+	pixel_y = -10
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Rn" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/chair/comfy/blue{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"Ro" = (
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 4
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Rv" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"RA" = (
+/obj/structure/curtain,
+/obj/machinery/shower{
+	pixel_y = 15
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/adminstrative)
+"RC" = (
+/obj/effect/turf_decal/siding/white,
+/obj/item/ammo_box/magazine/m10mm{
+	start_empty = 1
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"RF" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/light/directional/south,
+/obj/structure/chair/sofa/brown/corpo/left{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"RI" = (
+/obj/item/stack/sheet/metal,
+/obj/structure/railing,
+/turf/open/floor/plating,
+/area/overmap_encounter/planetoid/cave/explored)
+"RK" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"RO" = (
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"RU" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/obj/item/assembly/prox_sensor,
+/obj/item/bot_assembly/ed209,
+/turf/open/floor/circuit/red,
+/area/ruin/lavaland/factory/manager_office)
+"RZ" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/lavaland/factory/dorms)
+"Sa" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/ore/salvage/scrapmetal,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Sd" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/lava/explored)
+"Sm" = (
+/obj/structure/chair/greyscale{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"Sn" = (
+/obj/item/stock_parts/matter_bin,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/disposalpipe/segment{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Sq" = (
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 10
+	},
+/obj/machinery/light/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Su" = (
+/obj/effect/turf_decal/trimline/opaque/beige/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Sx" = (
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"SC" = (
+/obj/effect/turf_decal/trimline/opaque/beige/line{
+	dir = 6
+	},
+/obj/machinery/door/airlock/mining{
+	dir = 4;
+	name = "Warehouse"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"SE" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"SK" = (
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 5
+	},
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/opaque/lime{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"SL" = (
+/turf/closed/indestructible/reinforced,
+/area/ruin/lavaland/factory/manager_office)
+"SP" = (
+/obj/item/stack/ore/salvage/scrapmetal,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"SQ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"SR" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = 5
+	},
+/obj/item/pen/fountain/captain{
+	pixel_x = 5
+	},
+/obj/item/stamp/captain{
+	pixel_x = -8
+	},
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/manager_office)
+"SZ" = (
+/obj/structure/chair,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"Tc" = (
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 9
+	},
+/obj/machinery/door/airlock{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Tg" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Th" = (
+/obj/structure/sink{
+	pixel_y = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 9
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Tj" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 9
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier,
+/obj/effect/gibspawner/human/bodypartless,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Tn" = (
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"Tt" = (
+/obj/machinery/door/airlock/security/glass,
+/obj/machinery/door/poddoor/shutters{
+	id = "sec"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"Tx" = (
+/obj/machinery/door/airlock/command/glass,
+/obj/machinery/door/poddoor/shutters{
+	id = "foreman"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"TC" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/obj/item/rack_parts,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"TG" = (
+/obj/structure/falsewall/reinforced,
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/warehouse)
+"TI" = (
+/obj/effect/turf_decal/trimline/opaque/lime/corner{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/blood/gibs/down,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"TP" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/industrial/warning,
+/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"TS" = (
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"TZ" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Uf" = (
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Uh" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "warehouse"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/warehouse)
+"Ui" = (
+/obj/structure/flora/ausbushes/fullgrass/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"Uj" = (
+/obj/effect/turf_decal/corner/opaque/red/border{
+	dir = 8
+	},
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/adminstrative)
+"Up" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Ut" = (
+/obj/structure/closet/secure_closet/quartermaster{
+	populate = 0
+	},
+/obj/machinery/light/dim/directional/north,
+/obj/item/clipboard,
+/obj/item/storage/box/shipping,
+/obj/item/clothing/suit/space/hardsuit/mining/heavy,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/stock_parts/cell/gun/mini,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"Uu" = (
+/obj/structure/flora/ausbushes/sparsegrass/hell,
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"Uz" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"UC" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"UF" = (
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ruin/lavaland/factory/warehouse)
+"UG" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/machinery/suit_storage_unit/open,
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"UJ" = (
+/obj/item/bedsheet/qm{
+	dir = 4
+	},
+/obj/structure/bed{
+	dir = 1
+	},
+/obj/item/toy/plush/kari,
+/turf/open/floor/carpet/blue,
+/area/ruin/lavaland/factory/adminstrative)
+"UO" = (
+/obj/structure/table_frame,
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"US" = (
+/obj/structure/sign/warning/securearea,
+/turf/closed/wall/concrete,
+/area/overmap_encounter/planetoid/lava/explored)
+"UX" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 1
+	},
+/area/ruin/lavaland/factory/adminstrative)
+"UY" = (
+/obj/effect/turf_decal/corner/opaque/red{
+	dir = 10
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"Va" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Ve" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning{
+	dir = 4
+	},
+/mob/living/simple_animal/hostile/viscerator,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"Vn" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile/shuttle,
+/turf/open/floor/plating,
+/area/ruin/lavaland/factory/manager_office)
+"Vp" = (
+/obj/item/stack/sheet/metal,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Vw" = (
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"VA" = (
+/obj/structure/flora/ausbushes/fullgrass/hell,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"VC" = (
+/obj/item/stack/ore/salvage/scrapmetal{
+	pixel_x = -15;
+	pixel_y = -10
+	},
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"VD" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/obj/effect/mob_spawn/human/corpse/assistant,
+/obj/item/stack/sheet/metal,
+/obj/item/stack/rods,
+/obj/item/stack/rods,
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "bubblegumfoot"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"VI" = (
+/obj/structure/girder/reinforced,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"VK" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/machinery/light/directional/east,
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "drip4"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "gibmid2"
+	},
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 2
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"VL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"VN" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/stormtrooper,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/adminstrative)
+"VO" = (
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"VV" = (
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/white/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"VX" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/turf/open/floor/concrete/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"VY" = (
+/obj/item/chair{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/toy/cards/singlecard{
+	icon_state = "syndicate_hand4"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"Wa" = (
+/obj/structure/flora/ausbushes/genericbush/hell,
+/turf/open/floor/plating/grass/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"We" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/table{
+	dir = 4;
+	pixel_x = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/manager_office)
+"Wh" = (
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Wx" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"WI" = (
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/lava/explored)
+"WQ" = (
+/obj/structure/flora/tree/dead/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"WR" = (
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"WX" = (
+/obj/structure/flora/ausbushes/genericbush/hell,
+/turf/open/floor/plating/asteroid/purple/lit,
+/area/overmap_encounter/planetoid/lava/explored)
+"WZ" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "trails_2";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Xc" = (
+/obj/structure/sign/poster/official/cleanliness,
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/dorms)
+"Xh" = (
+/obj/effect/turf_decal/corner/opaque/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bar,
+/obj/structure/closet/crate/bin,
+/obj/machinery/light/directional/west,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/obj/effect/spawner/lootdrop/waste/trash,
+/turf/open/floor/plasteel,
+/area/ruin/lavaland/factory/dorms)
+"Xn" = (
+/turf/open/floor/plating/grass/lava/orange,
+/area/overmap_encounter/planetoid/lava/explored)
+"Xp" = (
+/obj/machinery/computer/secure_data,
+/turf/open/floor/carpet/nanoweave/red,
+/area/ruin/lavaland/factory/adminstrative)
+"Xv" = (
+/obj/structure/salvageable/machine,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"XA" = (
+/obj/machinery/computer/security/telescreen/entertainment,
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/adminstrative)
+"XB" = (
+/obj/structure/table_frame,
+/obj/effect/decal/cleanable/plastic,
+/turf/open/floor/plating/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"XF" = (
+/obj/effect/turf_decal/trimline/opaque/ntblue/warning,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/plasteel/mono/white,
+/area/ruin/lavaland/factory/lobby)
+"XM" = (
+/obj/machinery/newscaster/directional/west,
+/obj/structure/noticeboard/staff{
+	dir = 1;
+	pixel_y = -26
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"XR" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"XT" = (
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/item/rack_parts,
+/obj/item/clothing/mask/gas/explorer,
+/turf/open/floor/plasteel/mono,
+/area/ruin/lavaland/factory/warehouse)
+"XU" = (
+/obj/item/ammo_casing/c10mm{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"Yl" = (
+/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/turf_decal/siding/white,
+/obj/item/ammo_box/magazine/m10mm{
+	start_empty = 1
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Yo" = (
+/obj/machinery/light/directional/west,
+/obj/item/chair,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"Yp" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 5
+	},
+/obj/item/ammo_casing/c9mm{
+	icon_state = "pistol-brass-empty";
+	projectile_type = null
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"Yr" = (
+/obj/effect/turf_decal/trimline/opaque/beige/arrow_cw{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Yw" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Yy" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"Yz" = (
+/obj/item/broken_bottle,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"YG" = (
+/obj/effect/turf_decal/trimline/opaque/lime/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"YH" = (
+/obj/structure/chair/greyscale{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"YI" = (
+/obj/structure/flora/ausbushes/hell,
+/turf/open/floor/plating/grass/lava/purple,
+/area/overmap_encounter/planetoid/lava/explored)
+"YJ" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth,
+/obj/effect/turf_decal/corner/opaque/ntblue,
+/obj/effect/turf_decal/corner/opaque/ntblue{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/dorms)
+"YK" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/dresser,
+/obj/item/clothing/accessory/medal/gold/captain{
+	pixel_x = -8;
+	pixel_y = 5
+	},
+/obj/item/clothing/accessory/medal/gold/heroism{
+	pixel_y = 5
+	},
+/obj/item/clothing/accessory/medal/bronze_heart{
+	pixel_y = 5;
+	pixel_x = 10
+	},
+/obj/structure/sign/poster/official/enlist{
+	pixel_y = 32
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"YU" = (
+/obj/item/ammo_casing/c45{
+	icon_state = "pistol-steel-empty";
+	projectile_type = null
+	},
+/turf/open/floor/plating/rust/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Za" = (
+/obj/effect/turf_decal/trimline/opaque/beige/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/warehouse)
+"Zc" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/lavaland/factory/adminstrative)
+"Zd" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/adminstrative)
+"Zg" = (
+/obj/effect/decal/cleanable/blood/footprints{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/glass,
+/obj/effect/turf_decal/trimline/opaque/beige/arrow_cw{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark/lava,
+/area/overmap_encounter/planetoid/cave/explored)
+"Zn" = (
+/obj/machinery/computer/security{
+	dir = 1
+	},
+/turf/open/floor/carpet/nanoweave/red,
+/area/ruin/lavaland/factory/adminstrative)
+"Zp" = (
+/obj/machinery/door/airlock/glass_large,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/lavaland/factory/lobby)
+"Zq" = (
+/obj/effect/turf_decal/trimline/opaque/lime/line{
+	dir = 10
+	},
+/obj/machinery/door/airlock{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/lavaland/factory/dorms)
+"Zt" = (
+/obj/machinery/light/built/directional/west,
+/obj/item/light/tube/broken,
+/turf/open/floor/mech_bay_recharge_floor,
+/area/ruin/lavaland/factory/warehouse)
+"Zx" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/overmap_encounter/planetoid/lava/explored)
+"ZD" = (
+/obj/structure/flora/ash/stem_shroom,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/cave/explored)
+"ZH" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigarettes/cigars,
+/obj/item/lighter{
+	pixel_y = 7;
+	pixel_x = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/lavaland/factory/manager_office)
+"ZL" = (
+/turf/closed/wall/r_wall/rust,
+/area/overmap_encounter/planetoid/cave/explored)
+"ZN" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "foreman"
+	},
+/turf/open/floor/plasteel/dark,
+/area/overmap_encounter/planetoid/cave/explored)
+"ZO" = (
+/obj/item/radio,
+/turf/open/floor/plating/moss,
+/area/overmap_encounter/planetoid/lava/explored)
+"ZS" = (
+/turf/closed/wall/r_wall,
+/area/overmap_encounter/planetoid/cave/explored)
+"ZT" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/siding/white{
+	dir = 10
+	},
+/turf/open/floor/concrete/pavement/lava,
+/area/overmap_encounter/planetoid/lava/explored)
+"ZU" = (
+/obj/item/trash/pistachios,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ruin/lavaland/factory/warehouse)
+
+(1,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+US
+GO
+GO
+GO
+GO
+GO
+GO
+GO
+GO
+GO
+US
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+"}
+(2,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+ns
+Xn
+Xn
+fE
+Xn
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+An
+hJ
+iE
+iE
+tT
+yF
+tT
+iE
+iE
+IJ
+An
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+"}
+(3,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+Xn
+Xn
+Xn
+Xn
+ns
+GT
+Xn
+Xn
+Xn
+Cu
+Xn
+Xn
+iW
+tV
+tV
+fE
+An
+tg
+In
+In
+In
+In
+In
+In
+In
+fq
+An
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+"}
+(4,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+FC
+kO
+Xn
+gg
+Xn
+Xn
+tR
+Xn
+Xn
+Xn
+Xn
+Ui
+hY
+Ui
+tV
+An
+AE
+In
+In
+In
+In
+In
+In
+In
+sp
+An
+xi
+vx
+xi
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+"}
+(5,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+LI
+ns
+Xn
+FC
+rB
+tV
+wi
+An
+AE
+In
+In
+In
+In
+In
+In
+In
+sp
+An
+GJ
+xi
+GW
+xi
+xi
+fE
+fE
+fE
+fE
+fE
+"}
+(6,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+Zc
+Zc
+oO
+zf
+Zc
+UJ
+zs
+ei
+mM
+Zc
+jG
+Zc
+Zc
+hY
+Xn
+Xn
+tV
+Ne
+Ui
+An
+tg
+In
+In
+In
+In
+In
+In
+In
+fq
+An
+GJ
+Wa
+GJ
+xi
+ip
+fE
+fE
+fE
+fE
+fE
+"}
+(7,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+Zc
+fg
+Zd
+rj
+Zc
+SQ
+nV
+Fx
+Hp
+us
+kB
+dl
+Zc
+kO
+Xn
+wi
+Qw
+hY
+Ui
+pt
+Nj
+Uz
+Uz
+VX
+Gy
+VX
+Uz
+Uz
+kY
+An
+jm
+GJ
+GW
+xi
+zg
+xi
+fE
+fE
+fE
+fE
+"}
+(8,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+Zc
+Zc
+Zc
+qS
+nV
+Rn
+Zc
+HJ
+Bh
+Ox
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+Zc
+tV
+Ui
+US
+GO
+av
+GO
+GO
+GO
+GO
+GO
+GO
+GO
+US
+GW
+GJ
+GW
+xi
+pw
+xi
+fE
+fE
+fE
+fE
+"}
+(9,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+Zc
+RA
+Zc
+YK
+Fx
+UG
+Zc
+Zc
+uV
+Zc
+Zc
+SK
+Df
+lB
+Zc
+sQ
+jf
+EC
+Zc
+tV
+rB
+tV
+pV
+Ba
+nK
+GJ
+xi
+dS
+ip
+xi
+xi
+xi
+xi
+xb
+GW
+dS
+xi
+NM
+fE
+fE
+fE
+fE
+"}
+(10,1,1) = {"
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+Zc
+cx
+us
+Yy
+Hp
+UX
+CP
+eG
+gG
+QK
+mG
+bh
+IX
+uJ
+IQ
+pI
+Ac
+Fv
+Zc
+Ui
+tV
+tV
+VO
+nD
+nK
+kD
+iP
+iP
+iP
+iP
+iP
+iP
+iP
+iP
+NM
+NM
+NM
+NM
+fE
+fE
+fE
+fE
+"}
+(11,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+Zc
+nk
+Zc
+Zc
+Zc
+Zc
+Zc
+lj
+ey
+bx
+Zc
+lw
+IX
+Sq
+Zc
+lf
+jx
+ex
+Zc
+Ui
+tV
+YI
+VO
+nD
+nK
+iP
+yw
+TZ
+Zt
+Qh
+mk
+xC
+hw
+iP
+iP
+WX
+NM
+cU
+fE
+fE
+fE
+fE
+"}
+(12,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+Zc
+Zc
+Zc
+gO
+kv
+ax
+DE
+fm
+ax
+ax
+Zc
+ts
+VN
+UY
+Zc
+Zc
+Zc
+Zc
+Zc
+cL
+tV
+Ui
+VO
+nD
+nK
+iP
+dH
+jz
+xB
+Jd
+dA
+LE
+JQ
+HK
+iP
+La
+NM
+La
+La
+OE
+fE
+fE
+"}
+(13,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+LZ
+Zc
+Zc
+yU
+QM
+nV
+SZ
+ae
+el
+Zc
+iU
+zj
+xY
+Zc
+FY
+Uj
+Pv
+Zc
+WQ
+tV
+tV
+VO
+Jt
+qm
+Uh
+sv
+Rv
+nG
+vH
+ca
+TC
+qu
+lc
+iP
+OE
+NM
+NM
+mT
+OE
+fE
+fE
+"}
+(14,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+Zc
+Zc
+Zc
+XA
+SZ
+cm
+el
+Zc
+Pb
+LW
+xw
+Tt
+Bd
+Ac
+oc
+Zc
+rB
+tV
+tV
+VO
+Jt
+KK
+Uh
+eO
+PK
+Tn
+jk
+ca
+kV
+zl
+Dt
+iP
+La
+ly
+uc
+OE
+La
+fE
+fE
+"}
+(15,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+Zc
+Zc
+Zc
+Zc
+Zc
+ju
+IX
+mQ
+Zc
+Xp
+nT
+Zn
+Zc
+hY
+tV
+tV
+VO
+Jt
+KK
+Uh
+eW
+Jk
+Ho
+AB
+Fm
+XT
+LF
+EW
+iP
+QR
+NM
+OE
+NM
+La
+fE
+fE
+"}
+(16,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+gL
+LZ
+LZ
+Zc
+sT
+DT
+Ee
+Ha
+UY
+Zc
+OO
+BA
+OO
+Zc
+jQ
+Ui
+Ui
+VO
+nD
+qm
+Uh
+LK
+ch
+Bs
+AB
+bl
+jV
+zQ
+cz
+iP
+NM
+NM
+NM
+NM
+yP
+fE
+fE
+"}
+(17,1,1) = {"
+MH
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+yQ
+yQ
+yQ
+yQ
+yQ
+yQ
+pp
+Zc
+Pb
+se
+pn
+zD
+cy
+sD
+LX
+bi
+jQ
+jQ
+Qw
+VO
+nD
+nK
+iP
+AC
+hy
+cD
+kj
+Su
+Pt
+Pt
+Pt
+iP
+mT
+xb
+NM
+NM
+OE
+fE
+fE
+"}
+(18,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+Vn
+Vn
+yQ
+yQ
+GS
+ZH
+DB
+RF
+yQ
+Zc
+Zc
+Zc
+as
+Zc
+Zc
+ku
+go
+dL
+Mb
+ME
+jQ
+jQ
+Yl
+Jt
+nK
+iP
+GL
+dH
+HK
+wk
+jr
+HK
+eU
+MC
+iP
+iP
+iP
+NM
+NM
+NM
+Xn
+Xn
+"}
+(19,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+Vn
+Vn
+LP
+mn
+Ck
+Wx
+ve
+Vw
+rh
+yQ
+Qc
+Qc
+LR
+sV
+cR
+KX
+Lq
+aA
+yi
+yi
+Ve
+Pf
+jQ
+nL
+Jt
+Ph
+iP
+HS
+uL
+Kc
+jk
+Za
+xz
+Ho
+vB
+iP
+Ij
+iP
+iP
+Xn
+NM
+Xn
+kO
+"}
+(20,1,1) = {"
+fE
+MH
+MH
+MH
+aL
+gL
+gL
+LZ
+LZ
+Vn
+aM
+LP
+By
+Oc
+LP
+Wx
+LL
+MY
+yQ
+gj
+Qc
+LR
+sV
+LR
+KX
+XF
+ud
+LS
+NG
+Gc
+Gc
+Zp
+HL
+Ba
+nK
+iP
+Or
+Rv
+rV
+cZ
+pX
+Ho
+Ho
+tq
+iP
+TG
+iP
+iP
+iP
+kO
+Xn
+Xn
+"}
+(21,1,1) = {"
+MH
+MH
+MH
+ZO
+tj
+gL
+LZ
+LZ
+LZ
+Vn
+yq
+LP
+vP
+bz
+fB
+fB
+fB
+fB
+po
+yY
+cX
+hm
+pc
+Qc
+KX
+nm
+hf
+fr
+nH
+Om
+Om
+Km
+VO
+nD
+nK
+iP
+Ho
+Ho
+ML
+jk
+yo
+rI
+uH
+sG
+iP
+ZU
+bE
+xj
+iP
+iP
+Uu
+Xn
+"}
+(22,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+Vn
+Al
+LP
+wR
+SR
+LP
+vE
+DB
+Cc
+KX
+Gn
+hv
+JO
+ty
+ia
+KX
+hh
+HO
+HO
+HO
+HO
+aE
+jQ
+RC
+nD
+nK
+iP
+Eg
+Ho
+jJ
+If
+md
+gs
+Ho
+vv
+iP
+eE
+Fs
+qP
+zx
+iP
+Cu
+Xn
+"}
+(23,1,1) = {"
+MH
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+Vn
+Vn
+LP
+jW
+zk
+vE
+EU
+Vw
+Id
+KX
+PR
+KX
+PR
+KX
+PR
+KX
+kJ
+Lv
+vy
+Jc
+gt
+jQ
+jQ
+gI
+Jt
+nK
+iP
+iP
+pq
+pL
+mv
+II
+Pt
+hy
+hy
+tm
+GE
+Gp
+Pg
+Be
+iP
+Uu
+Xn
+"}
+(24,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+gL
+LZ
+LZ
+LZ
+LZ
+Vn
+Vn
+yQ
+yQ
+ab
+vQ
+LL
+Kg
+KX
+Gw
+KX
+Gw
+KX
+RU
+KX
+JM
+sn
+ii
+ap
+jQ
+jQ
+GR
+Lb
+UC
+eR
+Ro
+iP
+iP
+IO
+ux
+oL
+NA
+vC
+yG
+UF
+cE
+fc
+AP
+Ev
+iP
+Xn
+Xn
+"}
+(25,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+ui
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+yQ
+yQ
+yQ
+yQ
+yQ
+KX
+KX
+KX
+KX
+KX
+KX
+KX
+jQ
+jQ
+jQ
+jQ
+jQ
+cu
+os
+mU
+pH
+Up
+XR
+Ro
+iP
+iP
+yK
+SC
+iP
+iP
+iP
+iP
+iP
+iP
+iP
+iP
+iP
+Xn
+tR
+"}
+(26,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+bs
+jP
+sU
+sU
+sU
+sU
+sU
+sU
+sU
+Lb
+pb
+pb
+Ci
+VL
+gT
+Yp
+io
+sU
+om
+ft
+sU
+sU
+sU
+sU
+sU
+Zx
+sU
+sU
+GT
+gg
+Xn
+"}
+(27,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+su
+LZ
+LZ
+Bo
+Bv
+nv
+Tg
+nv
+Tg
+Fk
+nv
+nv
+hT
+hT
+Me
+Tj
+VV
+hT
+hT
+jC
+vN
+Nr
+Fw
+Tg
+gJ
+Tg
+lo
+Tg
+Tg
+dk
+ji
+ns
+ns
+Xn
+"}
+(28,1,1) = {"
+fE
+MH
+MH
+MH
+MH
+MH
+gL
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+wl
+LZ
+su
+MH
+MH
+MH
+bs
+ti
+Il
+Il
+qH
+Il
+jb
+qH
+Il
+xZ
+pb
+nO
+eH
+Up
+Qa
+tu
+Il
+CX
+OG
+td
+vG
+Sx
+Il
+kT
+Il
+Il
+Zx
+qV
+ns
+ns
+Xn
+"}
+(29,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+gL
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+sZ
+Tc
+Zq
+sZ
+sZ
+WR
+ZT
+cO
+UC
+pb
+wM
+DY
+ZS
+ZS
+dm
+El
+ZS
+ZS
+ZS
+ZS
+ZS
+ZS
+hZ
+bd
+Xn
+tR
+Xn
+"}
+(30,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+sZ
+sZ
+sZ
+sZ
+sZ
+MH
+sZ
+sZ
+Xh
+dY
+MZ
+Yo
+sZ
+sZ
+mK
+xZ
+UC
+tu
+DY
+ZS
+ZS
+rF
+OS
+mY
+EQ
+CG
+th
+FH
+bn
+ZN
+nf
+bd
+bd
+kO
+Xn
+"}
+(31,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+MH
+MH
+sZ
+DK
+RZ
+lq
+sZ
+sZ
+sZ
+MF
+oJ
+VD
+qn
+Yz
+YH
+sZ
+sZ
+VO
+Jt
+nK
+ZS
+ZS
+zJ
+Rj
+TS
+AT
+Sa
+Ou
+mi
+Va
+Wh
+ZN
+nf
+Oe
+Oe
+bd
+Xn
+"}
+(32,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+MH
+MH
+sZ
+sZ
+ac
+sZ
+ac
+sZ
+sZ
+nP
+PL
+PL
+dY
+zI
+Sm
+Br
+XM
+sZ
+VO
+qM
+GC
+aW
+Vp
+zC
+AG
+bH
+eI
+gc
+Mm
+hu
+RO
+wt
+ZN
+nf
+Sd
+WI
+Sd
+Sd
+"}
+(33,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+gL
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+vj
+Th
+qo
+Pk
+yy
+vS
+en
+SE
+vS
+HA
+tN
+TI
+vS
+vS
+IG
+sZ
+VO
+oE
+Ph
+GK
+Va
+LB
+Dk
+ka
+QB
+RI
+tS
+Hs
+du
+SL
+uE
+wU
+wU
+SL
+Sd
+Zx
+"}
+(34,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+gL
+VA
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+vj
+jM
+Ek
+VK
+kz
+Op
+jE
+rO
+DP
+YG
+vp
+bQ
+YG
+DP
+Gj
+sZ
+VO
+Jt
+nK
+VI
+oh
+FZ
+UO
+Dk
+Ga
+TP
+qe
+Rd
+yX
+Tx
+bm
+so
+sf
+SL
+SL
+bd
+"}
+(35,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+sZ
+Xc
+Re
+sZ
+uz
+sZ
+sZ
+iS
+oi
+PL
+dY
+sj
+PQ
+qs
+Kp
+sZ
+VO
+Jt
+nK
+ZL
+ce
+vw
+PH
+ev
+gu
+Fe
+qe
+NP
+CG
+SL
+Ut
+so
+ha
+Iz
+Pp
+bd
+"}
+(36,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+MH
+sZ
+sE
+sZ
+ok
+sZ
+sZ
+sZ
+nh
+AI
+KM
+Dd
+lQ
+VY
+sZ
+sZ
+VO
+Jt
+nK
+ZL
+zh
+RK
+XB
+AM
+Dk
+ss
+Hc
+kx
+am
+zO
+Eb
+lR
+QG
+Ai
+Pp
+bd
+"}
+(37,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+MH
+sZ
+sZ
+sZ
+sZ
+sZ
+MH
+sZ
+sZ
+oI
+Yw
+LU
+FJ
+sZ
+sZ
+MH
+MH
+MH
+Sx
+ZL
+wP
+Dk
+Dz
+bH
+or
+KB
+NP
+KS
+FM
+lU
+We
+Md
+QA
+SL
+SL
+bd
+"}
+(38,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+gL
+LZ
+LZ
+LZ
+LZ
+LZ
+LZ
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+sZ
+JT
+hb
+sZ
+sZ
+MH
+MH
+VO
+oE
+Go
+ZS
+wP
+pP
+KI
+MJ
+NP
+YU
+sm
+Dk
+Oq
+SL
+SL
+eD
+eT
+SL
+bd
+bd
+"}
+(39,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+LZ
+LZ
+LZ
+LZ
+VA
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+qX
+iR
+WZ
+CT
+sZ
+MH
+MH
+MH
+MH
+nK
+ZS
+ZS
+ih
+Sn
+GP
+xm
+qK
+br
+Yr
+Zg
+AW
+ZL
+bd
+bd
+bd
+bd
+fE
+"}
+(40,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+YJ
+PT
+WZ
+EP
+sZ
+MH
+MH
+MH
+MH
+MH
+MH
+ZS
+ZS
+Mq
+oz
+or
+VC
+lr
+Mp
+Hl
+Xv
+ZS
+bd
+bd
+bd
+MH
+fE
+"}
+(41,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+gk
+PT
+tH
+of
+sZ
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+CW
+ZS
+KS
+qz
+kG
+CG
+Ao
+ol
+ZL
+ZL
+bd
+bd
+MH
+MH
+fE
+"}
+(42,1,1) = {"
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+YJ
+zz
+nA
+YJ
+sZ
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+yN
+yN
+yN
+yN
+co
+Pi
+yN
+yN
+Mk
+MH
+MH
+MH
+MH
+MH
+fE
+"}
+(43,1,1) = {"
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+sZ
+uW
+dY
+Ie
+EK
+sZ
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+wO
+co
+mL
+co
+co
+co
+mS
+MH
+MH
+MH
+MH
+MH
+MH
+fE
+"}
+(44,1,1) = {"
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+NE
+MH
+MH
+MH
+MH
+MH
+sZ
+YJ
+lv
+Uf
+dc
+sZ
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+co
+yN
+MH
+ZD
+SP
+co
+yN
+MH
+MH
+MH
+MH
+MH
+fE
+fE
+"}
+(45,1,1) = {"
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+fE
+MH
+MH
+MH
+MH
+sZ
+sZ
+sZ
+sZ
+sZ
+sZ
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+jX
+ZD
+co
+ga
+XU
+yN
+MH
+MH
+MH
+fE
+fE
+fE
+"}
+(46,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+MH
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+yN
+co
+yN
+PE
+fs
+MH
+MH
+fE
+fE
+fE
+fE
+"}
+(47,1,1) = {"
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+fE
+fE
+fE
+fE
+MH
+MH
+MH
+MH
+MH
+yN
+co
+co
+co
+yN
+yN
+MH
+fE
+fE
+fE
+fE
+fE
+"}
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
index e664dfec8d96..397dff3689ee 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -1156,10 +1156,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/whitesands/pubbycrash/engine_room)
 "Ak" = (
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = 9;
-	pixel_y = -3
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/trash/pistachios{
 	pixel_y = 5
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
index 28f84c6dfea9..45591d25dde5 100644
--- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
+++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -3821,7 +3821,7 @@
 	pixel_x = 5;
 	pixel_y = -5
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx{
 	pixel_x = -4;
 	pixel_y = 2
 	},
@@ -4180,7 +4180,7 @@
 /area/ruin/space/has_grav/singularitylab/civvie)
 "qt" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail{
 	pixel_x = -6
 	},
 /obj/item/radio/intercom/directional/east,
@@ -13228,7 +13228,7 @@
 	default_raw_text = "Whatever happens. Happens."
 	},
 /obj/item/pen,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
 	pixel_x = 10;
 	pixel_y = 4
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index 6383f0b920f3..322ab73490f9 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -2809,10 +2809,9 @@
 /obj/item/clothing/head/collectable/chef,
 /obj/item/clothing/head/collectable/HoP,
 /obj/item/clothing/head/collectable/rabbitears,
-/obj/item/clothing/head/helmet/chaplain,
+/obj/item/clothing/head/witchunter,
 /obj/item/clothing/neck/cloak/trans,
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
 /obj/item/clothing/neck/beads,
 /obj/item/clothing/neck/necklace/dope,
 /obj/item/clothing/neck/stripedredscarf,
@@ -5555,11 +5554,11 @@
 /obj/item/reagent_containers/food/drinks/soda_cans/cola{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch,
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
 	pixel_x = 5
 	},
 /obj/item/storage/box/drinkingglasses,
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
index a880d2947ae2..207d91d4219a 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
@@ -424,7 +424,7 @@
 "qo" = (
 /obj/structure/closet/cabinet,
 /obj/item/spear/bonespear,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /obj/item/reagent_containers/food/snacks/grown/berries/death,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
@@ -461,7 +461,7 @@
 /area/ruin/wasteplanet)
 "qU" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "rh" = (
@@ -492,7 +492,7 @@
 "sV" = (
 /obj/structure/closet/cabinet,
 /obj/item/claymore/bone,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "tB" = (
diff --git a/_maps/configs/independent_boyardee.json b/_maps/configs/independent_boyardee.json
deleted file mode 100644
index d4659b14e0ac..000000000000
--- a/_maps/configs/independent_boyardee.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"map_name": "Boyardee-class Entertainment Vessel",
-	"prefix": "ISV",
-	"description": "Named for an ancient Solarian folk hero known for providing food to the masses shortly after the Night of Fire, the Boyardee-class is a remarkably popular civilian vessel, and a welcome sight to any weary travelers tired of synthesized tap water and stale rations for breakfast, lunch and dinner every day. The Boyardee-class features a full bar, an advanced hydroponics setup, a large kitchen and an expansive seating area, perfect for serving hungry customers and thirsty colonists. During the early days of the Syndicate, associated organizations would often create their own retrofits of the Boyardee to serve as recruiting centers or “shore-leave” posts, though these variants have mostly ceased to exist in the Frontier.",
-	"tags": [
-		"Service",
-		"Botany",
-		"RP Focus"
-	],
-	"namelists": [
-		"GENERAL",
-		"SPACE",
-		"MERCANTILE"
-	],
-	"starting_funds": 5000,
-	"map_short_name": "Boyardee-class",
-	"map_path": "_maps/shuttles/independent/independent_boyardee.dmm",
-	"unique_ship_access": false,
-	"job_slots": {
-		"Bartender": {
-			"outfit": "/datum/outfit/job/independent/bartender",
-			"slots": 1
-		},
-		"Cook": {
-			"outfit": "/datum/outfit/job/independent/cook",
-			"slots": 3
-		},
-		"Botanist": {
-			"outfit": "/datum/outfit/job/independent/botanist",
-			"slots": 2
-		},
-		"Janitor": {
-			"outfit": "/datum/outfit/job/independent/janitor",
-			"slots": 1
-		},
-		"Waiter": {
-			"outfit": "/datum/outfit/job/independent/assistant/waiter",
-			"slots": 2
-		}
-	},
-	"enabled": true
-}
diff --git a/_maps/configs/independent_sunskipper.json b/_maps/configs/independent_sunskipper.json
new file mode 100644
index 000000000000..08a4a56f9fde
--- /dev/null
+++ b/_maps/configs/independent_sunskipper.json
@@ -0,0 +1,36 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Sunskipper-class Culinary Vessel",
+	"prefix": "ISV",
+	"namelists": ["CRUISE", "NATURAL"],
+	"map_short_name": "Sunskipper-class",
+	"map_path": "_maps/shuttles/independent/independent_sunskipper.dmm",
+	"description": "The Sunskipper-class is a state-of-the-art culinary vessel found in the frontier. It's name is a wordplay between a Kalixcian species of butterfly and ship's unique solar-powered batteries. The Sunskipper is welcomed with open arms by weary spacers of greater paycheks, who are fatigued by the monotony of their everyday meals. The ship features a self-sustaining kitchen with hydroponics and a large, deluxe dining hall, designed to serve starved travelers. It also comes with a fully-stocked bar area that allows them to drink their troubles away, if even for a brief moment.",
+	"tags": [
+		"RP Focus",
+		"Service",
+		"Specialist"
+	],
+	"starting_funds": 3000,
+	"limit": 1,
+	"job_slots": {
+		"Manager": {
+			"outfit": "/datum/outfit/job/independent/captain/manager",
+			"slots": 1,
+			"officer": true
+		},
+		"Bartender": {
+			"outfit": "/datum/outfit/job/independent/bartender/disarmed",
+			"slots": 1
+		},
+		"Cook": {
+			"outfit": "/datum/outfit/job/independent/cook",
+			"slots": 2
+		},
+		"Waiter": {
+			"outfit": "/datum/outfit/job/independent/assistant/waiter",
+			"slots": 2
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json
index 82e104096b00..03caf7196183 100644
--- a/_maps/configs/srm_elder.json
+++ b/_maps/configs/srm_elder.json
@@ -22,17 +22,30 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Hunter Colligne": {
+			"outfit": "/datum/outfit/job/roumain/hop",
+			"officer": true,
+			"slots": 1
+		},
 		"Hunter Doctor": {
 			"outfit": "/datum/outfit/job/roumain/doctor",
 			"slots": 1
 		},
+		"Machinist": {
+			"outfit": "/datum/outfit/job/roumain/engineer",
+			"slots": 1
+		},
 		"Hunter": {
 			"outfit": "/datum/outfit/job/roumain/security",
 			"slots": 3
 		},
+		"Flamebearer": {
+			"outfit": "/datum/outfit/job/roumain/flamebearer",
+			"slots": 1
+		},
 		"Shadow": {
 			"outfit": "/datum/outfit/job/roumain/assistant",
-			"slots": 3
+			"slots": 2
 		}
 	},
 	"enabled": true
diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json
index 73ce92630014..2bc7a358b754 100644
--- a/_maps/configs/syndicate_gorlex_komodo.json
+++ b/_maps/configs/syndicate_gorlex_komodo.json
@@ -33,7 +33,7 @@
 			"slots": 1
 		},
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
+			"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
 			"slots": 1
 		},
 		"Trooper": {
@@ -45,7 +45,7 @@
 			"slots": 2
 		},
 		"Bridge Officer": {
-			"outfit": "/datum/outfit/job/syndicate/head_of_personnel",
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun",
 			"slots": 1
 		}
 	},
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
index 296bb0057088..5d941ef7fd60 100644
--- a/_maps/map_catalogue.txt
+++ b/_maps/map_catalogue.txt
@@ -86,6 +86,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		Size = (x = 90)(y = 63)(z = 1)
 		Tags = "Medium Combat Challenge", "Medium Loot", "Megafauna", "Necropolis Loot", "Inhospitable", "Lava"
 
+		File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_wrecked_factory.dmm"
+		Size = (x = 47)(y = 47)(z = 1)
+		Tags = "Boss Combat Challenge", "Major Loot", "Shelter", "Lava"
+
 		File Name = "_maps\RandomRuins\BeachRuins\lavaland_crashed_starwalker.dmm"
 		Size = (x = 33)(y = 56)(z = 1)
 		Tags = "Minor Combat Challenge", "Medium Loot", "Lava"
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 0f8565b7ecec..b37a44a0c8f6 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -4179,7 +4179,7 @@
 "aNr" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -4527,7 +4527,7 @@
 /obj/item/reagent_containers/food/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel,
 /area/tdome/tdomeobserve)
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index a55df014f4f9..d1a184d736fc 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -3689,10 +3689,7 @@
 	pixel_y = -5;
 	pixel_x = -9
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = -7;
-	pixel_y = 10
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/trimline/opaque/blue/filled/line{
 	dir = 4
 	},
@@ -9793,7 +9790,7 @@
 	pixel_y = -3
 	},
 /obj/item/reagent_containers/food/snacks/meatbun,
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
+/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda{
 	pixel_y = 12;
 	pixel_x = -8
 	},
@@ -12833,7 +12830,7 @@
 /obj/item/reagent_containers/food/snacks/nachos{
 	pixel_y = 9
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{
 	pixel_x = 8;
 	pixel_y = 3
 	},
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index 3975c649b490..1eae63fcac48 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -1341,10 +1341,7 @@
 	pixel_x = 8;
 	pixel_y = 7
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = -6;
-	pixel_y = -1
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/phone{
 	pixel_x = 9;
 	pixel_y = -2
@@ -3155,10 +3152,7 @@
 	pixel_x = 4;
 	pixel_y = 1
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = -5;
-	pixel_y = 7
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/siding/wood,
 /obj/item/lipstick{
 	pixel_x = -5;
@@ -4831,9 +4825,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood/reinforced,
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = 9
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/canteen)
 "VK" = (
diff --git a/_maps/shuttles/independent/independent_boyardee.dmm b/_maps/shuttles/independent/independent_boyardee.dmm
deleted file mode 100644
index 4ae94900b258..000000000000
--- a/_maps/shuttles/independent/independent_boyardee.dmm
+++ /dev/null
@@ -1,3488 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ao" = (
-/obj/machinery/power/smes/engineering,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
-/obj/machinery/light/directional/south,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/turf_decal/box,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"as" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/layer4,
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"az" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"aV" = (
-/obj/item/paicard,
-/obj/structure/table/wood/reinforced,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"bv" = (
-/obj/machinery/smartfridge/drinks,
-/turf/closed/wall,
-/area/ship/storage)
-"bB" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"cc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"cp" = (
-/obj/machinery/door/poddoor{
-	id = "cargoblastdoors"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "cargoholofield"
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"ct" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew)
-"cy" = (
-/obj/item/paper_bin,
-/obj/structure/table/wood/reinforced,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"cA" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/condiment/rice,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/sugar,
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"cC" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/canteen)
-"cJ" = (
-/obj/structure/toilet{
-	dir = 1
-	},
-/obj/item/storage/firstaid/medical{
-	pixel_x = -5;
-	pixel_y = -4
-	},
-/obj/structure/closet/wall/white/directional/east{
-	name = "First Aid"
-	},
-/obj/machinery/light/small/directional/south,
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/plasteel/patterned/brushed,
-/area/ship/crew/canteen)
-"cZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/light_switch{
-	pixel_x = -25;
-	pixel_y = 25
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 2;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"dh" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"di" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck/kotahi,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"dr" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"dt" = (
-/obj/structure/urinal{
-	pixel_y = 32
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"dy" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew)
-"dF" = (
-/obj/machinery/advanced_airlock_controller{
-	locked = 0;
-	pixel_x = 25
-	},
-/obj/structure/chair,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"dH" = (
-/turf/closed/wall/r_wall,
-/area/ship/maintenance)
-"dN" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"dP" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"dU" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/chair/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"dV" = (
-/turf/closed/wall,
-/area/ship/maintenance)
-"dW" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"dZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/airlock/freezer{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"ej" = (
-/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/turf_decal/corner/opaque/white/half,
-/obj/effect/turf_decal/corner/opaque/white{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"ep" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/machinery/computer/monitor{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"ev" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"ex" = (
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"eE" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/corner/opaque/white/half,
-/obj/effect/turf_decal/corner/opaque/white{
-	dir = 1
-	},
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"eG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/crew/hydroponics)
-"eS" = (
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew)
-"eZ" = (
-/obj/machinery/door/airlock/glass,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"fa" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/light_switch{
-	pixel_x = -25;
-	pixel_y = -25
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/crew/hydroponics)
-"fs" = (
-/turf/open/floor/plasteel,
-/area/ship/crew/hydroponics)
-"fz" = (
-/obj/machinery/cryopod{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	color = "#543C30";
-	dir = 4
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"fG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/storage)
-"fK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"gq" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"gL" = (
-/obj/effect/turf_decal/number/two,
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"gQ" = (
-/obj/machinery/door/airlock/external/glass{
-	dir = 4;
-	name = "Internal Airlock"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"gV" = (
-/obj/machinery/vending/dinnerware,
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 1
-	},
-/obj/effect/turf_decal/box,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"hl" = (
-/obj/effect/turf_decal/ihejirika_small/left{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"hs" = (
-/obj/structure/table/glass,
-/obj/machinery/plantgenes,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"hA" = (
-/obj/effect/turf_decal/ihejirika_small/right{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"hJ" = (
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"hL" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/bounty,
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"hQ" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/biogenerator,
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced/spawner/west,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"hZ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"is" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/item/radio/intercom/directional/east,
-/obj/structure/table/reinforced,
-/obj/item/stock_parts/cell/high/plus,
-/obj/item/stock_parts/cell/high/plus,
-/obj/machinery/cell_charger,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"iB" = (
-/obj/machinery/status_display/shuttle,
-/turf/closed/wall,
-/area/ship/storage)
-"ja" = (
-/obj/machinery/door/poddoor{
-	id = "windowlockdown";
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"jj" = (
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"jl" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"ju" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"jA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"jN" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"kr" = (
-/obj/structure/sign/warning/chemdiamond,
-/turf/closed/wall,
-/area/ship/maintenance)
-"ku" = (
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "bridgelockdown"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/canteen/kitchen)
-"kC" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 20;
-	pixel_y = -20
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"kM" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"kS" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"kZ" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/airlock/glass{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"lg" = (
-/obj/machinery/door/airlock/glass,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"ly" = (
-/obj/machinery/advanced_airlock_controller{
-	pixel_y = 25
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"lD" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe/silver,
-/obj/item/pickaxe/silver,
-/obj/item/clothing/head/hardhat/mining,
-/obj/item/clothing/head/hardhat/mining,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/gps{
-	gpstag = "NTREC1";
-	pixel_x = -9;
-	pixel_y = 7
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"lG" = (
-/obj/structure/table/reinforced,
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Cockpit";
-	pixel_y = 30
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/machinery/button/door{
-	id = "windowlockdown";
-	name = "Window Lockdown";
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/machinery/button/door{
-	id = "cargoblastdoors";
-	name = "Blast Door Control";
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/machinery/button/door{
-	id = "bridgelockdown";
-	name = "Bridge Lockdown";
-	pixel_y = -5
-	},
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"me" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"mg" = (
-/obj/machinery/door/airlock/glass,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"mk" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"mr" = (
-/turf/closed/wall,
-/area/ship/crew/hydroponics)
-"my" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"mH" = (
-/obj/effect/turf_decal/box,
-/obj/structure/cable/yellow{
-	icon_state = "2-4"
-	},
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"nc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"no" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/item/reagent_containers/glass/beaker/large,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"np" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave,
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/corner/opaque/white/half,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"ny" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"nA" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"nF" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"of" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/canteen/kitchen)
-"om" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/freezer,
-/area/ship/storage)
-"oX" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"pb" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/food/condiment/peppermill,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"pg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"ph" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"pt" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/item/stack/sheet/mineral/wood/fifty,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"px" = (
-/obj/machinery/status_display/shuttle,
-/turf/closed/wall/r_wall,
-/area/ship/crew/canteen/kitchen)
-"pN" = (
-/obj/machinery/atmospherics/components/binary/valve/digital,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"qe" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20;
-	pixel_y = -23
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"qg" = (
-/obj/machinery/atmospherics/components/unary/tank/toxins{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"qq" = (
-/obj/machinery/mineral/ore_redemption,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"qu" = (
-/obj/machinery/door/poddoor{
-	id = "windowlockdown";
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/hydroponics)
-"qB" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 10
-	},
-/obj/structure/chair/sofa/brown/right/directional/east,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"qE" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/structure/chair/stool/bar{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"qO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"qU" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 10
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"qZ" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/bounty,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"rj" = (
-/obj/structure/ore_box,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"rk" = (
-/obj/machinery/computer/helm/viewscreen/directional/west,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/structure/chair/sofa/brown/left/directional/east,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"rm" = (
-/obj/structure/urinal{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"ro" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/chair/stool/bar{
-	dir = 1
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"rr" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks{
-	dir = 8
-	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"rt" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"rz" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"rA" = (
-/obj/structure/sink/kitchen{
-	dir = 4;
-	pixel_x = -12
-	},
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/white{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"rC" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/item/areaeditor/shuttle{
-	pixel_x = -11
-	},
-/obj/item/radio/intercom/wideband/table{
-	dir = 8;
-	canhear_range = 5
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"rH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"sg" = (
-/turf/closed/wall,
-/area/ship/storage)
-"sn" = (
-/obj/structure/table/wood/reinforced,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"sp" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"st" = (
-/obj/structure/chair/stool/bar{
-	dir = 1
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"sD" = (
-/obj/machinery/door/poddoor{
-	id = "windowlockdown";
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"sI" = (
-/obj/machinery/status_display/shuttle,
-/turf/closed/wall,
-/area/ship/cargo)
-"sR" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/chair/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"sU" = (
-/turf/closed/wall,
-/area/ship/crew/canteen)
-"sX" = (
-/obj/structure/tank_dispenser/oxygen,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/box,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"ta" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/obj/item/soap/deluxe,
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"tP" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/box,
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"tT" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/table/wood/fancy/black,
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"ua" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"uI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/crew/hydroponics)
-"uP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"uR" = (
-/turf/closed/wall,
-/area/ship/crew)
-"uS" = (
-/obj/machinery/processor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 4
-	},
-/obj/effect/turf_decal/box,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"vi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"vw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/crew/hydroponics)
-"vZ" = (
-/turf/template_noop,
-/area/template_noop)
-"we" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 2
-	},
-/obj/effect/turf_decal/box,
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"wm" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/holopad/emergency/kitchen,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"wF" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen/fountain,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/item/megaphone{
-	pixel_x = 3;
-	pixel_y = 1
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 2;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"wO" = (
-/obj/machinery/seed_extractor,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"wQ" = (
-/obj/machinery/door/airlock/external/glass{
-	dir = 4;
-	name = "Internal Airlock"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"wY" = (
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"xh" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"xj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/item/storage/bag/tray,
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"xr" = (
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"xw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"xy" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/table/wood/poker,
-/obj/item/storage/pill_bottle/dice,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"xH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"xO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"xX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"yi" = (
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"yk" = (
-/obj/machinery/door/poddoor{
-	id = "cargoblastdoors"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"yn" = (
-/obj/structure/closet/secure_closet/bar{
-	req_access = null
-	},
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"ys" = (
-/obj/machinery/door/poddoor{
-	id = "cargoblastdoors"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "cargoholofield"
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"yF" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/mob/living/simple_animal/chicken{
-	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);
-	desc = "A regular chicken, nothing weird about this one .";
-	name = "Cluckens"
-	},
-/obj/structure/bed/nest{
-	color = "#FFFF00";
-	desc = "It's a pile of soft, loose hay shaped like a nest.";
-	name = "chicken nest"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"yV" = (
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"zd" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -25;
-	pixel_y = 25
-	},
-/obj/machinery/holopad,
-/turf/open/floor/plasteel/freezer,
-/area/ship/storage)
-"zl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"zu" = (
-/obj/machinery/gibber,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"zy" = (
-/obj/machinery/door/airlock/hatch{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance)
-"zP" = (
-/obj/machinery/icecream_vat,
-/turf/open/floor/plasteel/freezer,
-/area/ship/storage)
-"Af" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Ag" = (
-/turf/closed/wall/r_wall,
-/area/ship/cargo)
-"Au" = (
-/turf/closed/wall/r_wall,
-/area/ship/storage)
-"Av" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"AA" = (
-/obj/machinery/computer/helm{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"AF" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/landmark/observer_start,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew)
-"Ba" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Bc" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck/syndicate,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Bk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"BC" = (
-/obj/effect/turf_decal/number/zero,
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"BE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"BP" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"BQ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/vending/boozeomat/all_access{
-	density = 0;
-	pixel_x = 32
-	},
-/obj/item/reagent_containers/food/drinks/shaker,
-/obj/machinery/reagentgrinder{
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/glass/rag,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Ck" = (
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Cn" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/hydroponics)
-"Cu" = (
-/obj/machinery/door/poddoor{
-	id = "bridgelockdown"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/canteen/kitchen)
-"CP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"CV" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/power/port_gen/pacman,
-/obj/item/stack/sheet/mineral/plasma/five,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Da" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Dd" = (
-/obj/machinery/grill,
-/obj/effect/turf_decal/corner/opaque/white/half,
-/obj/effect/turf_decal/box,
-/obj/item/stack/sheet/mineral/coal/ten,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"Df" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"Dg" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12
-	},
-/obj/structure/mirror{
-	pixel_x = -25
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"Dj" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck/cas{
-	pixel_y = 8
-	},
-/obj/item/toy/cards/deck/cas/black,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Ds" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/layer2{
-	dir = 4
-	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Dt" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/white,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"DA" = (
-/obj/machinery/vending/wardrobe/chef_wardrobe,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/white{
-	dir = 8
-	},
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"DC" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/structure/chair/stool/bar{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"DD" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
-/obj/structure/chair/stool/bar{
-	dir = 1
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"DF" = (
-/obj/structure/chair/stool/bar,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"DG" = (
-/obj/machinery/status_display/shuttle,
-/turf/closed/wall,
-/area/ship/maintenance)
-"DI" = (
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"DV" = (
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"DZ" = (
-/obj/machinery/door/poddoor{
-	id = "windowlockdown"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/hydroponics)
-"Ea" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"Ed" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"Ei" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew)
-"En" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"Et" = (
-/obj/item/storage/box/drinkingglasses,
-/obj/machinery/firealarm/directional/south,
-/obj/structure/table/wood/reinforced,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Ex" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
-	dir = 1;
-	name = "Air to Distro";
-	target_pressure = 500
-	},
-/obj/machinery/door/window/southleft,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"EF" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/box,
-/obj/machinery/suit_storage_unit/independent/mining/eva,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"EH" = (
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"Fd" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"Fe" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/airlock/glass{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"Fm" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Fp" = (
-/obj/structure/table/reinforced,
-/obj/item/table_bell,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"FA" = (
-/obj/machinery/door/airlock/glass,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"FD" = (
-/obj/machinery/cryopod{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"FE" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/holopad,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"FN" = (
-/turf/closed/wall,
-/area/ship/crew/canteen/kitchen)
-"FR" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/hydroponics)
-"FU" = (
-/obj/machinery/power/smes/engineering,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/turf_decal/box,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Gd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"Gi" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/layer2{
-	dir = 4
-	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"GE" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_dispenser/drinks/beer{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"GG" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/hydroponics)
-"GO" = (
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"GS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 1
-	},
-/turf/open/floor/plasteel/freezer,
-/area/ship/storage)
-"GZ" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Hs" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/holopad/emergency/bar,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"HA" = (
-/obj/machinery/deepfryer,
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 4
-	},
-/obj/effect/turf_decal/box,
-/obj/machinery/light/directional/west,
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"HD" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"HG" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wood/corner,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"HY" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/holopad/emergency/botany,
-/turf/open/floor/plasteel,
-/area/ship/crew/hydroponics)
-"Ih" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"In" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Ix" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/vending/clothing,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"IC" = (
-/obj/effect/turf_decal/ihejirika_small{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"IQ" = (
-/obj/machinery/hydroponics/constructable{
-	layer = 2
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/structure/sink/kitchen{
-	dir = 4;
-	layer = 2.04;
-	pixel_x = -12
-	},
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"IV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew)
-"IX" = (
-/obj/machinery/status_display/shuttle,
-/turf/closed/wall,
-/area/ship/crew/canteen)
-"JE" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
-	pixel_x = -6;
-	pixel_y = 10
-	},
-/obj/item/folder,
-/obj/machinery/computer/cryopod/directional/north{
-	pixel_y = 17
-	},
-/obj/item/radio/intercom/directional/west,
-/obj/effect/turf_decal/siding/wood/corner{
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"JR" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew)
-"JT" = (
-/obj/structure/closet/secure_closet/freezer/kitchen{
-	req_access = null
-	},
-/obj/effect/turf_decal/box,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"Kk" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/item/phone{
-	pixel_x = 5;
-	pixel_y = 8
-	},
-/obj/item/gps{
-	gpstag = "NTREC1";
-	pixel_x = -9;
-	pixel_y = 7
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"Kl" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/vending/hydronutrients,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"KD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"KM" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/item/table_bell,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"Lg" = (
-/obj/machinery/door/airlock/external{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Lj" = (
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"LI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/food/condiment/peppermill,
-/obj/structure/table/wood/reinforced,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"Mo" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"Mp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"Ng" = (
-/obj/machinery/vending/wardrobe/bar_wardrobe,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"Nr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plating,
-/area/ship/crew/canteen)
-"Nv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"NB" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"NM" = (
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen)
-"NQ" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/effect/turf_decal/box,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"Od" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/table/wood/poker,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Of" = (
-/obj/effect/turf_decal/number/five,
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"OI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"OJ" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/machinery/modular_computer/console/preset/civilian{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"Qc" = (
-/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/ration,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"Qm" = (
-/obj/machinery/door/window/eastright,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"Qs" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"Qu" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
-	name = "Air to Distro";
-	target_pressure = 500
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"QR" = (
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/toolbox/electrical,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/multitool,
-/obj/structure/rack,
-/obj/effect/turf_decal/box,
-/obj/item/multitool,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"QW" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"Ro" = (
-/obj/machinery/smartfridge/food,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew/hydroponics)
-"RR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"RU" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/bounty,
-/obj/effect/turf_decal/siding/wood/corner{
-	color = "#543C30";
-	dir = 1
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"Sa" = (
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"Se" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Sf" = (
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/canteen/kitchen)
-"Si" = (
-/obj/structure/reagent_dispensers/cooking_oil,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Sl" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/reagentgrinder,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"Ss" = (
-/obj/machinery/door/airlock,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/canteen)
-"SA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"SM" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"SO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/structure/closet/secure_closet/freezer/meat/open,
-/obj/effect/turf_decal/box,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"Tc" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable/yellow,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Tl" = (
-/obj/docking_port/mobile{
-	can_move_docking_ports = 1;
-	name = "diner ship";
-	preferred_direction = 4;
-	port_direction = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external/dark)
-"To" = (
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/structure/closet/crate,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/siding/wood/corner{
-	color = "#543C30";
-	dir = 8
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-"Tp" = (
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"Ty" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"TD" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew/hydroponics)
-"TL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"TN" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/ship_gravity,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Uf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"Um" = (
-/obj/machinery/chem_master/condimaster,
-/obj/item/storage/box/beakers,
-/obj/effect/turf_decal/corner/opaque/white/half{
-	dir = 4
-	},
-/obj/effect/turf_decal/box,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew/canteen/kitchen)
-"Uq" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/maintenance)
-"Uv" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/button/door{
-	id = "cargoblastdoors";
-	name = "Blast Door Control";
-	pixel_x = 25;
-	pixel_y = 25
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_y = 24;
-	pixel_x = 37;
-	id = "cargoholofield"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Uy" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/structure/chair/stool/bar{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"UC" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"UI" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/jukebox,
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"UO" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/chair/stool/bar,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Vm" = (
-/obj/structure/table/glass,
-/obj/machinery/smartfridge/disks,
-/obj/item/storage/box/disks_plantgene,
-/obj/item/storage/box/disks_plantgene,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"Vo" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"Vr" = (
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate/hydroponics,
-/obj/item/seeds/wheat,
-/obj/item/seeds/tomato,
-/obj/item/seeds/random,
-/obj/item/seeds/banana,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"VB" = (
-/obj/machinery/door/airlock/external{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance)
-"VO" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	piping_layer = 2
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/effect/turf_decal/box,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance)
-"VR" = (
-/obj/machinery/computer/cargo/express{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono/white,
-/area/ship/crew/canteen/kitchen)
-"Wf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Wv" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/plant_analyzer,
-/obj/item/plant_analyzer,
-/obj/item/plant_analyzer,
-/obj/item/shovel/spade,
-/obj/item/shovel/spade,
-/obj/item/shovel/spade,
-/obj/item/cultivator,
-/obj/item/cultivator,
-/obj/item/cultivator,
-/obj/item/clothing/under/rank/civilian/hydroponics/skirt,
-/obj/item/clothing/under/rank/civilian/hydroponics/skirt,
-/obj/item/clothing/under/rank/civilian/hydroponics,
-/obj/item/clothing/under/rank/civilian/hydroponics,
-/obj/item/hatchet,
-/obj/item/hatchet,
-/obj/item/hatchet,
-/obj/item/storage/bag/plants,
-/obj/item/storage/bag/plants,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"WA" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/structure/chair/sofa/brown/directional/east,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"WH" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"WP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel,
-/area/ship/crew/hydroponics)
-"XB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew)
-"XP" = (
-/turf/closed/wall,
-/area/ship/cargo)
-"XQ" = (
-/obj/machinery/door/airlock{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"XU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/carpet/red_gold,
-/area/ship/crew/canteen)
-"Yc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/machinery/newscaster/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 10;
-	pixel_y = -18
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"Yj" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew)
-"Yr" = (
-/obj/docking_port/stationary{
-	width = 30;
-	height = 15;
-	dir = 8;
-	dwidth = 15
-	},
-/turf/template_noop,
-/area/template_noop)
-"YC" = (
-/obj/machinery/door/airlock/external{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance)
-"YR" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 25;
-	pixel_y = -20
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"YT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"YZ" = (
-/obj/machinery/door/poddoor{
-	id = "bridgelockdown";
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/crew/canteen/kitchen)
-"Zm" = (
-/obj/machinery/door/airlock{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen/kitchen)
-"Zn" = (
-/obj/machinery/hydroponics/constructable,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/hydroponics)
-"ZG" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
-	},
-/turf/open/floor/wood,
-/area/ship/crew/canteen)
-"ZY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
-	},
-/turf/open/floor/wood/walnut,
-/area/ship/crew)
-
-(1,1,1) = {"
-vZ
-vZ
-vZ
-vZ
-vZ
-Yr
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-"}
-(2,1,1) = {"
-vZ
-vZ
-cC
-cC
-Lg
-Lg
-cC
-cC
-cC
-dH
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-"}
-(3,1,1) = {"
-vZ
-vZ
-cC
-dN
-Sa
-Gi
-sU
-Nr
-we
-dH
-Df
-Df
-Df
-Uq
-Uq
-dV
-hl
-IC
-hA
-"}
-(4,1,1) = {"
-vZ
-vZ
-cC
-dF
-SA
-mk
-Ex
-jl
-we
-dV
-me
-me
-me
-xh
-xh
-dH
-YC
-dH
-Of
-"}
-(5,1,1) = {"
-vZ
-vZ
-cC
-sU
-wQ
-gQ
-IX
-sU
-sU
-dV
-BP
-HD
-HD
-qU
-Vo
-dH
-ly
-dH
-BC
-"}
-(6,1,1) = {"
-vZ
-vZ
-xr
-GO
-OI
-Sa
-sU
-rm
-Dg
-dV
-VO
-pt
-Qu
-Fm
-DV
-dH
-Ds
-dH
-gL
-"}
-(7,1,1) = {"
-vZ
-ja
-xr
-Fp
-xX
-kM
-sU
-dt
-ta
-dV
-TN
-QR
-rH
-FU
-ao
-dH
-VB
-dH
-vZ
-"}
-(8,1,1) = {"
-vZ
-xr
-GO
-In
-TL
-ex
-sU
-Gd
-sU
-dV
-dV
-mH
-nF
-GZ
-Tc
-cc
-xw
-dH
-vZ
-"}
-(9,1,1) = {"
-vZ
-cC
-Ck
-In
-BE
-Yc
-sU
-En
-Ss
-cJ
-dV
-CV
-is
-Si
-qe
-pN
-qg
-dH
-vZ
-"}
-(10,1,1) = {"
-vZ
-cC
-Qm
-sU
-CP
-rt
-sU
-XQ
-sU
-sU
-dV
-dV
-dV
-kr
-zy
-dV
-DG
-dH
-vZ
-"}
-(11,1,1) = {"
-vZ
-cC
-UC
-oX
-uP
-DC
-Uy
-ny
-rk
-WA
-qB
-uR
-JE
-rz
-xO
-FD
-fz
-JR
-vZ
-"}
-(12,1,1) = {"
-vZ
-xr
-dU
-qO
-Se
-Od
-Dj
-DD
-Da
-tT
-Bk
-uR
-wF
-XB
-Ei
-IV
-hJ
-JR
-vZ
-"}
-(13,1,1) = {"
-vZ
-xr
-pb
-FE
-Af
-UO
-xy
-ro
-hZ
-XU
-YT
-Yj
-cZ
-dy
-AF
-ct
-qZ
-eS
-vZ
-"}
-(14,1,1) = {"
-vZ
-xr
-sR
-my
-jj
-Bc
-di
-st
-Wf
-az
-Ed
-uR
-To
-Ix
-dr
-ZY
-RU
-eS
-vZ
-"}
-(15,1,1) = {"
-vZ
-xr
-dU
-ev
-HG
-qE
-qE
-gq
-gq
-pg
-ZG
-uR
-uR
-uR
-uR
-KD
-hL
-eS
-vZ
-"}
-(16,1,1) = {"
-vZ
-xr
-pb
-jA
-Tp
-WH
-kS
-kS
-kS
-DF
-kS
-UI
-sg
-zu
-sg
-dZ
-sg
-Au
-vZ
-"}
-(17,1,1) = {"
-vZ
-xr
-sR
-jA
-Tp
-sp
-cy
-sn
-sn
-LI
-Et
-sU
-sg
-om
-GS
-zd
-JT
-Au
-vZ
-"}
-(18,1,1) = {"
-vZ
-cC
-SM
-vi
-dP
-sp
-aV
-NM
-NM
-Hs
-NM
-NM
-bv
-zP
-SO
-fG
-NQ
-Au
-vZ
-"}
-(19,1,1) = {"
-vZ
-Ag
-kZ
-Fe
-XP
-XP
-sI
-rr
-GE
-Nv
-BQ
-yn
-sg
-iB
-sg
-dZ
-sg
-Au
-vZ
-"}
-(20,1,1) = {"
-vZ
-Ag
-DI
-ju
-Ih
-lD
-FN
-FN
-FN
-Zm
-FN
-FN
-FN
-Vm
-Wv
-fa
-IQ
-TD
-vZ
-"}
-(21,1,1) = {"
-yi
-Ag
-ua
-Ea
-EF
-FN
-FN
-HA
-uS
-fK
-rA
-Um
-FN
-hs
-fs
-vw
-wY
-TD
-vZ
-"}
-(22,1,1) = {"
-as
-cp
-nc
-Ty
-tP
-FN
-np
-Sf
-dh
-Mo
-Lj
-Sf
-Fd
-hQ
-fs
-vw
-EH
-DZ
-vZ
-"}
-(23,1,1) = {"
-yi
-yk
-Ba
-Av
-sX
-FN
-ej
-Lj
-xH
-KM
-Sf
-Lj
-Dt
-Ro
-WP
-HY
-EH
-DZ
-vZ
-"}
-(24,1,1) = {"
-Tl
-yk
-dW
-QW
-Uf
-mg
-zl
-Qs
-Sl
-Kk
-no
-Qs
-RR
-eZ
-uI
-eG
-Zn
-TD
-vZ
-"}
-(25,1,1) = {"
-yi
-ys
-Uv
-jN
-YR
-FA
-Sf
-Lj
-Qc
-rC
-cA
-Lj
-Sf
-lg
-fs
-GG
-EH
-DZ
-vZ
-"}
-(26,1,1) = {"
-yi
-Ag
-nA
-qq
-yV
-FN
-eE
-Sf
-wm
-xj
-VR
-Sf
-DA
-mr
-Cn
-FR
-yF
-DZ
-vZ
-"}
-(27,1,1) = {"
-vZ
-Ag
-rj
-Ag
-Ag
-px
-Dd
-Lj
-bB
-Mp
-Sf
-kC
-gV
-TD
-wO
-Kl
-Vr
-TD
-vZ
-"}
-(28,1,1) = {"
-vZ
-Ag
-sD
-Ag
-vZ
-of
-of
-lG
-NB
-ph
-ph
-Ng
-of
-of
-TD
-TD
-qu
-TD
-vZ
-"}
-(29,1,1) = {"
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-Cu
-YZ
-ep
-AA
-OJ
-YZ
-Cu
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-"}
-(30,1,1) = {"
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-Cu
-ku
-ku
-ku
-Cu
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-vZ
-"}
diff --git a/_maps/shuttles/independent/independent_sunskipper.dmm b/_maps/shuttles/independent/independent_sunskipper.dmm
new file mode 100644
index 000000000000..61c49a25295e
--- /dev/null
+++ b/_maps/shuttles/independent/independent_sunskipper.dmm
@@ -0,0 +1,4735 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Kitchen";
+	req_one_access = list(25, 28, 35)
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"al" = (
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"ax" = (
+/obj/effect/turf_decal/siding/wood/end{
+	color = "#D5A66E";
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/grunge{
+	name = "Crew Quarters"
+	},
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"aJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/north,
+/obj/item/kirbyplants/random{
+	pixel_y = 20
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"aK" = (
+/obj/structure/cable/green{
+	icon_state = "2-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"aQ" = (
+/obj/effect/turf_decal/ihejirika_small/left{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/marker_beacon,
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"aV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"bf" = (
+/obj/machinery/hydroponics/constructable{
+	layer = 2
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"bi" = (
+/obj/structure/table/wood/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#332521"
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"bj" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/window/eastright{
+	name = "Engine Access"
+	},
+/obj/machinery/door/poddoor{
+	id = "sunskipper_engine_shutters";
+	name = "Engineering Blast Doors";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"bp" = (
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/external/dark)
+"br" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#332521"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"bt" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"bx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"bz" = (
+/obj/machinery/computer/helm{
+	icon_state = "computer-left";
+	dir = 8
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"bI" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/item/reagent_containers/food/condiment/ketchup{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/food/condiment/mayonnaise{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"bJ" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#332521"
+	},
+/obj/machinery/light/dim/directional/north,
+/obj/item/reagent_containers/food/drinks/shaker{
+	pixel_x = -7;
+	pixel_y = 8
+	},
+/obj/item/paper_bin{
+	pixel_y = 9;
+	pixel_x = 8
+	},
+/obj/item/pen/fourcolor,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"bK" = (
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/bridge)
+"bL" = (
+/obj/machinery/light_switch{
+	pixel_x = -10;
+	pixel_y = -19;
+	dir = 1
+	},
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/power/ship_gravity,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/structure/sign/poster/contraband/twelve_gauge{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"bM" = (
+/obj/machinery/hydroponics/constructable{
+	layer = 2
+	},
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"bU" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"bX" = (
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
+/obj/machinery/newscaster/directional/north,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_y = 21;
+	id = "sunskipper_holo";
+	pixel_x = 11
+	},
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"cf" = (
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/crew/cryo)
+"cx" = (
+/obj/machinery/biogenerator,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/hydroponics)
+"cC" = (
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"cE" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/opaque/bottlegreen/bordercorner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/bordercorner{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/bordercorner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/food/tomato_smudge,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"cH" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_crew_shutters";
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/crew/hydroponics)
+"cI" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing/wood{
+	dir = 10;
+	color = "#543C30"
+	},
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"cY" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/tracker,
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"ds" = (
+/obj/structure/table/reinforced,
+/obj/item/table_bell{
+	pixel_x = -7;
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_y = 13;
+	pixel_x = 4
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_y = 13;
+	pixel_x = 11
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"dG" = (
+/obj/structure/closet/wall/white/directional/south{
+	name = "Seeds Storage";
+	color = "#50C878";
+	storage_capacity = 38
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 8
+	},
+/obj/item/seeds/apple,
+/obj/item/seeds/banana,
+/obj/item/seeds/berry,
+/obj/item/seeds/cabbage,
+/obj/item/seeds/carrot,
+/obj/item/seeds/carrot/parsnip,
+/obj/item/seeds/chanter,
+/obj/item/seeds/cherry,
+/obj/item/seeds/chili,
+/obj/item/seeds/chili/ice,
+/obj/item/seeds/cocoapod,
+/obj/item/seeds/cocoapod/vanillapod,
+/obj/item/seeds/coffee/robusta,
+/obj/item/seeds/corn,
+/obj/item/seeds/eggplant,
+/obj/item/seeds/garlic,
+/obj/item/seeds/grape,
+/obj/item/seeds/lemon,
+/obj/item/seeds/lime,
+/obj/item/seeds/onion,
+/obj/item/seeds/orange,
+/obj/item/seeds/peas,
+/obj/item/seeds/pineapple,
+/obj/item/seeds/plump,
+/obj/item/seeds/poppy,
+/obj/item/seeds/potato,
+/obj/item/seeds/potato/sweet,
+/obj/item/seeds/pumpkin,
+/obj/item/seeds/redbeet,
+/obj/item/seeds/seaweed,
+/obj/item/seeds/soya,
+/obj/item/seeds/sugarcane,
+/obj/item/seeds/tea/astra,
+/obj/item/seeds/tomato,
+/obj/item/seeds/watermelon,
+/obj/item/seeds/wheat,
+/obj/item/seeds/wheat/rice,
+/obj/item/seeds/whitebeet,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"dW" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"ex" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	id = "sunskipper_dining_shutters";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"eI" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#543C30"
+	},
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"eK" = (
+/obj/structure/table/reinforced,
+/obj/item/cutting_board{
+	pixel_x = -5;
+	pixel_y = 5;
+	anchored = 1
+	},
+/obj/item/kitchen/knife{
+	pixel_x = -11;
+	pixel_y = 9
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"eM" = (
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"eR" = (
+/obj/effect/turf_decal/ihejirika_small{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"eU" = (
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"eW" = (
+/obj/structure/table/wood,
+/obj/structure/sign/painting/library{
+	pixel_y = 30
+	},
+/obj/machinery/fax/indie,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"fg" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable/green,
+/obj/structure/dresser{
+	dir = 4
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"fi" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/canteen)
+"fl" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"fz" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/processor,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"fE" = (
+/obj/structure/cable/green{
+	icon_state = "4-10"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/holopad/emergency/kitchen,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"fP" = (
+/obj/structure/closet/crate/bin,
+/obj/item/trash/popcorn,
+/obj/item/trash/can,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"ga" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/light/floor{
+	pixel_x = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"gw" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 8
+	},
+/obj/structure/fluff/hedge/opaque,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"gE" = (
+/obj/machinery/firealarm/directional/north,
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/jukebox/boombox,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"gU" = (
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"hh" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"hi" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"hj" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange{
+	icon_state = "0-4"
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"hC" = (
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-6"
+	},
+/obj/item/cigbutt,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"hU" = (
+/obj/structure/table/wood,
+/obj/machinery/newscaster/directional/south,
+/obj/item/pen/fourcolor,
+/obj/item/pen/fountain{
+	pixel_y = 3;
+	pixel_x = 6
+	},
+/obj/item/phone{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"hW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 10
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/item/clothing/neck/stethoscope{
+	pixel_y = 18;
+	pixel_x = 11
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"ib" = (
+/obj/item/candle{
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"il" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#332521"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = -10;
+	pixel_x = -19
+	},
+/obj/structure/closet/cabinet,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/item/toy/cards/deck/kotahi,
+/obj/item/toy/cards/deck/syndicate,
+/obj/item/toy/cards/deck/cas,
+/obj/item/toy/cards/deck/cas/black,
+/obj/item/storage/pill_bottle/dice/hazard,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"iC" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"iS" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 5
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"jb" = (
+/obj/structure/sign/warning/docking,
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/hallway/central)
+"je" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"jk" = (
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/curtain/cloth/fancy,
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/canteen)
+"jo" = (
+/turf/closed/wall/r_wall,
+/area/ship/cargo)
+"jx" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"jy" = (
+/obj/structure/cable/green{
+	icon_state = "1-6"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 8
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_x = -25;
+	pixel_y = 36
+	},
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"jz" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_bridge_shutters";
+	name = "Bridge Lockdown";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"jC" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_crew_shutters";
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/hydroponics)
+"jR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	icon_state = "5-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "4-9"
+	},
+/obj/item/reagent_containers/glass/bucket{
+	pixel_x = 7;
+	pixel_y = 14
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"jS" = (
+/obj/machinery/door/airlock/command{
+	name = "Bridge";
+	req_access = list(20)
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood/end{
+	color = "#792f27"
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"kw" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"ky" = (
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/obj/structure/cable/green{
+	icon_state = "9-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/green{
+	icon_state = "6-10"
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"kG" = (
+/obj/machinery/shower{
+	pixel_y = 20
+	},
+/obj/structure/curtain,
+/obj/machinery/light/dim/directional/west,
+/obj/item/soap,
+/turf/open/floor/noslip,
+/area/ship/crew/dorm)
+"kO" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"kW" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	pixel_y = -20;
+	pixel_x = 7;
+	name = "Cargo Bay Shutters Control";
+	dir = 1;
+	id = "sunskipper_storage"
+	},
+/obj/machinery/light_switch{
+	pixel_x = -2;
+	pixel_y = -19;
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/crate/wooden{
+	name = "mining gear crate"
+	},
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/kitchen/knife/hunting,
+/obj/item/kitchen/knife/hunting,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/head/hardhat/mining,
+/obj/item/clothing/head/hardhat/mining,
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -12
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"kX" = (
+/turf/closed/wall,
+/area/ship/hallway/central)
+"kZ" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"lf" = (
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/wall/orange/directional/south{
+	name = "Tool Closet"
+	},
+/obj/item/flashlight,
+/obj/item/storage/toolbox/electrical,
+/obj/item/clothing/head/welding,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/weldingtool/largetank,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"lu" = (
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"lI" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/curtain/cloth/grey,
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Kitchen";
+	req_one_access = list(25, 28, 35)
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"lK" = (
+/obj/machinery/photocopier,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"lV" = (
+/obj/structure/crate_shelf,
+/obj/structure/sign/poster/contraband/space_cube{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"mk" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 2
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"mm" = (
+/obj/structure/table/wood/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#332521"
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"mr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/borderfloorblack,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"mD" = (
+/obj/structure/cable/orange{
+	icon_state = "6-9"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -10
+	},
+/obj/machinery/vending/hydronutrients,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"mQ" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"mR" = (
+/obj/structure/cable/green{
+	icon_state = "5-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"mW" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#543C30"
+	},
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 8
+	},
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"mX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-5"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#D5A66E";
+	dir = 10
+	},
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"ne" = (
+/obj/structure/extinguisher_cabinet/directional/east{
+	pixel_y = 7
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#D5A66E";
+	dir = 6
+	},
+/obj/machinery/firealarm/directional/east{
+	pixel_y = -5
+	},
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"ng" = (
+/obj/item/candle{
+	pixel_y = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"nj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"nJ" = (
+/obj/structure/cable/green{
+	icon_state = "2-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#792f27";
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#792f27"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"nK" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#332521"
+	},
+/obj/machinery/vending/boozeomat/all_access,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"nM" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/vending/dinnerware,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"nQ" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_bridge_shutters";
+	name = "Bridge Lockdown"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"ob" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"ok" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
+	},
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"om" = (
+/obj/structure/table/wood/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#332521"
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"on" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#D5A66E"
+	},
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"op" = (
+/obj/structure/bed{
+	dir = 1
+	},
+/obj/item/bedsheet/dorms{
+	dir = 1
+	},
+/obj/structure/curtain/cloth/grey,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"oO" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "2-5"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"pp" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/item/candle{
+	pixel_y = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"pw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable/green{
+	icon_state = "0-6"
+	},
+/obj/structure/closet/wall/directional/north{
+	name = "Telecommunication Equipment"
+	},
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/cryo)
+"pJ" = (
+/obj/structure/cable/green{
+	icon_state = "6-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#792f27";
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"pM" = (
+/obj/structure/sink/kitchen{
+	dir = 8;
+	layer = 2.04
+	},
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_x = 24
+	},
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_x = 32;
+	pixel_y = -10
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"pS" = (
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"pT" = (
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/box,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"qj" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"qk" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor{
+	id = "sunskipper_engine_shutters";
+	name = "Engineering Blast Doors";
+	dir = 4
+	},
+/obj/machinery/door/window/eastright{
+	name = "Engine Access"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"qm" = (
+/obj/machinery/hydroponics/constructable{
+	layer = 2
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = 6
+	},
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"qD" = (
+/obj/machinery/door/airlock/public{
+	dir = 4;
+	name = "Bathroom";
+	id_tag = "sunskipper_bathroom"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/dorm)
+"qG" = (
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/machinery/autolathe,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"qP" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/canteen/kitchen)
+"qV" = (
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/window/eastleft{
+	name = "Engine Access"
+	},
+/obj/machinery/door/poddoor{
+	id = "sunskipper_engine_shutters";
+	name = "Engineering Blast Doors";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"rf" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/helm/viewscreen/directional/east,
+/obj/machinery/airalarm/directional/north,
+/obj/item/modular_computer/laptop/preset/civilian,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"rl" = (
+/obj/machinery/door/airlock/grunge{
+	id_tag = "sunskipper_toilet";
+	name = "Toilet";
+	req_ship_access = 0
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"ro" = (
+/obj/structure/table/wood/fancy/red_gold,
+/obj/item/candle{
+	pixel_y = 21
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"rr" = (
+/turf/closed/wall,
+/area/ship/crew/canteen/kitchen)
+"ru" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "sunskipper_dining_shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"rD" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"rS" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/airlock/wood/glass{
+	id_tag = "sunskipper_lobby";
+	name = "Lobby";
+	req_ship_access = 0
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"rT" = (
+/obj/machinery/gibber,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/structure/sign/poster/contraband/starkist{
+	pixel_x = -32
+	},
+/obj/effect/decal/cleanable/blood/gibs/old,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"sd" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "5-10"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"sk" = (
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"sm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"sx" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/smartfridge/food,
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/hydroponics)
+"sN" = (
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/crew/toilet)
+"sW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 1
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"tb" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/obj/machinery/vending/cigarette,
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"td" = (
+/obj/structure/chair/stool/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"tr" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable/green{
+	icon_state = "0-10"
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 28
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"ty" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 8
+	},
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 8
+	},
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"tJ" = (
+/obj/machinery/door/airlock/wood/glass{
+	dir = 4;
+	name = "Cryopod Room"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-9"
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/cryo)
+"tP" = (
+/obj/structure/table/wood/reinforced,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10;
+	color = "#332521"
+	},
+/obj/item/radio/intercom/directional/west,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"uc" = (
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 6
+	},
+/obj/machinery/light_switch{
+	pixel_x = -10;
+	pixel_y = -19;
+	dir = 1
+	},
+/obj/structure/bed/dogbed{
+	name = "Remy's bed";
+	anchored = 1
+	},
+/mob/living/simple_animal/mouse/gray{
+	name = "Remy"
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"uj" = (
+/turf/closed/wall,
+/area/ship/cargo)
+"ul" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"up" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27"
+	},
+/obj/item/radio/intercom/directional/south,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	color = "#792f27"
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"ux" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"uz" = (
+/obj/item/mop,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/storage/bag/trash,
+/obj/machinery/firealarm/directional/east,
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/structure/janitorialcart,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"uG" = (
+/obj/structure/cable/green{
+	icon_state = "6-9"
+	},
+/obj/structure/cable/green{
+	icon_state = "4-9"
+	},
+/obj/structure/chair/wood{
+	dir = 2
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"uP" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"uQ" = (
+/turf/closed/wall,
+/area/ship/crew/dorm)
+"vf" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/structure/chair/sofa/red/right/directional/west,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"vh" = (
+/obj/structure/fluff/hedge,
+/obj/structure/railing/wood{
+	layer = 3.1;
+	dir = 2;
+	color = "#792f27"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"vy" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/obj/machinery/light/floor{
+	pixel_x = -10
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"vB" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"vH" = (
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"vI" = (
+/obj/structure/sink{
+	pixel_y = 24;
+	layer = 2.91
+	},
+/obj/structure/mirror{
+	pixel_y = 34
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"wf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"wg" = (
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"wK" = (
+/turf/closed/wall/r_wall,
+/area/ship/hallway/central)
+"wM" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"xe" = (
+/obj/machinery/light/directional/north,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = -10;
+	pixel_x = -19
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#D5A66E";
+	dir = 9
+	},
+/obj/machinery/vending/cigarette,
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"xn" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_bridge_shutters";
+	name = "Bridge Lockdown";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"xo" = (
+/obj/machinery/light/directional/north,
+/obj/structure/chair/office,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"xH" = (
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/poddoor{
+	id = "sunskipper_entrance"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "sunskipper_holo";
+	locked = 1
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"xI" = (
+/obj/item/reagent_containers/glass/bucket{
+	pixel_x = 12;
+	pixel_y = -8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"xJ" = (
+/obj/item/kirbyplants/random{
+	pixel_x = 8
+	},
+/obj/machinery/light_switch{
+	pixel_x = -10;
+	pixel_y = -19;
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"xM" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"xT" = (
+/obj/structure/cable/orange{
+	icon_state = "5-10"
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"xW" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"ya" = (
+/obj/structure/toilet{
+	pixel_y = -4;
+	dir = 1
+	},
+/obj/machinery/button/door{
+	pixel_x = -22;
+	dir = 4;
+	pixel_y = 9;
+	id = "sunskipper_toilet";
+	name = "Door Bolts";
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
+/obj/machinery/light/dim/directional/south,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"yi" = (
+/obj/item/kirbyplants/random{
+	pixel_y = 20
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"yn" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/sign/warning/vacuum/external{
+	pixel_y = 39
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"yp" = (
+/obj/structure/grille,
+/obj/structure/window/plasma/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "sunskipper_dining_shutters";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"yu" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable/orange{
+	icon_state = "6-9"
+	},
+/obj/structure/cable/orange{
+	icon_state = "9-10"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/maintenance{
+	req_one_access = list(25, 28, 35)
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"yB" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/structure/sign/painting/library{
+	pixel_y = -30
+	},
+/obj/structure/chair/sofa/red/corner/directional/west,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"yH" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#543C30"
+	},
+/obj/structure/chair/sofa/red/directional/north,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"yL" = (
+/obj/structure/closet/crate/bin,
+/obj/item/reagent_containers/food/snacks/badrecipe,
+/obj/item/trash/can/food/peaches,
+/obj/structure/sign/directions/evac{
+	dir = 4;
+	pixel_y = -20
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"yQ" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 2
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"zc" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 9
+	},
+/obj/structure/safe,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
+/obj/item/gun/energy/e_gun/mini,
+/obj/structure/sign/painting/library{
+	pixel_y = 30
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"zj" = (
+/obj/structure/table/wood/reinforced,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#332521"
+	},
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"zm" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable/green{
+	icon_state = "0-6"
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"zw" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/dept/cargo{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"zC" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange,
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"zP" = (
+/obj/structure/chair/stool/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"zS" = (
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/crew/canteen)
+"Ai" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Az" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 8;
+	id = "sunskipper_storage";
+	name = "Cargo Hold"
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"AP" = (
+/obj/machinery/computer/cargo/express{
+	icon_state = "computer-right";
+	dir = 8
+	},
+/obj/structure/railing/wood{
+	layer = 3.1;
+	dir = 2;
+	color = "#792f27"
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"AR" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/hydroponics)
+"AX" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"AY" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/obj/machinery/jukebox,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Ba" = (
+/obj/machinery/light/small/directional/east,
+/obj/structure/reagent_dispensers/cooking_oil,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Bg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Bl" = (
+/obj/structure/urinal{
+	dir = 4;
+	pixel_x = -16
+	},
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"Bo" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/obj/machinery/door/airlock{
+	name = "Front Desk";
+	req_one_access = list(25, 28, 35)
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"By" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Bz" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/obj/machinery/firealarm/directional/west,
+/obj/structure/chair/sofa/red/left/directional/east,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"BA" = (
+/turf/closed/wall,
+/area/ship/maintenance/aft)
+"BO" = (
+/obj/structure/curtain/cloth/fancy,
+/obj/machinery/button/door{
+	pixel_x = 22;
+	name = "Lobby Door Bolts Control";
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	id = "sunskipper_lobby";
+	dir = 8;
+	pixel_y = 4
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/crew/canteen)
+"BR" = (
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/crew/dorm)
+"Ce" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable/green{
+	icon_state = "2-9"
+	},
+/obj/effect/decal/cleanable/food/tomato_smudge,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Cu" = (
+/turf/closed/wall/r_wall,
+/area/ship/bridge)
+"Cx" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/radio/intercom/table{
+	dir = 8;
+	pixel_x = -7;
+	pixel_y = -2
+	},
+/obj/item/table_bell{
+	pixel_x = -7;
+	pixel_y = 26
+	},
+/obj/effect/turf_decal/siding/wood/end{
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"CA" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/light/directional/south,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 1
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"CH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"CM" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/sandwich{
+	pixel_x = 15;
+	pixel_y = 13
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"CQ" = (
+/obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10;
+	color = "#543C30"
+	},
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 4
+	},
+/obj/structure/fluff/hedge/opaque,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"De" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_crew_shutters"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/crew/hydroponics)
+"Dg" = (
+/obj/structure/sink/kitchen{
+	dir = 4;
+	layer = 2.04
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Ds" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/structure/chair/wood,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"DH" = (
+/obj/structure/cable/orange{
+	icon_state = "5-10"
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"DJ" = (
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"DK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"DN" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"DY" = (
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Ea" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "0-6"
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 10
+	},
+/obj/structure/closet/crate/engineering/electrical{
+	name = "fuel crate"
+	},
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/button/door{
+	name = "Engine Blast Doors";
+	id = "sunskipper_engine_shutters";
+	pixel_y = 22
+	},
+/obj/item/stack/sheet/mineral/coal/ten,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Eg" = (
+/obj/machinery/icecream_vat,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Ez" = (
+/obj/machinery/holopad,
+/obj/structure/railing/wood{
+	layer = 3.1;
+	dir = 10;
+	color = "#792f27"
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"EG" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = -6
+	},
+/obj/structure/extinguisher_cabinet/directional/west{
+	pixel_y = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "2-9"
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"ER" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/structure/sign/directions/evac{
+	dir = 1;
+	pixel_y = 24
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"ET" = (
+/obj/effect/turf_decal/ihejirika_small/right{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"Fb" = (
+/obj/machinery/light/directional/east,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/obj/structure/chair/comfy/red/directional/west,
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"Fw" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "4-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"FG" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"FN" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"FO" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"FP" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_crew_shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen/kitchen)
+"FY" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/obj/machinery/light/dim/directional/west,
+/obj/structure/chair/sofa/red/directional/east,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"Gd" = (
+/obj/machinery/light/directional/north,
+/obj/structure/cable/orange{
+	icon_state = "5-10"
+	},
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/effect/turf_decal/industrial/hatch/blue,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Ge" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/paper_bin{
+	pixel_x = 9;
+	pixel_y = 6
+	},
+/obj/item/flashlight/lamp{
+	pixel_x = -6;
+	pixel_y = 13
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable/green{
+	icon_state = "0-9"
+	},
+/obj/item/pen/fourcolor,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"Gp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/orange{
+	icon_state = "1-6"
+	},
+/obj/structure/cable/green{
+	icon_state = "4-9"
+	},
+/obj/structure/extinguisher_cabinet/directional/south{
+	pixel_x = 6
+	},
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -6
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Gt" = (
+/obj/structure/chair/sofa/red/left/directional/north,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Gv" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"Gw" = (
+/obj/structure/cable/green{
+	icon_state = "2-5"
+	},
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "5-9"
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Gz" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"GG" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/poddoor{
+	id = "sunskipper_entrance"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "sunskipper_holo";
+	locked = 1
+	},
+/obj/docking_port/mobile{
+	dir = 2;
+	port_direction = 8;
+	preferred_direction = 4
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"GM" = (
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"GR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/cryo)
+"Hj" = (
+/obj/machinery/power/solar_control{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/structure/railing{
+	color = "#999999"
+	},
+/obj/machinery/light/small/directional/east,
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Hq" = (
+/obj/structure/chair/stool/bar{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Hr" = (
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Hu" = (
+/obj/structure/sign/painting/library{
+	pixel_y = 30
+	},
+/obj/structure/aquarium/prefilled,
+/obj/structure/railing/wood{
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"HG" = (
+/obj/structure/sign/poster/official/work_for_a_future{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"HK" = (
+/turf/closed/wall,
+/area/ship/crew/canteen)
+"HP" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = 6
+	},
+/obj/item/pen,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"Id" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/airlock/wood/glass{
+	id_tag = "sunskipper_lobby";
+	name = "Lobby";
+	req_ship_access = 0
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"Ip" = (
+/turf/closed/wall/r_wall/yesdiag,
+/area/ship/crew/hydroponics)
+"Iq" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_crew_shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/dorm)
+"Iw" = (
+/obj/structure/cable/orange{
+	icon_state = "5-10"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/decal/cleanable/food/flour,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"IJ" = (
+/obj/item/candle{
+	pixel_y = 4;
+	pixel_x = -16
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"IV" = (
+/obj/machinery/door/airlock/external{
+	dir = 4;
+	req_ship_access = 0
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"Jf" = (
+/turf/closed/wall,
+/area/ship/crew/cryo)
+"Jg" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/structure/cable/orange{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Jt" = (
+/obj/structure/cable/green{
+	icon_state = "5-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/chair/wood{
+	dir = 2
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Ju" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"JE" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 10
+	},
+/obj/machinery/firealarm/directional/south,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/item/kirbyplants/random{
+	pixel_x = -8
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"JK" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"JY" = (
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/effect/turf_decal/box/red,
+/obj/structure/cable/orange{
+	icon_state = "0-8"
+	},
+/obj/structure/cable/orange{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Kh" = (
+/obj/machinery/cryopod{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/cryo)
+"Kk" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable/orange{
+	icon_state = "5-9"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/airlock/glass{
+	name = "Hydroponics";
+	req_one_access = list(25, 28, 35);
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "6-8"
+	},
+/obj/effect/turf_decal/corner/opaque/black/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/bordercorner{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/hydroponics)
+"Kl" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/machinery/light/dim/directional/north,
+/obj/structure/closet/crate/bin,
+/obj/item/trash/can,
+/obj/item/trash/candle,
+/obj/item/trash/candle,
+/obj/item/trash/candle,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"KG" = (
+/obj/machinery/light/directional/south,
+/obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10;
+	color = "#543C30"
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"KJ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"KP" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = 6
+	},
+/obj/item/flashlight/lamp{
+	pixel_x = -8;
+	pixel_y = 15
+	},
+/obj/machinery/recharger{
+	pixel_x = -9;
+	pixel_y = -3
+	},
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"Lb" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Le" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"Ll" = (
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/head/helmet/space/eva,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/suit/space/eva,
+/obj/item/clothing/suit/space/eva,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/internals{
+	name = "EVA gear crate"
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -32
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Lo" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Lp" = (
+/turf/closed/wall,
+/area/ship/crew/hydroponics)
+"Lx" = (
+/obj/structure/chair/office,
+/obj/item/toy/plush/lizardplushie{
+	layer = 3.1
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"LA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"LF" = (
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"LP" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Mg" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#D5A66E";
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1;
+	color = "#D5A66E"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"Mh" = (
+/obj/structure/table/reinforced,
+/obj/structure/sign/poster/contraband/borg_fancy_1{
+	pixel_y = -32
+	},
+/obj/item/fish_feed{
+	pixel_y = 5;
+	pixel_x = 1
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Mj" = (
+/obj/machinery/door/airlock/public{
+	dir = 8;
+	name = "Restroom"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"MM" = (
+/obj/structure/sign/painting/library{
+	pixel_y = -30
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 28
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"MN" = (
+/obj/structure/cable/green{
+	icon_state = "5-10"
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"MO" = (
+/obj/structure/chair/stool,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"MV" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Nd" = (
+/obj/structure/toilet{
+	dir = 8;
+	pixel_x = 8;
+	layer = 2.89
+	},
+/obj/machinery/button/door{
+	pixel_x = -13;
+	pixel_y = -22;
+	id = "sunskipper_bathroom";
+	name = "Door Bolts";
+	specialfunctions = 4;
+	normaldoorcontrol = 1;
+	dir = 1
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = -14
+	},
+/obj/structure/mirror{
+	pixel_y = -28;
+	layer = 2.91
+	},
+/obj/effect/decal/cleanable/vomit/old,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/dorm)
+"Nk" = (
+/turf/closed/wall,
+/area/ship/bridge)
+"Nv" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"NH" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/oil,
+/obj/item/cigbutt,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"NI" = (
+/obj/structure/chair/wood{
+	dir = 2
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"NM" = (
+/obj/structure/cable/green{
+	icon_state = "4-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Ok" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Ol" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"OP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 2
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"OS" = (
+/obj/structure/table/reinforced,
+/obj/structure/cable/orange{
+	icon_state = "5-10"
+	},
+/obj/machinery/reagentgrinder{
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"OU" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/obj/item/candle{
+	pixel_y = 21
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"OY" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#332521"
+	},
+/obj/structure/sink/kitchen{
+	dir = 8;
+	layer = 2.04;
+	pixel_y = -5
+	},
+/obj/structure/sign/painting/library{
+	pixel_x = 30
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"OZ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Pa" = (
+/turf/template_noop,
+/area/template_noop)
+"Pe" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/condiment/enzyme{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/food/condiment/oliveoil{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Ph" = (
+/turf/closed/wall/r_wall,
+/area/ship/maintenance/aft)
+"Pk" = (
+/turf/closed/wall,
+/area/ship/crew/toilet)
+"Pm" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = -10
+	},
+/obj/structure/mirror{
+	pixel_y = 34
+	},
+/obj/structure/sink{
+	pixel_y = 24;
+	layer = 2.91
+	},
+/obj/structure/sign/warning/nosmoking/circle{
+	pixel_x = 30
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"Pt" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Pu" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#332521"
+	},
+/obj/item/lighter{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/glass/rag{
+	pixel_x = 15;
+	pixel_y = 1
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"PM" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"PN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	color = "#543C30";
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Qc" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/food/egg_smudge,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Qp" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/effect/turf_decal/box,
+/obj/item/reagent_containers/food/condiment/rice,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"QB" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/grill,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"QG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"QR" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing/wood{
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Rd" = (
+/obj/structure/cable/orange{
+	icon_state = "5-10"
+	},
+/obj/machinery/deepfryer,
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Rq" = (
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"Rr" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10;
+	color = "#543C30"
+	},
+/obj/machinery/newscaster/directional/west,
+/obj/structure/chair/sofa/red/corner/directional/north,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"Ry" = (
+/obj/structure/closet/crate/wooden{
+	anchored = 1;
+	name = "suit crate"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 10
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/east,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/airalarm/directional/south,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/under/suit/waiter/syndicate,
+/obj/item/clothing/under/suit/waiter,
+/obj/item/clothing/under/pants/black,
+/obj/item/clothing/under/pants/black,
+/obj/item/clothing/under/rank/civilian/chef,
+/obj/item/clothing/under/rank/civilian/bartender,
+/obj/item/clothing/accessory/waistcoat,
+/obj/item/clothing/accessory/waistcoat,
+/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/that,
+/obj/item/clothing/gloves/color/evening,
+/obj/item/clothing/gloves/color/white,
+/obj/item/storage/backpack/satchel/leather,
+/obj/item/storage/backpack/satchel/leather,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/cryo)
+"Rz" = (
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"RH" = (
+/obj/structure/cable/green{
+	icon_state = "6-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"RS" = (
+/obj/structure/cable/orange{
+	icon_state = "1-10"
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"RX" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"Sa" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"SB" = (
+/obj/machinery/door/airlock/freezer{
+	dir = 4;
+	req_one_access = list(28, 35)
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"SH" = (
+/obj/structure/chair/stool/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"SV" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/toilet)
+"SW" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/orange,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external/dark)
+"SY" = (
+/obj/machinery/door/airlock/external{
+	dir = 4;
+	req_ship_access = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"Tr" = (
+/obj/structure/chair/comfy/shuttle{
+	name = "Helm Control";
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"TG" = (
+/obj/machinery/light/small/directional/west,
+/obj/item/stack/rods/twentyfive{
+	pixel_x = -11
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"TM" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/closet/emcloset/wall/directional/north,
+/turf/open/floor/wood/walnut,
+/area/ship/hallway/central)
+"Uc" = (
+/obj/structure/closet/secure_closet/freezer/meat/open,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 1
+	},
+/obj/effect/turf_decal/box,
+/obj/item/radio/intercom/directional/east,
+/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
+/obj/item/reagent_containers/food/snacks/meat/slab/bear,
+/obj/item/reagent_containers/food/snacks/meat/slab/chicken,
+/obj/item/reagent_containers/food/snacks/meat/slab/chicken,
+/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
+/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen/kitchen)
+"Ug" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/door/airlock/wood/glass{
+	dir = 4;
+	name = "Office";
+	req_access = list(20)
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"Uj" = (
+/obj/machinery/microwave,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"Uo" = (
+/obj/machinery/hydroponics/constructable{
+	layer = 2
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable/green{
+	icon_state = "0-6"
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Up" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1;
+	color = "#332521"
+	},
+/obj/machinery/smartfridge/drinks{
+	color = "#D5A66E"
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/crew/canteen)
+"UK" = (
+/obj/structure/closet/crate{
+	name = "supplies crate"
+	},
+/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/food/condiment/saltshaker,
+/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/storage/box/lights/mixed,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
+/obj/item/stack/sheet/plastic/five,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Ve" = (
+/obj/item/candle{
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2;
+	color = "#543C30"
+	},
+/obj/structure/table/wood/fancy/red_gold,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Vf" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "sunskipper_crew_shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen/kitchen)
+"Vj" = (
+/obj/item/storage/box/zipties,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6;
+	color = "#543C30"
+	},
+/obj/machinery/light_switch{
+	pixel_y = -19;
+	pixel_x = -11;
+	dir = 1
+	},
+/obj/item/reagent_containers/spray/pepper,
+/obj/structure/closet/secure_closet/wall/directional/south{
+	name = "Security Equipment";
+	icon_state = "sec_wall";
+	req_access = list(20);
+	pixel_x = 2
+	},
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"Vm" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"VE" = (
+/obj/machinery/button/door{
+	pixel_x = -22;
+	name = "Lobby Door Bolts Control";
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	dir = 4;
+	id = "sunskipper_lobby";
+	pixel_y = -4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 10;
+	color = "#543C30"
+	},
+/obj/machinery/button/door{
+	name = "Cargo Bay Shutters Control";
+	id = "sunskipper_storage";
+	dir = 4;
+	pixel_x = -22;
+	pixel_y = 8
+	},
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"VG" = (
+/obj/machinery/light/directional/west,
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/condiment/soysauce{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/food/condiment/bbqsauce{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"VI" = (
+/obj/structure/chair/sofa/red/right/directional/north,
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"VM" = (
+/obj/structure/cable/green{
+	icon_state = "0-5"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/closet/wall/white/med{
+	name = "First Aid";
+	pixel_y = -28
+	},
+/obj/item/storage/firstaid/regular,
+/obj/item/reagent_containers/hypospray/medipen,
+/obj/item/reagent_containers/hypospray/medipen,
+/obj/item/storage/pill_bottle/charcoal/less,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"Wg" = (
+/obj/structure/filingcabinet{
+	pixel_x = 11;
+	pixel_y = 20;
+	density = 0
+	},
+/obj/item/clipboard,
+/obj/item/folder/red,
+/obj/item/folder,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/siding/wood{
+	dir = 5;
+	color = "#543C30"
+	},
+/obj/machinery/button/door{
+	pixel_y = 22;
+	pixel_x = -12;
+	name = "External Blast Doors Control";
+	color = "#FF9999";
+	id = "sunskipper_entrance"
+	},
+/turf/open/floor/carpet/black,
+/area/ship/hallway/central)
+"Wl" = (
+/obj/machinery/door/airlock{
+	dir = 4;
+	name = "Bar";
+	req_one_access = list(25, 28)
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"WA" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/dorm)
+"WN" = (
+/obj/machinery/hydroponics/constructable{
+	layer = 2
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"WR" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4;
+	color = "#543C30"
+	},
+/obj/structure/chair/sofa/red/directional/west,
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
+"Xm" = (
+/obj/machinery/seed_extractor,
+/obj/effect/turf_decal/corner/opaque/bottlegreen/border{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/crew/hydroponics)
+"Xp" = (
+/obj/machinery/cryopod{
+	dir = 4
+	},
+/obj/machinery/computer/cryopod/directional/north,
+/obj/structure/sign/poster/contraband/ntos{
+	pixel_x = -32
+	},
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew/cryo)
+"Xt" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"Xz" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono/white,
+/area/ship/crew/canteen/kitchen)
+"XH" = (
+/obj/effect/turf_decal/siding/wood{
+	color = "#D5A66E";
+	dir = 5
+	},
+/obj/structure/noticeboard{
+	pixel_y = 28
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/birch,
+/area/ship/crew/dorm)
+"XS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/mono,
+/area/ship/crew/canteen/kitchen)
+"Yc" = (
+/obj/structure/urinal{
+	dir = 4;
+	pixel_x = -16
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"Yl" = (
+/obj/docking_port/stationary{
+	dwidth = 7;
+	width = 30;
+	height = 15;
+	dir = 4
+	},
+/turf/template_noop,
+/area/template_noop)
+"YF" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 4;
+	layer = 2.35;
+	piping_layer = 2
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/plating,
+/area/ship/maintenance/aft)
+"YL" = (
+/obj/item/clothing/gloves/color/white,
+/obj/item/clothing/glasses/sunglasses,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/under/suit/black_really,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/item/clothing/under/suit/checkered,
+/obj/item/clothing/under/suit/red,
+/obj/item/clothing/under/suit/blacktwopiece,
+/obj/structure/closet/wall/blue/directional/north{
+	name = "Manager's Locker"
+	},
+/obj/item/clothing/under/pants/black,
+/obj/item/clothing/suit/toggle/lawyer/charcoal,
+/obj/item/clothing/neck/tie,
+/obj/item/storage/backpack/satchel/leather,
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/bridge)
+"YM" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing/wood{
+	color = "#543C30"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	color = "#543C30"
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"YQ" = (
+/obj/structure/cable/green{
+	icon_state = "1-6"
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/plaque{
+	pixel_x = -32
+	},
+/turf/open/floor/carpet/red_gold,
+/area/ship/hallway/central)
+"Zq" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 8;
+	id = "sunskipper_storage";
+	name = "Cargo Hold"
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/structure/cable/green{
+	icon_state = "6-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"Zr" = (
+/obj/structure/filingcabinet/double,
+/obj/effect/turf_decal/siding/wood{
+	color = "#792f27";
+	dir = 5
+	},
+/obj/item/folder/blue,
+/obj/item/folder/red,
+/obj/item/folder,
+/obj/item/clipboard,
+/turf/open/floor/wood/mahogany,
+/area/ship/bridge)
+"Zw" = (
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 8
+	},
+/obj/structure/railing/wood{
+	color = "#543C30";
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"ZO" = (
+/turf/closed/wall/r_wall,
+/area/ship/crew/cryo)
+"ZP" = (
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/wood/walnut,
+/area/ship/crew/canteen)
+"ZY" = (
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 4
+	},
+/obj/item/radio/intercom/wideband/directional/west,
+/obj/structure/railing/corner/wood{
+	dir = 8;
+	layer = 2.99;
+	color = "#792f27"
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	pixel_x = -10;
+	pixel_y = 22;
+	name = "Bridge Lockdown";
+	id = "sunskipper_bridge_shutters";
+	layer = 2.89
+	},
+/obj/machinery/button/door{
+	pixel_y = 22;
+	name = "Crew Area Shutters Control";
+	id = "sunskipper_crew_shutters"
+	},
+/obj/machinery/button/door{
+	pixel_x = 10;
+	pixel_y = 22;
+	name = "Dining Hall Shutters Control";
+	id = "sunskipper_dining_shutters";
+	layer = 2.91
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+
+(1,1,1) = {"
+Pa
+Pa
+Pa
+Pa
+Pa
+Ph
+hi
+hi
+hi
+Ph
+Ph
+RX
+hj
+SW
+zC
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(2,1,1) = {"
+Pa
+Pa
+bK
+Cu
+jz
+Ph
+qk
+qV
+bj
+BA
+Ph
+cH
+jC
+cH
+cH
+Ip
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(3,1,1) = {"
+Pa
+Pa
+Cu
+eW
+KP
+BA
+Ea
+NH
+kO
+YF
+BA
+Uo
+Jg
+OZ
+bf
+De
+bp
+Pa
+Pa
+Pa
+Pa
+"}
+(4,1,1) = {"
+Pa
+Pa
+Cu
+xo
+hU
+BA
+eU
+Gw
+hC
+lf
+BA
+WN
+jR
+Ju
+qm
+AR
+ZO
+ZO
+cf
+Pa
+Pa
+"}
+(5,1,1) = {"
+Pa
+bK
+Cu
+YL
+lK
+BA
+tr
+JY
+Hj
+Gp
+BA
+Gd
+Ai
+Bg
+bM
+AR
+Xp
+Kh
+ZO
+cf
+Pa
+"}
+(6,1,1) = {"
+Pa
+Cu
+Nk
+Ug
+Nk
+rr
+rr
+rr
+rr
+Rq
+yu
+jy
+cE
+DN
+Xm
+Lp
+pw
+GR
+Ry
+ZO
+Pa
+"}
+(7,1,1) = {"
+bK
+Cu
+zc
+hW
+Nk
+rT
+TG
+pT
+rr
+bL
+BA
+mD
+NM
+xI
+dG
+Lp
+Jf
+tJ
+Jf
+ZO
+BR
+"}
+(8,1,1) = {"
+Cu
+Nk
+Zr
+up
+Nk
+Uc
+fl
+Qp
+rr
+BA
+BA
+Lp
+Kk
+sx
+cx
+uQ
+xe
+mX
+op
+fg
+Iq
+"}
+(9,1,1) = {"
+Cu
+ZY
+Ez
+CA
+Nk
+rr
+SB
+rr
+rr
+gE
+VG
+Rd
+Hr
+Ce
+aV
+ax
+Mg
+on
+DK
+lu
+Iq
+"}
+(10,1,1) = {"
+nQ
+Tr
+mr
+pJ
+JE
+Nk
+MV
+zm
+Dg
+Ok
+DH
+MN
+ob
+LF
+xJ
+uQ
+XH
+ne
+wf
+fP
+Iq
+"}
+(11,1,1) = {"
+nQ
+bz
+AP
+sW
+nJ
+jS
+Vm
+bI
+QB
+Iw
+fE
+sm
+rD
+yL
+uQ
+uQ
+qD
+uQ
+Lx
+CM
+Iq
+"}
+(12,1,1) = {"
+nQ
+nQ
+vh
+iS
+uc
+Nk
+ul
+GM
+xT
+LF
+Qc
+LF
+XS
+Pe
+uQ
+kG
+Nd
+uQ
+rf
+HP
+Iq
+"}
+(13,1,1) = {"
+Pa
+xn
+xn
+Cu
+Nk
+Nk
+HG
+OS
+eK
+vH
+Xz
+ds
+By
+Mh
+uQ
+uQ
+uQ
+uQ
+uQ
+WA
+BR
+"}
+(14,1,1) = {"
+Pa
+Gz
+cY
+Vf
+nM
+wg
+RS
+Ol
+pM
+LF
+kZ
+kw
+fz
+Uj
+Pk
+Bl
+Yc
+rl
+ya
+SV
+Pa
+"}
+(15,1,1) = {"
+Pa
+ux
+ux
+FP
+Ba
+vH
+Eg
+rr
+rr
+ab
+lI
+rr
+rr
+rr
+Pk
+yi
+sk
+Pk
+Pk
+SV
+Pa
+"}
+(16,1,1) = {"
+Pa
+ux
+ux
+qP
+rr
+Wl
+rr
+rr
+AY
+Lo
+xW
+Bz
+FY
+Rr
+Pk
+vI
+Le
+VM
+SV
+sN
+Pa
+"}
+(17,1,1) = {"
+Pa
+qj
+ux
+fi
+il
+br
+tP
+td
+AX
+pS
+iC
+xM
+ro
+yH
+Pk
+Pm
+Fw
+uz
+SV
+Pa
+Pa
+"}
+(18,1,1) = {"
+Pa
+Pa
+ux
+fi
+Pu
+cC
+bi
+zP
+Rz
+Rz
+mQ
+vf
+WR
+yB
+Pk
+Pk
+Mj
+Pk
+SV
+Pa
+Pa
+"}
+(19,1,1) = {"
+Pa
+Pa
+ux
+fi
+bJ
+MO
+om
+Hq
+CH
+CH
+Sa
+Zw
+Zw
+ty
+YM
+eM
+Xt
+CQ
+ru
+Pa
+Pa
+"}
+(20,1,1) = {"
+Pa
+Pa
+ux
+fi
+Up
+cC
+mm
+zP
+Rz
+Rz
+RH
+NI
+Lb
+Gt
+QR
+ib
+DY
+gU
+ru
+Pa
+Pa
+"}
+(21,1,1) = {"
+Pa
+Pa
+ux
+fi
+nK
+OY
+zj
+SH
+hh
+Rz
+PM
+uG
+IJ
+VI
+QR
+sd
+je
+Ve
+ru
+Pa
+Pa
+"}
+(22,1,1) = {"
+Pa
+Pa
+qj
+jo
+uj
+uj
+uj
+uj
+tb
+Rz
+jx
+FN
+aK
+ga
+DJ
+LA
+bx
+FO
+ru
+Pa
+Pa
+"}
+(23,1,1) = {"
+Pa
+Pa
+ET
+jo
+lV
+UK
+Ll
+uj
+Kl
+hh
+PM
+vB
+al
+QR
+dW
+QG
+mW
+ru
+ru
+Pa
+Pa
+"}
+(24,1,1) = {"
+Pa
+Pa
+eR
+jo
+qG
+zw
+kW
+uj
+HK
+Hu
+PN
+Jt
+ng
+QR
+dW
+ZP
+eI
+ru
+Pa
+Pa
+Pa
+"}
+(25,1,1) = {"
+Pa
+Pa
+aQ
+jo
+uj
+Az
+Zq
+uj
+kX
+ER
+mR
+Rz
+FG
+QR
+dW
+JK
+OU
+ru
+Pa
+Pa
+Pa
+"}
+(26,1,1) = {"
+Pa
+Pa
+Pa
+GG
+YQ
+Gv
+oO
+EG
+rS
+jk
+mk
+Lo
+Lo
+vy
+Pt
+uP
+ru
+ru
+Pa
+Pa
+Pa
+"}
+(27,1,1) = {"
+Pa
+Pa
+Pa
+xH
+Nv
+ky
+nj
+bU
+Id
+BO
+wM
+yQ
+OP
+ok
+gw
+ru
+ru
+Pa
+Pa
+Pa
+Pa
+"}
+(28,1,1) = {"
+Pa
+Pa
+Pa
+wK
+aJ
+Fb
+Ge
+Cx
+kX
+HK
+cI
+LP
+Ds
+pp
+yp
+yp
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(29,1,1) = {"
+Pa
+Pa
+Pa
+wK
+SY
+kX
+kX
+bX
+VE
+Bo
+KJ
+bt
+yp
+yp
+yp
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(30,1,1) = {"
+Pa
+Pa
+Pa
+wK
+yn
+KG
+kX
+Wg
+Vj
+fi
+yp
+yp
+yp
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(31,1,1) = {"
+Pa
+Pa
+Pa
+wK
+TM
+MM
+wK
+ex
+ex
+zS
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(32,1,1) = {"
+Pa
+Pa
+Pa
+jb
+IV
+wK
+jb
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
+(33,1,1) = {"
+Pa
+Pa
+Pa
+Pa
+Yl
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+Pa
+"}
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index 1ac7b7fb0d33..08738bbe821f 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -995,9 +995,9 @@
 	name = "Minifridge"
 	},
 /obj/item/reagent_containers/food/drinks/soda_cans/molten,
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
+/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda,
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel,
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel,
 /obj/item/reagent_containers/food/drinks/soda_cans/random,
 /obj/item/reagent_containers/food/drinks/soda_cans/random,
 /obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index 107044c9e80f..ea1b99d7d1c4 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -6112,7 +6112,7 @@
 /obj/item/storage/pill_bottle/aranesp,
 /obj/item/taperecorder,
 /obj/item/t_scanner,
-/obj/item/switchblade,
+/obj/item/kitchen/knife/switchblade,
 /obj/item/trash/candy,
 /obj/structure/filingcabinet/double,
 /obj/item/radio/intercom/directional/south,
@@ -11028,10 +11028,7 @@
 	pixel_x = -5;
 	pixel_y = -12
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = 8;
-	pixel_y = -4
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/newspaper{
 	pixel_x = -8;
 	pixel_y = 5
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index f06f4e5dbc66..2ae859c2bcfe 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -6124,6 +6124,9 @@
 	pixel_y = -9;
 	pixel_x = -3
 	},
+/obj/item/clothing/head/helmet/gezena{
+	pixel_y = -11
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
 "Wc" = (
diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
index 0fdb4827655a..8a411993f382 100644
--- a/_maps/shuttles/roumain/srm_elder.dmm
+++ b/_maps/shuttles/roumain/srm_elder.dmm
@@ -1056,12 +1056,12 @@
 /area/ship/roumain)
 "lA" = (
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/emergency_oxygen/double,
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 6
 	},
+/obj/item/clothing/suit/space/hardsuit/solgov/roumain,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/emergency_oxygen/double,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "lM" = (
@@ -1523,6 +1523,24 @@
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
+"rN" = (
+/obj/item/clothing/under/suit/roumain,
+/obj/item/clothing/suit/armor/roumain/shadow,
+/obj/item/clothing/head/cowboy/sec/roumain/shadow,
+/obj/item/flashlight/lantern,
+/obj/structure/closet/secure_closet/shadow,
+/obj/item/lighter,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy/black,
+/obj/item/clothing/shoes/combat,
+/obj/item/kitchen/knife/hunting,
+/obj/item/gps{
+	pixel_x = -7
+	},
+/obj/item/storage/backpack/satchel/leather,
+/obj/item/clothing/accessory/waistcoat/roumain,
+/turf/open/floor/wood/ebony,
+/area/ship/storage)
 "rW" = (
 /obj/machinery/smartfridge/drying_rack,
 /turf/open/floor/ship/dirt/dark,
@@ -1669,6 +1687,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/structure/chair/wood/wings,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "up" = (
@@ -1987,8 +2006,8 @@
 /obj/item/clothing/shoes/cowboy,
 /obj/item/clothing/shoes/cowboy/black,
 /obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/hos/roumain/montagne,
-/obj/item/clothing/head/HoS/cowboy/montagne,
+/obj/item/clothing/suit/armor/roumain/montagne,
+/obj/item/clothing/head/cowboy/sec/roumain/montagne,
 /obj/item/flashlight/lantern,
 /obj/item/storage/fancy/candle_box{
 	pixel_y = 3;
@@ -2010,6 +2029,7 @@
 /obj/item/ammo_box/c45_speedloader,
 /obj/item/ammo_box/c45_speedloader,
 /obj/item/ammo_box/c45,
+/obj/item/clothing/accessory/waistcoat/roumain,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "zH" = (
@@ -2435,6 +2455,7 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
 /obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/destructible/tribal_torch,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "DV" = (
@@ -2617,7 +2638,7 @@
 /obj/item/clothing/under/suit/roumain,
 /obj/item/clothing/suit/armor/roumain,
 /obj/item/clothing/head/cowboy/sec/roumain,
-/obj/item/clothing/suit/armor/riot/chaplain/witchhunter,
+/obj/item/clothing/suit/armor/witchhunter,
 /obj/item/flashlight/lantern,
 /obj/structure/closet/secure_closet/hunter,
 /obj/item/lighter,
@@ -2629,6 +2650,7 @@
 	pixel_x = -7
 	},
 /obj/item/storage/backpack/satchel/leather,
+/obj/item/clothing/accessory/waistcoat/roumain,
 /turf/open/floor/wood/ebony,
 /area/ship/storage)
 "HB" = (
@@ -2656,10 +2678,33 @@
 /turf/open/floor/wood/maple,
 /area/ship/hallway/starboard)
 "HO" = (
-/obj/structure/chair/wood/wings,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/suit/roumain,
+/obj/item/flashlight/lantern,
+/obj/item/storage/fancy/candle_box{
+	pixel_y = 3;
+	pixel_x = 8
+	},
+/obj/item/lighter{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/kitchen/knife/combat,
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 5
 	},
+/obj/item/gps{
+	pixel_x = -7
+	},
+/obj/item/storage/backpack/satchel/leather,
+/obj/item/gun/ballistic/revolver/detective,
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38_box,
+/obj/item/clothing/head/cowboy/sec/roumain/colligne,
+/obj/item/clothing/suit/armor/roumain/colligne,
+/obj/structure/closet/secure_closet/collignes,
+/obj/item/clothing/accessory/waistcoat/roumain,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "Ii" = (
@@ -3254,17 +3299,26 @@
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "Od" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/destructible/tribal_torch,
+/obj/item/clothing/head/hardhat/solgov,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/head/welding,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/item/clothing/suit/hazardvest/roumain,
+/obj/item/clothing/head/cowboy/sec/roumain/machinist,
+/obj/item/clothing/under/suit/roumain,
+/obj/item/clothing/shoes/workboots/mining,
+/obj/item/storage/belt,
+/obj/structure/closet/secure_closet/machinist,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Oo" = (
@@ -3595,11 +3649,11 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "SR" = (
+/obj/structure/closet/secure_closet/flamebearer,
 /obj/item/clothing/under/suit/roumain,
-/obj/item/clothing/suit/armor/roumain/shadow,
-/obj/item/clothing/head/cowboy/sec/roumain/shadow,
+/obj/item/clothing/suit/armor/roumain/flamebearer,
+/obj/item/clothing/head/cowboy/sec/roumain/flamebearer,
 /obj/item/flashlight/lantern,
-/obj/structure/closet/secure_closet/shadow,
 /obj/item/lighter,
 /obj/item/clothing/shoes/cowboy,
 /obj/item/clothing/shoes/cowboy/black,
@@ -3609,6 +3663,7 @@
 	pixel_x = -7
 	},
 /obj/item/storage/backpack/satchel/leather,
+/obj/item/clothing/accessory/waistcoat/roumain,
 /turf/open/floor/wood/ebony,
 /area/ship/storage)
 "Tc" = (
@@ -5069,7 +5124,7 @@ sH
 sH
 sH
 LN
-SR
+rN
 sT
 ds
 LX
@@ -5106,7 +5161,7 @@ sH
 sH
 sH
 LN
-SR
+rN
 AN
 al
 cY
diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
index e001e89d1383..3e66121e59b1 100644
--- a/_maps/shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -5236,9 +5236,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Zq" = (
-/obj/structure/closet/wall/orange{
-	name = "Engineering locker";
-	pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Engineering locker"
 	},
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index fc7e7a029b82..445b6391a30d 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -188,17 +188,16 @@
 /turf/open/floor/plating/rust,
 /area/ship/maintenance/starboard)
 "dD" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/item/clothing/head/beret/black,
-/obj/item/clothing/under/syndicate,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "dG" = (
@@ -372,21 +371,21 @@
 	pixel_x = -12;
 	pixel_y = 7
 	},
-/obj/item/clothing/under/syndicate/sniper,
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/mask/gas/syndicate,
-/obj/item/clothing/suit/armor/vest/duster,
 /obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "Bridge Officer's Locker";
 	req_access_txt = "57"
 	},
 /obj/item/melee/classic_baton/telescopic,
-/obj/item/clothing/neck/chameleon,
 /obj/item/radio/headset/syndicate,
 /obj/item/megaphone{
 	pixel_x = -2
 	},
+/obj/item/clothing/under/syndicate/cybersun/officer,
+/obj/item/clothing/suit/cybersun_suit,
+/obj/item/clothing/head/HoS/cybersun,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "eN" = (
@@ -653,12 +652,10 @@
 	dir = 1;
 	layer = 2.8
 	},
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/obj/item/clothing/under/syndicate,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
@@ -668,6 +665,8 @@
 	pixel_x = -23;
 	pixel_y = 4
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "hk" = (
@@ -1156,8 +1155,6 @@
 /obj/structure/closet/wall/orange/directional/south{
 	name = "Engineering locker"
 	},
-/obj/item/clothing/under/syndicate/coldres,
-/obj/item/clothing/suit/toggle/industrial,
 /obj/item/clothing/shoes/workboots,
 /obj/item/clothing/head/welding,
 /obj/item/clothing/head/hardhat/red,
@@ -1174,6 +1171,8 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/item/clothing/under/syndicate/hardliners,
+/obj/item/clothing/suit/hazardvest/hardliners,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "ls" = (
@@ -2880,11 +2879,6 @@
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/c10mm,
 /obj/item/clothing/gloves/tackler/combat/insulated,
-/obj/item/clothing/suit/armor/vest/leather{
-	desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders."
-	},
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/head/HoS/beret/syndicate,
 /obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
 	name = "Sergeant's Locker";
@@ -2892,11 +2886,12 @@
 	},
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/clothing/suit/armor/vest/blueshirt,
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate,
 /obj/item/clothing/accessory/holster,
 /obj/item/clothing/shoes/combat,
 /obj/item/radio/headset/syndicate,
+/obj/item/clothing/under/syndicate/hardliners/officer,
+/obj/item/clothing/suit/armor/hardliners/sergeant,
+/obj/item/clothing/head/hardliners/peaked,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "AS" = (
@@ -3124,18 +3119,17 @@
 	name = "captain's locker";
 	req_access_txt = "20"
 	},
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/glasses/thermal/eyepatch,
-/obj/item/clothing/head/HoS/beret/syndicate,
-/obj/item/clothing/head/HoS/syndicate,
 /obj/item/gun/ballistic/revolver,
 /obj/item/clothing/under/syndicate/sniper,
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/radio/headset/syndicate/alt/leader,
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners/officer,
+/obj/item/clothing/suit/toggle/armor/vest/hardliners,
+/obj/item/clothing/head/hardliners/peaked,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "El" = (
@@ -3347,7 +3341,6 @@
 	},
 /area/ship/maintenance/starboard)
 "GD" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -3356,11 +3349,12 @@
 	dir = 9
 	},
 /obj/item/clothing/mask/balaclava,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "GJ" = (
@@ -3845,7 +3839,6 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/aft)
 "Lb" = (
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/neck/scarf/red,
 /obj/item/clothing/mask/bandana/skull,
 /obj/item/clothing/mask/gas/syndicate,
@@ -3855,11 +3848,12 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/item/clothing/under/utility,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners/jumpsuit,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "Lj" = (
@@ -4064,21 +4058,16 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
-/obj/item/clothing/under/syndicate/skirt,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners/jumpsuit,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "Ni" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/head/helmet/operator,
-/obj/item/clothing/head/helmet/operator,
-/obj/item/clothing/head/helmet/operator,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
@@ -4090,9 +4079,21 @@
 	name = "Armor Locker";
 	req_access_txt = "1"
 	},
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
+/obj/item/clothing/suit/armor/hardliners/jacket,
+/obj/item/clothing/suit/armor/hardliners/jacket,
+/obj/item/clothing/suit/armor/hardliners/jacket,
+/obj/item/clothing/suit/armor/hardliners,
+/obj/item/clothing/suit/armor/hardliners,
+/obj/item/clothing/suit/armor/hardliners,
+/obj/item/clothing/head/helmet/hardliners,
+/obj/item/clothing/head/helmet/hardliners,
+/obj/item/clothing/head/helmet/hardliners,
+/obj/item/storage/belt/security/webbing/hardliners,
+/obj/item/storage/belt/security/webbing/hardliners,
+/obj/item/storage/belt/security/webbing/hardliners,
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ship/security/armory)
 "Nj" = (
@@ -4271,7 +4272,6 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo)
 "PE" = (
-/obj/structure/chair/comfy,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line{
 	dir = 8
@@ -4281,6 +4281,7 @@
 	pixel_y = -1
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/structure/chair/comfy/red,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/crew/canteen)
 "PG" = (
@@ -5096,17 +5097,17 @@
 /area/ship/hallway/central)
 "WQ" = (
 /obj/structure/railing,
-/obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
 /obj/item/clothing/mask/balaclava,
-/obj/item/clothing/under/syndicate/gorlex,
 /obj/structure/closet/syndicate{
 	desc = "It's a basic storage unit.";
 	name = "uniform closet"
 	},
+/obj/item/clothing/shoes/combat,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/hallway/central)
 "WR" = (
@@ -5426,12 +5427,8 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/item/clothing/under/utility,
 /obj/item/clothing/suit/longcoat/roboblack,
-/obj/item/clothing/suit/apron/surgical,
-/obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/mask/surgical,
-/obj/item/clothing/head/beret/black,
 /obj/item/clothing/gloves/color/latex/nitrile/evil{
 	pixel_x = 1;
 	pixel_y = -3
@@ -5442,6 +5439,9 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
+/obj/item/clothing/suit/hardliners,
+/obj/item/clothing/head/hardliners,
+/obj/item/clothing/under/syndicate/hardliners,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/medical)
 "Zy" = (
diff --git a/check_regex.yaml b/check_regex.yaml
index e01c41995e8e..d03e15391975 100644
--- a/check_regex.yaml
+++ b/check_regex.yaml
@@ -38,7 +38,7 @@ standards:
 
     - exactly:
           [
-              268,
+              265,
               "non-bitwise << uses",
               '(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
           ]
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index d47980b59c6b..ddd395d3879a 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -445,11 +445,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define FALL_NO_MESSAGE (1<<1) //Used to suppress the "[A] falls through [old_turf]" messages where it'd make little sense at all, like going downstairs.
 #define FALL_STOP_INTERCEPTING (1<<2) //Used in situations where halting the whole "intercept" loop would be better, like supermatter dusting (and thus deleting) the atom.
 
-//Religion
-
-#define HOLY_ROLE_PRIEST 1 //default priestly role
-#define HOLY_ROLE_HIGHPRIEST 2 //the one who designates the religion
-
 #define ALIGNMENT_GOOD "good"
 #define ALIGNMENT_NEUT "neutral"
 #define ALIGNMENT_EVIL "evil"
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 59f25efe9823..532ed3f888d7 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 			) = 1,
 		list(//drinks
 			/obj/item/reagent_containers/food/drinks/bottle/vodka = 1,
-			/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
+			/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1,
 			) = 1,
 		list(//sprayers
 			/obj/item/reagent_containers/spray = 1,
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index ab7a2d4315d7..95bbae56a904 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -16,6 +16,7 @@
 	if(!(result in reqs))
 		blacklist += result
 
+
 /**
  * Run custom pre-craft checks for this recipe
  *
diff --git a/code/datums/components/crafting/recipes/weapon.dm b/code/datums/components/crafting/recipes/weapon.dm
index 10f63bede5ce..c1dde04b3650 100644
--- a/code/datums/components/crafting/recipes/weapon.dm
+++ b/code/datums/components/crafting/recipes/weapon.dm
@@ -125,8 +125,10 @@
 	name = "Pulse Slug Shell"
 	result = /obj/item/ammo_casing/shotgun/pulseslug
 	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
-				/obj/item/stock_parts/capacitor/adv = 2,
-				/obj/item/stock_parts/micro_laser/ultra = 1)
+				/obj/item/stock_parts/capacitor = 3,
+				/obj/item/stock_parts/micro_laser = 1,
+				/obj/item/stock_parts/cell = 1,
+				/datum/reagent/lithium = 5)
 	tools = list(TOOL_SCREWDRIVER)
 	time = 5
 	category = CAT_WEAPONRY
@@ -135,7 +137,7 @@
 /datum/crafting_recipe/dragonsbreath
 	name = "Dragonsbreath Shell"
 	result = /obj/item/ammo_casing/shotgun/dragonsbreath
-	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 5)
+	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 10)
 	tools = list(TOOL_SCREWDRIVER)
 	time = 5
 	category = CAT_WEAPONRY
@@ -157,8 +159,11 @@
 	name = "Ion Scatter Shell"
 	result = /obj/item/ammo_casing/shotgun/ion
 	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
-				/obj/item/stock_parts/micro_laser/ultra = 1,
-				/obj/item/stock_parts/subspace/crystal = 1)
+				/obj/item/stock_parts/micro_laser = 2,
+				/obj/item/stock_parts/capacitor = 2,
+				/obj/item/stock_parts/scanning_module = 1,
+				/datum/reagent/iron = 5,
+				/datum/reagent/uranium = 5)
 	tools = list(TOOL_SCREWDRIVER)
 	time = 5
 	category = CAT_WEAPONRY
@@ -179,8 +184,10 @@
 	name = "Scatter Laser Shell"
 	result = /obj/item/ammo_casing/shotgun/laserscatter
 	reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
-				/obj/item/stock_parts/capacitor/adv = 1,
-				/obj/item/stock_parts/micro_laser/high = 1)
+				/obj/item/stock_parts/capacitor = 1,
+				/obj/item/stock_parts/micro_laser = 3,
+				/obj/item/stock_parts/cell = 1,
+				/datum/reagent/lithium = 5)
 	tools = list(TOOL_SCREWDRIVER)
 	time = 5
 	category = CAT_WEAPONRY
diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm
index cf0199d05e18..b65a2d8b7e32 100644
--- a/code/datums/components/edible.dm
+++ b/code/datums/components/edible.dm
@@ -33,8 +33,10 @@ Behavior that's still missing from this component that original food items had t
 	var/datum/callback/after_eat
 	///Last time we checked for food likes
 	var/last_check_time
+	///Color we use when stuffed in things
+	var/filling_color = "#FFFFFF"
 
-/datum/component/edible/Initialize(list/initial_reagents, food_flags = NONE, foodtypes = NONE, volume = 50, eat_time = 30, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, datum/callback/after_eat)
+/datum/component/edible/Initialize(list/initial_reagents, food_flags = NONE, foodtypes = NONE, volume = 50, eat_time = 30, list/tastes, list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"), bite_consumption = 2, filling_color = "#FFFFFF", datum/callback/after_eat)
 	if(!isatom(parent))
 		return COMPONENT_INCOMPATIBLE
 
@@ -52,6 +54,7 @@ Behavior that's still missing from this component that original food items had t
 	src.eatverbs = eatverbs
 	src.junkiness = junkiness
 	src.after_eat = after_eat
+	src.filling_color = filling_color
 
 	var/atom/owner = parent
 
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 5724d4327bee..89831dafab72 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -258,7 +258,7 @@
 		return
 	var/datum/progressbar/progress = new(M, len, I.loc)
 	var/list/rejections = list()
-	while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
+	while(do_after(M, 10, parent, TRUE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
 		stoplag(1)
 	progress.end_progress()
 	to_chat(M, "<span class='notice'>You put everything you could [insert_preposition] [parent].</span>")
diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm
index aed6577a5af9..62479d90e0d3 100644
--- a/code/datums/materials/pizza.dm
+++ b/code/datums/materials/pizza.dm
@@ -28,4 +28,4 @@
 /datum/material/pizza/proc/make_edible(atom/source, amount, material_flags)
 	var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT)
 	var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT)
-	source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat"))
+	source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, GRAIN | MEAT | DAIRY | VEGETABLES, null, 30, list("crust", "tomato", "cheese", "meat"), filling_color = COLOR_YELLOW)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 36ec4a1b5ae6..96ca4b12d8b4 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -55,7 +55,6 @@
 	var/damnation_type = 0
 	var/datum/mind/soulOwner //who owns the soul.  Under normal circumstances, this will point to src
 	var/hasSoul = TRUE // If false, renders the character unable to sell their soul.
-	var/holy_role = NONE //is this person a chaplain or admin role allowed to use bibles, Any rank besides 'NONE' allows for this.
 
 	var/mob/living/enslaved_to //If this mind's master is another mob
 	var/datum/language_holder/language_holder
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index 7b1b9c6e29a6..816ffd685c14 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -31,6 +31,12 @@
 	description = "Tectonic activity has gouged a large fissure into the surface of the planet here. Tucked in the crevasse, the remains of an ashwalker village lay in ashes."
 	suffix = "lavaland_surface_lava_canyon.dmm"
 
+/datum/map_template/ruin/lavaland/wrecked_factory
+	name = "Wrecked Factory"
+	id = "wreck_factory"
+	description = "A  Nanotrasen processing facility, assaulted by a pirate raid that has killed most of the staff. The offices however, remain unbreached for now."
+	suffix = "lavaland_surface_wrecked_factory.dmm"
+
 /datum/map_template/ruin/lavaland/fallenstar
 	name = "Crashed Starwalker"
 	id = "crashed_star"
diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm
index db6561b6550c..71580b599f62 100644
--- a/code/game/MapData/shuttles/srm_elder.dm
+++ b/code/game/MapData/shuttles/srm_elder.dm
@@ -21,14 +21,31 @@
 	desc = "The closet of equipment and attire for the aspiring shadow."
 	icon_state = "cabinet"
 
+/obj/structure/closet/secure_closet/flamebearer
+	name = "flamebearer's locker"
+	desc = "The closet of equipment an ascetic Flamebearer would require."
+	icon_state = "cabinet"
+
 /obj/structure/closet/secure_closet/hunter
 	name = "hunter's locker"
 	desc = "Everything a hunter will need, held in one secure closet."
 	icon_state = "cabinet"
 	req_access = list(ACCESS_SECURITY)
 
+/obj/structure/closet/secure_closet/machinist
+	name = "machinist's Locker"
+	desc = "The personal closet with tools of a Machinist."
+	req_access = list(ACCESS_ENGINE)
+	icon_state = "eng_secure"
+
+/obj/structure/closet/secure_closet/collignes
+	name = "\proper hunter colligne's locker"
+	desc = "The posessions of the Hunter Colligne aboard the vessel."
+	req_access = list(ACCESS_HOP)
+	icon_state = "hop"
+
 /obj/structure/closet/secure_closet/montagnes
-	name = "\proper Hunter Montagnes Locker"
+	name = "\proper hunter montagne's locker"
 	desc = "The posessions of the owning Hunter Montagnes."
 	req_access = list(ACCESS_HOS)
 	icon_state = "hos"
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index da8611dd9cc8..f7cbb414bc00 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -44,6 +44,37 @@
 	name = "Scorched Hut"
 	icon_state = "red"
 
+// Wrecked Factory
+
+/area/ruin/lavaland/factory/warehouse
+	name = "Factory Warehouse"
+	icon_state = "cargo_warehouse"
+	requires_power = FALSE
+
+/area/ruin/lavaland/factory/foreman_office
+	name = "Foreman's Office"
+	icon_state = "purple"
+	requires_power = FALSE
+
+/area/ruin/lavaland/factory/adminstrative
+	name = "Adminstrative Wing"
+	icon_state = "bridge_hallway"
+	requires_power = FALSE
+
+/area/ruin/lavaland/factory/manager_office
+	name ="Manager's Office"
+	icon_state = "bridge"
+	requires_power = FALSE
+
+/area/ruin/lavaland/factory/lobby
+	name ="Lobby"
+	icon_state = "hallC"
+	requires_power = FALSE
+
+/area/ruin/lavaland/factory/dorms
+	name ="Dormitory"
+	icon_state = "crew_quarters"
+	requires_power = FALSE
 //Buried Shrine
 
 /area/ruin/unpowered/buried_shrine
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index e6f4f882a401..f7ce7b036eb5 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -16,8 +16,6 @@
 	if(!istype(M))
 		return FALSE
 	if(M.mind)
-		if(ishuman(M) && (M.mind.holy_role))
-			return FALSE
 		if(specific_cult && specific_cult.is_sacrifice_target(M.mind))
 			return FALSE
 		if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to))
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 81cb1908ce89..1ab88896accb 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -104,7 +104,7 @@
 	if(!welded && !operating && !(machine_stat & NOPOWER) && (!density || allow_hand_open(user)))
 		user.visible_message("[user] tries to open \the [src] manually.",
 								"You operate the manual lever on \the [src].")
-		if (!do_after(user, 30, TRUE, src))
+		if (!do_after(user, 30, src))
 			return FALSE
 		add_fingerprint(user)
 		if(density)
@@ -174,7 +174,7 @@
 		if(is_holding_pressure())
 			// tell the user that this is a bad idea, and have a do_after as well
 			to_chat(user, "<span class='warning'>As you begin crowbarring \the [src] a gush of air blows in your face... maybe you should reconsider?</span>")
-			if(!do_after(user, 20, TRUE, src)) // give them a few seconds to reconsider their decision.
+			if(!do_after(user, 20, src)) // give them a few seconds to reconsider their decision.
 				return
 			log_game("[key_name(user)] has opened a firelock with a pressure difference at [AREACOORD(loc)]")
 			user.log_message("has opened a firelock with a pressure difference at [AREACOORD(loc)]", LOG_ATTACK)
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 3882fe8d5a6f..63d308f69558 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -101,13 +101,13 @@
 	chassis.use_power(energy_drain)
 	addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
 
-/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target, mob/user, interaction_key)
+/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
 	if(!chassis)
 		return
 	var/C = chassis.loc
 	set_ready_state(0)
 	chassis.use_power(energy_drain)
-	. = do_after(user, equip_cooldown, target=target, interaction_key = interaction_key)
+	. = do_after(chassis.occupant, equip_cooldown, target=target)
 	set_ready_state(1)
 	if(!chassis || 	chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
 		return 0
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 88c2ca721da2..48cc0388b508 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -158,7 +158,7 @@
 	return cell
 
 /obj/mecha/Destroy()
-	if(occupant)
+	if(occupant && iscarbon(occupant))
 		occupant.SetSleeping(destruction_sleep_duration)
 	go_out()
 	var/mob/living/silicon/ai/AI
diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm
index e62b1e52f7b3..4a85f9321154 100644
--- a/code/game/objects/effects/anomalies/_anomalies.dm
+++ b/code/game/objects/effects/anomalies/_anomalies.dm
@@ -133,7 +133,7 @@
 /obj/effect/anomaly/attackby(obj/item/weapon, mob/user, params)
 	if(weapon.tool_behaviour == TOOL_ANALYZER && aSignal)
 		to_chat(user, span_notice("You start analyzing [src]."))
-		if(do_after(user, 20, TRUE, src))
+		if(do_after(user, 20, src, hidden = TRUE))
 			to_chat(user, span_notice("[src]'s primary field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code]."))
 			if(bSignal)
 				to_chat(user, span_notice("A second field is fluctuating along [format_frequency(bSignal.frequency)], code [bSignal.code]. It is highly unstable." ))
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index 975f94102ecf..2dfea3173feb 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -39,7 +39,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /obj/effect/turf_decal
-	icon = 'icons/turf/decals.dmi'
+	icon = 'icons/turf/decals/decals.dmi'
 	icon_state = "warningfulltile"
 	plane = FLOOR_PLANE
 	layer = TURF_DECAL_LAYER
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index eb9fb026e958..fc23ed89c278 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -418,7 +418,6 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
 /obj/effect/turf_decal/plaque
 	name = "plaque"
 	icon_state = "plaque"
-	icon = 'icons/turf/decals.dmi'
 
 /obj/effect/turf_decal/chapel
 	name = "chapel"
@@ -801,6 +800,404 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
 /obj/effect/turf_decal/solgov/all/bottom_right
 	icon_state = "bottom-right-all"
 
+// suns
+
+/obj/effect/turf_decal/suns
+	icon = 'icons/turf/decals/suns_floor.dmi'
+	icon_state = "suns-columm1-bottom"
+
+/obj/effect/turf_decal/suns/capital_s
+	icon_state = "capital-s"
+
+/obj/effect/turf_decal/suns/capital_u
+	icon_state = "capital-u"
+
+/obj/effect/turf_decal/suns/capital_n
+	icon_state = "capital-n"
+
+/obj/effect/turf_decal/suns/capital_s/fancy
+	icon_state = "capitalfancy-s"
+
+/obj/effect/turf_decal/suns/capital_u/fancy
+	icon_state = "capitalfancy-u"
+
+/obj/effect/turf_decal/suns/capital_n/fancy
+	icon_state = "capitalfancy-n"
+
+/obj/effect/turf_decal/suns/capital_s/marble
+	icon_state = "capitalmarble-s"
+
+/obj/effect/turf_decal/suns/capital_u/marble
+	icon_state = "capitalmarble-u"
+
+/obj/effect/turf_decal/suns/capital_n/marble
+	icon_state = "capitalmarble-n"
+
+// borders
+
+/obj/effect/turf_decal/suns/line
+	icon_state = "suns-border"
+
+/obj/effect/turf_decal/suns/line/corner
+	icon_state = "suns-bordercorner"
+
+/obj/effect/turf_decal/suns/line/end
+	icon_state = "suns-borderend"
+
+/obj/effect/turf_decal/suns/line/fill
+	icon_state = "suns-fill"
+
+/obj/effect/turf_decal/suns/line/fill/corner
+	icon_state = "suns-fillcorner"
+
+/obj/effect/turf_decal/suns/line/fill/end
+	icon_state = "suns-fillend"
+
+/obj/effect/turf_decal/suns/line/fancy
+	icon_state = "sunsfancy-border"
+
+/obj/effect/turf_decal/suns/line/fancy/corner
+	icon_state = "sunsfancy-bordercorner"
+
+/obj/effect/turf_decal/suns/line/fancy/end
+	icon_state = "sunsfancy-borderend"
+
+/obj/effect/turf_decal/suns/line/fancy/fill
+	icon_state = "sunsfancy-fill"
+
+/obj/effect/turf_decal/suns/line/fancy/fill/corner
+	icon_state = "sunsfancy-fillcorner"
+
+/obj/effect/turf_decal/suns/line/fancy/fill/end
+	icon_state = "sunsfancy-fillend"
+
+/obj/effect/turf_decal/suns/line/marble
+	icon_state = "sunsmarble-border"
+
+/obj/effect/turf_decal/suns/line/marble/corner
+	icon_state = "sunsmarble-bordercorner"
+
+/obj/effect/turf_decal/suns/line/marble/end
+	icon_state = "sunsmarble-borderend"
+
+/obj/effect/turf_decal/suns/line/marble/fill
+	icon_state = "sunsmarble-fill"
+
+/obj/effect/turf_decal/suns/line/marble/fill/corner
+	icon_state = "sunsmarble-fillcorner"
+
+/obj/effect/turf_decal/suns/line/marble/fill/end
+	icon_state = "sunsmarble-fillend"
+
+// suns 3x6 decal
+
+/obj/effect/turf_decal/suns/columm1
+	icon_state = "suns-columm1-bottom"
+
+/obj/effect/turf_decal/suns/columm1/middle
+	icon_state = "suns-columm1-middle"
+
+/obj/effect/turf_decal/suns/columm1/top
+	icon_state = "suns-columm1-top"
+
+/obj/effect/turf_decal/suns/columm2
+	icon_state = "suns-columm2-bottom"
+
+/obj/effect/turf_decal/suns/columm2/middle
+	icon_state = "suns-columm2-middle"
+
+/obj/effect/turf_decal/suns/columm2/top
+	icon_state = "suns-columm2-top"
+
+/obj/effect/turf_decal/suns/columm3
+	icon_state = "suns-columm3-bottom"
+
+/obj/effect/turf_decal/suns/columm3/middle
+	icon_state = "suns-columm3-middle"
+
+/obj/effect/turf_decal/suns/columm3/top
+	icon_state = "suns-columm3-top"
+
+/obj/effect/turf_decal/suns/columm4
+	icon_state = "suns-columm4-middle"
+
+/obj/effect/turf_decal/suns/columm4/top
+	icon_state = "suns-columm4-top"
+
+/obj/effect/turf_decal/suns/columm5
+	icon_state = "suns-columm5-middle"
+
+/obj/effect/turf_decal/suns/columm5/top
+	icon_state = "suns-columm5-top"
+
+/obj/effect/turf_decal/suns/columm6
+	icon_state = "suns-columm6-middle"
+
+/obj/effect/turf_decal/suns/columm6/top
+	icon_state = "suns-columm6-top"
+
+/obj/effect/turf_decal/suns/marble/columm1
+	icon_state = "sunsmarble-columm1-bottom"
+
+/obj/effect/turf_decal/suns/marble/columm1/middle
+	icon_state = "sunsmarble-columm1-middle"
+
+/obj/effect/turf_decal/suns/marble/columm1/top
+	icon_state = "sunsmarble-columm1-top"
+
+/obj/effect/turf_decal/suns/marble/columm2
+	icon_state = "sunsmarble-columm2-bottom"
+
+/obj/effect/turf_decal/suns/marble/columm2/middle
+	icon_state = "sunsmarble-columm2-middle"
+
+/obj/effect/turf_decal/suns/marble/columm2/top
+	icon_state = "sunsmarble-columm2-top"
+
+/obj/effect/turf_decal/suns/marble/columm3
+	icon_state = "sunsmarble-columm3-bottom"
+
+/obj/effect/turf_decal/suns/marble/columm3/middle
+	icon_state = "sunsmarble-columm3-middle"
+
+/obj/effect/turf_decal/suns/marble/columm3/top
+	icon_state = "sunsmarble-columm3-top"
+
+/obj/effect/turf_decal/suns/marble/columm4
+	icon_state = "sunsmarble-columm4-middle"
+
+/obj/effect/turf_decal/suns/marble/columm4/top
+	icon_state = "sunsmarble-columm4-top"
+
+/obj/effect/turf_decal/suns/marble/columm5
+	icon_state = "sunsmarble-columm5-middle"
+
+/obj/effect/turf_decal/suns/marble/columm5/top
+	icon_state = "sunsmarble-columm5-top"
+
+/obj/effect/turf_decal/suns/marble/columm6
+	icon_state = "sunsmarble-columm6-middle"
+
+/obj/effect/turf_decal/suns/marble/columm6/top
+	icon_state = "sunsmarble-columm6-top"
+
+/obj/effect/turf_decal/suns/fancy/columm1
+	icon_state = "sunsfancy-columm1-bottom"
+
+/obj/effect/turf_decal/suns/fancy/columm1/middle
+	icon_state = "sunsfancy-columm1-middle"
+
+/obj/effect/turf_decal/suns/fancy/columm1/top
+	icon_state = "sunsfancy-columm1-top"
+
+/obj/effect/turf_decal/suns/fancy/columm2
+	icon_state = "sunsfancy-columm2-bottom"
+
+/obj/effect/turf_decal/suns/fancy/columm2/middle
+	icon_state = "sunsfancy-columm2-middle"
+
+/obj/effect/turf_decal/suns/fancy/columm2/top
+	icon_state = "sunsfancy-columm2-top"
+
+/obj/effect/turf_decal/suns/fancy/columm3
+	icon_state = "sunsfancy-columm3-bottom"
+
+/obj/effect/turf_decal/suns/fancy/columm3/middle
+	icon_state = "sunsfancy-columm3-middle"
+
+/obj/effect/turf_decal/suns/fancy/columm3/top
+	icon_state = "sunsfancy-columm3-top"
+
+/obj/effect/turf_decal/suns/fancy/columm4
+	icon_state = "sunsfancy-columm4-middle"
+
+/obj/effect/turf_decal/suns/fancy/columm4/top
+	icon_state = "sunsfancy-columm4-top"
+
+/obj/effect/turf_decal/suns/fancy/columm5
+	icon_state = "sunsfancy-columm5-middle"
+
+/obj/effect/turf_decal/suns/fancy/columm5/top
+	icon_state = "sunsfancy-columm5-top"
+
+/obj/effect/turf_decal/suns/fancy/columm6
+	icon_state = "sunsfancy-columm6-middle"
+
+/obj/effect/turf_decal/suns/fancy/columm6/top
+	icon_state = "sunsfancy-columm6-top"
+
+
+// suns alt decal
+
+/obj/effect/turf_decal/suns/alt
+	icon_state = "sunsalt-top-left"
+
+/obj/effect/turf_decal/suns/alt/top_left
+	icon_state = "sunsalt-top-left"
+
+/obj/effect/turf_decal/suns/alt/top_center
+	icon_state = "sunsalt-top-center"
+
+/obj/effect/turf_decal/suns/alt/top_right
+	icon_state = "sunsalt-top-right"
+
+/obj/effect/turf_decal/suns/alt/middle_left
+	icon_state = "sunsalt-middle-left"
+
+/obj/effect/turf_decal/suns/alt/middle_center
+	icon_state = "sunsalt-middle-center"
+
+/obj/effect/turf_decal/suns/alt/middle_right
+	icon_state = "sunsalt-middle-right"
+
+/obj/effect/turf_decal/suns/alt/bottom_left
+	icon_state = "sunsalt-bottom-left"
+
+/obj/effect/turf_decal/suns/alt/bottom_center
+	icon_state = "sunsalt-bottom-center"
+
+/obj/effect/turf_decal/suns/alt/bottom_right
+	icon_state = "sunsalt-bottom-right"
+
+/obj/effect/turf_decal/suns/alt/fancy
+	icon_state = "sunsaltfancy-top-left"
+
+/obj/effect/turf_decal/suns/alt/fancy/top_left
+	icon_state = "sunsaltfancy-top-left"
+
+/obj/effect/turf_decal/suns/alt/fancy/top_center
+	icon_state = "sunsaltfancy-top-center"
+
+/obj/effect/turf_decal/suns/alt/fancy/top_right
+	icon_state = "sunsaltfancy-top-right"
+
+/obj/effect/turf_decal/suns/alt/fancy/middle_left
+	icon_state = "sunsaltfancy-middle-left"
+
+/obj/effect/turf_decal/suns/alt/fancy/middle_center
+	icon_state = "sunsaltfancy-middle-center"
+
+/obj/effect/turf_decal/suns/alt/fancy/middle_right
+	icon_state = "sunsaltfancy-middle-right"
+
+/obj/effect/turf_decal/suns/alt/fancy/bottom_left
+	icon_state = "sunsaltfancy-bottom-left"
+
+/obj/effect/turf_decal/suns/alt/fancy/bottom_center
+	icon_state = "sunsaltfancy-bottom-center"
+
+/obj/effect/turf_decal/suns/alt/fancy/bottom_right
+	icon_state = "sunsaltfancy-bottom-right"
+
+/obj/effect/turf_decal/suns/alt/marble
+	icon_state = "sunsaltmarble-top-left"
+
+/obj/effect/turf_decal/suns/alt/marble/top_left
+	icon_state = "sunsaltmarble-top-left"
+
+/obj/effect/turf_decal/suns/alt/marble/top_center
+	icon_state = "sunsaltmarble-top-center"
+
+/obj/effect/turf_decal/suns/alt/marble/top_right
+	icon_state = "sunsaltmarble-top-right"
+
+/obj/effect/turf_decal/suns/alt/marble/middle_left
+	icon_state = "sunsaltmarble-middle-left"
+
+/obj/effect/turf_decal/suns/alt/marble/middle_center
+	icon_state = "sunsaltmarble-middle-center"
+
+/obj/effect/turf_decal/suns/alt/marble/middle_right
+	icon_state = "sunsaltmarble-middle-right"
+
+/obj/effect/turf_decal/suns/alt/marble/bottom_left
+	icon_state = "sunsaltmarble-bottom-left"
+
+/obj/effect/turf_decal/suns/alt/marble/bottom_center
+	icon_state = "sunsaltmarble-bottom-center"
+
+/obj/effect/turf_decal/suns/alt/marble/bottom_right
+	icon_state = "sunsaltmarble-bottom-right"
+
+/obj/effect/turf_decal/suns/alt/transparent
+	icon_state = "sunsalttrans-top-left"
+
+/obj/effect/turf_decal/suns/alt/transparent/top_left
+	icon_state = "sunsalttrans-top-left"
+
+/obj/effect/turf_decal/suns/alt/transparent/top_center
+	icon_state = "sunsalttrans-top-center"
+
+/obj/effect/turf_decal/suns/alt/transparent/top_right
+	icon_state = "sunsalttrans-top-right"
+
+/obj/effect/turf_decal/suns/alt/transparent/middle_left
+	icon_state = "sunsalttrans-middle-left"
+
+/obj/effect/turf_decal/suns/alt/transparent/middle_center
+	icon_state = "sunsalttrans-middle-center"
+
+/obj/effect/turf_decal/suns/alt/transparent/middle_right
+	icon_state = "sunsalttrans-middle-right"
+
+/obj/effect/turf_decal/suns/alt/transparent/bottom_left
+	icon_state = "sunsalttrans-bottom-left"
+
+/obj/effect/turf_decal/suns/alt/transparent/bottom_center
+	icon_state = "sunsalttrans-bottom-center"
+
+/obj/effect/turf_decal/suns/alt/transparent/bottom_right
+	icon_state = "sunsalttrans-bottom-right"
+
+// suns 3x6 decal transparent
+
+/obj/effect/turf_decal/suns/transparent/columm1
+	icon_state = "sunstrans-columm1-bottom"
+
+/obj/effect/turf_decal/suns/transparent/columm1/middle
+	icon_state = "sunstrans-columm1-middle"
+
+/obj/effect/turf_decal/suns/transparent/columm1/top
+	icon_state = "sunstrans-columm1-top"
+
+/obj/effect/turf_decal/suns/transparent/columm2
+	icon_state = "sunstrans-columm2-bottom"
+
+/obj/effect/turf_decal/suns/transparent/columm2/middle
+	icon_state = "sunstrans-columm2-middle"
+
+/obj/effect/turf_decal/suns/transparent/columm2/top
+	icon_state = "sunstrans-columm2-top"
+
+/obj/effect/turf_decal/suns/transparent/columm3
+	icon_state = "sunstrans-columm3-bottom"
+
+/obj/effect/turf_decal/suns/transparent/columm3/middle
+	icon_state = "sunstrans-columm3-middle"
+
+/obj/effect/turf_decal/suns/transparent/columm3/top
+	icon_state = "sunstrans-columm3-top"
+
+/obj/effect/turf_decal/suns/transparent/columm4
+	icon_state = "sunstrans-columm4-middle"
+
+/obj/effect/turf_decal/suns/transparent/columm4/top
+	icon_state = "sunstrans-columm4-top"
+
+/obj/effect/turf_decal/suns/transparent/columm5
+	icon_state = "sunstrans-columm5-middle"
+
+/obj/effect/turf_decal/suns/transparent/columm5/top
+	icon_state = "sunstrans-columm5-top"
+
+/obj/effect/turf_decal/suns/transparent/columm6
+	icon_state = "sunstrans-columm6-middle"
+
+/obj/effect/turf_decal/suns/transparent/columm6/top
+	icon_state = "sunstrans-columm6-top"
+
+// nanotrasen
+
 /obj/effect/turf_decal/nanotrasen //placeholder for sorting these together, add 3x3 NT and Vigilitas logos later
 	icon = 'icons/obj/nanotrasen_floor.dmi'
 	icon_state = "NS-2x2" //also placeholder
diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm
index e0a0746f5a2d..860f8f0bd2b2 100644
--- a/code/game/objects/effects/decals/turfdecal/markings.dm
+++ b/code/game/objects/effects/decals/turfdecal/markings.dm
@@ -229,32 +229,28 @@
 /obj/effect/turf_decal/syndicateemblem/top/right
 	icon_state = "s3,3"
 
+/obj/effect/turf_decal/atmos
+	icon = 'icons/turf/decals/decals.dmi'
+
 /obj/effect/turf_decal/atmos/oxygen
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "oxygen"
 
 /obj/effect/turf_decal/atmos/carbon_dioxide
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "carbon_dioxide"
 
 /obj/effect/turf_decal/atmos/nitrogen
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "nitrogen"
 
 /obj/effect/turf_decal/atmos/air
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "air"
 
 /obj/effect/turf_decal/atmos/nitrous_oxide
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "nitrous_oxide"
 
 /obj/effect/turf_decal/atmos/plasma
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "plasma"
 
 /obj/effect/turf_decal/atmos/mix
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "mix"
 
 /**
@@ -339,169 +335,129 @@
 
 
 // centered number decals
+
 /obj/effect/turf_decal/number/one
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "1"
 
 /obj/effect/turf_decal/number/two
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "2"
 
 /obj/effect/turf_decal/number/three
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "3"
 
 /obj/effect/turf_decal/number/four
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "4"
 
 /obj/effect/turf_decal/number/five
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "5"
 
 /obj/effect/turf_decal/number/six
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "6"
 
 /obj/effect/turf_decal/number/seven
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "7"
 
 /obj/effect/turf_decal/number/eight
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "8"
 
 /obj/effect/turf_decal/number/nine
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "9"
 
 /obj/effect/turf_decal/number/zero
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "0"
 
 // right-shifted number decals (1s digit)
 /obj/effect/turf_decal/number/right_one
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-1"
 
 /obj/effect/turf_decal/number/right_two
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-2"
 
 /obj/effect/turf_decal/number/right_three
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-3"
 
 /obj/effect/turf_decal/number/right_four
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-4"
 
 /obj/effect/turf_decal/number/right_five
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-5"
 
 /obj/effect/turf_decal/number/right_six
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-6"
 
 /obj/effect/turf_decal/number/right_seven
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-7"
 
 /obj/effect/turf_decal/number/right_eight
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-8"
 
 /obj/effect/turf_decal/number/right_nine
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-9"
 
 /obj/effect/turf_decal/number/right_zero
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "-0"
 
 // left-shifted number decals (10s digit)
 /obj/effect/turf_decal/number/left_one
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "1-"
 
 /obj/effect/turf_decal/number/left_two
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "2-"
 
 /obj/effect/turf_decal/number/left_three
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "3-"
 
 /obj/effect/turf_decal/number/left_four
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "4-"
 
 /obj/effect/turf_decal/number/left_five
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "5-"
 
 /obj/effect/turf_decal/number/left_six
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "6-"
 
 /obj/effect/turf_decal/number/left_seven
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "7-"
 
 /obj/effect/turf_decal/number/left_eight
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "8-"
 
 /obj/effect/turf_decal/number/left_nine
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "9-"
 
 /obj/effect/turf_decal/number/left_zero
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "0-"
 
 
 /obj/effect/turf_decal/dept/hop
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "hop"
 
 /obj/effect/turf_decal/dept/bar
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "bar"
 
 /obj/effect/turf_decal/dept/cargo
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "cargo"
 
 /obj/effect/turf_decal/dept/medical
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "med"
 
 /obj/effect/turf_decal/dept/science
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "sci"
 
 /obj/effect/turf_decal/dept/security
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "sec"
 
 /obj/effect/turf_decal/dept/mining
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "mine"
 
 /obj/effect/turf_decal/zoo
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "zoo"
 
 /obj/effect/turf_decal/no
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "no"
 
 /obj/effect/turf_decal/radiation
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "radiation"
 
 /obj/effect/turf_decal/radiation/white
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "radiation-w"
diff --git a/code/game/objects/effects/decals/turfdecal/weather.dm b/code/game/objects/effects/decals/turfdecal/weather.dm
index 04dcf807314a..0c8284b53f8c 100644
--- a/code/game/objects/effects/decals/turfdecal/weather.dm
+++ b/code/game/objects/effects/decals/turfdecal/weather.dm
@@ -13,12 +13,10 @@
 
 /obj/effect/turf_decal/weather/dirt
 	name = "dirt siding"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "dirt_side"
 
 /obj/effect/turf_decal/weather/dirt/corner
 	name = "corner"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "dirt_side_corner"
 
 /obj/effect/turf_decal/weather/sand
@@ -36,30 +34,24 @@
 
 /obj/effect/turf_decal/weather/asteroid
 	name = "asteroid siding"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "asteroid_side"
 
 /obj/effect/turf_decal/weather/asteroid/corner
 	name = "corner"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "asteroid_side_corner"
 
 /obj/effect/turf_decal/weather/whitesands
 	name = "salted sand siding"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "ws_side"
 
 /obj/effect/turf_decal/weather/whitesands/corner
 	name = "corner"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "ws_side_corner"
 
 /obj/effect/turf_decal/weather/rock
 	name = "rock siding"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "rock_side"
 
 /obj/effect/turf_decal/weather/rock/corner
 	name = "corner"
-	icon = 'icons/turf/decals.dmi'
 	icon_state = "rock_side_corner"
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 9d5623498733..110121dc08e2 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -766,13 +766,26 @@ update_label()
 	name = "bunker access ID"
 
 /obj/item/card/id/solgov
-	name = "\improper SolGov ID"
-	desc = "A SolGov ID with no proper access to speak of."
+	name = "\improper SolGov keycard"
+	desc = "A SolGov keycard with no proper access to speak of."
 	assignment = "Officer"
 	icon_state = "solgov"
 	uses_overlays = FALSE
 
 /obj/item/card/id/solgov/commander
-	name = "\improper SolGov ID"
-	desc = "A SolGov ID with no proper access to speak of. This one indicates a Commander."
+	name = "\improper SolGov commander keycard"
+	desc = "A SolGov keycard with no proper access to speak of. This one indicates a Commander."
 	assignment = "Commander"
+
+/obj/item/card/id/suns
+	name = "\improper SUNS keycard"
+	desc = "A keycard belonging to the Student-Union Association of Naturalistic Sciences."
+	assignment = "Student"
+	icon_state = "suns"
+	uses_overlays = FALSE
+
+/obj/item/card/id/suns/command
+	name = "\improper SUNS command keycard"
+	desc = "A keycard belonging to the Student-Union Association of Naturalistic Sciences. This one has a gold stripe, indicating a command member."
+	assignment = "Academic Staff"
+	icon_state = "sunscommand"
diff --git a/code/game/objects/items/decal_painter.dm b/code/game/objects/items/decal_painter.dm
index e6043d584a84..7b12190ba581 100644
--- a/code/game/objects/items/decal_painter.dm
+++ b/code/game/objects/items/decal_painter.dm
@@ -201,9 +201,9 @@
 		to_chat(user, "<span class='warning'>\The [src] can only be used on flooring.</span>")
 		return
 	if(color_disallowed.Find(decal_state))
-		F.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', decal_state, decal_dir, FALSE, color, null, null, alpha)
+		F.AddElement(/datum/element/decal, 'icons/turf/decals/decals.dmi', decal_state, decal_dir, FALSE, color, null, null, alpha)
 	else
-		F.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', decal_state, decal_dir, FALSE, decal_color, null, null, alpha)
+		F.AddElement(/datum/element/decal, 'icons/turf/decals/decals.dmi', decal_state, decal_dir, FALSE, decal_color, null, null, alpha)
 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE)
 
 /obj/item/decal_painter/attack_self(mob/user)
@@ -215,7 +215,7 @@
 
 /obj/item/decal_painter/interact(mob/user as mob) //TODO: Make TGUI for this because ouch
 	if(!decal_icon)
-		decal_icon = icon('icons/turf/decals.dmi', decal_state, decal_dir)
+		decal_icon = icon('icons/turf/decals/decals.dmi', decal_state, decal_dir)
 	user << browse_rsc(decal_icon, "floor.png")
 	var/dat = {"
 		<center>
@@ -288,7 +288,7 @@
 				decal_color = chosen_colour
 
 
-	decal_icon = icon('icons/turf/decals.dmi', decal_state, decal_dir)
+	decal_icon = icon('icons/turf/decals/decals.dmi', decal_state, decal_dir)
 	if(usr)
 		attack_self(usr)
 
diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm
index 3e7c299fc3bd..c1af9cfe6c3f 100644
--- a/code/game/objects/items/desk_flags.dm
+++ b/code/game/objects/items/desk_flags.dm
@@ -1,6 +1,6 @@
 /obj/item/desk_flag
 	name = "blank desk flag"
-	desc = "Show your patriotism with WaffleCo. brand desk flags!"
+	desc = "Show your patriotism with desk flags!"
 	icon = 'icons/obj/deskflags.dmi'
 	icon_state = "flag"
 	force = 3
@@ -30,3 +30,8 @@
 	name = "gezenan desk flag"
 	desc = "A small banner on a pole depicting the sigil of the Pan-Gezenan Federation."
 	icon_state = "gezena"
+
+/obj/item/desk_flag/suns
+	name = "SUNS desk flag"
+	desc = "A little desk decoration in the gold and purple color palette of SUNS."
+	icon_state = "suns"
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index 37613679e628..c8a918732a9d 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -239,3 +239,8 @@
 	name = "brig physician PDA"
 	default_cartridge = /obj/item/cartridge/medical
 	icon_state = "pda-brig_phys"
+
+/obj/item/pda/suns
+	name = "SUNS PDA"
+	default_cartridge = /obj/item/cartridge/medical
+	icon_state = "pda-suns"
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 73cae6b853bc..f8ced22c54be 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -88,6 +88,11 @@
 	icon_state = "solgov_cypherkey"
 	channels = list(RADIO_CHANNEL_SOLGOV = 1)
 
+//	/obj/item/encryptionkey/suns
+//	name = "\improper SUNS encryption key"
+//	icon_state = "suns_cypherkey"
+//	channels = list(RADIO_CHANNEL_SUNS = 1)
+
 /obj/item/encryptionkey/wideband
 	name = "wideband encryption key"
 	icon = 'icons/obj/radio.dmi'
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 3afd539d4c97..0f0081c90454 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -118,6 +118,26 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	name = "team leader headset"
 	command = TRUE
 
+/obj/item/radio/headset/syndicate/suns
+	name = "SUNS headset"
+	icon_state = "suns_headset"
+	desc = "A headset worn by staff and students of SUNS, both in the frontier and elsewhere."
+
+/obj/item/radio/headset/syndicate/suns/command
+	name = "SUNS command headset"
+	desc = "A headset worn by staff and students of SUNS, both in the frontier and elsewhere. This one is worn by command staff."
+	command = TRUE
+
+/obj/item/radio/headset/syndicate/alt/suns
+	name = "SUNS bowman headset"
+	icon_state = "suns_headset_alt"
+	desc = "A headset worn by staff and students of SUNS, both in the frontier and elsewhere. Protects ears from distractions during exams."
+
+/obj/item/radio/headset/syndicate/alt/suns/command
+	name = "SUNS bowman command headset"
+	desc = "A headset worn by staff and students of SUNS, both in the frontier and elsewhere. This one is worn by command staff. Protects ears from distractions during exams."
+	command = TRUE
+
 //nanotrasen
 /obj/item/radio/headset/nanotrasen
 	name = "nanotrasen radio headset"
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index f3cdfb068944..50da920b06f1 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -12,7 +12,7 @@
 
 /obj/item/book/granter/proc/turn_page(mob/user)
 	playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, TRUE)
-	if(do_after(user, 50, TRUE, src))
+	if(do_after(user, 50, src, hidden = TRUE))
 		if(remarks.len)
 			to_chat(user, "<span class='notice'>[pick(remarks)]</span>")
 		else
@@ -57,7 +57,7 @@
 			on_reading_stopped()
 			reading = FALSE
 			return
-	if(do_after(user, 50, TRUE, src))
+	if(do_after(user, 50, src, hidden = TRUE))
 		on_reading_finished(user)
 	reading = FALSE
 	return TRUE
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 872d81323cf3..0affcd107af0 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -1,150 +1,12 @@
 // CHAPLAIN CUSTOM ARMORS //
 
-/obj/item/clothing/head/helmet/chaplain
-	name = "crusader helmet"
-	desc = "Deus Vult."
-	icon_state = "knight_templar"
-	item_state = "knight_templar"
-	armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
-	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-	strip_delay = 80
-	dog_fashion = null
-
-/obj/item/clothing/suit/armor/riot/chaplain
-	name = "crusader armour"
-	desc = "God wills it!"
-	icon_state = "chaplain_templar"
-	item_state = "knight_templar"
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
-	slowdown = 0
-	clothing_flags = NONE
-
-/obj/item/choice_beacon/holy
-	name = "armaments beacon"
-	desc = "Contains a set of armaments for the chaplain."
-
-/obj/item/choice_beacon/holy/canUseBeacon(mob/living/user)
-	if(user.mind && user.mind.holy_role)
-		return ..()
-	else
-		playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE)
-		return FALSE
-
-/obj/item/choice_beacon/holy/generate_display_names()
-	var/static/list/holy_item_list
-	if(!holy_item_list)
-		holy_item_list = list()
-		var/list/templist = typesof(/obj/item/storage/box/holy)
-		for(var/V in templist)
-			var/atom/A = V
-			holy_item_list[initial(A.name)] = A
-	return holy_item_list
-
-/obj/item/choice_beacon/holy/spawn_option(obj/choice,mob/living/M)
-	if(!GLOB.holy_armor_type)
-		..()
-		playsound(src, 'sound/effects/pray_chaplain.ogg', 40, TRUE)
-		SSblackbox.record_feedback("tally", "chaplain_armor", 1, "[choice]")
-		GLOB.holy_armor_type = choice
-	else
-		to_chat(M, "<span class='warning'>A selection has already been made. Self-Destructing...</span>")
-		return
-
-
 /obj/item/storage/box/holy
-	name = "Templar Kit"
-
-/obj/item/storage/box/holy/PopulateContents()
-	new /obj/item/clothing/head/helmet/chaplain(src)
-	new /obj/item/clothing/suit/armor/riot/chaplain(src)
-
-/obj/item/storage/box/holy/student
-	name = "Profane Scholar Kit"
-
-/obj/item/storage/box/holy/student/PopulateContents()
-	new /obj/item/clothing/suit/armor/riot/chaplain/studentuni(src)
-	new /obj/item/clothing/head/helmet/chaplain/cage(src)
-
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni
-	name = "student robe"
-	desc = "The uniform of a bygone institute of learning."
-	icon_state = "chaplain_studentuni"
-	item_state = "studentuni"
-	body_parts_covered = ARMS|CHEST
-	allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
-
-/obj/item/clothing/head/helmet/chaplain/cage
-	name = "cage"
-	desc = "A cage that restrains the will of the self, allowing one to see the profane world for what it is."
-	flags_inv = HIDEHAIR //bald
-	mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
-	icon_state = "cage"
-	item_state = "cage"
-	worn_x_dimension = 64
-	worn_y_dimension = 64
-
-/obj/item/storage/box/holy/sentinel
-	name = "Stone Sentinel Kit"
-
-/obj/item/storage/box/holy/sentinel/PopulateContents()
-	new /obj/item/clothing/suit/armor/riot/chaplain/ancient(src)
-	new /obj/item/clothing/head/helmet/chaplain/ancient(src)
-
-/obj/item/clothing/head/helmet/chaplain/ancient
-	name = "ancient helmet"
-	desc = "None may pass!"
-	icon_state = "knight_ancient"
-	item_state = "knight_ancient"
-
-/obj/item/clothing/suit/armor/riot/chaplain/ancient
-	name = "ancient armour"
-	desc = "Defend the treasure..."
-	icon_state = "chaplain_ancient"
-	item_state = "knight_ancient"
-
-/obj/item/storage/box/holy/witchhunter
 	name = "Witchhunter Kit"
 
-/obj/item/storage/box/holy/witchhunter/PopulateContents()
-	new /obj/item/clothing/suit/armor/riot/chaplain/witchhunter(src)
-	new /obj/item/clothing/head/helmet/chaplain/witchunter_hat(src)
-
-/obj/item/clothing/suit/armor/riot/chaplain/witchhunter
-	name = "witchunter garb"
-	desc = "This worn outfit saw much use back in the day."
-	icon_state = "chaplain_witchhunter"
-	item_state = "witchhunter"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat
-	name = "witchunter hat"
-	desc = "This hat saw much use back in the day."
-	icon_state = "witchhunterhat"
-	item_state = "witchhunterhat"
-	flags_cover = HEADCOVERSEYES
-	flags_inv = HIDEEYES|HIDEHAIR
-
-/obj/item/storage/box/holy/adept
-	name = "Divine Adept Kit"
-
-/obj/item/storage/box/holy/adept/PopulateContents()
-	new /obj/item/clothing/suit/armor/riot/chaplain/adept(src)
-	new /obj/item/clothing/head/helmet/chaplain/adept(src)
-
-/obj/item/clothing/head/helmet/chaplain/adept
-	name = "adept hood"
-	desc = "Its only heretical when others do it."
-	icon_state = "crusader"
-	item_state = "crusader"
-	flags_cover = HEADCOVERSEYES
-	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+/obj/item/storage/box/holy/PopulateContents()
+	new /obj/item/clothing/head/witchunter(src)
+	new /obj/item/clothing/suit/armor/witchhunter(src)
 
-/obj/item/clothing/suit/armor/riot/chaplain/adept
-	name = "adept robes"
-	desc = "The ideal outfit for burning the unfaithful."
-	icon_state = "chaplain_crusader"
-	item_state = "crusader"
 
 /obj/item/storage/box/holy/follower
 	name = "Followers of the Chaplain Kit"
@@ -203,62 +65,6 @@
 	var/reskinned = FALSE
 	var/chaplain_spawnable = TRUE
 
-/obj/item/nullrod/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE)
-
-/obj/item/nullrod/attack_self(mob/user)
-	if(user.mind && (user.mind.holy_role) && !reskinned)
-		reskin_holy_weapon(user)
-
-/**
- * reskin_holy_weapon: Shows a user a list of all available nullrod reskins and based on his choice replaces the nullrod with the reskinned version
- *
- * Arguments:
- * * M The mob choosing a nullrod reskin
- */
-/obj/item/nullrod/proc/reskin_holy_weapon(mob/M)
-	if(GLOB.holy_weapon_type)
-		return
-	var/list/display_names = list()
-	var/list/nullrod_icons = list()
-	for(var/V in typesof(/obj/item/nullrod))
-		var/obj/item/nullrod/rodtype = V
-		if(initial(rodtype.chaplain_spawnable))
-			display_names[initial(rodtype.name)] = rodtype
-			nullrod_icons += list(initial(rodtype.name) = image(icon = initial(rodtype.icon), icon_state = initial(rodtype.icon_state)))
-
-	nullrod_icons = sortList(nullrod_icons)
-	var/choice = show_radial_menu(M, src , nullrod_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), M), radius = 42, require_near = TRUE)
-	if(!choice || !check_menu(M))
-		return
-
-	var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new
-	var/obj/item/nullrod/holy_weapon = new A
-	GLOB.holy_weapon_type = holy_weapon.type
-
-	SSblackbox.record_feedback("tally", "chaplain_weapon", 1, "[choice]")
-
-	if(holy_weapon)
-		holy_weapon.reskinned = TRUE
-		qdel(src)
-		M.put_in_active_hand(holy_weapon)
-
-/**
- * check_menu: Checks if we are allowed to interact with a radial menu
- *
- * Arguments:
- * * user The mob interacting with a menu
- */
-/obj/item/nullrod/proc/check_menu(mob/user)
-	if(!istype(user))
-		return FALSE
-	if(QDELETED(src) || reskinned)
-		return FALSE
-	if(user.incapacitated() || !user.is_holding(src))
-		return FALSE
-	return TRUE
-
 /obj/item/nullrod/godhand
 	icon_state = "disintegrate"
 	item_state = "disintegrate"
@@ -648,13 +454,6 @@
 	hitsound = 'sound/weapons/bite.ogg'
 	var/used_blessing = FALSE
 
-/obj/item/nullrod/carp/attack_self(mob/living/user)
-	if(used_blessing)
-	else if(user.mind && (user.mind.holy_role))
-		to_chat(user, "<span class='boldnotice'>You are blessed by Carp-Sie. Wild space carp will no longer attack you.</span>")
-		user.faction |= "carp"
-		used_blessing = TRUE
-
 /obj/item/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking
 	name = "monk's staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, it is now used to harass the clown."
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index e386420462d6..9e90329404f0 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -177,6 +177,42 @@
 /obj/item/kitchen/knife/hunting/set_butchering()
 	AddComponent(/datum/component/butchering, 80 - force, 100, force + 10)
 
+/obj/item/kitchen/knife/switchblade
+	name = "switchblade"
+	icon_state = "switchblade"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	desc = "A sharp, concealable, spring-loaded knife."
+	flags_1 = CONDUCT_1
+	force = 3
+	w_class = WEIGHT_CLASS_SMALL
+	throwforce = 5
+	custom_materials = list(/datum/material/iron=12000)
+	hitsound = 'sound/weapons/genhit.ogg'
+	attack_verb = list("stubbed", "poked")
+	resistance_flags = FIRE_PROOF
+	var/extended = 0
+
+/obj/item/kitchen/knife/switchblade/attack_self(mob/user)
+	extended = !extended
+	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+	if(extended)
+		force = 20
+		w_class = WEIGHT_CLASS_NORMAL
+		throwforce = 23
+		icon_state = "switchblade_ext"
+		attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+		hitsound = 'sound/weapons/bladeslice.ogg'
+		sharpness = IS_SHARP
+	else
+		force = 3
+		w_class = WEIGHT_CLASS_SMALL
+		throwforce = 5
+		icon_state = "switchblade"
+		attack_verb = list("stubbed", "poked")
+		hitsound = 'sound/weapons/genhit.ogg'
+		sharpness = IS_BLUNT
+
 /obj/item/kitchen/knife/combat
 	name = "combat knife"
 	icon = 'icons/obj/world/melee.dmi'
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index a0e5865e1528..243b84b7e1ec 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -176,7 +176,7 @@
 				return
 
 			to_chat(user, "<span class='notice'>You connect to [M]'s power line...</span>")
-			while(do_after(user, 15, target = M, progress = 0))
+			while(do_after(user, 15, target = M, progress = TRUE))
 				if(!user || !user.cell || mode != "draw")
 					return
 
@@ -210,7 +210,7 @@
 
 			to_chat(user, "<span class='notice'>You connect to [target]'s power port...</span>")
 
-			while(do_after(user, 15, target = target, progress = 0))
+			while(do_after(user, 15, target = target, progress = TRUE))
 				if(!user || !user.cell || mode != "draw")
 					return
 
@@ -248,7 +248,7 @@
 
 		to_chat(user, "<span class='notice'>You connect to [target]'s power port...</span>")
 
-		while(do_after(user, 15, target = target, progress = 0))
+		while(do_after(user, 15, target = target, progress = TRUE))
 			if(!user || !user.cell || mode != "charge")
 				return
 
diff --git a/code/game/objects/items/stacks/tiles/tiles_suns.dm b/code/game/objects/items/stacks/tiles/tiles_suns.dm
new file mode 100644
index 000000000000..65cc090b152d
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/tiles_suns.dm
@@ -0,0 +1,64 @@
+/obj/item/stack/tile/suns
+	name = "white marble tile"
+	singular_name = "white marble floor tile"
+	icon_state = "tile_suns_light"
+	turf_type = /turf/open/floor/suns
+	tile_reskin_types = list(
+	/obj/item/stack/tile/suns/plain,
+	/obj/item/stack/tile/suns/pattern,
+	/obj/item/stack/tile/suns/hatch,
+	/obj/item/stack/tile/suns/diagonal,
+	/obj/item/stack/tile/suns/grid,
+	/obj/item/stack/tile/suns/dark,
+	/obj/item/stack/tile/suns/dark/plain,
+	/obj/item/stack/tile/suns/dark/pattern)
+
+/obj/item/stack/tile/suns/plain
+	name = "white plain marble tile"
+	singular_name = "white plain marble floor tile"
+	icon_state = "tile_suns_lightplain"
+	turf_type = /turf/open/floor/suns/plain
+
+/obj/item/stack/tile/suns/pattern
+	name = "patterned white marble tile"
+	singular_name = "patterned white marble floor tile"
+	icon_state = "tile_suns_lightpattern"
+	turf_type = /turf/open/floor/suns/pattern
+
+/obj/item/stack/tile/suns/hatch
+	name = "hatched white marble tile"
+	singular_name = "hatched white marble floor tile"
+	icon_state = "tile_suns_lighthatched"
+	turf_type = /turf/open/floor/suns/hatch
+
+/obj/item/stack/tile/suns/diagonal
+	name = "diagonal white marble tile"
+	singular_name = "diagonal white marble floor tile"
+	icon_state = "tile_suns_lightdiag"
+	turf_type = /turf/open/floor/suns/diagonal
+
+/obj/item/stack/tile/suns/grid
+	name = "dark grid tile"
+	singular_name = "dark grid floor floor tile"
+	icon_state = "tile_suns_darkchunky"
+	turf_type = /turf/open/floor/suns/grid
+
+/obj/item/stack/tile/suns/dark
+	name = "black marble tile"
+	singular_name = "black marble floor tile"
+	icon_state = "tile_suns_dark"
+	turf_type = /turf/open/floor/suns/dark
+
+/obj/item/stack/tile/suns/dark/plain
+	name = "black plain marble tile"
+	singular_name = "black plain marble floor tile"
+	icon_state = "tile_suns_darkplain"
+	turf_type = /turf/open/floor/suns/dark/plain
+
+/obj/item/stack/tile/suns/dark/pattern
+	name = "patterned black marble tile"
+	singular_name = "patterned black marble floor tile"
+	icon_state = "tile_suns_darkpattern"
+	turf_type = /turf/open/floor/suns/dark/pattern
+
+
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 802eeee2d45f..2904745f25aa 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -524,13 +524,12 @@
 		/obj/item/reagent_containers/food/snacks/rofflewaffles,
 		/obj/item/reagent_containers/food/snacks/donkpocket,
 		/obj/item/reagent_containers/food/drinks/soda_cans/cola,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,
-		/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-		/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
+		/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail,
+		/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx,
+		/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch,
 		/obj/item/reagent_containers/food/drinks/soda_cans/space_up,
-		/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
-		/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
-		/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
+		/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel,
+		/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda
 		))
 		new rig_snacks(src)
 
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 45fee1d67660..67dba503642d 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -1,3 +1,10 @@
+//need to refactor this.
+GLOBAL_LIST_INIT(biblenames, list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon", "Insulationism", "Guru Granth Sahib"))
+//If you get these two lists not matching in size, there will be runtimes and I will hurt you in ways you couldn't even begin to imagine
+// if your bible has no custom itemstate, use one of the existing ones
+GLOBAL_LIST_INIT(biblestates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon", "insuls", "gurugranthsahib"))
+GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon", "kingyellow", "gurugranthsahib"))
+
 /obj/item/storage/book
 	name = "hollowed book"
 	desc = "I guess someone didn't like it."
@@ -17,18 +24,6 @@
 /obj/item/storage/book/attack_self(mob/user)
 	to_chat(user, "<span class='notice'>The pages of [title] have been cut out!</span>")
 
-GLOBAL_LIST_INIT(biblenames, list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon", "Insulationism", "Guru Granth Sahib"))
-//If you get these two lists not matching in size, there will be runtimes and I will hurt you in ways you couldn't even begin to imagine
-// if your bible has no custom itemstate, use one of the existing ones
-GLOBAL_LIST_INIT(biblestates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon", "insuls", "gurugranthsahib"))
-GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon", "kingyellow", "gurugranthsahib"))
-
-/mob/proc/bible_check() //The bible, if held, might protect against certain things
-	var/obj/item/storage/book/bible/B = locate() in src
-	if(is_holding(B))
-		return B
-	return 0
-
 /obj/item/storage/book/bible
 	name = "bible"
 	desc = "Apply to head repeatedly."
@@ -41,205 +36,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
 	var/deity_name = "Christ"
 	force_string = "holy"
 
-/obj/item/storage/book/bible/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, FALSE, TRUE)
-
-/obj/item/storage/book/bible/attack_self(mob/living/carbon/human/H)
-	if(!istype(H))
-		return
-	if(!H.can_read(src))
-		return FALSE
-	// If H is the Chaplain, we can set the icon_state of the bible (but only once!)
-	if(!GLOB.bible_icon_state && H.mind.holy_role == HOLY_ROLE_HIGHPRIEST)
-		var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"
-		for(var/i in 1 to GLOB.biblestates.len)
-			var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i])
-			var/nicename = GLOB.biblenames[i]
-			H << browse_rsc(bibleicon, nicename)
-			dat += {"<tr><td><img src="[nicename]"></td><td><a href="?src=[REF(src)];seticon=[i]">[nicename]</a></td></tr>"}
-		dat += "</table></body></html>"
-		H << browse(dat, "window=editicon;can_close=0;can_minimize=0;size=250x650")
-
-/obj/item/storage/book/bible/Topic(href, href_list)
-	if(!usr.canUseTopic(src, BE_CLOSE))
-		return
-	if(href_list["seticon"] && !GLOB.bible_icon_state)
-		var/iconi = text2num(href_list["seticon"])
-		var/biblename = GLOB.biblenames[iconi]
-		icon_state = GLOB.biblestates[iconi]
-		item_state = GLOB.bibleitemstates[iconi]
-
-		if(icon_state == "honk1" || icon_state == "honk2")
-			var/mob/living/carbon/human/H = usr
-			H.dna.add_mutation(CLOWNMUT)
-			H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), ITEM_SLOT_MASK)
-		if(icon_state == "insuls")
-			var/mob/living/carbon/human/H =usr
-			var/obj/item/clothing/gloves/color/fyellow/insuls = new
-			insuls.name = "insuls"
-			insuls.desc = "A mere copy of the true insuls."
-			insuls.siemens_coefficient = 0.99999
-			H.equip_to_slot(insuls, ITEM_SLOT_GLOVES)
-		GLOB.bible_icon_state = icon_state
-		GLOB.bible_item_state = item_state
-
-		SSblackbox.record_feedback("text", "religion_book", 1, "[biblename]")
-		usr << browse(null, "window=editicon")
-
-/obj/item/storage/book/bible/proc/bless(mob/living/L, mob/living/user)
-	if(GLOB.religious_sect)
-		return GLOB.religious_sect.sect_bless(L,user)
-	if(!ishuman(L))
-		return
-	var/mob/living/carbon/human/H = L
-	for(var/X in H.bodyparts)
-		var/obj/item/bodypart/BP = X
-		if(!IS_ORGANIC_LIMB(BP))
-			to_chat(user, "<span class='warning'>[src.deity_name] refuses to heal this metallic taint!</span>")
-			return 0
-
-	var/heal_amt = 10
-	var/list/hurt_limbs = H.get_damaged_bodyparts(1, 1, null, BODYTYPE_ORGANIC)
-
-	if(hurt_limbs.len)
-		for(var/X in hurt_limbs)
-			var/obj/item/bodypart/affecting = X
-			if(affecting.heal_damage(heal_amt, heal_amt, null, BODYTYPE_ORGANIC))
-				H.update_damage_overlays()
-		H.visible_message("<span class='notice'>[user] heals [H] with the power of [deity_name]!</span>")
-		to_chat(H, "<span class='boldnotice'>May the power of [deity_name] compel you to be healed!</span>")
-		playsound(src.loc, "punch", 25, TRUE, -1)
-		SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing)
-	return 1
-
-/obj/item/storage/book/bible/attack(mob/living/M, mob/living/carbon/human/user, heal_mode = TRUE)
-
-	if (!user.IsAdvancedToolUser())
-		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
-		return
-
-	if (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
-		to_chat(user, "<span class='danger'>[src] slips out of your hand and hits your head.</span>")
-		user.take_bodypart_damage(10)
-		user.Unconscious(400)
-		return
-
-	var/chaplain = 0
-	if(user.mind && (user.mind.holy_role))
-		chaplain = 1
-
-	if(!chaplain)
-		to_chat(user, "<span class='danger'>The book sizzles in your hands.</span>")
-		user.take_bodypart_damage(0,10)
-		return
-
-	if (!heal_mode)
-		return ..()
-
-	var/smack = 1
-
-	if (M.stat != DEAD)
-		if(chaplain && user == M)
-			to_chat(user, "<span class='warning'>You can't heal yourself!</span>")
-			return
-
-		if(prob(60) && bless(M, user))
-			smack = 0
-		else if(iscarbon(M))
-			var/mob/living/carbon/C = M
-			if(!istype(C.head, /obj/item/clothing/head/helmet))
-				C.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 60)
-				to_chat(C, "<span class='danger'>You feel dumber.</span>")
-
-		if(smack)
-			M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", \
-					"<span class='userdanger'>[user] beats [M] over the head with [src]!</span>")
-			playsound(src.loc, "punch", 25, TRUE, -1)
-			log_combat(user, M, "attacked", src)
-
-	else
-		M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>")
-		playsound(src.loc, "punch", 25, TRUE, -1)
-
-/obj/item/storage/book/bible/afterattack(atom/A, mob/user, proximity)
-	. = ..()
-	if(!proximity)
-		return
-	if(isfloorturf(A))
-		to_chat(user, "<span class='notice'>You hit the floor with the bible.</span>")
-		if(user.mind && (user.mind.holy_role))
-			for(var/obj/effect/rune/R in orange(2,user))
-				R.invisibility = 0
-	if(user?.mind?.holy_role)
-		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(/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(/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/storage/book/bible) && !istype(A, /obj/item/storage/book/bible/syndicate))
-			to_chat(user, "<span class='notice'>You purify [A], conforming it to your belief.</span>")
-			var/obj/item/storage/book/bible/B = A
-			B.name = name
-			B.icon_state = icon_state
-			B.item_state = item_state
-	if(istype(A, /obj/item/cult_bastard) && !iscultist(user))
-		var/obj/item/cult_bastard/sword = A
-		to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
-		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
-		if(do_after(user, 40, target = sword))
-			playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
-			for(var/obj/item/soulstone/SS in sword.contents)
-				SS.usability = TRUE
-				for(var/mob/living/simple_animal/shade/EX in SS)
-					SSticker.mode.remove_cultist(EX.mind, 1, 0)
-					EX.icon_state = "ghost1"
-					EX.name = "Purified [EX.name]"
-				SS.release_shades(user)
-				qdel(SS)
-			new /obj/item/nullrod/claymore(get_turf(sword))
-			user.visible_message("<span class='notice'>[user] purifies [sword]!</span>")
-			qdel(sword)
-	else if(istype(A, /obj/item/soulstone) && !iscultist(user))
-		var/obj/item/soulstone/SS = A
-		if(SS.purified)
-			return
-		to_chat(user, "<span class='notice'>You begin to exorcise [SS].</span>")
-		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
-		if(do_after(user, 40, target = SS))
-			playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
-			SS.usability = TRUE
-			SS.purified = TRUE
-			SS.icon_state = "purified_soulstone"
-			for(var/mob/M in SS.contents)
-				if(M.mind)
-					SS.icon_state = "purified_soulstone2"
-					if(iscultist(M))
-						SSticker.mode.remove_cultist(M.mind, FALSE, FALSE)
-			for(var/mob/living/simple_animal/shade/EX in SS)
-				EX.icon_state = "ghost1"
-				EX.name = "Purified [initial(EX.name)]"
-			user.visible_message("<span class='notice'>[user] purifies [SS]!</span>")
-	else if(istype(A, /obj/item/nullrod/scythe/talking))
-		var/obj/item/nullrod/scythe/talking/sword = A
-		to_chat(user, "<span class='notice'>You begin to exorcise [sword]...</span>")
-		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
-		if(do_after(user, 40, target = sword))
-			playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
-			for(var/mob/living/simple_animal/shade/S in sword.contents)
-				to_chat(S, "<span class='userdanger'>You were destroyed by the exorcism!</span>")
-				qdel(S)
-			sword.possessed = FALSE //allows the chaplain (or someone else) to reroll a new spirit for their sword
-			sword.name = initial(sword.name)
-			REMOVE_TRAIT(sword, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) //in case the "sword" is a possessed dummy
-			user.visible_message("<span class='notice'>[user] exorcises [sword]!</span>", \
-								"<span class='notice'>You successfully exorcise [sword]!</span>")
-
 /obj/item/storage/book/bible/koran
 	name = "Koran"
 	icon_state = "koran"
@@ -253,34 +49,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
 	new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
 
 /obj/item/storage/book/bible/syndicate
+	name = "Syndicate Tome"
 	icon_state ="ebook"
 	deity_name = "The Syndicate"
-	throw_speed = 2
-	throwforce = 18
-	throw_range = 7
-	force = 18
-	hitsound = 'sound/weapons/sear.ogg'
-	damtype = BURN
-	name = "Syndicate Tome"
-	attack_verb = list("attacked", "burned", "blessed", "damned", "scorched")
-	var/uses = 1
-
-/obj/item/storage/book/bible/syndicate/attack_self(mob/living/carbon/human/H)
-	if (uses)
-		H.mind.holy_role = HOLY_ROLE_PRIEST
-		uses -= 1
-		to_chat(H, "<span class='userdanger'>You try to open the book AND IT BITES YOU!</span>")
-		playsound(src.loc, 'sound/effects/snap.ogg', 50, TRUE)
-		H.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
-		to_chat(H, "<span class='notice'>Your name appears on the inside cover, in blood.</span>")
-		var/ownername = H.real_name
-		desc += "<span class='warning'>The name [ownername] is written in blood inside the cover.</span>"
-
-/obj/item/storage/book/bible/syndicate/attack(mob/living/M, mob/living/carbon/human/user, heal_mode = TRUE)
-	if (user.a_intent == INTENT_HELP)
-		return ..()
-	else
-		return ..(M,user,heal_mode = FALSE)
-
-/obj/item/storage/book/bible/syndicate/add_blood_DNA(list/blood_dna)
-	return FALSE
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 3cd1e72192ee..8aa7b1d9c478 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -856,6 +856,16 @@
 	for(var/i in 1 to 7)
 		new /obj/item/ammo_casing/shotgun/buckshot(src)
 
+/obj/item/storage/box/techshot
+	name = "box of unloaded shotgun tech shells"
+	desc = "A box full of unloaded tech shells, capable of producing a variety of effects once loaded."
+	icon_state = "techshot_box"
+	illustration = null
+
+/obj/item/storage/box/techshot/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/ammo_casing/shotgun/techshell(src)
+
 /obj/item/storage/box/beanbag
 	name = "box of beanbags"
 	desc = "A box full of beanbag shells."
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 01307d92a0f8..d6edfb29461a 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -133,6 +133,29 @@
 	STR.max_items = 12
 	STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/egg))
 
+/obj/item/storage/fancy/egg_box/update_icon_state()
+	. = ..()
+	icon_state = "[base_icon_state][is_open ? "_open" : null]"
+
+/obj/item/storage/fancy/egg_box/update_overlays()
+	. = ..()
+	cut_overlays()
+	if(!is_open)
+		return
+	var/egg_count = 0
+	for(var/obj/item/reagent_containers/food/snacks/egg as anything in contents)
+		egg_count++
+		if(!egg)
+			return
+		var/image/current_huevo = image(icon = icon, icon_state = "eggbox_eggoverlay")
+		if(egg_count <= 6) //less than 6 eggs
+			current_huevo.pixel_x = (3*(egg_count-1))
+		else //if more than 6, make an extra row
+			current_huevo.pixel_x = (3*(egg_count-7)) //-7 to 'reset' it
+			current_huevo.pixel_y = -3
+		add_overlay(current_huevo)
+
+
 /*
  * Candle Box
  */
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index d91fc622cd56..702416e4202e 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -22,7 +22,7 @@
 			new /obj/item/multitool/ai_detect(src) // 1 tc
 			new /obj/item/encryptionkey/syndicate(src) // 2 tc
 			new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc
-			new /obj/item/switchblade(src) //I'll count this as 2 tc
+			new /obj/item/kitchen/knife/switchblade(src) //I'll count this as 2 tc
 			new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
 			new /obj/item/flashlight/emp(src) // 2 tc
 			new /obj/item/chameleon(src) // 7 tc
@@ -195,7 +195,7 @@
 		if("made_man")
 			new /obj/effect/spawner/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
 			new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
-			new /obj/item/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
+			new /obj/item/kitchen/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
 			new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
 			new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
 			new /obj/item/reagent_containers/food/drinks/bottle/vodka (src)
diff --git a/code/game/objects/items/survery_handheld.dm b/code/game/objects/items/survery_handheld.dm
index 547bdc150237..a10097031485 100644
--- a/code/game/objects/items/survery_handheld.dm
+++ b/code/game/objects/items/survery_handheld.dm
@@ -51,7 +51,7 @@
 			src_turf.visible_message("<span class='warning'>Warning: unable to locate valuable information in current sector.</span>")
 			break
 
-		if(!do_after(user, list(src), survey_delay / penalty))
+		if(!do_after(user, survey_delay / penalty, src))
 			flick(icon_state + "-corrupted", src)
 			playsound(src, 'sound/machines/buzz-sigh.ogg', 20)
 			src_turf.visible_message("<span class='warning'>Warning: results corrupted. Please try again.</span>")
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index f0868c029d28..a76334a0b7ea 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -350,44 +350,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	attack_verb = list("stabbed", "ripped", "gored", "impaled")
 	embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit
 
-/obj/item/switchblade
-	name = "switchblade"
-	icon_state = "switchblade"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	desc = "A sharp, concealable, spring-loaded knife."
-	flags_1 = CONDUCT_1
-	force = 3
-	w_class = WEIGHT_CLASS_SMALL
-	throwforce = 5
-	throw_speed = 3
-	throw_range = 6
-	custom_materials = list(/datum/material/iron=12000)
-	hitsound = 'sound/weapons/genhit.ogg'
-	attack_verb = list("stubbed", "poked")
-	resistance_flags = FIRE_PROOF
-	var/extended = 0
-
-/obj/item/switchblade/attack_self(mob/user)
-	extended = !extended
-	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
-	if(extended)
-		force = 20
-		w_class = WEIGHT_CLASS_NORMAL
-		throwforce = 23
-		icon_state = "switchblade_ext"
-		attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-		hitsound = 'sound/weapons/bladeslice.ogg'
-		sharpness = IS_SHARP
-	else
-		force = 3
-		w_class = WEIGHT_CLASS_SMALL
-		throwforce = 5
-		icon_state = "switchblade"
-		attack_verb = list("stubbed", "poked")
-		hitsound = 'sound/weapons/genhit.ogg'
-		sharpness = IS_BLUNT
-
 /obj/item/phone
 	name = "red phone"
 	desc = "Should anything ever go wrong..."
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 35b7663ca05e..d57e31ce9514 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -235,6 +235,13 @@ LINEN BINS
 	item_state = "sheetsolgov"
 	dream_messages = list("bureaucracy", "laws", "papers", "writing")
 
+/obj/item/bedsheet/suns
+	name = "\improper SUNS bedsheet"
+	desc = "A gold and purple bedsheet with the SUNS icon on it."
+	icon_state = "sheetsuns"
+	item_state = "sheetsuns"
+	dream_messages = list("learning", "science", "geology", "studying a day before an exam")
+
 /obj/item/bedsheet/ian
 	icon_state = "sheetian"
 	item_state = "sheetian"
@@ -356,6 +363,13 @@ LINEN BINS
 	dream_messages = list("bureaucracy", "laws", "papers", "writing")
 	desc = "It has the emblem of the Solar Confederation emblazoned upon it!"
 
+/obj/item/bedsheet/double/suns
+	name = "double SUNS bedsheet"
+	desc = "A large gold and purple bedsheet with the SUNS icon on it."
+	icon_state = "double_sheetsuns"
+	item_state = "double_sheetsuns"
+	dream_messages = list("learning", "science", "geology", "studying a day before an exam")
+
 /obj/item/bedsheet/random/Initialize()
 	..()
 	var/type = pick(typesof(/obj/item/bedsheet) - (typesof(/obj/item/bedsheet/double) + /obj/item/bedsheet/random))
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 0e65a5aeb760..dac919bb428c 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -98,7 +98,7 @@
 	icon_door = "black"
 
 /obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
-	new /obj/item/choice_beacon/holy(src)
+	new /obj/item/storage/box/holy(src)
 	new /obj/item/clothing/accessory/pocketprotector/cosmetology(src)
 	new /obj/item/clothing/under/rank/civilian/chaplain(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
index 165dac720c04..e05bd4524230 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
@@ -65,3 +65,7 @@
 	new /obj/item/storage/box/smart_metal_foam(src)
 	for(var/i in 1 to 3)
 		new /obj/item/rcd_ammo/large(src)
+
+/obj/structure/closet/secure_closet/suns
+	name = "SUNS locker"
+	icon_state = "suns"
diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm
index 35a55824c806..f96d11703943 100644
--- a/code/game/objects/structures/signs/_signs.dm
+++ b/code/game/objects/structures/signs/_signs.dm
@@ -252,18 +252,24 @@
 
 // some solgov stuff
 /obj/structure/sign/solgov_seal
-	name = "Seal of the solarian government"
-	desc = "A seal emblazened with a gold trim depicting the star, sol."
+	name = "seal of the solarian government"
+	desc = "A seal emblazened with a gold trim depicting Sol."
 	icon = 'icons/obj/solgov_logos.dmi'
 	icon_state = "solgovseal"
 	pixel_y = 27
 
 /obj/structure/sign/solgov_flag
 	name = "solgov banner"
-	desc = "A large flag displaying the logo of solgov, the local government of the sol system."
+	desc = "A large flag displaying the logo of solgov, the government of the Sol system."
 	icon = 'icons/obj/solgov_logos.dmi'
 	icon_state = "solgovflag-left"
 
+// suns seal
+/obj/structure/sign/suns
+	name = "emblem of the Student-Union Association of Naturalistic Sciences"
+	desc = "A large emblem showcasing the icon of SUNS."
+	icon_state = "suns"
+
 // clip seal
 /obj/structure/sign/clip
 	name = "Banner of the Confederated League of Independent Planets"
@@ -275,7 +281,7 @@
 /obj/structure/sign/number
 	name = "zero"
 	desc = "A numeral sign."
-	icon = 'icons/turf/decals.dmi'
+	icon = 'icons/turf/decals/decals.dmi'
 	icon_state = "0"
 
 /obj/structure/sign/number/one
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index a8652f130806..415bce3bf6f5 100644
--- a/code/game/objects/structures/signs/signs_flags.dm
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -37,6 +37,12 @@
 	icon_state = "flag_gezena"
 	item_flag = /obj/item/sign/flag/gezena
 
+/obj/structure/sign/flag/suns
+	name = "\improper SUNS flag"
+	desc = "A flag featuring the iconography of the Student-Union Association of Naturalistic Sciences. Something about the flag reminds you of books."
+	icon_state = "flag_suns"
+	item_flag = /obj/item/sign/flag/suns
+
 // ITEM FLAGS - THE THINGS YOU HOLD AND PLACE
 
 /obj/item/sign/flag
@@ -51,3 +57,9 @@
 	desc = "A folded up Gezenan Flag. Something about this flag makes you think of plants."
 	icon_state = "folded_gezena"
 	sign_path = /obj/structure/sign/flag/gezena
+
+/obj/item/sign/flag/suns
+	name = "folded SUNS flag"
+	desc = "A folded up purple Flag. Something about this flag makes you think of chemistry."
+	icon_state = "folded_suns"
+	sign_path = /obj/structure/sign/flag/suns
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 4866dbfb3f60..2b7d93ae2590 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -77,6 +77,16 @@
 	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
 	canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)
 
+/turf/closed/indestructible/titanium
+	name = "wall"
+	desc = "A light-weight titanium wall used in shuttles. Effectively impervious to conventional methods of destruction."
+	icon = 'icons/turf/walls/shuttle_wall.dmi'
+	icon_state = "shuttle_wall-0"
+	base_icon_state = "shuttle_wall"
+	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
+	smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+	smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
+	canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE)
 
 /turf/closed/indestructible/riveted
 	icon = 'icons/turf/walls/riveted.dmi'
diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm
index 89f48aee49a1..996d122a4ac9 100644
--- a/code/game/turfs/open/floor/plating/asteroid.dm
+++ b/code/game/turfs/open/floor/plating/asteroid.dm
@@ -101,7 +101,7 @@
 				to_chat(user, "<span class='warning'>There is already a grave there!</span>")
 				return
 			to_chat(user, "<span class='notice'>You start piling the dirt...</span>")
-			if(do_after(user,30, target = src))
+			if(do_after(user, 30, target = src))
 				if(locate(/obj/structure/closet/crate/grave) in dest_turf)
 					return
 				if(istype(W, /obj/item/stack/sheet/mineral/wood))
diff --git a/code/game/turfs/open/floor/plating/lavaland.dm b/code/game/turfs/open/floor/plating/lavaland.dm
index e3e22f0ad670..84e0173819b7 100644
--- a/code/game/turfs/open/floor/plating/lavaland.dm
+++ b/code/game/turfs/open/floor/plating/lavaland.dm
@@ -93,3 +93,39 @@
 	light_range = 2
 	light_power = 0.6
 	light_color = LIGHT_COLOR_FIRE
+
+/turf/open/floor/concrete/lava
+	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
+
+/turf/open/floor/concrete/slab_1/lava
+	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
+
+/turf/open/floor/plating/lava
+	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
+
+/turf/open/floor/plating/rust/lava
+	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
+
+/turf/open/floor/plasteel/white/lava
+	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
+
+/turf/open/floor/plasteel/dark/lava
+	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
diff --git a/code/game/turfs/open/floor/suns_floor.dm b/code/game/turfs/open/floor/suns_floor.dm
new file mode 100644
index 000000000000..9505bc5a33a5
--- /dev/null
+++ b/code/game/turfs/open/floor/suns_floor.dm
@@ -0,0 +1,45 @@
+/turf/open/floor/suns
+	name = "white marble floor"
+	icon = 'icons/turf/floors/suns.dmi'
+	icon_state = "light"
+	floor_tile = /obj/item/stack/tile/suns
+
+/turf/open/floor/suns/plain
+	name = "white plain marble floor"
+	icon_state = "lightplain"
+	floor_tile = /obj/item/stack/tile/suns/plain
+
+/turf/open/floor/suns/pattern
+	name = "patterned white marble floor"
+	icon_state = "lightpattern"
+	floor_tile = /obj/item/stack/tile/suns/pattern
+
+/turf/open/floor/suns/hatch
+	name = "hatched white marble floor"
+	icon_state = "lighthatched"
+	floor_tile = /obj/item/stack/tile/suns/hatch
+
+/turf/open/floor/suns/diagonal
+	name = "diagonal white marble floor"
+	icon_state = "lightdiag"
+	floor_tile = /obj/item/stack/tile/suns/diagonal
+
+/turf/open/floor/suns/grid
+	name = "dark grid floor"
+	icon_state = "darkchunky"
+	floor_tile = /obj/item/stack/tile/suns/grid
+
+/turf/open/floor/suns/dark
+	name = "black marble floor"
+	icon_state = "dark"
+	floor_tile = /obj/item/stack/tile/suns/dark
+
+/turf/open/floor/suns/dark/plain
+	name = "black plain marble floor"
+	icon_state = "darkplain"
+	floor_tile = /obj/item/stack/tile/suns/dark/plain
+
+/turf/open/floor/suns/dark/pattern
+	name = "patterned black marble floor"
+	icon_state = "darkpattern"
+	floor_tile = /obj/item/stack/tile/suns/dark/pattern
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 4ed4b47297a2..e5cc9709559c 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -461,12 +461,12 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
 		return
 	if(length(src_object.contents()))
 		to_chat(usr, "<span class='notice'>You start dumping out the contents...</span>")
-		if(!do_after(usr,20,target=src_object.parent))
+		if(!do_after(usr, 20, target=src_object.parent))
 			return FALSE
 
 	var/list/things = src_object.contents()
 	var/datum/progressbar/progress = new(user, things.len, src)
-	while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress)))
+	while (do_after(usr, 10, src, TRUE, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress)))
 		stoplag(1)
 	progress.end_progress()
 
diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm
index 6036ae1d00f6..f158499d8b0f 100644
--- a/code/modules/antagonists/changeling/powers/linglink.dm
+++ b/code/modules/antagonists/changeling/powers/linglink.dm
@@ -67,7 +67,7 @@
 	to_chat(user, "<span class='notice'>We must keep holding on to [target] to sustain the link. </span>")
 	while(user.pulling && user.grab_state >= GRAB_NECK)
 		target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 0.5) // So they don't choke to death while you interrogate them
-		do_after(user, 10 SECONDS, target, TRUE)
+		do_after(user, 10 SECONDS, target, hidden = TRUE)
 
 	changeling.islinking = 0
 	target.mind.linglink = 0
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 7355880e6da1..5058dc73f081 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -61,10 +61,6 @@ Runes can either be invoked by one's self or with many different cultists. Each
 		if(do_after(user, 15, target = src))
 			to_chat(user, "<span class='notice'>You carefully erase the [lowertext(cultist_name)] rune.</span>")
 			qdel(src)
-	else if(istype(I, /obj/item/nullrod))
-		user.say("BEGONE FOUL MAGIKS!!", forced = "nullrod")
-		to_chat(user, "<span class='danger'>You disrupt the magic of [src] with [I].</span>")
-		qdel(src)
 
 /obj/effect/rune/attack_hand(mob/living/user)
 	. = ..()
@@ -502,9 +498,6 @@ structure_check() searches for nearby cultist structures required for the invoca
 		if(do_after(user, 50, target = src))	//Prevents accidental erasures.
 			log_game("Summon Narsie rune erased by [key_name(user)] with [I.name]")
 			message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with [I.name]")
-	else if(istype(I, /obj/item/nullrod))	//Begone foul magiks. You cannot hinder me.
-		log_game("Summon Narsie rune erased by [key_name(user)] using a null rod")
-		message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with a null rod")
 	else
 		..()
 
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index f3d6bb31abf4..648803185661 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -126,7 +126,7 @@
 			if(istype(I, /obj/item/nuke_core_container))
 				var/obj/item/nuke_core_container/core_box = I
 				to_chat(user, "<span class='notice'>You start loading the plutonium core into [core_box]...</span>")
-				if(do_after(user,50,target=src, hidden = TRUE))
+				if(do_after(user, 50, target = src, hidden = TRUE))
 					if(core_box.load(core, user))
 						to_chat(user, "<span class='notice'>You load the plutonium core into [core_box].</span>")
 						deconstruction_state = NUKESTATE_CORE_REMOVED
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index 76da8304df09..084176f4b8c4 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -190,17 +190,6 @@
 		return BULLET_ACT_FORCE_PIERCE
 	return ..()
 
-//damage, gibbing, and dying
-/mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params)
-	. = ..()
-	if(istype(W, /obj/item/nullrod))
-		visible_message("<span class='warning'>[src] violently flinches!</span>", \
-						"<span class='revendanger'>As \the [W] passes through you, you feel your essence draining away!</span>")
-		adjustBruteLoss(25) //hella effective
-		inhibited = TRUE
-		update_action_buttons_icon()
-		addtimer(CALLBACK(src, PROC_REF(reset_inhibit)), 30)
-
 /mob/living/simple_animal/revenant/proc/reset_inhibit()
 	inhibited = FALSE
 	update_action_buttons_icon()
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index a95ef0d1b579..a20b905b590d 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -58,14 +58,6 @@
 	if(spawn_amt_left <= 0)
 		qdel(src)
 
-/obj/effect/rend/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/nullrod))
-		user.visible_message("<span class='danger'>[user] seals \the [src] with \the [I].</span>")
-		qdel(src)
-		return
-	else
-		return ..()
-
 /obj/effect/rend/singularity_pull()
 	return
 
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 3705cb361d82..5ff6b2e396b5 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -299,7 +299,7 @@
 			close_machine(target)
 	else
 		user.visible_message("<span class='notice'>[user] starts shoving [target] inside [src].</span>", "<span class='notice'>You start shoving [target] inside [src].</span>")
-		if (do_after(user, 25, target=target))
+		if (do_after(user, 25, target = target))
 			close_machine(target)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 6e6551b58e86..e3a20e0e8905 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -161,10 +161,10 @@
 	availability_prob = 80
 	unlimited =  TRUE
 
-/datum/blackmarket_item/consumable/thirteenloko
-	name = "Can of Thirteen Loko"
+/datum/blackmarket_item/consumable/vimukti
+	name = "Can of Vimukti"
 	desc = "This product was quietly discontinued after multiple health related incidents. But you aren't a coward, are you?"
-	item = /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
+	item = /obj/item/reagent_containers/food/drinks/soda_cans/vimukti
 
 	price_min = 10
 	price_max = 50
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 83740509f2d7..11fef220ee01 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -38,7 +38,7 @@
 /datum/blackmarket_item/weapon/switchblade
 	name = "Switchblade"
 	desc = "Extra shrap switchblades for intimidation AND style. Bandages not included if you cut yourself."
-	item = /obj/item/switchblade
+	item = /obj/item/kitchen/knife/switchblade
 
 	price_min = 500
 	price_max = 700
@@ -209,6 +209,38 @@
 	stock_max = 3
 	availability_prob = 30
 
+/datum/blackmarket_item/weapon/mecha_syringe_gun
+	name = "Mounted Syringe Gun"
+	desc = "We ripped this off an old Nanotrasen exosuit. It's a real advanced piece of equipment. Exosuit not included."
+	item = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
+
+	price_min = 5000
+	price_max = 7000
+	stock = 1
+	availability_prob = 15
+
+/datum/blackmarket_item/weapon/mecha_hades
+	name = "Mounted FNX-99 Carbine"
+	desc = "This so called \"Hades\" carbine is sure to burn brightly above the competition! Not to be confused with the \"Hades\" energy rifle. Exosuit not included."
+	item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
+	pair_item = /datum/blackmarket_item/weapon/mecha_hades_ammo
+
+	price_min = 2000
+	price_max = 3000
+	stock_max = 2
+	availability_prob = 25
+
+/datum/blackmarket_item/weapon/mecha_hades_ammo
+	name = "FNX-99 Incediary Ammo"
+	desc = "A box of 24 incendiary shells for the FNX-99 mounted carbine."
+	item = /obj/item/mecha_ammo/incendiary
+
+	price_min = 250
+	price_max = 350
+	stock_min = 3
+	stock_max = 5
+	availability_prob = 0
+
 /datum/blackmarket_item/weapon/model_h
 	name = "Model H"
 	desc = "A Model H slug pistol. The H stands for Hurt. Chambered in ferromagnetic slugs."
diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm
index a3ece1cce8c6..0fcbbf4f1794 100644
--- a/code/modules/cargo/bounties/reagent.dm
+++ b/code/modules/cargo/bounties/reagent.dm
@@ -71,7 +71,7 @@
 		/datum/reagent/consumable/ethanol/syndicatebomb,\
 		/datum/reagent/consumable/ethanol/tequila_sunrise,\
 		/datum/reagent/consumable/ethanol/manly_dorf,\
-		/datum/reagent/consumable/ethanol/thirteenloko,\
+		/datum/reagent/consumable/ethanol/vimukti,\
 		/datum/reagent/consumable/triple_citrus,\
 		/datum/reagent/consumable/ethanol/vodkamartini,\
 		/datum/reagent/consumable/ethanol/whiskeysoda,\
@@ -100,10 +100,7 @@
 		/datum/reagent/consumable/ethanol/booger,\
 		/datum/reagent/consumable/ethanol/hippies_delight,\
 		/datum/reagent/consumable/ethanol/drunkenblumpkin,\
-		/datum/reagent/consumable/ethanol/fetching_fizz,\
 		/datum/reagent/consumable/ethanol/goldschlager,\
-		/datum/reagent/consumable/ethanol/manhattan_proj,\
-		/datum/reagent/consumable/ethanol/narsour,\
 		/datum/reagent/consumable/ethanol/neurotoxin,\
 		/datum/reagent/consumable/ethanol/patron,\
 		/datum/reagent/consumable/ethanol/quadruple_sec,\
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index ab521998f07c..aa165cbc8149 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -70,6 +70,12 @@
 	cost = 500
 	contains = list(/obj/item/ammo_box/a12g/slug)
 
+/datum/supply_pack/ammo/techshells
+	name = "Unloaded Shotgun Technological Shells Crate"
+	desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required."
+	cost = 210
+	contains = list(/obj/item/storage/box/techshot)
+
 /*
 		.38 ammo
 */
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index 5bce9871719a..fa63529b7955 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -115,7 +115,7 @@
 		if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying.
 			new /obj/item/clothing/mask/fakemoustache/italian(C)
 	if(prob(10)) //A little extra sugar every now and then to shake things up.
-		new	/obj/item/switchblade(C)
+		new	/obj/item/kitchen/knife/switchblade(C)
 
 /datum/supply_pack/costumes_toys/mech_suits
 	name = "Mech Pilot's Suit Crate"
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index bf16fb592e21..7abc0188f9d9 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -184,7 +184,7 @@
 	cost = 5000
 	contains = list(/obj/item/stack/sheet/mineral/coal/five,
 					/obj/machinery/grill/unwrenched,
-					/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy)
+					/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy)
 	crate_name = "grilling starter kit crate"
 	crate_type = /obj/structure/closet/crate/large
 
diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
index 376c22fc0db8..937126a86361 100644
--- a/code/modules/cargo/packs/mechs.dm
+++ b/code/modules/cargo/packs/mechs.dm
@@ -109,6 +109,14 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/drill
 	)
 
+/datum/supply_pack/mech/equipment/diamond_drill
+	name = "Mech diamond drill kit"
+	desc = "Contains mechanized diamond drill, for the enterprising prospector!"
+	cost = 750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
+	)
+
 /datum/supply_pack/mech/equipment/scanner
 	name = "Mech scanner kit"
 	desc = "An electronic mining scanner, graded to interface with a mech."
@@ -125,6 +133,22 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/generator
 	)
 
+/datum/supply_pack/mech/equipment/nuclear_gen
+	name = "Mech nuclear generator kit"
+	desc = "Contains a uranium-fueled generator for a mech, ideal for polluting the environment."
+	cost = 1250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/generator/nuclear
+	)
+
+/datum/supply_pack/mech/equipment/tesla_energy_relay
+	name = "Mech tesla relay kit"
+	desc = "Contains an advanced exosuit module which draws power from nearby APCs."
+	cost = 1750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
+	)
+
 /datum/supply_pack/mech/equipment/clamp
 	name = "Mech clamp kit"
 	desc = "Contains a clamp designed for mechanized freight hauling."
@@ -133,6 +157,37 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
 	)
 
+/datum/supply_pack/mech/equipment/extinguisher
+	name = "Mech extinguisher kit"
+	desc = "Contains a heavy duty fire extinguisher, for heavy duty firefighting."
+	cost = 250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/extinguisher
+	)
+
+/datum/supply_pack/mech/equipment/cable_layer
+	name = "Mech RCL Kit"
+	desc = "Contains a \"rapid cable layer\" for laying down long lengths of wire."
+	cost = 250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/cable_layer
+	)
+
+/datum/supply_pack/mech/equipment/mech_sleeper
+	name = "Mech Mounted Sleeper Kit"
+	desc = "Contains a mounted sleeper device, used for retrieving and stabilizing patients."
+	cost = 1000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/medical/sleeper
+	)
+
+/datum/supply_pack/mech/equipment/beam_gun
+	name = "Mech Beam Gun Kit"
+	desc = "Contains an advanced mounted medical beamgun, capable of alleviating wounds to targets."
+	cost = 7000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam
+	)
 /datum/supply_pack/mech/equipment/rcs
 	name = "Mech RCS kit"
 	desc = "A gas fueled RCS pack, ideal for mechanized space operation."
@@ -149,19 +204,40 @@ Mech Equipment
 		/obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley
 	)
 
+/datum/supply_pack/mech/equipment/melee_armor_booster
+	name = "Mech CCW armor kit"
+	desc = "A \"close combat weaponry\" module designed to deflect melee attacks."
+	cost = 750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster
+	)
+
+/datum/supply_pack/mech/equipment/projectile_armor_booster
+	name = "Mech projectile armor kit"
+	desc = "A protective exosuit module designed to deflect ranged attacks."
+	cost = 1000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
+	)
+
 /*
 weapons
 */
 
-/datum/supply_pack/mech/equipment/pka
+/datum/supply_pack/mech/weapon
+	name = "Mech weapons crate"
+	crate_type = /obj/structure/closet/crate/secure/weapon
+	crate_name = "mech weapon crate"
+
+/datum/supply_pack/mech/weapon/pka
 	name = "Mech Mounted Proto-Kinetic Accelerator kit"
 	desc = "A ranged mining attachment for any mech."
-	cost = 1500
+	cost = 750
 	contains = list(
 		/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
 	)
 
-/datum/supply_pack/mech/equipment/laser
+/datum/supply_pack/mech/weapon/laser
 	name = "Immolator kit"
 	desc = "A light laser cannon designed for combat usage."
 	cost = 1000
@@ -169,10 +245,75 @@ weapons
 		/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
 	)
 
-/datum/supply_pack/mech/equipment/biglaser
+/datum/supply_pack/mech/weapon/biglaser
 	name = "Solaris kit"
 	desc = "A heavy laser cannon designed for combat usage."
 	cost = 2000
 	contains = list(
 		/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
 	)
+
+/datum/supply_pack/mech/weapon/ion_cannon
+	name = "MK4 ion cannon kit"
+	desc = "Contains a heavy ion cannon for disabling technology in large blasts."
+	cost = 3000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
+	)
+
+/datum/supply_pack/mech/weapon/scattershot
+	name = "LBX AC 10 kit"
+	desc = "Contains a \"Scattershot\" gun to mount on combat exosuits."
+	cost = 1750
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	)
+
+/datum/supply_pack/mech/weapon/lmg
+	name = "Ultra AC 2 kit"
+	desc = "Contains a mounted gun which fires in three round bursts."
+	cost = 2250
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
+	)
+
+/datum/supply_pack/mech/weapon/missile_rack
+	name = "BRM-6 kit"
+	desc = "Contains a low-explosive missile launcher, excellent for breaching through obstacles."
+	cost = 3000
+	contains = list(
+		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/breaching
+	)
+
+/*
+ammo
+*/
+
+/datum/supply_pack/mech/ammo
+	name = "Mech ammo crate"
+	crate_type = /obj/structure/closet/crate/secure/gear
+	crate_name = "mech ammo crate"
+
+/datum/supply_pack/mech/ammo/scattershot_ammo
+	name = "LBX AC 10 ammo box"
+	desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX AC 10."
+	cost = 500
+	contains = list(
+		/obj/item/mecha_ammo/scattershot
+	)
+
+/datum/supply_pack/mech/ammo/lmg_ammo
+	name = "Ultra AC 2 ammo box"
+	desc = "Contains a three hundred-round box of heavy ammunition for the Ultra AC 2."
+	cost = 750
+	contains = list(
+		/obj/item/mecha_ammo/lmg
+	)
+
+/datum/supply_pack/mech/ammo/missile_rack_ammo
+	name = "BRM-6 missile box"
+	desc = "Contains a box of six breaching missiles designed to explode upon striking hard surfaces."
+	cost = 1000
+	contains = list(
+		/obj/item/mecha_ammo/missiles_br
+	)
diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm
new file mode 100644
index 000000000000..5c3423f745c0
--- /dev/null
+++ b/code/modules/clothing/factions/hardliners.dm
@@ -0,0 +1,181 @@
+//////////////
+//Jumpsuits//
+/////////////
+
+/obj/item/clothing/under/syndicate/hardliners
+	name = "hardliners uniform"
+	desc = "A crimson combat uniform, reminiscent of the Gorlex Marauders at the height of the Inter-Corporate Wars. It's oddly comfortable, and warm."
+	icon_state = "hardliners"
+	item_state = "hardliners"
+	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
+	can_adjust = FALSE
+	icon = 'icons/obj/clothing/faction/hardliners/uniforms.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/uniforms.dmi'
+
+/obj/item/clothing/under/syndicate/hardliners/jumpsuit
+	name = "hardliners jumpsuit"
+	desc = "A black jumpsuit with white overalls, a scant reminder of the old miners of Gorlex VII."
+	icon_state = "hl_jumpsuit"
+	item_state = "hl_jumpsuit"
+
+/obj/item/clothing/under/syndicate/hardliners/officer
+	name = "hardliners officer uniform"
+	desc = "A button-up uniform with cargo pants, certainly more tactical than most officer uniforms."
+	icon_state = "hl_officer"
+	item_state = "hl_officer"
+
+////////////////////
+//Unarmored suits//
+///////////////////
+
+/obj/item/clothing/suit/hardliners
+	name = "white smock"
+	desc = "A plain-white surgical smock typically worn by both Hardliners and Cybersun staff. Even mercenaries need medical attention!"
+	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+	icon_state = "hl_apron"
+	item_state = "whitecloth"
+
+/obj/item/clothing/suit/hazardvest/hardliners
+	name = "blood-red hazard vest"
+	desc = "A white high-visibility vest, worn by mechanics associated with Hardliners. Safety first!"
+	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+	icon_state = "hl_hazard"
+	item_state = "whitecloth"
+
+//////////////////
+//Armored suits//
+/////////////////
+
+/obj/item/clothing/suit/armor/hardliners
+	name = "hardliners armor vest"
+	desc = "A slim Type I armored vest, painted in a classic white associated with the Hardliners. It would probably make bloodstains very obvious..."
+	icon_state = "hl_vest"
+	item_state = "armor"
+	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+	blood_overlay_type = "armor"
+
+/obj/item/clothing/suit/armor/hardliners/jacket
+	name = "hardliners armored kutte"
+	desc = "A leather Kutte with a slim Type I armored vest, painted in a classic white associated with the Hardliners. The patch of the Hardliner movement can be seen behind the leather kutte, a nostalgic callback to the leather outfits used by the civilians of Gorlex VII."
+	icon_state = "hl_jacket"
+	item_state = "armor"
+	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+	blood_overlay_type = "armor"
+
+/obj/item/clothing/suit/armor/hardliners/sergeant
+	name = "hardliners sergeant jacket"
+	desc = "An armored jacket typically worn by sergeant of the Hardliners. They're reminiscent of the garb worn by old Gorlex navymen, prior to its destruction."
+	body_parts_covered = CHEST|GROIN|ARMS
+	icon_state = "hl_sergeant"
+	item_state = "hl_sergeant"
+	blood_overlay_type = "coat"
+	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/suit/toggle/armor/vest/hardliners
+	name = "hardliners captain coat"
+	desc = "An imposing armored coat worn by captains of Hardliner fleets, hand-designed by Cybersun tailors to provide maximum protection to its wearer."
+	body_parts_covered = CHEST|GROIN|ARMS
+	icon_state = "hl_captain"
+	item_state = "hl_captain"
+	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+	blood_overlay_type = "coat"
+	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	togglename = "buttons"
+
+///////////////
+//Spacesuits//
+//////////////
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
+	name = "white-red hardsuit helmet"
+	desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Cybersun Biodynamics."
+	alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Cybersun Biodynamics."
+	icon_state = "hardsuit1-hl"
+	item_state = "hardsuit1-hl"
+	icon = 'icons/obj/clothing/faction/hardliners/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi'
+	hardsuit_type = "hl"
+
+/obj/item/clothing/suit/space/hardsuit/syndi/hl
+	name = "white-red hardsuit"
+	desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Cybersun Biodynamics."
+	alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by Cybersun Biodynamics."
+	icon_state = "hardsuit1-hl"
+	item_state = "hardsuit1-hl"
+	hardsuit_type = "hl"
+	icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
+	lightweight = 1
+	jetpack = null
+
+/////////
+//Hats//
+////////
+
+/obj/item/clothing/head/hardliners
+	name = "white surgical cap"
+	desc = "A surgical cap used by doctors of Hardliner fleets, matching their white smocks."
+	icon_state = "hl_surgery"
+	icon = 'icons/obj/clothing/faction/hardliners/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi'
+
+
+/obj/item/clothing/head/hardhat/hardliners
+	name = "white-red hard hat"
+	desc = "A white-red hardhat typically used by both miners and mechanics under the Hardliner fleets."
+	icon_state = "hl_hardhat"
+	icon = 'icons/obj/clothing/faction/hardliners/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi'
+
+/obj/item/clothing/head/hardliners/peaked
+	name = "Hardliner peaked cap"
+	desc = "A stylish peaked cap utilized by high-ranking officers of the Hardliner movement. Most who wear it are likely to have been a veteran of the ICW, still vying for revenge against Nanotrasen..."
+	icon_state = "hl_officer"
+	item_state = "hl_officer"
+
+/obj/item/clothing/head/helmet/hardliners
+	name = "hardliners X-11 helmet"
+	desc = "A well-armored helmet utilized by the Hardliners, though painted in their iconic white. Either it makes them stick out like a sore thumb, or it provides excellent camouflage in snow-covered planets."
+	icon = 'icons/obj/clothing/faction/hardliners/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi'
+	armor = list("melee" = 40, "bullet" = 60, "laser" = 35, "energy" = 35, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) // The guys who specialize in ballistics would probably have better bullet armor. Maybe.
+	icon_state = "hl_x11"
+	item_state = "hl_x11"
+
+/obj/item/clothing/head/helmet/hardliners/swat
+	name = "hardliners pilot helmet"
+	desc = "A modified X-11 helmet utilized by regular pilots, as well as the feared mech pilots of the Hardliner movement. The attached visor helps protect against sudden flashes from explosions."
+	flash_protect = FLASH_PROTECTION_WELDER
+	icon_state = "hl_pilot"
+	item_state = "hl_pilot"
+
+////////////
+//Glasses//
+///////////
+
+/obj/item/clothing/glasses/hud/security/sunglasses/hardliners
+	name = "hardliners security goggles"
+	desc = "Tinted-red flash-proof goggles used by Hardliners, with an integrated security HUD, courtesy of their partners, Cybersun."
+	icon_state = "hl_goggles"
+	item_state = "hl_goggles"
+	icon = 'icons/obj/clothing/faction/hardliners/eyes.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/eyes.dmi'
+	glass_colour_type = /datum/client_colour/glass_colour/red
+
+//////////
+//Belts//
+/////////
+
+/obj/item/storage/belt/security/webbing/hardliners
+	name = "hardliners webbing"
+	desc = "A set of tactical webbing for operators of the Hardliner movement, can hold security gear."
+	icon_state = "hl_webbing"
+	item_state = "hl_webbing"
+	icon = 'icons/obj/clothing/faction/hardliners/belt.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/belt.dmi'
diff --git a/code/modules/clothing/factions/srm.dm b/code/modules/clothing/factions/srm.dm
new file mode 100644
index 000000000000..84b1f0b12640
--- /dev/null
+++ b/code/modules/clothing/factions/srm.dm
@@ -0,0 +1,154 @@
+//////////////
+//Jumpsuits//
+/////////////
+
+/obj/item/clothing/under/suit/roumain
+	name = "saint-roumain's worksuit"
+	desc = "A simple, hard-wearing suit designed for the hardworking hunters of the Saint-Roumain Militia."
+	icon_state = "rouma_work"
+	item_state = "rouma_work"
+	can_adjust = FALSE
+	icon = 'icons/obj/clothing/faction/srm/uniforms.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/uniforms.dmi'
+
+//////////////////
+//Armored suits//
+/////////////////
+
+/obj/item/clothing/suit/armor/roumain
+	name = "saint-roumain duster"
+	desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness."
+	icon_state = "armor_rouma"
+	item_state = "rouma_coat"
+	body_parts_covered = CHEST|GROIN|ARMS
+	cold_protection = CHEST|GROIN|ARMS
+	heat_protection = CHEST|GROIN|ARMS
+	icon = 'icons/obj/clothing/faction/srm/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
+
+/obj/item/clothing/suit/armor/roumain/shadow
+	name = "saint-roumain shadow duster"
+	desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees."
+	icon_state = "armor_rouma_shadow"
+	item_state = "rouma_shadow_coat"
+
+/obj/item/clothing/suit/toggle/labcoat/roumain_med
+	name = "saint-roumain medical duster"
+	desc = "A coat made from hard leather and further treated with exotic sterilizing oils and wax. The treatment and its more closed design offers much better protection against biological hazards."
+	icon = 'icons/obj/clothing/faction/srm/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
+	icon_state = "rouma_med_coat"
+	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/item/clothing/suit/hazardvest/roumain
+	name = "saint-roumain machinist leather vest"
+	desc = "A modified Roumain leather duster with its large flaps and sleeves cut off to provide extra mobility when maintaining weapons and vessels belonging to the Church of Saint Roumain. Its specialty treatment grants it better protection against acid and fire."
+	icon = 'icons/obj/clothing/faction/srm/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
+	icon_state = "armor_rouma_machinist"
+	item_state = "rouma_coat"
+	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
+
+/obj/item/clothing/suit/armor/roumain/flamebearer
+	name = "saint-roumain flamebearer robes"
+	desc = "A set of ashy-grey robes made from hard leather, adorned with gold trims. Its rough finish after a near-char and application of aromatics is heavily favored for the ecclesiastical sect of the Church of Saint Roumain, a living reminder of the Ashen Huntsman himself."
+	icon_state = "armor_rouma_flamebearer"
+
+/obj/item/clothing/suit/armor/roumain/colligne
+	name = "saint-roumain colligne coat"
+	desc = "A well-maintained hard leather coat typically worn to denote the rank of Colligne, a trainee Hunter Montagne. It is treated with bullet-resistant materials, and lined with the dark fur of Illestrian dire wolves."
+	icon_state = "armor_rouma_colligne"
+	item_state = "rouma_coat"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	cold_protection = CHEST|GROIN|LEGS|ARMS
+	heat_protection = CHEST|GROIN|LEGS|ARMS
+
+/obj/item/clothing/suit/armor/roumain/montagne
+	name = "saint-roumain montagne coat"
+	desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature."
+	icon_state = "armor_rouma_montagne"
+	item_state = "rouma_montagne_coat"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
+	cold_protection = CHEST|GROIN|LEGS|ARMS
+	heat_protection = CHEST|GROIN|LEGS|ARMS
+
+///////////////
+//Spacesuits//
+//////////////
+
+/obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain
+	name = "\improper roumain hardsuit helmet"
+	desc = "An armored helmet with an unusual design that recalls both pre-industrial Solarian armor and iconography depicting the Ashen Huntsman. Though hand-made, it is surprisingly quite spaceworthy."
+	icon = 'icons/obj/clothing/faction/srm/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi'
+	icon_state = "hardsuit0-roumain"
+	item_state = "hardsuit0-roumain"
+	hardsuit_type = "roumain"
+	worn_y_offset = 4
+
+/obj/item/clothing/suit/space/hardsuit/solgov/roumain
+	name = "\improper roumain hardsuit"
+	desc = "A hand-crafted suit of armor either modified from a set of normal plate armor or designed to resemble one. A powered exoskeleton has been cleverly integrated into the design and, surprisingly, it is completely vacuum-proof. Suits like this are a testament to what the master craftsmen of Hunter's Pride are capable of."
+	icon = 'icons/obj/clothing/faction/srm/suits.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
+	icon_state = "hardsuit-roumain"
+	item_state = "hardsuit-roumain"
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain
+	slowdown = 0.5
+
+/////////
+//Hats//
+////////
+
+/obj/item/clothing/head/cowboy/sec/roumain
+	name = "hunter's hat"
+	desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass."
+	icon_state = "rouma_hat"
+	icon = 'icons/obj/clothing/faction/srm/head.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi'
+
+/obj/item/clothing/head/cowboy/sec/roumain/shadow
+	name = "shadow's hat"
+	desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter."
+	icon_state = "rouma_shadow_hat"
+
+/obj/item/clothing/head/cowboy/sec/roumain/machinist
+	name = "machinist's hat"
+	desc = "A small, humble leather top hat. It gives you the gnawing urge to create classical gizmos and goobers, or alternatively repair any breaches within your vessel."
+	icon_state = "rouma_machinist_hat"
+
+/obj/item/clothing/head/cowboy/sec/roumain/med
+	name = "medical hunter's hat"
+	desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time."
+	icon_state = "rouma_med_hat"
+
+/obj/item/clothing/head/cowboy/sec/roumain/flamebearer
+	name = "flamebearer's hat"
+	desc = "A wide-brimmed, pointed hat with charred leather, granting it an ash-grey appearance. The design honors the one the Ashen Huntsman himself wore, according to legend."
+	icon_state = "rouma_flamebearer_hat"
+
+/obj/item/clothing/head/cowboy/sec/roumain/colligne
+	name = "colligne's hat"
+	desc = "A fancy, pointy leather hat with a large feather plume to signal that you are, in fact... A Hunter Colligne. You still have some ways to go before you gain the title of Montagne."
+	icon_state = "rouma_colligne_hat"
+
+/obj/item/clothing/head/cowboy/sec/roumain/montagne
+	name = "montagne's hat"
+	desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft and bafflingly bulletproof."
+	icon_state = "rouma_montagne_hat"
+
+///////////////
+//Accessories//
+///////////////
+
+//These are stored in clothing/accessories.dmi instead of a factional variant due to accessory code being dogwater
+//Please transfer them over to a factional file if accessory code is ever fixed
+
+/obj/item/clothing/accessory/waistcoat/roumain
+	name = "roumain waistcoat"
+	desc = "A warm, red wool waistcoat, worn by any member of the Church of Saint Roumain, though heavily favored by Machinists for the added warmth given to their rather breezy outfit."
+	icon_state = "rouma_waistcoat"
+	icon = 'icons/obj/clothing/accessories.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/accessories.dmi'
+	minimize_when_attached = TRUE
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 994cc6042ef2..3e04245e1a14 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -138,26 +138,6 @@
 	desc = "A robust stetson adorned with a deputy's badge. Its imitation leather is thick and worn."
 	icon_state = "cowboysec"
 
-/obj/item/clothing/head/cowboy/sec/roumain
-	name = "hunter's hat"
-	desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass."
-	icon_state = "rouma_hat"
-
-/obj/item/clothing/head/cowboy/sec/roumain/shadow
-	name = "shadow's hat"
-	desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter."
-	icon_state = "rouma_shadow_hat"
-
-/obj/item/clothing/head/cowboy/sec/roumain/med
-	name = "medical hunter's hat"
-	desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time."
-	icon_state = "rouma_med_hat"
-
-/obj/item/clothing/head/HoS/cowboy/montagne
-	name = "montagne's hat"
-	desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft and bafflingly bulletproof."
-	icon_state = "rouma_montagne_hat"
-
 /obj/item/clothing/head/HoS/syndicate
 	name = "syndicate cap"
 	desc = "A black cap fit for a high ranking syndicate officer."
@@ -272,3 +252,12 @@
 #undef DRILL_SHOUTING
 #undef DRILL_YELLING
 #undef DRILL_CANADIAN
+
+/obj/item/clothing/head/witchunter
+	name = "witchunter hat"
+	desc = "This hat saw much use back in the day."
+	icon_state = "witchhunterhat"
+	item_state = "witchhunterhat"
+	flags_cover = HEADCOVERSEYES
+	flags_inv = HIDEEYES|HIDEHAIR
+	armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index b9e828ab3974..c04b61563f53 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -315,13 +315,6 @@
 	var/datum/brain_trauma/mild/phobia/conspiracies/paranoia
 	var/warped = FALSE
 
-/obj/item/clothing/head/foilhat/Initialize(mapload)
-	. = ..()
-	if(!warped)
-		AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_HEAD,  6, TRUE, null, CALLBACK(src, PROC_REF(warp_up)))
-	else
-		warp_up()
-
 /obj/item/clothing/head/foilhat/equipped(mob/living/carbon/human/user, slot)
 	. = ..()
 	if(slot != ITEM_SLOT_HEAD || warped)
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index a541941208e2..4cec7ad56f8a 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -29,7 +29,7 @@
 	belt = /obj/item/storage/belt/security/full
 	backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
 		/obj/item/melee/baton/loaded=1)
-	l_pocket = /obj/item/switchblade
+	l_pocket = /obj/item/kitchen/knife/switchblade
 
 /datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index ed32d8b698e7..df7a5145e47f 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -7,6 +7,7 @@
 	if(visualsOnly)
 		return
 	H.faction |= list(FACTION_PLAYER_GEZENA)
+	H.grant_language(/datum/language/draconic)
 
 //Playable Roles (put in ships):
 /datum/outfit/job/gezena/assistant
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index c819246f7cae..24b3201573d3 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -19,8 +19,21 @@
 
 /datum/outfit/job/independent/assistant/waiter
 	name = "Independent - Assistant (Waiter)"
+
 	uniform = /obj/item/clothing/under/suit/waiter
+	alt_uniform = /obj/item/clothing/under/suit/waiter/syndicate
+	gloves = /obj/item/clothing/gloves/color/evening
+	ears = /obj/item/radio/headset/headset_srv
 	shoes = /obj/item/clothing/shoes/laceup
+	l_pocket = /obj/item/lighter
+	r_pocket = /obj/item/reagent_containers/glass/rag
+
+/datum/outfit/job/independent/assistant/waiter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	var/obj/item/card/id/W = H.wear_id
+	W.access += list(ACCESS_KITCHEN)
 
 /datum/outfit/job/independent/assistant/fancy
 	name = "Independent - Assistant (Formal Uniform)"
@@ -138,6 +151,18 @@
 	implants = list(/obj/item/implant/radio)
 	accessory = null
 
+/datum/outfit/job/independent/captain/manager
+	name = "Independent - Captain (Manager)"
+
+	id = /obj/item/card/id
+	gloves = /obj/item/clothing/gloves/color/white
+	uniform = /obj/item/clothing/under/suit/black_really
+	alt_uniform = /obj/item/clothing/under/suit/blacktwopiece
+	dcoat = null
+	glasses = /obj/item/clothing/glasses/sunglasses
+	head = null
+	accessory = null
+
 // Head of Personnel
 
 /datum/outfit/job/independent/hop
@@ -586,7 +611,8 @@
 	job_icon = "cook"
 
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/civilian/chef //WS Edit - Alt Uniforms
+	shoes = /obj/item/clothing/shoes/laceup
+	uniform = /obj/item/clothing/under/rank/civilian/chef
 	suit = /obj/item/clothing/suit/toggle/chef
 	alt_suit = /obj/item/clothing/suit/apron/chef
 	head = /obj/item/clothing/head/chefhat
@@ -601,8 +627,6 @@
 	var/chosen_box = pick(possible_boxes)
 	var/obj/item/storage/box/I = new chosen_box(src)
 	H.equip_to_slot_or_del(I,ITEM_SLOT_BACKPACK)
-	var/datum/martial_art/cqc/under_siege/justacook = new
-	justacook.teach(H)
 
 // Bartender
 
@@ -617,6 +641,14 @@
 	suit = /obj/item/clothing/suit/armor/vest
 	backpack_contents = list(/obj/item/storage/box/beanbag=1)
 	shoes = /obj/item/clothing/shoes/laceup
+	accessory = /obj/item/clothing/accessory/waistcoat
+
+/datum/outfit/job/independent/bartender/disarmed //No armor, no shotgun ammo.
+	name = "Independent - Bartender (Disarmed)"
+
+	suit = null
+	alt_suit = null
+	backpack_contents = null
 
 /datum/outfit/job/independent/bartender/pharma
 	name = "Independent - Bartender (Mixologist)"
@@ -628,6 +660,7 @@
 	belt = /obj/item/storage/belt
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	uniform = /obj/item/clothing/under/suit/black
+	accessory = null
 
 // Lawyer
 
diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm
index 424827e69010..fe31fddd9041 100644
--- a/code/modules/clothing/outfits/factions/roumain.dm
+++ b/code/modules/clothing/outfits/factions/roumain.dm
@@ -19,7 +19,7 @@
 	name = "Saint-Roumain Militia - Shadow"
 	id_assignment = "Shadow"
 	jobtype = /datum/job/assistant
-	job_icon = "assistant"
+	job_icon = "srm_shadow"
 
 	uniform = /obj/item/clothing/under/suit/roumain
 	alt_uniform = null
@@ -33,14 +33,40 @@
 /datum/outfit/job/roumain/captain
 	name = "Saint-Roumain Militia - Hunter Montagne"
 	id_assignment = "Hunter Montagne"
-	job_icon = "captain"
+	job_icon = "srm_montagne"
 	jobtype = /datum/job/captain
 
+	ears = /obj/item/radio/headset/headset_com/alt
+	uniform = /obj/item/clothing/under/suit/roumain
+	shoes = /obj/item/clothing/shoes/workboots/mining
+	suit = /obj/item/clothing/suit/armor/roumain/montagne
+	head = /obj/item/clothing/head/cowboy/sec/roumain/montagne
+	id = /obj/item/card/id/gold
+
+	duffelbag = /obj/item/storage/backpack/cultpack
+	courierbag = /obj/item/storage/backpack/cultpack
+	backpack = /obj/item/storage/backpack/cultpack
+	satchel = /obj/item/storage/backpack/cultpack
+
+	backpack_contents = list(/obj/item/book/manual/srmlore=1,
+		/obj/item/stamp/chap = 1,
+		/obj/item/melee/classic_baton/telescopic=1,
+	)
+	chameleon_extras = null
+
+// Second-In-Command
+
+/datum/outfit/job/roumain/hop
+	name = "Saint-Roumain Militia - Hunter Colligne"
+	id_assignment = "Hunter Colligne"
+	job_icon = "srm_colligne"
+	jobtype = /datum/job/head_of_personnel
+
 	ears = /obj/item/radio/headset/headset_com
 	uniform = /obj/item/clothing/under/suit/roumain
 	shoes = /obj/item/clothing/shoes/workboots/mining
-	suit = /obj/item/clothing/suit/armor/hos/roumain/montagne
-	head = /obj/item/clothing/head/HoS/cowboy/montagne
+	suit = /obj/item/clothing/suit/armor/roumain/colligne
+	head = /obj/item/clothing/head/cowboy/sec/roumain/colligne
 	id = /obj/item/card/id/silver
 
 	duffelbag = /obj/item/storage/backpack/cultpack
@@ -58,7 +84,7 @@
 	name = "Saint-Roumain Militia - Hunter"
 	id_assignment = "Hunter"
 	jobtype = /datum/job/officer
-	job_icon = "securityofficer"
+	job_icon = "hsrm_hunter"
 
 	uniform = /obj/item/clothing/under/suit/roumain
 	alt_uniform = null
@@ -74,12 +100,34 @@
 
 	backpack_contents = null
 
+// engineer
+
+/datum/outfit/job/roumain/engineer
+	name = "Saint-Roumain Militia - Machinist"
+	id_assignment = "Machinist"
+	job_icon = "srm_machinist"
+	jobtype = /datum/job/engineer
+
+	uniform = /obj/item/clothing/under/suit/roumain
+	alt_uniform = null
+	shoes = /obj/item/clothing/shoes/workboots/mining
+	belt = /obj/item/storage/belt/utility/full/engi
+	suit = /obj/item/clothing/suit/hazardvest/roumain
+	head = /obj/item/clothing/head/cowboy/sec/roumain/machinist
+	accessory = /obj/item/clothing/accessory/waistcoat/roumain
+	gloves = null
+
+	backpack = /obj/item/storage/backpack
+	satchel  = /obj/item/storage/backpack/satchel
+	duffelbag = /obj/item/storage/backpack/duffelbag
+	courierbag = /obj/item/storage/backpack/messenger
+
 // Medical Doctor
 
 /datum/outfit/job/roumain/doctor
 	name = "Saint-Roumain Militia - Hunter Doctor"
 	id_assignment = "Hunter Doctor"
-	job_icon = "medicaldoctor"
+	job_icon = "srm_doctor"
 	jobtype = /datum/job/doctor
 
 	uniform = /obj/item/clothing/under/suit/roumain
@@ -94,3 +142,27 @@
 	satchel  = /obj/item/storage/backpack/satchel
 	duffelbag = /obj/item/storage/backpack/duffelbag
 	courierbag = /obj/item/storage/backpack/messenger
+
+// Chaplain
+
+/datum/outfit/job/roumain/flamebearer
+	name = "Saint-Roumain Militia - Flamebearer"
+	id_assignment = "Flamebearer"
+	job_icon = "srm_flamebearer"
+	jobtype = /datum/job/chaplain
+
+	uniform = /obj/item/clothing/under/suit/roumain
+	alt_uniform = null
+	shoes = /obj/item/clothing/shoes/workboots/mining
+	suit = /obj/item/clothing/suit/armor/roumain/flamebearer
+	head = /obj/item/clothing/head/cowboy/sec/roumain/flamebearer
+	gloves = null
+
+	duffelbag = /obj/item/storage/backpack/cultpack
+	courierbag = /obj/item/storage/backpack/cultpack
+	backpack = /obj/item/storage/backpack/cultpack
+	satchel = /obj/item/storage/backpack/cultpack
+
+	backpack_contents = list(/obj/item/book/manual/srmlore=1,
+		/obj/item/stamp/chap = 1,
+	)
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index 8f13554f4b00..5e04d87d88c6 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -54,10 +54,10 @@
 	box = /obj/item/storage/box/survival/syndie
 
 /datum/outfit/job/syndicate/assistant/gorlex
-	name = "Syndicate - Junior Agent (Gorlex Marauders)"
+	name = "Syndicate - Junior Agent (Hardliner)"
 
-	uniform = /obj/item/clothing/under/syndicate/gorlex
-	alt_uniform = /obj/item/clothing/under/syndicate
+	uniform = /obj/item/clothing/under/syndicate/hardliners
+	alt_uniform = /obj/item/clothing/under/syndicate/hardliners/jumpsuit
 
 /datum/outfit/job/syndicate/assistant/ngr
 	name = "Syndicate - Initiate (New Gorlex Republic)"
@@ -306,11 +306,12 @@
 
 
 /datum/outfit/job/syndicate/captain/gorlex
-	name = "Syndicate - Captain (Gorlex Marauders)"
-	uniform = /obj/item/clothing/under/syndicate/ngr/officer
+	name = "Syndicate - Captain (Hardliner)"
+	uniform = /obj/item/clothing/under/syndicate/hardliners/officer
 
-	head = /obj/item/clothing/head/ngr/peaked
-	suit = /obj/item/clothing/suit/armor/ngr/captain
+	head = /obj/item/clothing/head/hardliners/peaked
+	suit = /obj/item/clothing/suit/toggle/armor/vest/hardliners
+	shoes = /obj/item/clothing/shoes/combat
 
 /datum/outfit/job/syndicate/captain/ngr
 	name = "Syndicate - Captain (New Gorlex Republic)"
@@ -428,17 +429,6 @@
 	id = /obj/item/card/id/syndicate_command/captain_id
 	gloves = /obj/item/clothing/gloves/combat
 
-/datum/outfit/job/syndicate/ce/gorlex
-	name = "Syndicate - Foreman (Gorlex Marauders)"
-
-	ears = /obj/item/radio/headset/syndicate/alt
-	uniform = /obj/item/clothing/under/syndicate/gorlex
-	alt_uniform = null
-	suit = /obj/item/clothing/suit/toggle/hazard
-	alt_suit = null
-	shoes = /obj/item/clothing/shoes/jackboots
-	gloves = /obj/item/clothing/gloves/combat
-
 /datum/outfit/job/syndicate/ce/ngr
 	name = "Syndicate - Foreman (New Gorlex Republic)"
 
@@ -566,24 +556,27 @@
 	backpack_contents = list(/obj/item/melee/baton/loaded=1)
 
 /datum/outfit/job/syndicate/hos/gorlex
-	name = "Syndicate - Sergeant (Gorlex)"
+	name = "Syndicate - Sergeant (Hardliner)"
 	id_assignment = "Sergeant"
 
+	uniform = /obj/item/clothing/under/syndicate/hardliners/officer
+	head = /obj/item/clothing/head/hardliners/peaked
+	suit = /obj/item/clothing/suit/armor/hardliners/sergeant
+	id = /obj/item/card/id/syndicate_command/crew_id
+	shoes = /obj/item/clothing/shoes/combat
+	suit_store = /obj/item/gun/ballistic/automatic/pistol
+
 /datum/outfit/job/syndicate/hos/ngr
 	name = "Syndicate - Lieutenant (New Gorlex Republic)"
 	id_assignment = "Lieutenant"
 
-	ears = /obj/item/radio/headset/syndicate/alt
 	uniform = /obj/item/clothing/under/syndicate/ngr/officer
 	head = /obj/item/clothing/head/ngr/peaked
-	suit =/obj/item/clothing/suit/armor/ngr/lieutenant
+	suit = /obj/item/clothing/suit/armor/ngr/lieutenant
 	id = /obj/item/card/id/syndicate_command/crew_id
 	shoes = /obj/item/clothing/shoes/combat
-	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	suit_store = /obj/item/gun/ballistic/automatic/pistol
-	r_pocket = /obj/item/assembly/flash/handheld
-	l_pocket = /obj/item/restraints/handcuffs
-	backpack_contents = list(/obj/item/melee/baton/loaded=1)
+
 
 /datum/outfit/job/syndicate/hos/twink
 	name = "Syndicate - Lieutenant (Twinkleshine, NGR)"
@@ -691,13 +684,15 @@
 
 	uniform = /obj/item/clothing/under/syndicate/medic
 	accessory = /obj/item/clothing/accessory/armband/medblue
-	shoes = /obj/item/clothing/shoes/jackboots
+	shoes = /obj/item/clothing/shoes/combat
 
 /datum/outfit/job/syndicate/doctor/gorlex
-	name = "Syndicate - Medical Doctor (Gorlex)"
+	name = "Syndicate - Medical Doctor (Hardliner)"
 
-	uniform = /obj/item/clothing/under/syndicate/gorlex
-	glasses = /obj/item/clothing/glasses/hud/health/prescription
+	uniform = /obj/item/clothing/under/syndicate/hardliners
+	head = /obj/item/clothing/head/hardliners
+	suit = /obj/item/clothing/suit/hardliners
+	glasses = /obj/item/clothing/glasses/hud/health
 	r_pocket = /obj/item/kitchen/knife/combat/survival
 	back = /obj/item/storage/backpack/duffelbag/syndie/med
 	id = /obj/item/card/id/syndicate_command/crew_id
@@ -904,7 +899,25 @@
 
 
 /datum/outfit/job/syndicate/security/gorlex
-	name = "Syndicate - Assault Operative (Gorlex)"
+	name = "Syndicate - Trooper (Hardliner)"
+	id_assignment = "Trooper"
+	job_icon = "securityofficer"
+
+	uniform = /obj/item/clothing/under/syndicate/hardliners
+	belt = /obj/item/storage/belt/security/webbing/hardliners
+	suit = /obj/item/clothing/suit/armor/hardliners
+	gloves = /obj/item/clothing/gloves/color/black
+	head = /obj/item/clothing/head/helmet/hardliners
+	shoes = /obj/item/clothing/shoes/combat
+	l_pocket = /obj/item/restraints/handcuffs
+	r_pocket = /obj/item/assembly/flash/handheld
+
+/datum/outfit/job/syndicate/security/gorlex
+	name = "Syndicate - Pilot (Hardliner)"
+	id_assignment = "Pilot"
+	job_icon = "securityofficer"
+
+	head = /obj/item/clothing/head/helmet/hardliners/swat
 
 /datum/outfit/job/syndicate/security/ngr
 	name = "Syndicate - Operative (New Gorlex Republic)"
@@ -920,6 +933,14 @@
 	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/assembly/flash/handheld
 
+/datum/outfit/job/syndicate/security/ngr/pilot
+	name = "Syndicate - Pilot (New Gorlex Republic)"
+	id_assignment = "Pilot"
+	job_icon = "securityofficer"
+
+	uniform = /obj/item/clothing/under/syndicate/ngr/fatigues
+	head = /obj/item/clothing/head/helmet/ngr/swat
+
 /datum/outfit/job/syndicate/security/twink
 	name = "Syndicate - Operative (Twinkleshine)"
 
@@ -987,10 +1008,12 @@
 		/obj/item/stack/marker_beacon/ten=1)
 
 /datum/outfit/job/syndicate/miner/gorlex
-	name = "Syndicate - Wrecker (Gorlex Marauders)"
+	name = "Syndicate - Wrecker (Hardliner)"
 	id_assignment = "Wrecker"
 
-	uniform = /obj/item/clothing/under/syndicate/gorlex
+	head = /obj/item/clothing/head/hardhat/hardliners
+	suit = /obj/item/clothing/suit/hazardvest/hardliners
+	uniform = /obj/item/clothing/under/syndicate/hardliners/jumpsuit
 	accessory = /obj/item/clothing/accessory/armband/cargo
 	shoes = /obj/item/clothing/shoes/workboots
 	ears = /obj/item/radio/headset/alt
@@ -1090,10 +1113,12 @@
 	id = /obj/item/card/id/syndicate_command/crew_id
 
 /datum/outfit/job/syndicate/engineer/gorlex
-	name = "Syndicate - Mechanic (Gorlex Marauders)"
+	name = "Syndicate - Mechanic (Hardliner)"
 	id_assignment = "Mechanic"
 
-	uniform = /obj/item/clothing/under/syndicate/gorlex
+	head = /obj/item/clothing/head/hardhat/hardliners
+	suit = /obj/item/clothing/suit/hazardvest/hardliners
+	uniform = /obj/item/clothing/under/syndicate/hardliners
 	shoes = /obj/item/clothing/shoes/workboots
 	glasses = null
 
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 7eaccd402e35..4827186a95c5 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -166,7 +166,7 @@
 		if(L.status)
 			to_chat(user, "<span class='warning'>This bulb is too damaged to use as a replacement!</span>")
 			return
-		if(do_after(user, 50, 1, src))
+		if(do_after(user, 50, src))
 			qdel(I)
 			helmet = new helmettype(src)
 			to_chat(user, "<span class='notice'>You have successfully repaired [src]'s helmet.</span>")
@@ -444,27 +444,6 @@
 	combat_slowdown = 0.5
 	jetpack = null
 
-//Hardliner Syndie suit
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
-	name = "white-red hardsuit helmet"
-	desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup."
-	alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Second Battlegroup."
-	icon_state = "hardsuit1-hl"
-	item_state = "hardsuit1-hl"
-	hardsuit_type = "hl"
-
-/obj/item/clothing/suit/space/hardsuit/syndi/hl
-	name = "white-red hardsuit"
-	desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup."
-	alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by the Second Battlegroup."
-	icon_state = "hardsuit1-hl"
-	item_state = "hardsuit1-hl"
-	hardsuit_type = "hl"
-	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
-	lightweight = 1
-	jetpack = null
-
-
 //Elite Syndie suit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
 	name = "elite syndicate hardsuit helmet"
@@ -585,11 +564,6 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
 
-/obj/item/clothing/suit/space/hardsuit/wizard/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, FALSE, FALSE, ITEM_SLOT_OCLOTHING, INFINITY, FALSE)
-
-
 	//Medical hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/medical
 	name = "medical hardsuit helmet"
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index ae6ebb525a64..67dc7ce529b3 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -332,10 +332,6 @@ Contains:
 	actions_types = list()
 	resistance_flags = FIRE_PROOF
 
-/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_OCLOTHING)
-
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal
 	name = "paranormal response team hardsuit"
 	desc = "Powerful wards are built into this hardsuit, protecting the user from all manner of paranormal threats."
@@ -345,10 +341,6 @@ Contains:
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF
 
-/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE, TRUE, ITEM_SLOT_OCLOTHING)
-
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
 	name = "inquisitor's hardsuit"
 	icon_state = "hardsuit-inq"
@@ -373,11 +365,6 @@ Contains:
 	resistance_flags = FIRE_PROOF
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/transforming/cleaving_saw)
 
-
-/obj/item/clothing/suit/space/hardsuit/berserker/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE, TRUE, ITEM_SLOT_OCLOTHING)
-
 /obj/item/clothing/suit/space/hardsuit/berserker/RemoveHelmet()
 	var/obj/item/clothing/head/helmet/space/hardsuit/berserker/helm = helmet
 	if(helm?.berserk_active)
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index ee72151d9567..9dfd23210d9c 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -360,27 +360,6 @@
 		/obj/item/melee/baton,
 	)
 
-/obj/item/clothing/suit/armor/roumain
-	name = "saint-roumain duster"
-	desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness."
-	icon_state = "armor_rouma"
-	item_state = "rouma_coat"
-	body_parts_covered = CHEST|GROIN|ARMS
-	cold_protection = CHEST|GROIN|ARMS
-	heat_protection = CHEST|GROIN|ARMS
-
-/obj/item/clothing/suit/armor/roumain/shadow
-	name = "saint-roumain shadow duster"
-	desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees."
-	icon_state = "armor_rouma_shadow"
-	item_state = "rouma_shadow_coat"
-
-/obj/item/clothing/suit/armor/hos/roumain/montagne
-	name = "saint-roumain montagne coat"
-	desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature."
-	icon_state = "armor_rouma_montagne"
-	item_state = "rouma_montagne_coat"
-
 /obj/item/clothing/suit/armor/vest/bulletproof/solgov
 	name = "\improper Sonnensoldner gambison"
 	desc = "A standard armor vest fielded for SolGov's Sonnensoldners."
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 79aaf15c4d34..56018c288b6a 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -286,3 +286,10 @@
 	body_parts_covered = HEAD
 	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR
 
+/obj/item/clothing/suit/armor/witchhunter
+	name = "witchunter garb"
+	desc = "This worn outfit saw much use back in the day."
+	icon_state = "chaplain_witchhunter"
+	item_state = "witchhunter"
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+	allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index f95a91ab27fe..858b494564e6 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -68,12 +68,6 @@ You're pretty sure this is just a raincoat.
 	icon_state = "raincoat"
 	item_state = "raincoat"
 
-/obj/item/clothing/suit/toggle/labcoat/roumain_med
-	name = "saint-roumain medical duster"
-	desc = "A coat made from hard leather and further treated with exotic sterilizing oils and wax. The treatment and its more closed design offers much better protection against biological hazards."
-	icon_state = "rouma_med_coat"
-	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
-
 /obj/item/clothing/suit/longcoat
 	name = "longcoat"
 	desc = "A long, victorian styled labcoat."
diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm
index 786f2dcd5fa3..a0ec0a4da5e5 100644
--- a/code/modules/clothing/under/suits.dm
+++ b/code/modules/clothing/under/suits.dm
@@ -29,7 +29,6 @@
 	item_state = "waiter"
 
 /obj/item/clothing/under/suit/waiter/syndicate
-	name = "syndicate waiter's outfit"
 	icon_state = "waiter_s"
 	item_state = "waiter_s"
 
@@ -140,12 +139,6 @@
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR
 
-/obj/item/clothing/under/suit/roumain
-	name = "saint-roumain's worksuit"
-	desc = "A simple, hard-wearing suit designed for the hardworking hunters of the Saint-Roumain Militia."
-	icon_state = "rouma_work"
-	item_state = "rouma_work"
-
 /obj/item/clothing/under/suit/dresssuit
 	name = "navy dress-suit"
 	desc = "A very strange piece of clothing. Mostly navy, but with a pink undershirt. Who would even wear this?"
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index d6a281a2b925..32c4b1a9a09f 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -221,8 +221,8 @@
 //	Formatting is the same as food.
 
 /obj/item/reagent_containers/food/drinks/coffee
-	name = "robust coffee"
-	desc = "Careful, the beverage you're about to enjoy is extremely hot."
+	name = "Solar's Best black coffee"
+	desc = "A cup of piping hot black coffee. Made from beans grown across the solar cantons for the caffeine that every spacer needs."
 	icon_state = "coffee"
 	list_reagents = list(/datum/reagent/consumable/coffee = 30)
 	spillable = TRUE
@@ -258,13 +258,13 @@
 		icon_state = "tea_empty"
 
 /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."
+	name = "Guildmaiden's tea"
+	desc = "Dark tea, made from pressed, fermented tea leaves. Originally from Sol, it became wildly popular among the Rachnid Guilds, and has become a staple."
 	list_reagents = list(/datum/reagent/consumable/tea = 30)
 
 /obj/item/reagent_containers/food/drinks/mug/coco
-	name = "Pearl Hot Chocolate"
-	desc = "A rich delicacy from the humid regions of Terra."
+	name = "Solar's Best Hot Cocoa"
+	desc = "A cup of hot water mixed with chocolate and malted milk powder. A classic hot drink from the Solarian Confederation."
 	list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
 	foodtype = SUGAR
 	resistance_flags = FREEZE_PROOF
@@ -286,7 +286,7 @@
 
 /obj/item/reagent_containers/food/drinks/dry_ramen
 	name = "cup ramen"
-	desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!"
+	desc = "A cup full of dried noodles, premixed with a flavor powder. Adding 5 units of water will cause the cup to self-heat, cooking it rapidly. Commonly eaten under dozens of brands, from students to eating on a budget. Always umami!"
 	icon_state = "ramen"
 	list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
 	foodtype = GRAIN
@@ -294,12 +294,12 @@
 	custom_price = 95
 
 /obj/item/reagent_containers/food/drinks/waterbottle
-	name = "bottle of water"
-	desc = "A bottle of water filled at an old Earth bottling facility."
+	name = "Ryuunosuke Reserve" //we still have to find a way to make multiple variants as per the plan
+	desc = "Water bottled from a plant somewhere on Ryuunosuke. It has a mild, mineral-y flavor."
 	icon = 'icons/obj/drinks/drinks.dmi'
 	icon_state = "smallbottle"
 	item_state = "bottle"
-	list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
+	list_reagents = list(/datum/reagent/water = 50)
 	custom_materials = list(/datum/material/plastic=1000)
 	volume = 50
 	amount_per_transfer_from_this = 10
@@ -369,8 +369,8 @@
 	update_appearance()
 
 /obj/item/reagent_containers/food/drinks/beer
-	name = "space beer"
-	desc = "Beer. In space."
+	name = "Bizircan Brewery GDM" //ditto the plan for bottled water, need to find a way to make multiple variants
+	desc = "A popular Gezenan drink made of fermented honey and spices, known as Gezenan Dark Mead, or GDM for short."
 	icon_state = "beer"
 	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
 	foodtype = GRAIN | ALCOHOL
@@ -382,8 +382,8 @@
 	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."
+	name = "RHIMBASA TAP"
+	desc = "An ale that is brewed on Reh'himl, named after the planet that shields it from their sun. Telh'aim Pale Ales are shortened to TAP, with most breweries reducing their names to acronyms alongside it."
 	icon_state = "alebottle"
 	item_state = "beer"
 	list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
@@ -454,17 +454,17 @@
 			if(/datum/reagent/consumable/pineapplejuice)
 				icon_state = "pineapplebox"
 				name = "pineapple juice box"
-				desc = "Why would you even want this?"
+				desc = "Sweet, tart pineapple juice."
 				foodtype = FRUIT | PINEAPPLE
 			if(/datum/reagent/consumable/milk/chocolate_milk)
 				icon_state = "chocolatebox"
 				name = "carton of chocolate milk"
-				desc = "Milk for cool kids!"
+				desc = "Milk mixed with chocolate, a common childhood favorite!"
 				foodtype = SUGAR
 			if(/datum/reagent/consumable/ethanol/eggnog)
 				icon_state = "nog2"
 				name = "carton of eggnog"
-				desc = "For enjoying the most wonderful time of the year."
+				desc = "A carton of eggnog, a drink of choice for celebrating Winter Solstice."
 				foodtype = MEAT
 	else
 		icon_state = "juicebox"
@@ -511,7 +511,7 @@
 
 /obj/item/reagent_containers/food/drinks/flask
 	name = "flask"
-	desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
+	desc = "Every good spacer knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
 	custom_price = 200
 	icon_state = "flask"
 	custom_materials = list(/datum/material/iron=250)
@@ -530,10 +530,10 @@
 	icon_state = "detflask"
 	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
 
-/obj/item/reagent_containers/food/drinks/britcup
+/obj/item/reagent_containers/food/drinks/mug
 	name = "cup"
-	desc = "A cup with the british flag emblazoned on it."
-	icon_state = "britcup"
+	desc = "A mug. Stylishly plain."
+	icon_state = "tea_empty"
 	volume = 30
 	spillable = TRUE
 
@@ -643,39 +643,35 @@
 	. = ..()
 
 /obj/item/reagent_containers/food/drinks/soda_cans/cola
-	name = "Space Cola"
-	desc = "Cola. in space."
+	name = "Master Cola"
+	desc = "Originally a commission to the Rachnid culinary guilds from Solarian historical reenactors on creating an authentic cola that, at some point, dominated the globe in popularity, this soft drink comes as close to anyone might be able to taste the sodas of yore... But it's still a pretty alright drink."
 	icon_state = "cola"
 	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."
+	name = "Sixikirtchia's Tonic"
+	desc = "A can of water mixed with quinine, which the label purportedly states that it has more health benefits for the Vox than fending off malaria. Most people use it for mixing drinks, Vox or otherwise."
 	icon_state = "tonic"
 	list_reagents = list(/datum/reagent/consumable/tonic = 50)
 	foodtype = ALCOHOL
 
 /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?"
+	name = "Stitiamix Club"
+	desc = "Mineral-flavored carbonated water, infused on some part of The Shoal. Touts being made out of minerals from embedded asteroids, apparently!"
 	icon_state = "sodawater"
 	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(/datum/reagent/consumable/lemon_lime = 30)
+/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda
+	name = "Sol Sparkler: Orange Remembrance"
+	desc = "A line of flavored seltzer water from the Solarian Confederation. Its infamy stems from being flavored sparingly enough to warrant it being referred to as being vague memories of the fruit in question."
+	icon_state = "orange_soda"
+	list_reagents = list(/datum/reagent/consumable/orangejuice = 5, /datum/reagent/consumable/sodawater = 25)
 	foodtype = FRUIT
 
-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
-	. = ..()
-	name = "lemon-lime soda"
-
 /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry
 	name = "Sol Dry"
-	desc = "Maybe this will help your tummy feel better. Maybe not."
+	desc = "A can of ginger ale, known for helping those with upset stomachs. Popularized due to a widespread belief from Solarians that drinking it will alleviate the nausea from bluespace travel."
 	icon_state = "sol_dry"
 	list_reagents = list(/datum/reagent/consumable/sol_dry = 30)
 	foodtype = SUGAR
@@ -687,86 +683,79 @@
 	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(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch
+	name = "Lunapunch"
+	desc = "A soda with a distinctly herbal sweetness and a bitter aftertaste, popular across the C.L.I.P. colonies. Originally marketed as a health soft-drink for members of the CMM, the herbs used in its recipe claim to have health benefits... to dubious results."
+	icon_state = "lunapunch"
+	list_reagents = list(/datum/reagent/consumable/lunapunch = 30)
 	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(/datum/reagent/consumable/spacemountainwind = 30)
+/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail
+	name = "Comet Trail"
+	desc = "A citrusy drink from the Kepori space installation known as The Ring. Known for its sharp flavor and refreshing carbonation -- best served cold."
+	icon_state = "comet_trail"
+	list_reagents = list(/datum/reagent/consumable/comet_trail = 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."
+/obj/item/reagent_containers/food/drinks/soda_cans/vimukti
+	name = "Vimukti"
+	desc = "A liquor brewed from sweet lichen scraped off the walls of Shoal water condensers. Stamped with the thirteen-spoked wheel of enlightenment. Spiritual Vox consider it to open the mind's boundaries."
 	icon_state = "thirteen_loko"
-	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/vimukti = 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(/datum/reagent/consumable/dr_gibb = 30)
+/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx
+	name = "Tadrixx"
+	desc = "A Kalixcian drink made from a plant that tastes similar to sassafrass, which is used in root beer. A stumpy drake holding a mug of it is on the front."
+	icon_state = "tadrixx"
+	list_reagents = list(/datum/reagent/consumable/tadrixx = 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. When a gamer talks about gamerfuel, this is what they're literally referring to."
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel
+	name = "PAC-Fuel"
+	desc = "A carbonated energy drink themed after the purple coloration, similar to plasma. It seems to have gotten a sponsorship with the the G.E.C., with a special offer for some sort of deal on... gaming gear and industrial equipment?"
 	icon_state = "purple_can"
-	list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
+	list_reagents = list(/datum/reagent/consumable/pacfuel = 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(/datum/reagent/consumable/shamblers = 30)
+/obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch
+	name = "Shoal Punch"
+	desc = "Carbonated fruit soda, made from a mix of dozens of fruits collected and grown on The Shoal. There's an extensive list of potential allergens on the back."
+	icon_state = "shoal_punch"
+	list_reagents = list(/datum/reagent/consumable/shoal_punch = 30)
 	foodtype = SUGAR | JUNKFOOD
 
-/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
-	name = "Grey Bull"
-	desc = "Grey Bull, it gives you gloves!"
+/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk
+	name = "Crosstalk"
+	desc = "Crosstalk! Share the energy with everyone! The can is a little thin to be passing it around to actually share the energy drink around, though."
 	icon_state = "energy_drink"
-	list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
+	list_reagents = list(/datum/reagent/consumable/crosstalk = 20)
 	foodtype = SUGAR | JUNKFOOD
 
-/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
-	name = "Monkey Energy"
-	desc = "Unleash the ape!"
-	icon_state = "monkey_energy"
-	item_state = "monkey_energy"
-	list_reagents = list(/datum/reagent/consumable/monkey_energy = 40, /datum/reagent/consumable/electrolytes = 10)
+/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy
+	name = "Xeno-Energy"
+	desc = "A sickly green energy drink that poses itself as made from the real blood of xenomorphs. Deeply controversial among the BARD ranks."
+	icon_state = "xeno_energy"
+	item_state = "xeno_energy"
+	list_reagents = list(/datum/reagent/consumable/xeno_energy = 40, /datum/reagent/consumable/electrolytes = 10)
 	foodtype = SUGAR | JUNKFOOD
 
-/obj/item/reagent_containers/food/drinks/soda_cans/efuel
-	name = "E-Fuel"
-	desc = "Shocking for the Elzu!"
-	icon_state = "monkey_energy"
-	item_state = "monkey_energy"
-	list_reagents = list(/datum/reagent/consumable/electrolytes = 50)
-
 /obj/item/reagent_containers/food/drinks/soda_cans/air
-	name = "canned air"
-	desc = "There is no air shortage. Do not drink."
+	name = "Tradewind Canned"
+	desc = "Intended to be filled with air from home planets for the sake of nostalgia after it's initial failure as an emergency method of 'canning air'. Tradewind Canned - a breath from home."
 	icon_state = "air"
 	list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/molten
 	name = "Molten Bubbles"
-	desc = "A spicy cola to cool the nerves and burn the soul."
+	desc = "A spicy soft drink made from a coca-like plant from Kalixcis. Popularly served both cold -and- hot, depending on the weather."
 	icon_state = "molten"
-	list_reagents = list(/datum/reagent/medicine/molten_bubbles = 50)
+	list_reagents = list(/datum/reagent/consumable/molten = 50)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/plasma
 	name = "Plasma Fizz"
-	desc = "A dangerous fusion of flavors!"
+	desc = "A spinoff of the popular Molten Bubbles drink from Kalixcis, made to emulate the flavor of spiced grape instead. It's... not exactly convincing or a very good mix."
 	icon_state = "plasma"
-	list_reagents = list(/datum/reagent/medicine/molten_bubbles/plasma = 50)
+	list_reagents = list(/datum/reagent/consumable/molten/plasma_fizz = 50)
 
 /obj/item/reagent_containers/food/drinks/ration
 	name = "empty ration pouch"
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index c19fd9dd3baa..57d84ee22397 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -124,20 +124,20 @@
 	AddComponent(/datum/component/butchering, 200, 55)
 
 /obj/item/reagent_containers/food/drinks/bottle/gin
-	name = "Griffeater gin"
-	desc = "A bottle of high quality gin, produced in the New London Space Station."
+	name = "Neue Wacholder Gin"
+	desc = "A bottle of high quality gin, cultivated from juniper berries grown across the Solar cantons. Brewed in Stuteföhle."
 	icon_state = "ginbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100)
 
 /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."
+	name = "Kadi-Witka Reserve"
+	desc = "An equivalent to single-malt whiskey, commonly enjoyed and brewed in a brewery originally founded Zohil. While different from traditionally used wheat, it can be safely enjoyed by every species."
 	icon_state = "whiskeybottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/kong
 	name = "Kong"
-	desc = "Makes You Go Ape!&#174;"
+	desc = "Makes You Go Ape!"
 	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/kong = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/candycornliquor
@@ -146,8 +146,8 @@
 	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/candycorn = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka
-	name = "Tunguska triple distilled"
-	desc = "Vodka, prime choice of drink and fuel."
+	name = "Triple Horned"
+	desc = "Potato-based liquor commonly known as Vodka, distilled thrice to the standards of the PGF's requirements for their rations."
 	icon_state = "vodkabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
 
@@ -158,8 +158,8 @@
 	list_reagents = list(/datum/reagent/consumable/ethanol/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!"
+	name = "Rimeki Letisa"
+	desc = "Originally made from fermented succulents growing near Teceti's equator-deserts, this brand considers itself equivalent to the original tequila."
 	icon_state = "tequilabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100)
 
@@ -173,19 +173,19 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/patron
 	name = "Wrapp Artiste Patron"
-	desc = "Silver laced tequila, served in space night clubs across the galaxy."
+	desc = "Tequila laced with silver, showy enough to impress when ordered in nightclubs across the galaxy."
 	icon_state = "patronbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100)
 
 /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."
+	name = "Ahkskra Spiced"
+	desc = "Ahkskra Spiced - a spiced rum for the vox folkhero in everyone. Features a gallant-looking vox on the front of the bottle."
 	icon_state = "rumbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/holywater
 	name = "flask of holy water"
-	desc = "A flask of the chaplain's holy water."
+	desc = "A flask of water, sanctified in some way by the supertitious."
 	icon_state = "holyflask"
 	list_reagents = list(/datum/reagent/water/holywater = 100)
 	foodtype = NONE
@@ -195,144 +195,108 @@
 	list_reagents = list(/datum/reagent/hellwater = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth
-	name = "Goldeneye vermouth"
-	desc = "Sweet, sweet dryness~"
+	name = "Whitespear Dry"
+	desc = "Dry and sweet vermouth, commonly used for mixed drinks. Some Solarians drink it as a digestive before meals."
 	icon_state = "vermouthbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100)
 
 /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."
+	name = "Keh'Lu'Tex Liqueur"
+	desc = "An adapted recipe of a caffeine-mixed liqueur originating from Reh'himl, which replaces it's original ingredient with coffee from Terra."
 	icon_state = "kahluabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100)
 	foodtype = VEGETABLES
 
 /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."
+	name = "Student-Union's Gold Standard"
+	desc = "Extremely high-proof cinnamon schnapps, typically found in commemorative bottles by those in the Student-Union Association of Naturalistic Sciences. Nigh-undrinkable and with a tasteless amount of gold flakes floating within."
 	icon_state = "goldschlagerbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100)
 
 /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."
+	name = "Geheimnis Cognac"
+	desc = "While the origins of the name 'cognac' are lost to time, this type of brandy is reserved as a high-class drink with particular methods of brewing."
 	icon_state = "cognacbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100)
 
 /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."
+	name = "Waldstätte Sauvignon"
+	desc = "A bottle of wine, brewed from grapes specifically grown in Neue Waldstätte. You've mostly seen these in bottles sold specifically for tourists."
 	icon_state = "winebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100)
 	foodtype = FRUIT | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe
-	name = "extra-strong absinthe"
-	desc = "An strong alcoholic drink brewed and distributed by"
+	name = "Severtail Green"
+	desc = "Strong absinthe brewed in the Pan-Gezenan Federation, with their own transplants of Wormwood gifted to them during the first contact with humankind. If the legend (and label) means anything, the first attempt at brewing this caused some poor sarathi's tail to fall off."
 	icon_state = "absinthebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
-	. = ..()
-	redact()
-
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/proc/redact()
-	// There was a large fight in the coderbus about a player reference
-	// in absinthe. Ergo, this is why the name generation is now so
-	// complicated. Judge us kindly.
-	var/shortname = pickweight(
-		list("T&T" = 1, "A&A" = 1, "Generic" = 1))
-	var/fullname
-	switch(shortname)
-		if("T&T")
-			fullname = "Teal and Tealer"
-		if("A&A")
-			fullname = "Ash and Asher"
-		if("Generic")
-			fullname = "Nanotrasen Cheap Imitations"
-	var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]",
-		"\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]",
-		"\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]")
-	var/chance = 50
-
-	if(prob(chance))
-		shortname = pick_n_take(removals)
-
-	var/list/final_fullname = list()
-	for(var/word in splittext(fullname, " "))
-		if(prob(chance))
-			word = pick_n_take(removals)
-		final_fullname += word
-
-	fullname = jointext(final_fullname, " ")
-
-	// Actually finally setting the new name and desc
-	name = "[shortname] [name]"
-	desc = "[desc] [fullname] Inc."
-
-
 /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium
-	name = "Gwyn's premium absinthe"
-	desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs."
+	name = "Chacheyi Gold"
+	desc = "A higher shelf absinthe, distributed primarily from The Shoal. Features the folkhero Chacheyi on the label, alongside their goldgrub companions."
 	icon_state = "absinthepremium"
 
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium/redact()
-	return
-
 /obj/item/reagent_containers/food/drinks/bottle/lizardwine
-	name = "bottle of 'kalixcis' wine"
-	desc = "An alcoholic beverage of sarathi origin, now so widespread that knock-offs can be found everywhere. Check the label for point of origin."
+	name = "bottle of Blueflame Pyrecask"
+	desc = "An alcoholic beverage originating from isolated vineyards on Zohil, maintained by the reclusive religious sects of the Blueflame. Now considered so popular and high quality, imitation bottles can be found everywhere. Check the label for point of origin."
 	icon_state = "lizardwine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100)
 	foodtype = FRUIT | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/bottle/hcider
-	name = "Jian Hard Cider"
-	desc = "Apple juice for adults."
+	name = "Neue Hamburg Spiced"
+	desc = "One of the main exports of Neue Hamburg - hard, spiced cider. Enjoyed all across the cantons and beyond."
 	icon_state = "hcider"
 	volume = 50
 	list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50)
 
 /obj/item/reagent_containers/food/drinks/bottle/amaretto
-	name = "Luini Amaretto"
-	desc = "A gentle and syrup like drink, tastes of almonds and apricots"
+	name = "Lu'Ni'Xer'Nan Amaretto"
+	desc = "A popular Rachnid take on the recipe for Amaretto, which fell to obscurity after only being semi-rediscovered by Solarian historians. Features a semi-reconstructed depiction of a supposed origin story, with the painter Lu'Ni'Xer'Nan and her muse, an innkeeper."
 	icon_state = "disaronno"
 	list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/grappa
-	name = "Phillipes well-aged Grappa"
-	desc = "Bottle of Grappa."
+	name = "Neue Maynila Grappamiel"
+	desc = "A bottle of Grappa, premixed with honey-based spirits. Commonly seen as a drink for recycling grapes after their use in winemaking, and commonly seen as a winter drink."
 	icon_state = "grappabottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/sake
-	name = "Ryo's traditional sake"
-	desc = "Sweet as can be, and burns like fire going down."
+	name = "Sakamai Sake"
+	desc = "An alcoholic drink derived from rice, rediscovered by Solarian historians and reintroduced to the best of their ability to reproduce it."
 	icon_state = "sakebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
 	. = ..()
 	if(prob(10))
-		name = "Fluffy Tail Sake"
-		desc += " On the bottle is a picture of a kitsune with nine touchable tails."
+		name = "Fluffy Tail"
+		desc += "This particular brand's mascot is a human with nine fox tails - which is an impressive amount of genemodding."
 		icon_state = "sakebottle_k"
 	else if(prob(10))
 		name = "Inubashiri's Home Brew"
-		desc += " Awoo."
+		desc += "This particular brand's mascot is a human with vaguely canine ears and a tail."
 		icon_state = "sakebottle_i"
 
 /obj/item/reagent_containers/food/drinks/bottle/fernet
 	name = "Fernet Bronca"
-	desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
+	desc = "A bitter and aromatic drink, commonly enjoyed in the intersolar cantons due to relaxed alcoholic tariffs from being technically classified as a medicinal beverage. Commonly mixed with cola-based soft drinks."
 	icon_state = "fernetbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100)
 
+/obj/item/reagent_containers/food/drinks/bottle/triplesec
+	name = "Teeka-Gih's triple sec liqueur"
+	desc = "A bottle of triple sec originating from Bezuts."
+	icon_state = "triplesecbottle"
+	list_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 100)
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/reagent_containers/food/drinks/bottle/orangejuice
 	name = "orange juice"
-	desc = "Full of vitamins and deliciousness!"
+	desc = "Sweet and tart orange juice. Usually found fortified to make it more nutritious. Full of vitamin C!"
 	custom_price = 100
 	icon_state = "orangejuice"
 	item_state = "carton"
@@ -342,9 +306,21 @@
 	list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
 	foodtype = FRUIT | BREAKFAST
 
+/obj/item/reagent_containers/food/drinks/bottle/lemonjuice
+	name = "lemon juice"
+	desc = "Lemonade for everyone!"
+	custom_price = 100
+	icon_state = "lemonjuice"
+	item_state = "carton"
+	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+	isGlass = FALSE
+	list_reagents = list(/datum/reagent/consumable/lemonjuice = 100)
+	foodtype = FRUIT
+
 /obj/item/reagent_containers/food/drinks/bottle/cream
 	name = "milk cream"
-	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
+	desc = "Cream made from milk. It's thicker than milk, which hopefully prevents any mixups."
 	custom_price = 100
 	icon_state = "cream"
 	item_state = "carton"
@@ -356,7 +332,7 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
 	name = "tomato juice"
-	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
+	desc = "Juice from tomatoes and salt. You'll often find some technicians soaking in this if they've been working with plasma."
 	custom_price = 100
 	icon_state = "tomatojuice"
 	item_state = "carton"
@@ -368,7 +344,7 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/limejuice
 	name = "lime juice"
-	desc = "Sweet-sour goodness."
+	desc = "Lime juice. You might want to mix something with this instead of drinking it straight..."
 	custom_price = 100
 	icon_state = "limejuice"
 	item_state = "carton"
@@ -380,7 +356,7 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
 	name = "pineapple juice"
-	desc = "Extremely tart, yellow juice."
+	desc = "Tart, sweet juice from the tropical pineapple."
 	custom_price = 100
 	icon_state = "pineapplejuice"
 	item_state = "carton"
@@ -403,8 +379,8 @@
 	list_reagents = list(/datum/reagent/consumable/menthol = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine
-	name = "Jester Grenadine"
-	desc = "Contains 0% real cherries!"
+	name = "Three-Star Grenadine"
+	desc = "A commonly seen bottle of grenadine - or sweet fruit syrup. It might even contain real cherries, as well as some blackcurrant for color."
 	custom_price = 100
 	icon_state = "grenadine"
 	isGlass = TRUE
@@ -413,8 +389,8 @@
 
 
 /obj/item/reagent_containers/food/drinks/bottle/applejack
-	name = "Buckin' Bronco's Applejack"
-	desc = "Kicks like a horse, tastes like an apple!"
+	name = "Mars Lightning"
+	desc = "A strong brandy originating from apples, considered the older sibling to hard cider. Mars Lightning is often partnered with anti-gravity racing companies, leading to it often being served straight or for impromptu mixes."
 	custom_price = 100
 	icon_state = "applejack_bottle"
 	isGlass = TRUE
@@ -422,22 +398,22 @@
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/champagne
-	name = "Eau d' Dandy Brut Champagne"
-	desc = "Finely sourced from only the most pretentious French vineyards."
+	name = "Treu Champagne"
+	desc = "Finely sourced from entire canton planets dedicated to faithful reproduction of pre-Night Of Fire vineyards. Typically enjoyed for celebrations and the turn of new years."
 	custom_premium_price = 250
 	icon_state = "champagne_bottle"
 	isGlass = TRUE
 	list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
 
 /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."
+	name = "Hyperspace Highball"
+	desc = "Infamously expensive, infamously contains bluespace 'flakes' for bragging rights, and infamously removed from most shelves due to accidents involving teleportation accidents upon ingestion."
 	icon_state = "blazaambottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/trappist
-	name = "Mont de Requin Trappistes Bleu"
-	desc = "Brewed in space-Belgium. Fancy!"
+	name = "Roumain Trapper's"
+	desc = "Traditionally (and heavily monitored for authenticity) made beer brewed on Illestren. Trapper's beer must be brewed by Saint Roumain Hunters or Shadows, made to fit the needs of their community first, and must never be made for profit... which makes it a common sight in the Frontier."
 	custom_premium_price = 170
 	icon_state = "trappistbottle"
 	volume = 50
@@ -445,27 +421,41 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/hooch
 	name = "hooch bottle"
-	desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag."
+	desc = "A bottle of homebrewed, low quality alcohol. The paper wrapping is covered in little signatures and messages - how many hands have passed this bottle before you came around?"
 	icon_state = "hoochbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/moonshine
 	name = "moonshine jug"
-	desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle."
+	desc = "High-proof hard liquor, most likely made in the privacy of a bootlegger's ship. Permanent marker on packaging tape is the most you'll get for a label. Remember: if it doesn't burn blue, don't drink it!"
 	icon_state = "moonshinebottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/coconut
-	name = "Tali's Pure Coconut Delight"
-	desc = "Seems to be some promotional product for a Teceti video game. You're pretty certain this stuff is synthetic."
+	name = "T4l1's Pure Coconut Delight"
+	desc = "A fanmade, promotional bottle of coconut cream liquor. There's a stylized picture of a synthetic kepori on the side, along with a blurb about whoever she is. You're pretty certain this stuff is synthetic, despite Teceti growing actual coconut trees..." //if i have to recognize rilena here, I'm going to have fun with it
 	icon_state = "coconutbottle"
 	list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 100)
 	isGlass = TRUE
 
+/obj/item/reagent_containers/food/drinks/bottle/cacao
+	name = "Sharai's Pure Cacao Delight"
+	desc = "Seems to be some promotional product for a Teceti video game. You're pretty certain this stuff is synthetic."
+	icon_state = "cacaobottle"
+	list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_cacao = 100)
+	isGlass = TRUE
+
+/obj/item/reagent_containers/food/drinks/bottle/menthe
+	name = "Mora's Pure Mint Delight"
+	desc = "Seems to be some promotional product for a Teceti video game. You're pretty certain this stuff is synthetic."
+	icon_state = "mintbottle"
+	list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_menthe = 100)
+	isGlass = TRUE
+
 ////////////////////////// MOLOTOV ///////////////////////
 /obj/item/reagent_containers/food/drinks/bottle/molotov
 	name = "molotov cocktail"
-	desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss."
+	desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by desperate militias and revolutionaries. Light and toss."
 	icon_state = "vodkabottle"
 	list_reagents = list()
 	var/active = 0
@@ -525,7 +515,7 @@
 
 /obj/item/reagent_containers/food/drinks/bottle/pruno
 	name = "pruno mix"
-	desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet. Security would love to confiscate this, one of the many things wrong with them."
+	desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet."
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "trashbag"
 	list_reagents = list(/datum/reagent/consumable/prunomix = 50)
@@ -569,7 +559,7 @@
 	else
 		reagents.add_reagent(/datum/reagent/consumable/ethanol/pruno, 50)
 	name = "bag of pruno"
-	desc = "Fermented prison wine made from fruit, sugar, and despair. You probably shouldn't drink this around Security."
+	desc = "Fermented prison wine made from fruit, sugar, and despair."
 	icon_state = "trashbag1" // pruno releases air as it ferments, we don't want to simulate this in atmos, but we can make it look like it did
 	for (var/mob/living/M in view(2, get_turf(src))) // letting people and/or narcs know when the pruno is done
 		to_chat(M, "<span class='info'>A pungent smell emanates from [src], like fruit puking out its guts.</span>")
@@ -577,7 +567,7 @@
 
 /obj/item/reagent_containers/food/drinks/colocup/lean
 	name = "lean"
-	desc = "A cup of that purple drank, the stuff that makes you go WHEEZY BABY."
+	desc = "Despite this mix of codeine-based cough syrup and a soft drink of choice being popular online, you're not sure anyone talking about ever tried it. First time for everything?"
 	icon_state = "lean"
 	list_reagents = list(/datum/reagent/consumable/lean = 50)
 	random_sprite = FALSE
@@ -587,7 +577,7 @@
 	desc = "Sealed for a guaranteed fresh taste in every bottle."
 	icon_state = "sandbottle"
 	volume = 50
-	list_reagents = list(/datum/reagent/medicine/molten_bubbles/sand = 50)
+	list_reagents = list(/datum/reagent/consumable/molten/sand = 50)
 	reagent_flags = null //Cap's on
 
 /obj/item/reagent_containers/food/drinks/bottle/sarsaparilla/attack_self(mob/user)
@@ -662,7 +652,7 @@
 	. = ..()
 	if(sealed)
 		var/datum/component/storage/S = GetComponent(/datum/component/storage)
-		user.visible_message("<span class='notice'>[user] prys open \the [src].</span>", "You pry open \the [src]")
+		user.visible_message("<span class='notice'>[user] pries open \the [src].</span>", "You pry open \the [src]")
 		playsound(src, 'sound/machines/wooden_closet_close.ogg', 20, 1)
 		sealed = FALSE
 		S.locked = FALSE
@@ -672,7 +662,7 @@
 
 /obj/item/storage/bottles/sandblast
 	name = "sarsaparilla bottle crate"
-	desc = "Holds six bottles of the finest sarsaparilla this side of the sector."
+	desc = "Holds six bottles of the finest sarsaparilla this side of the Frontier."
 	sealed = TRUE
 
 /obj/item/storage/bottles/sandblast/PopulateContents()
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 1d7adb7db4f2..2f73f7678e38 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -100,10 +100,6 @@
 	name = "Space Cola"
 	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(/datum/reagent/consumable/nuka_cola = 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
 		var/obj/item/reagent_containers/food/snacks/egg/E = I
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index c4daa88869a7..fc3df2f74713 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -24,7 +24,7 @@
 /obj/item/reagent_containers/food/snacks/customizable/examine(mob/user)
 	. = ..()
 	var/ingredients_listed = ""
-	for(var/obj/item/reagent_containers/food/snacks/ING in ingredients)
+	for(var/obj/item/ING in ingredients)
 		ingredients_listed += "[ING.name], "
 	var/size = "standard"
 	if(ingredients.len<2)
@@ -36,8 +36,11 @@
 	. += "It contains [ingredients.len?"[ingredients_listed]":"no ingredient, "]making a [size]-sized [initial(name)]."
 
 /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
-	if(!istype(I, /obj/item/reagent_containers/food/snacks/customizable) && istype(I, /obj/item/reagent_containers/food/snacks))
-		var/obj/item/reagent_containers/food/snacks/S = I
+	if(istype(I, /obj/item/reagent_containers/food/snacks/customizable))
+		return
+	var/datum/component/edible/E = I.GetComponent(/datum/component/edible)
+	var/obj/item/reagent_containers/food/snacks/S = I
+	if(istype(S) || E)
 		if(I.w_class > WEIGHT_CLASS_SMALL)
 			to_chat(user, "<span class='warning'>The ingredient is too big for [src]!</span>")
 		else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume))
@@ -47,20 +50,25 @@
 		else
 			if(!user.transferItemToLoc(I, src))
 				return
-			if(S.trash)
-				S.generate_trash(get_turf(user))
-			ingredients += S
-			mix_filling_color(S)
-			S.reagents.trans_to(src,min(S.reagents.total_volume, 15), transfered_by = user) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
-			foodtype |= S.foodtype
-			update_customizable_overlays(S)
+			ingredients += I
+			I.reagents.trans_to(src,min(S.reagents.total_volume, 15), transfered_by = user) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
+			if(istype(S))
+				if(S.trash)
+					S.generate_trash(get_turf(user))
+				mix_filling_color(S.filling_color)
+				foodtype |= S.foodtype
+				update_customizable_overlays(S.filling_color)
+			else
+				mix_filling_color(E.filling_color)
+				foodtype |= E.foodtypes
+				update_customizable_overlays(E.filling_color)
 			to_chat(user, "<span class='notice'>You add the [I.name] to the [name].</span>")
-			update_food_name(S)
+			update_food_name(I)
 	else
 		. = ..()
 
 
-/obj/item/reagent_containers/food/snacks/customizable/proc/update_food_name(obj/item/reagent_containers/food/snacks/S)
+/obj/item/reagent_containers/food/snacks/customizable/proc/update_food_name(obj/item/S)
 	for(var/obj/item/I in ingredients)
 		if(!istype(S, I.type))
 			customname = "custom"
@@ -88,25 +96,25 @@
 		attackby(I, user)
 	qdel(BASE)
 
-/obj/item/reagent_containers/food/snacks/customizable/proc/mix_filling_color(obj/item/reagent_containers/food/snacks/S)
+/obj/item/reagent_containers/food/snacks/customizable/proc/mix_filling_color(newcolor)
 	if(ingredients.len == 1)
-		filling_color = S.filling_color
+		filling_color = newcolor
 	else
 		var/list/rgbcolor = list(0,0,0,0)
 		var/customcolor = GetColors(filling_color)
-		var/ingcolor =  GetColors(S.filling_color)
+		var/ingcolor =  GetColors(newcolor)
 		rgbcolor[1] = (customcolor[1]+ingcolor[1])/2
 		rgbcolor[2] = (customcolor[2]+ingcolor[2])/2
 		rgbcolor[3] = (customcolor[3]+ingcolor[3])/2
 		rgbcolor[4] = (customcolor[4]+ingcolor[4])/2
 		filling_color = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4])
 
-/obj/item/reagent_containers/food/snacks/customizable/update_customizable_overlays(obj/item/reagent_containers/food/snacks/S)
+/obj/item/reagent_containers/food/snacks/customizable/update_customizable_overlays(filling_color = "#FFFFFF")
 	var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
-	if(S.filling_color == "#FFFFFF")
+	if(filling_color == "#FFFFFF")
 		filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
 	else
-		filling.color = S.filling_color
+		filling.color = filling_color
 
 	switch(ingredients_placement)
 		if(INGREDIENTS_SCATTER)
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index b64d52eea54a..61121a3ca950 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -167,26 +167,27 @@ All foods are distributed among various categories. Use common sense.
 /obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/storage))
 		..() // -> item/attackby()
-		return 0
-	if(istype(W, /obj/item/reagent_containers/food/snacks))
+		return FALSE
+	var/datum/component/edible/E = W.GetComponent(/datum/component/edible)
+	if(istype(W, /obj/item/reagent_containers/food/snacks) || E)
 		var/obj/item/reagent_containers/food/snacks/S = W
 		if(custom_food_type && ispath(custom_food_type))
-			if(S.w_class > WEIGHT_CLASS_SMALL)
-				to_chat(user, "<span class='warning'>[S] is too big for [src]!</span>")
-				return 0
-			if(!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/reagent_containers/food/snacks/cakeslice/custom))
-				to_chat(user, "<span class='warning'>[src] can't be filled with [S]!</span>")
-				return 0
+			if(W.w_class > WEIGHT_CLASS_SMALL)
+				to_chat(user, span_warning("[S] is too big for [src]!"))
+				return FALSE
+			if(istype(S) && (!S.customfoodfilling || istype(W, /obj/item/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/reagent_containers/food/snacks/cakeslice/custom)))
+				to_chat(user, span_warning("[src] can't be filled with [S]!"))
+				return FALSE
 			if(contents.len >= 20)
-				to_chat(user, "<span class='warning'>You can't add more ingredients to [src]!</span>")
-				return 0
+				to_chat(user, span_warning("You can't add more ingredients to [src]!"))
+				return FALSE
 			var/obj/item/reagent_containers/food/snacks/customizable/C = new custom_food_type(get_turf(src))
-			C.initialize_custom_food(src, S, user)
-			return 0
+			C.initialize_custom_food(src, W, user)
+			return FALSE
 	var/sharp = W.get_sharpness()
 	if(sharp)
 		if(slice(sharp, W, user))
-			return 1
+			return TRUE
 	else
 		..()
 
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
index a048fb0e4371..d6f6151d47ac 100644
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ b/code/modules/food_and_drinks/food/snacks_cake.dm
@@ -195,7 +195,7 @@
 	force = 5
 	hitsound = 'sound/weapons/blade1.ogg'
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy
-	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/pwr_game = 10, /datum/reagent/consumable/liquidelectricity = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/pacfuel = 10, /datum/reagent/consumable/liquidelectricity = 10)
 	tastes = list("cake" = 3, "a Vlad's Salad" = 1)
 
 /obj/item/reagent_containers/food/snacks/store/cake/birthday/energy/proc/energy_bite(mob/living/user)
@@ -220,7 +220,7 @@
 	force = 2
 	hitsound = 'sound/weapons/blade1.ogg'
 	filling_color = "#00FF00"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1,  /datum/reagent/consumable/pwr_game = 2, /datum/reagent/consumable/liquidelectricity = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1,  /datum/reagent/consumable/pacfuel = 2, /datum/reagent/consumable/liquidelectricity = 2)
 	tastes = list("cake" = 3, "a Vlad's Salad" = 1)
 
 /obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy/proc/energy_bite(mob/living/user)
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 930fabc31775..e35cb7eeb5fe 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -178,7 +178,7 @@
 	name = "Space Mountain Wind snowcone"
 	desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
 	icon_state = "mountainwind_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/comet_trail = 5)
 	tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
 
 
@@ -186,7 +186,7 @@
 	name = "pwrgame snowcone"
 	desc = "Pwrgame soda drizzled over a snowball in a paper cup."
 	icon_state = "pwrgame_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pwr_game = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pacfuel = 5)
 	tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/honey
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
index 4c1a8695d838..f76bdb462539 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm
@@ -61,10 +61,10 @@
 				grill_loop.start()
 				return
 		else
-			if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
-				grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
+			if(I.reagents.has_reagent(/datum/reagent/consumable/xeno_energy))
+				grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/xeno_energy)))
 				to_chat(user, "<span class='notice'>You pour the Monkey Energy in [src].</span>")
-				I.reagents.remove_reagent(/datum/reagent/consumable/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))
+				I.reagents.remove_reagent(/datum/reagent/consumable/xeno_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/xeno_energy))
 				update_appearance()
 				return
 	..()
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index acd768347327..2474d1d53501 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -25,10 +25,6 @@
 	results = list(/datum/reagent/consumable/hot_ice_coffee = 3)
 	required_reagents = list(/datum/reagent/toxin/hot_ice = 1, /datum/reagent/consumable/coffee = 2)
 
-/datum/chemical_reaction/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
 	results = list(/datum/reagent/consumable/ethanol/moonshine = 10)
 	required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5)
@@ -173,16 +169,12 @@
 
 /datum/chemical_reaction/hiveminderaser
 	results = list(/datum/reagent/consumable/ethanol/hiveminderaser = 4)
-	required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/consumable/grenadine = 1)
+	required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/vimukti = 1, /datum/reagent/consumable/grenadine = 1)
 
 /datum/chemical_reaction/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
-	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
 	results = list(/datum/reagent/consumable/ethanol/vodkatonic = 3)
 	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/tonic = 1)
@@ -205,7 +197,7 @@
 
 /datum/chemical_reaction/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)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/comet_trail = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/tadrixx = 1)
 
 /datum/chemical_reaction/booger
 	results = list(/datum/reagent/consumable/ethanol/booger = 4)
@@ -340,8 +332,8 @@
 	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
-	results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3)
+/datum/chemical_reaction/vimukti
+	results = list(/datum/reagent/consumable/ethanol/vimukti = 3)
 	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/chocolatepudding
@@ -368,9 +360,9 @@
 	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
-	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/tadrixxfloat
+	results = list(/datum/reagent/consumable/tadrixxfloat = 15)
+	required_reagents = list(/datum/reagent/consumable/tadrixx = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5)
 
 /datum/chemical_reaction/triple_citrus
 	results = list(/datum/reagent/consumable/triple_citrus = 5)
@@ -390,11 +382,6 @@
 	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
-	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
 	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)
@@ -438,12 +425,6 @@
 	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
-	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
 	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)
@@ -525,7 +506,6 @@
 	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
 	results = list(/datum/reagent/consumable/ethanol/fanciulli = 2)
 	required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 1, /datum/reagent/consumable/ethanol/fernet = 1)
@@ -536,8 +516,7 @@
 
 /datum/chemical_reaction/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)
-
+	required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1)
 
 /datum/chemical_reaction/wizz_fizz
 	results = list(/datum/reagent/consumable/ethanol/wizz_fizz = 3)
@@ -545,7 +524,6 @@
 	mix_message = "The beverage starts to froth with an almost mystical zeal!"
 	mix_sound = 'sound/effects/bubbles2.ogg'
 
-
 /datum/chemical_reaction/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)
@@ -559,7 +537,7 @@
 
 /datum/chemical_reaction/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)
+	required_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/nitrous_oxide = 1, /datum/reagent/consumable/ethanol/sugar_rush = 1, /datum/reagent/consumable/pacfuel = 1)
 
 /datum/chemical_reaction/old_timer
 	results = list(/datum/reagent/consumable/ethanol/old_timer = 6)
@@ -567,7 +545,7 @@
 
 /datum/chemical_reaction/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)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/crosstalk = 5, /datum/reagent/consumable/astrotame = 1)
 
 /datum/chemical_reaction/duplex
 	results = list(/datum/reagent/consumable/ethanol/duplex = 4)
@@ -629,22 +607,11 @@
 	required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/creme_de_cacao = 2, /datum/reagent/consumable/ethanol/irishcarbomb = 1)
 	mix_message = "The area around the glass seems to darken as the mixture forms!"
 
-/datum/chemical_reaction/archmagus_brew
-	results = list(/datum/reagent/consumable/ethanol/archmagus_brew = 4)
-	required_reagents = list(/datum/reagent/consumable/ethanol/wizz_fizz = 2, /datum/reagent/consumable/ethanol/crevice_spike = 1, /datum/reagent/consumable/ethanol/stinger = 1)
-	mix_message = "The mixture bubbles intensely before settling in the glass."
-
 /datum/chemical_reaction/out_of_lime
 	results = list(/datum/reagent/consumable/ethanol/out_of_lime = 4)
 	required_reagents = list(/datum/reagent/consumable/lemonade = 1, /datum/reagent/consumable/ethanol/beer/green = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ethanol/out_of_touch = 1)
 	mix_message = "The glass cycles through different colors before settling on one."
 
-/datum/chemical_reaction/cogchamp
-	results = list(/datum/reagent/consumable/ethanol/cogchamp = 3)
-	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol/screwdrivercocktail = 1)
-	mix_message = "You hear faint sounds of gears turning as it mixes."
-	mix_sound = 'sound/effects/clockcult_gateway_closing.ogg'
-
 /datum/chemical_reaction/ash_wine
 	results = list(/datum/reagent/consumable/ethanol/trickwine/ash_wine = 5)
 	required_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 3, /datum/reagent/ash = 1, /datum/reagent/drug/mushroomhallucinogen = 1)
@@ -671,7 +638,7 @@
 
 /datum/chemical_reaction/force_wine
 	results = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 5)
-	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/spacemountainwind = 1)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/comet_trail = 1)
 	required_container = /obj/structure/fermenting_barrel/distiller
 	mix_sound ='sound/magic/forcewall.ogg'
 
@@ -680,3 +647,18 @@
 	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1)
 	required_container = /obj/structure/fermenting_barrel/distiller
 	mix_sound ='sound/weapons/laser.ogg'
+
+/datum/chemical_reaction/molten_bubbles
+	results = list(/datum/reagent/consumable/molten = 30)
+	required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)
+
+/datum/chemical_reaction/plasma_bubbles
+	results = list(/datum/reagent/consumable/molten/plasma_fizz = 3)
+	required_reagents = list(/datum/reagent/consumable/molten = 3, /datum/reagent/toxin/plasma = 2)
+
+/datum/chemical_reaction/sand_bubbles
+	results = list(/datum/reagent/consumable/molten/sand = 3)
+	required_reagents = list(/datum/reagent/consumable/molten = 3, /datum/reagent/silicon = 2)
+
+/datum/chemical_reaction/sand_bubbles/plasma			// Subbing plasma bubbles for reg
+	required_reagents = list(/datum/reagent/consumable/molten/plasma_fizz = 3, /datum/reagent/silicon = 2)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index 92647559d9cd..edca42fda076 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -27,7 +27,7 @@
 	name ="Space freezy"
 	reqs = list(
 		/datum/reagent/consumable/bluecherryjelly = 5,
-		/datum/reagent/consumable/spacemountainwind = 15,
+		/datum/reagent/consumable/comet_trail = 15,
 		/obj/item/reagent_containers/food/snacks/icecream = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/spacefreezy
@@ -217,7 +217,7 @@
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/spacemountainwind = 5
+		/datum/reagent/consumable/comet_trail = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
 	subcategory = CAT_ICE
@@ -227,7 +227,7 @@
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/datum/reagent/consumable/pwr_game = 15
+		/datum/reagent/consumable/pacfuel = 15
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
 	subcategory = CAT_ICE
diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index e95bdb2063a8..d5b0c0ff6638 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -243,17 +243,6 @@
 	if(prob(5))
 		playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, TRUE)
 
-/mob/living/simple_animal/hostile/clown_insane/attackby(obj/item/O, mob/user)
-	if(istype(O, /obj/item/nullrod))
-		if(prob(5))
-			visible_message("<span class='notice'>[src] finally found the peace it deserves. <i>You hear honks echoing off into the distance.</i></span>")
-			playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, TRUE)
-			qdel(src)
-		else
-			visible_message("<span class='danger'>[src] seems to be resisting the effect!</span>")
-		return
-	return ..()
-
 /mob/living/simple_animal/hostile/clown_insane/handle_temperature_damage()
 	return
 
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index 1378fb0253fc..1c6b19313ee4 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -52,19 +52,3 @@
 	dried_type = null
 	wine_power = 70 //Water to wine, baby.
 	wine_flavor = "divinity"
-
-/obj/item/reagent_containers/food/snacks/grown/holymelon/Initialize()
-	. = ..()
-	var/uses = 1
-	if(seed)
-		uses = round(seed.potency / 20)
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_HANDS, uses, TRUE, CALLBACK(src, PROC_REF(block_magic)), CALLBACK(src, PROC_REF(expire))) //deliver us from evil o melon god
-
-/obj/item/reagent_containers/food/snacks/grown/holymelon/proc/block_magic(mob/user, major)
-	if(major)
-		to_chat(user, "<span class='warning'>[src] hums slightly, and seems to decay a bit.</span>")
-
-/obj/item/reagent_containers/food/snacks/grown/holymelon/proc/expire(mob/user)
-	to_chat(user, "<span class='warning'>[src] rapidly turns into ash!</span>")
-	qdel(src)
-	new /obj/effect/decal/cleanable/ash(drop_location())
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index 870697476794..ab4ceb6968c0 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -16,8 +16,6 @@
 	var/obj/item/storage/book/bible/booze/B = new
 
 	if(GLOB.religion)
-		if(H.mind)
-			H.mind.holy_role = HOLY_ROLE_PRIEST
 		B.deity_name = GLOB.deity
 		B.name = GLOB.bible_name
 		B.icon_state = GLOB.bible_icon_state
@@ -30,8 +28,6 @@
 		if(GLOB.religious_sect)
 			GLOB.religious_sect.on_conversion(H)
 		return
-	if(H.mind)
-		H.mind.holy_role = HOLY_ROLE_HIGHPRIEST
 
 	var/new_religion = DEFAULT_RELIGION
 	if(M.client && M.client.prefs.custom_names["religion"])
diff --git a/code/modules/mining/drill.dm b/code/modules/mining/drill.dm
index 281097be7842..9a35c2b4bf11 100644
--- a/code/modules/mining/drill.dm
+++ b/code/modules/mining/drill.dm
@@ -218,7 +218,7 @@
 /obj/machinery/drill/AltClick(mob/user)
 	if(active)
 		to_chat(user, "<span class='notice'>You begin the manual shutoff process.</span>")
-		if(do_after(user,10))
+		if(do_after(user, 10, src))
 			active = FALSE
 			soundloop.stop()
 			deltimer(current_timerid)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 7b80559d2691..268413ef203c 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -501,10 +501,6 @@
 			if(input)
 				src.warcry = input
 
-/obj/item/immortality_talisman/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE, TRUE)
-
 /datum/action/item_action/hands_free/immortality
 	name = "Immortality"
 
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 4430fc1da300..f92e8d762f2d 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -314,10 +314,6 @@
 
 			msg += "</span>"
 
-			if(HAS_TRAIT(user, TRAIT_SPIRITUAL) && mind?.holy_role)
-				msg += "[t_He] [t_has] a holy aura about [t_him].\n"
-				SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "religious_comfort", /datum/mood_event/religiously_comforted)
-
 		switch(stat)
 			if(UNCONSCIOUS, HARD_CRIT)
 				msg += "[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.\n"
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index 4ad5297b73d9..27362b348cab 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -271,7 +271,7 @@
 	var/static/mutable_appearance/overcharge //shameless copycode from lightning spell
 	overcharge = overcharge || mutable_appearance('icons/effects/effects.dmi', "electricity", EFFECTS_LAYER)
 	_human.add_overlay(overcharge)
-	if(do_after(_human, 50, _human, 1))
+	if(do_after(_human, 50, _human, TRUE))
 		_human.flash_lighting_fx(5, 7, current_color)
 		var/obj/item/organ/stomach/ethereal/stomach = _human.getorganslot(ORGAN_SLOT_STOMACH)
 		playsound(_human, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
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 30f3d5f74b58..14526059354d 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -313,7 +313,7 @@
 
 	H.notransform = TRUE
 
-	if(do_after(owner, delay=60, target=owner, progress=TRUE, timed_action_flags = IGNORE_HELD_ITEM))
+	if(do_after(owner, delay = 60, target = owner, progress = TRUE, timed_action_flags = IGNORE_HELD_ITEM))
 		if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT)
 			make_dupe()
 		else
diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm
index 9c0f58dc8312..764a7166ff2d 100644
--- a/code/modules/mob/living/carbon/human/species_types/spider.dm
+++ b/code/modules/mob/living/carbon/human/species_types/spider.dm
@@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
 	var/nutrition_threshold = NUTRITION_LEVEL_FED
 	if (H.nutrition >= nutrition_threshold)
 		to_chat(H, "<i>You begin spinning some web...</i>")
-		if(!do_after(H, 10 SECONDS, 1, T))
+		if(!do_after(H, 10 SECONDS, T, hidden = TRUE))
 			to_chat(H, "<span class='warning'>Your web spinning was interrupted!</span>")
 			return
 		if(prob(75))
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
 			to_chat(H, "<span class='warning'>You cannot wrap this.</span>")
 			return
 		H.visible_message("<span class='danger'>[H] starts to wrap [A] into a cocoon!</span>","<span class='warning'>You start to wrap [A] into a cocoon.</span>")
-		if(!do_after(H, 10 SECONDS, 1, A))
+		if(!do_after(H, 10 SECONDS, A, hidden = TRUE))
 			to_chat(H, "<span class='warning'>Your web spinning was interrupted!</span>")
 			return
 		H.adjust_nutrition(E.spinner_rate * -3.5)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 6a66c0546f6e..755c674a107d 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -75,8 +75,6 @@
 	var/amount
 	if(reagents.has_reagent(/datum/reagent/medicine/morphine))
 		amount = -1
-	if(reagents.has_reagent(/datum/reagent/consumable/nuka_cola))
-		amount = -1
 	if(amount)
 		add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_reagent_speedmod, TRUE, amount)
 
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index ec49e59ecace..4a3e284addd6 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -50,7 +50,7 @@
 			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>")
-				if(do_after(user, 1 SECONDS, TRUE, src))
+				if(do_after(user, 1 SECONDS, src, hidden = TRUE))
 					fold_in()
 					if(user.put_in_hands(card))
 						user.visible_message("<span class='notice'>[user] promptly scoops up [user.p_their()] pAI's card.</span>")
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 104d4363bc3b..16f377cb1b01 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -17,7 +17,7 @@
 				if("Cannibalize")
 					if(D.health < D.maxHealth)
 						D.visible_message("<span class='notice'>[D] begins to cannibalize parts from [src].</span>", "<span class='notice'>You begin to cannibalize parts from [src]...</span>")
-						if(do_after(D, 60, 0, target = src))
+						if(do_after(D, 60, src, FALSE))
 							D.visible_message("<span class='notice'>[D] repairs itself using [src]'s remains!</span>", "<span class='notice'>You repair yourself using [src]'s remains.</span>")
 							D.adjustBruteLoss(-src.maxHealth)
 							new /obj/effect/decal/cleanable/oil/streak(get_turf(src))
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index cf1b0de8ae70..f2fbf6e5b262 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -165,7 +165,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
 	visible_message(
 		"<span class='danger'>[src] starts eating away [A]...</span>",
 		"<span class='notice'>You start eating the [A]...</span>")
-	if(do_after(src, 30, FALSE, A))
+	if(do_after(src, 30, A, hidden = TRUE))
 		if(QDELETED(A))
 			return
 		visible_message(
diff --git a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
index 675c6fc99342..b251dda91e48 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
@@ -47,8 +47,8 @@
 	melee_damage_upper = 30
 	deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!"
 	loot = list(/obj/effect/decal/remains/human,
-				/obj/item/clothing/suit/armor/riot/chaplain,
-				/obj/item/clothing/head/helmet/chaplain,
+				/obj/item/clothing/suit/armor/witchhunter,
+				/obj/item/clothing/head/witchunter,
 				/obj/item/claymore/weak{name = "holy sword"})
 
 /mob/living/simple_animal/hostile/human/skeleton/ice
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index d7db5351de45..e4478b705f45 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -213,7 +213,7 @@
 
 /mob/living/simple_animal/hostile/asteroid/goliath/beast/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/saddle) && !saddled)
-		if(tame && do_after(user,55,target=src))
+		if(tame && do_after(user, 55, target=src))
 			user.visible_message("<span class='notice'>You manage to put [O] on [src], you can now ride [p_them()].</span>")
 			qdel(O)
 			saddled = TRUE
diff --git a/code/modules/movespeed/modifiers/reagent.dm b/code/modules/movespeed/modifiers/reagent.dm
index d6b0703ccb59..ecf91d0760fa 100644
--- a/code/modules/movespeed/modifiers/reagent.dm
+++ b/code/modules/movespeed/modifiers/reagent.dm
@@ -13,7 +13,7 @@
 /datum/movespeed_modifier/reagent/badstims
 	multiplicative_slowdown = -0.45
 
-/datum/movespeed_modifier/reagent/monkey_energy
+/datum/movespeed_modifier/reagent/xeno_energy
 	multiplicative_slowdown = -0.35
 
 /datum/movespeed_modifier/reagent/changelinghaste
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
index 4939686ee9fd..f45c231c7098 100644
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ b/code/modules/ninja/suit/ninjaDrainAct.dm
@@ -85,7 +85,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
 				drain = S.cell.maxcharge - S.cell.charge
 				maxcapacity = 1
 
-			if (do_after(H,10, target = src, hidden = TRUE))
+			if (do_after(H, 10, target = src, hidden = TRUE))
 				spark_system.start()
 				playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 				charge -= drain
@@ -235,7 +235,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
 			if(S.cell.charge+drain > S.cell.maxcharge)
 				drain = S.cell.maxcharge - S.cell.charge
 				maxcapacity = 1
-			if (do_after(H,10, hidden = TRUE))
+			if (do_after(H, 10, hidden = TRUE))
 				spark_system.start()
 				playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 				cell.use(drain)
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index f9641a7a63ff..b700e22156fa 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -21,7 +21,7 @@
 		var/obj/item/stock_parts/cell/CELL = I
 		if(CELL.maxcharge > cell.maxcharge && n_gloves && n_gloves.candrain)
 			to_chat(U, "<span class='notice'>Higher maximum capacity detected.\nUpgrading...</span>")
-			if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = src))
+			if (n_gloves && n_gloves.candrain && do_after(U, s_delay, target = src))
 				U.transferItemToLoc(CELL, src)
 				CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge)
 				var/obj/item/stock_parts/cell/old_cell = cell
diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm
index a919dce944ce..3c9dbb89feae 100644
--- a/code/modules/paperwork/folders_premade.dm
+++ b/code/modules/paperwork/folders_premade.dm
@@ -61,3 +61,10 @@
 	document = /obj/item/documents/terragov
 	desc = "A green folder with a Terran Regency seal."
 	icon_state = "folder_terragovred"
+
+/obj/item/folder/suns
+	desc = "A purple folder with a SUNS seal."
+	icon_state = "folder_suns"
+
+/obj/item/folder/suns/red
+	icon_state = "folder_sunsred" // i'm not sure why SUNS would need secret documents
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 3bfc292108b5..45893f8d5fc5 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -140,5 +140,10 @@
 	icon_state = "stamp-bard"
 	dye_color = DYE_FO
 
+/obj/item/stamp/suns
+	name = "SUNS rubber stamp"
+	icon_state = "stamp-suns"
+	dye_color = DYE_PURPLE
+
 /obj/item/stamp/attack_paw(mob/user)
 	return attack_hand(user)
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index 8e5f2e128ac7..9f6a8c169ecd 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -111,8 +111,8 @@
 	desc = "A shotgun shell which fires a spread of incendiary pellets."
 	icon_state = "dragonsbreath"
 	projectile_type = /obj/projectile/bullet/incendiary/shotgun/dragonsbreath
-	pellets = 4
-	variance = 35
+	pellets = 8
+	variance = 45
 
 /obj/item/ammo_casing/shotgun/meteorslug
 	name = "meteorslug shell"
@@ -128,20 +128,20 @@
 
 /obj/item/ammo_casing/shotgun/ion
 	name = "ion shell"
-	desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \
-	The unique properties of the crystal split the pulse into a spread of individually weaker bolts."
+	desc = "An advanced shotgun shell which uses a micro laser to focus the effects of an EMP reaction to produce an effect similar to a standard ion rifle. \
+	The more uncontrolled nature of the reaction causes the pulse to spread into multiple individually weaker bolts."
 	icon_state = "ion"
 	projectile_type = /obj/projectile/ion/weak
-	pellets = 4
-	variance = 35
+	pellets = 8
+	variance = 25
 
 /obj/item/ammo_casing/shotgun/laserscatter
 	name = "scatter laser shell"
 	desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a scatter laser weapon in a ballistic package."
 	icon_state = "laser"
 	projectile_type = /obj/projectile/beam/weak
-	pellets = 4 //WS edit: makes scatter lasers based again
-	variance = 35
+	pellets = 8
+	variance = 25
 
 /obj/item/ammo_casing/shotgun/pulseslug
 	name = "pulse slug"
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index 4c3c8b736c4d..3b1bdbc6eb1c 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -98,7 +98,7 @@
 	if(istype(attacking_obj, /obj/item/ammo_box))
 		var/obj/item/ammo_box/attacking_box = attacking_obj
 		for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo)
-			if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, list(attacking_box))))
+			if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box)))
 				break
 			var/did_load = give_round(casing_to_insert, replace_spent)
 			if(!did_load)
diff --git a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
index f8ce8223748d..658eef2d781c 100644
--- a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
@@ -66,7 +66,7 @@
 		var/list/ammo_list_no_empty = ammo_list(FALSE)
 		listclearnulls(ammo_list_no_empty)
 		for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo)
-			if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after(user, 1 SECONDS, list(attacking_box)))) //stupid work around for revolvers
+			if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box))) //stupid work around for revolvers
 				break
 			var/did_load = give_round(casing_to_insert, replace_spent)
 			if(!did_load)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index e5345c0eab45..71a291f301de 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -241,7 +241,7 @@
 	update_appearance()
 	SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
 	if (tac_load)
-		if(do_after(user, tactical_reload_delay, TRUE, src))
+		if(do_after(user, tactical_reload_delay, src, hidden = TRUE))
 			if (insert_magazine(user, tac_load, FALSE))
 				to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src].</span>")
 			else
diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
index 4e9abd0cd70c..afa111c6bbf8 100644
--- a/code/modules/projectiles/guns/ballistic/hmg.dm
+++ b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -88,7 +88,7 @@
 	if(!can_deploy)
 		to_chat(user, "<span class='warning'>You need to brace against something to deploy [src]'s bipod! Either lie on the floor or stand next to a waist high object like a table!</span>")
 		return
-	if(!do_after(user, deploy_time, src, FALSE, TRUE, CALLBACK(src, PROC_REF(is_wielded))))
+	if(!do_after(user, deploy_time, src, NONE, TRUE, CALLBACK(src, PROC_REF(is_wielded))))
 		to_chat(user, "<span class='warning'>You need to hold still to deploy [src]'s bipod!</span>")
 		return
 	playsound(src, 'sound/machines/click.ogg', 75, TRUE)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index d06ad71d206d..dffa9a7fe7b1 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -158,7 +158,7 @@
 	to_chat(user, "<span class='notice'>You pull the cell out of \the [src].</span>")
 	update_appearance()
 	if(tac_load && tac_reloads)
-		if(do_after(user, tactical_reload_delay, TRUE, src))
+		if(do_after(user, tactical_reload_delay, src, hidden = TRUE))
 			if(insert_cell(user, tac_load))
 				to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src].</span>")
 			else
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index e102c4c3b48f..ba9c8c88d7f8 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -18,7 +18,7 @@
 
 /obj/projectile/bullet/incendiary/shotgun/dragonsbreath
 	name = "dragonsbreath pellet"
-	damage = 5
+	damage = 8
 	armour_penetration = -35
 
 /obj/projectile/bullet/slug/stun
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 037256db302f..2fa26e8f4bfb 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -470,14 +470,14 @@
 		/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/comet_trail,
+		/datum/reagent/consumable/tadrixx,
 		/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/pacfuel,
+		/datum/reagent/consumable/shoal_punch,
 		/datum/reagent/consumable/sugar,
 		/datum/reagent/consumable/pineapplejuice,
 		/datum/reagent/consumable/orangejuice,
@@ -489,7 +489,7 @@
 	)
 	upgrade_reagents = null
 	emagged_reagents = list(
-		/datum/reagent/consumable/ethanol/thirteenloko,
+		/datum/reagent/consumable/ethanol/vimukti,
 		/datum/reagent/consumable/ethanol/whiskey_cola,
 		/datum/reagent/toxin/mindbreaker,
 		/datum/reagent/toxin/staminatoxin
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 123afbcf387c..10519c75c434 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -87,30 +87,30 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer
 	name = "Beer"
-	description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today."
+	description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. A timeless classic."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	boozepwr = 25
-	taste_description = "piss water"
+	taste_description = "bad water"
 	glass_name = "glass of beer"
-	glass_desc = "A freezing pint of beer."
+	glass_desc = "A pint of beer."
 
 /datum/reagent/consumable/ethanol/beer/light
 	name = "Light Beer"
-	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content."
+	description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. This variety has reduced calorie and alcohol content."
 	boozepwr = 5 //Space Europeans hate it
 	taste_description = "dish water"
 	glass_name = "glass of light beer"
-	glass_desc = "A freezing pint of watery light beer."
+	glass_desc = "A pint of watery light beer."
 
 /datum/reagent/consumable/ethanol/beer/green
 	name = "Green Beer"
-	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is dyed a festive green."
+	description = "An alcoholic beverage, brewed originally to keep a safe source of drinking water. This variety is dyed green, but you're not sure why."
 	color = "#A8E61D"
-	taste_description = "green piss water"
+	taste_description = "green bad water"
 	glass_icon_state = "greenbeerglass"
 	glass_name = "glass of green beer"
-	glass_desc = "A freezing pint of green beer. Festive."
+	glass_desc = "A pint of green beer. You get the feeling this had some sort of meaning, once."
 
 /datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/M)
 	if(M.color != color)
@@ -122,12 +122,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/kahlua
 	name = "Kahlua"
-	description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
+	description = "A widely known coffee-flavoured liqueur. Still labeled under an old name from Earth, despite the loss of history."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
 	glass_icon_state = "kahluaglass"
-	glass_name = "glass of RR coffee liquor"
-	glass_desc = "DAMN, THIS THING LOOKS ROBUST!"
+	glass_name = "glass of coffee liquor"
+	glass_desc = "Bitter from the coffee and alcohol alike!"
 	shot_glass_icon_state = "shotglasscream"
 
 /datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M)
@@ -141,23 +141,23 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey
 	name = "Whiskey"
-	description = "A superb and well-aged single-malt whiskey. Damn."
+	description = "A well-aged whiskey."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 75
 	taste_description = "molasses"
 	glass_icon_state = "whiskeyglass"
 	glass_name = "glass of whiskey"
-	glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
+	glass_desc = "Often described as having a silky mouthfeel and a smokey aftertaste. The brown-amber color catches the light very well."
 	shot_glass_icon_state = "shotglassbrown"
 
 /datum/reagent/consumable/ethanol/whiskey/kong
 	name = "Kong"
-	description = "Makes You Go Ape!&#174;"
+	description = "Makes You Go Ape!"
 	color = "#332100" // rgb: 51, 33, 0
 	addiction_threshold = 15
 	taste_description = "the grip of a giant ape"
 	glass_name = "glass of Kong"
-	glass_desc = "Makes You Go Ape!&#174;"
+	glass_desc = "Makes You Go Ape!"
 
 /datum/reagent/consumable/ethanol/whiskey/kong/addiction_act_stage1(mob/living/M)
 	if(prob(5))
@@ -200,21 +200,21 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		M.hallucination += hal_amt //conscious dreamers can be treasurers to their own currency
 	..()
 
-/datum/reagent/consumable/ethanol/thirteenloko
-	name = "Thirteen Loko"
-	description = "A potent mixture of caffeine and alcohol."
+/datum/reagent/consumable/ethanol/vimukti
+	name = "Vimukti"
+	description = "A potent, fermented sweet lichen drink from the Shoal."
 	color = "#ce871d"
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	boozepwr = 80
 	quality = DRINK_GOOD
 	overdose_threshold = 60
 	addiction_threshold = 30
-	taste_description = "jitters and death"
-	glass_icon_state = "thirteen_loko_glass"
-	glass_name = "glass of Thirteen Loko"
-	glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
+	taste_description = "oily syrup"
+	glass_icon_state = "vimukti_glass"
+	glass_name = "glass of Vimukti"
+	glass_desc = "A spiritually-taxing drink from the Shoal. Numerous warnings about this drink tell you to not drink too much, lest you incur some sort of wrath... or an overdose of a psychoactive lichen."
 
-/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/ethanol/vimukti/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(0,M.drowsyness-7)
 	M.AdjustSleeping(-40)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -222,12 +222,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		M.Jitter(5)
 	return ..()
 
-/datum/reagent/consumable/ethanol/thirteenloko/overdose_start(mob/living/M)
+/datum/reagent/consumable/ethanol/vimukti/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>Your entire body violently jitters as you start to feel queasy. You really shouldn't have drank all of that [name]!</span>")
 	M.Jitter(20)
 	M.Stun(15)
 
-/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/M)
+/datum/reagent/consumable/ethanol/vimukti/overdose_process(mob/living/M)
 	if(prob(7) && iscarbon(M))
 		var/obj/item/I = M.get_active_held_item()
 		if(I)
@@ -260,18 +260,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	if(prob(1) && iscarbon(M))
 		var/datum/disease/D = new /datum/disease/heart_failure
 		M.ForceContractDisease(D)
-		to_chat(M, "<span class='userdanger'>You're pretty sure you just felt your heart stop for a second there..</span>")
+		to_chat(M, "<span class='userdanger'>You're pretty sure you just felt your heart stop for a second there...</span>")
 		M.playsound_local(M, 'sound/effects/singlebeat.ogg', 100, 0)
 
 /datum/reagent/consumable/ethanol/vodka
 	name = "Vodka"
-	description = "Number one drink that also serves as fuel."
+	description = "A clear, hard liquor. Doubles as a flammable fuel source, if you really need it."
 	color = "#0064C8" // rgb: 0, 100, 200
 	boozepwr = 65
 	taste_description = "grain alcohol"
 	glass_icon_state = "ginvodkaglass"
 	glass_name = "glass of vodka"
-	glass_desc = "The glass contain wodka. Xynta."
+	glass_desc = "It's almost difficult to tell the glass is full of vodka until you tip it around. The smell makes your nose wrinkle... but it might just be worth it."
 	shot_glass_icon_state = "shotglassclear"
 
 /datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M)
@@ -280,14 +280,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bilk
 	name = "Bilk"
-	description = "This appears to be beer mixed with milk. Disgusting."
+	description = "This appears to be beer mixed with milk. Creative...?"
 	color = "#895C4C" // rgb: 137, 92, 76
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	boozepwr = 15
 	taste_description = "desperation and lactate"
 	glass_icon_state = "glass_brown"
 	glass_name = "glass of bilk"
-	glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
+	glass_desc = "A brew of milk and beer. You have to wonder if this was made by accident just from the smell."
 
 /datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(10))
@@ -297,14 +297,14 @@ 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"
-	description = "Made for a woman, strong enough for a man."
+	description = "The extreme version of fruity cocktails."
 	color = "#666340" // rgb: 102, 99, 64
 	boozepwr = 10
 	quality = DRINK_FANTASTIC
-	taste_description = "dryness"
+	taste_description = "sweet dryness"
 	glass_icon_state = "threemileislandglass"
 	glass_name = "Three Mile Island Ice Tea"
-	glass_desc = "A glass of this is sure to prevent a meltdown."
+	glass_desc = "A glass of Three Mile Island Ice Tea, named after a cordoned-off set of islands on Earth, for some reason. You almost can't taste the alcohol in it..."
 
 /datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/M)
 	M.set_drugginess(50)
@@ -312,75 +312,75 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gin
 	name = "Gin"
-	description = "It's gin. In space. I say, good sir."
+	description = "A very sharp alcohol, with a flavor that's distinctly fresh."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
-	taste_description = "an alcoholic christmas tree"
+	taste_description = "an alcoholic pine tree"
 	glass_icon_state = "ginvodkaglass"
 	glass_name = "glass of gin"
-	glass_desc = "A crystal clear glass of Griffeater gin."
+	glass_desc = "A glass of gin, made with a specific type of berry that leaves it smelling like the tree it came from. It's enough to wet your eyes."
 
 /datum/reagent/consumable/ethanol/rum
 	name = "Rum"
-	description = "Yohoho and all that."
+	description = "The liquor of choice for sailors and spacers alike."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60
 	taste_description = "spiked butterscotch"
 	glass_icon_state = "rumglass"
 	glass_name = "glass of rum"
-	glass_desc = "Now you want to Pray for a pirate suit, don't you?"
+	glass_desc = "There's no need to worry about being seen as a pirate with one of these. If you add enough ice and let it melt, it'll turn into grog."
 	shot_glass_icon_state = "shotglassbrown"
 
 /datum/reagent/consumable/ethanol/tequila
 	name = "Tequila"
-	description = "A strong and mildly flavoured, Mexican produced spirit. Feeling thirsty, hombre?"
+	description = "A strongly flavoured spirit."
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 70
 	taste_description = "paint stripper"
 	glass_icon_state = "tequilaglass"
 	glass_name = "glass of tequila"
-	glass_desc = "Now all that's missing is the weird colored shades!"
+	glass_desc = "Despite the strong, woody taste, there's just enough sweetness to keep you coming for more."
 	shot_glass_icon_state = "shotglassgold"
 
 /datum/reagent/consumable/ethanol/vermouth
 	name = "Vermouth"
-	description = "You suddenly feel a craving for a martini..."
+	description = "A fine wine to go with a meal."
 	color = "#91FF91" // rgb: 145, 255, 145
 	boozepwr = 45
 	taste_description = "dry alcohol"
 	glass_icon_state = "vermouthglass"
 	glass_name = "glass of vermouth"
-	glass_desc = "You wonder why you're even drinking this straight."
+	glass_desc = "Vermouth was used as a medicine in the past, and the flavor makes sure to remind you of that."
 	shot_glass_icon_state = "shotglassclear"
 
 /datum/reagent/consumable/ethanol/wine
 	name = "Wine"
-	description = "A premium alcoholic beverage made from distilled grape juice."
+	description = "An alcoholic beverage made from fermented grapes of all kinds."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 35
 	taste_description = "bitter sweetness"
 	glass_icon_state = "wineglass"
 	glass_name = "glass of wine"
-	glass_desc = "A very classy looking drink."
+	glass_desc = "Deeply red wine in a glass. You're not enough of a sommelier to really describe how it smells."
 	shot_glass_icon_state = "shotglassred"
 
 /datum/reagent/consumable/ethanol/lizardwine
-	name = "Kalixcis Wine"
-	description = "A relatively popular Kalixcane beverage, made by infusing cacti in ethanol."
+	name = "Blueflame Pyrecask"
+	description = "A popular Zohil beverage, made by infusing specially-gathered cacti and grapes in ethanol."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 45
 	quality = DRINK_FANTASTIC
-	taste_description = "scaley sweetness"
+	taste_description = "warm sweetness"
 
 /datum/reagent/consumable/ethanol/grappa
 	name = "Grappa"
-	description = "A fine Italian brandy, for when regular wine just isn't alcoholic enough for you."
+	description = "A fine brandy mixed with spirits."
 	color = "#F8EBF1"
 	boozepwr = 60
 	taste_description = "classy bitter sweetness"
 	glass_icon_state = "grappa"
 	glass_name = "glass of grappa"
-	glass_desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
+	glass_desc = "Despite being made from the recycled remains of wine grapes, it's not bad at all."
 
 /datum/reagent/consumable/ethanol/amaretto
 	name = "Amaretto"
@@ -390,28 +390,28 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "fruity and nutty sweetness"
 	glass_icon_state = "amarettoglass"
 	glass_name = "glass of amaretto"
-	glass_desc = "A sweet and syrupy looking drink."
+	glass_desc = "A sweet and syrupy looking alcohol. You're lucky it wasn't lost to history."
 
 /datum/reagent/consumable/ethanol/cognac
 	name = "Cognac"
-	description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
+	description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing."
 	color = "#AB3C05" // rgb: 171, 60, 5
 	boozepwr = 75
-	taste_description = "angry and irish"
+	taste_description = "sharp and relaxing"
 	glass_icon_state = "cognacglass"
 	glass_name = "glass of cognac"
-	glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
+	glass_desc = "You wonder how many exhausted Solarian bureaucrats are drinking this the same way you are, right now."
 	shot_glass_icon_state = "shotglassbrown"
 
 /datum/reagent/consumable/ethanol/absinthe
 	name = "Absinthe"
-	description = "A powerful alcoholic drink. Rumored to cause hallucinations but does not."
+	description = "A powerful alcoholic drink. Rumored to cause hallucinations if taken irresponsibly."
 	color = rgb(10, 206, 0)
 	boozepwr = 80 //Very strong even by default
 	taste_description = "death and licorice"
 	glass_icon_state = "absinthe"
 	glass_name = "glass of absinthe"
-	glass_desc = "It's as strong as it smells."
+	glass_desc = "The smell is enough to bring you to the verge of tears. The hint of liquorice threatens to bring you over the edge."
 	shot_glass_icon_state = "shotglassgreen"
 
 /datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M)
@@ -421,13 +421,13 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hooch
 	name = "Hooch"
-	description = "Either someone's failure at cocktail making or attempt in alcohol production. In any case, do you really want to drink that?"
+	description = "Low quality, low grade, and low expectations."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 100
 	taste_description = "pure resignation"
 	glass_icon_state = "glass_brown2"
 	glass_name = "Hooch"
-	glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+	glass_desc = "You can't help but feel like you'd rather drink anything else right now, just from looking at it."
 
 /datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
 	if(M.mind && M.mind.assigned_role == "Assistant")
@@ -440,67 +440,67 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	description = "A dark alcoholic beverage made with malted barley and yeast."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 65
-	taste_description = "hearty barley ale"
+	taste_description = "hearty alcoholic grains"
 	glass_icon_state = "aleglass"
 	glass_name = "glass of ale"
-	glass_desc = "A freezing pint of delicious Ale."
+	glass_desc = "A pint of ale. A classic for the working class."
 
 /datum/reagent/consumable/ethanol/goldschlager
 	name = "Goldschlager"
-	description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
+	description = "100 proof cinnamon schnapps, made for the Student Unions' unbearable tastes."
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 25
 	quality = DRINK_VERYGOOD
 	taste_description = "burning cinnamon"
 	glass_icon_state = "goldschlagerglass"
 	glass_name = "glass of goldschlager"
-	glass_desc = "100% proof that teen girls will drink anything with gold in it."
+	glass_desc = "Extremely high proof, with cinnamon to boot. At least the light catches the gold flakes nicely enough to distract you from the imminent sting."
 	shot_glass_icon_state = "shotglassgold"
 
 /datum/reagent/consumable/ethanol/patron
 	name = "Patron"
-	description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
+	description = "Tequila with silver in it, often found in nightclubs."
 	color = "#585840" // rgb: 88, 88, 64
 	boozepwr = 60
 	quality = DRINK_VERYGOOD
 	taste_description = "metallic and expensive"
 	glass_icon_state = "patronglass"
 	glass_name = "glass of patron"
-	glass_desc = "Drinking patron in the bar, with all the subpar ladies."
+	glass_desc = "A glass of Patron. The silver is for show, but you can't help but wonder how you would show it off to anyone."
 	shot_glass_icon_state = "shotglassclear"
 
 /datum/reagent/consumable/ethanol/gintonic
 	name = "Gin and Tonic"
-	description = "An all time classic, mild cocktail."
+	description = "A classic cocktail, with quinine for flavor."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 25
 	quality = DRINK_NICE
 	taste_description = "mild and tart"
 	glass_icon_state = "gintonicglass"
 	glass_name = "Gin and Tonic"
-	glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
+	glass_desc = "A mild, venerable cocktail. You wonder if the quinine is doing anything for you."
 
 /datum/reagent/consumable/ethanol/rum_coke
 	name = "Rum and Coke"
 	description = "Rum, mixed with cola."
-	taste_description = "cola"
+	taste_description = "cola and alcohol"
 	boozepwr = 40
 	quality = DRINK_NICE
 	color = "#6b2f01"
 	glass_icon_state = "whiskeycolaglass"
 	glass_name = "Rum and Coke"
-	glass_desc = "The classic go-to of space-fratboys."
+	glass_desc = "The classic for mixing drinks on the fly."
 
 /datum/reagent/consumable/ethanol/cuba_libre
-	name = "Cuba Libre"
-	description = "Viva la Revolucion! Viva Cuba Libre!"
+	name = "Frontier Libre"
+	description = "For a freer Frontier, everywhere!"
 	color = "#692e01"
 	boozepwr = 50
 	quality = DRINK_GOOD
 	taste_description = "a refreshing marriage of citrus and rum"
 	glass_icon_state = "cubalibreglass"
-	glass_name = "Cuba Libre"
-	glass_desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!"
+	glass_name = "Frontier Libre"
+	glass_desc = "A mix of rum, cola, and lime. A favorite of among independent spacers and the Frontiersmen alike, who named it in the spirit of securing a free Frontier."
 
 /datum/reagent/consumable/ethanol/whiskey_cola
 	name = "Whiskey Cola"
@@ -508,55 +508,55 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	color = "#602a00"
 	boozepwr = 70
 	quality = DRINK_NICE
-	taste_description = "cola"
+	taste_description = "sweet soda and bitter alcohol"
 	glass_icon_state = "whiskeycolaglass"
 	glass_name = "whiskey cola"
-	glass_desc = "An innocent-looking mixture of cola and whiskey. Delicious."
+	glass_desc = "An sweet-and-bitter mixture of cola and whiskey."
 
 
 /datum/reagent/consumable/ethanol/martini
 	name = "Classic Martini"
-	description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
+	description = "Vermouth with gin."
 	color = "#9e8c67"
 	boozepwr = 60
 	quality = DRINK_NICE
-	taste_description = "dry class"
+	taste_description = "dry"
 	glass_icon_state = "martiniglass"
 	glass_name = "Classic Martini"
-	glass_desc = "Damn, the bartender even stirred it, not shook it."
+	glass_desc = "Rumored to be a favorite amongst the Evidenzkompanien, much to their chagrin."
 
 /datum/reagent/consumable/ethanol/vodkamartini
 	name = "Vodka Martini"
-	description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
+	description = "Vodka with gin."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 65
 	quality = DRINK_NICE
 	taste_description = "shaken, not stirred"
 	glass_icon_state = "martiniglass"
 	glass_name = "Vodka martini"
-	glass_desc ="A bastardisation of the classic martini. Still great."
+	glass_desc ="Rumored to be a favorite amongst the Verwaltungskompanien, to their entertainment."
 
 /datum/reagent/consumable/ethanol/white_russian
-	name = "White Russian"
-	description = "That's just, like, your opinion, man..."
+	name = "White Gezenan"
+	description = "Cream and vodka."
 	color = "#A68340" // rgb: 166, 131, 64
 	boozepwr = 50
 	quality = DRINK_GOOD
 	taste_description = "bitter cream"
 	glass_icon_state = "whiterussianglass"
-	glass_name = "White Russian"
-	glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
+	glass_name = "White Gezenan"
+	glass_desc = "A mix of traditionally PGF-sourced vodka and cream derived from nut milk. You can still drink this if you're not from Gezena, though."
 
 /datum/reagent/consumable/ethanol/screwdrivercocktail
 	name = "Screwdriver"
-	description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
+	description = "Vodka mixed with orange juice."
 	color = "#A68310" // rgb: 166, 131, 16
 	boozepwr = 55
 	quality = DRINK_NICE
 	taste_description = "oranges"
 	glass_icon_state = "screwdriverglass"
 	glass_name = "Screwdriver"
-	glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
+	glass_desc = "You won't be turning any screws with this, but you're far from lamenting that."
 
 /datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/M)
 	var/static/list/increased_rad_loss = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")
@@ -572,18 +572,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "sweet 'n creamy"
 	glass_icon_state = "booger"
 	glass_name = "Booger"
-	glass_desc = "Ewww..."
+	glass_desc = "The name isn't selling the drink very well, is it..."
 
 /datum/reagent/consumable/ethanol/bloody_mary
 	name = "Bloody Mary"
-	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
+	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 55
 	quality = DRINK_GOOD
 	taste_description = "tomatoes with a hint of lime"
 	glass_icon_state = "bloodymaryglass"
 	glass_name = "Bloody Mary"
-	glass_desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. Tastes like liquid murder."
+	glass_desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. The taste is acquired, and usually acquired through tgrying to use it as a hangover remedy."
 
 /datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/C)
 	if(C.blood_volume < BLOOD_VOLUME_NORMAL)
@@ -592,14 +592,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/brave_bull
 	name = "Brave Bull"
-	description = "It's just as effective as Dutch-Courage!"
+	description = "Liquid courage is as good as any courage!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60
 	quality = DRINK_NICE
 	taste_description = "alcoholic bravery"
 	glass_icon_state = "bravebullglass"
 	glass_name = "Brave Bull"
-	glass_desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
+	glass_desc = "Tequila and coffee liqueur, brought together to give you the will to pick fights. Don't drink enough to ruin your sense of safety, though."
 	var/tough_text
 
 /datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/M)
@@ -615,14 +615,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/tequila_sunrise
 	name = "Tequila Sunrise"
-	description = "Tequila, Grenadine, and Orange Juice."
+	description = "Tequila, grenadine, and orange juice."
 	color = "#FFE48C" // rgb: 255, 228, 140
 	boozepwr = 45
 	quality = DRINK_GOOD
 	taste_description = "oranges with a hint of pomegranate"
 	glass_icon_state = "tequilasunriseglass"
 	glass_name = "tequila Sunrise"
-	glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
+	glass_desc = "You feel a distinct sense of nostalgia - when's the last time you felt the sun on your face?"
 	var/obj/effect/light_holder
 
 /datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_metabolize(mob/living/M)
@@ -643,14 +643,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/toxins_special
 	name = "Toxins Special"
-	description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
+	description = "It's a bit tasteless to name your drink after industrial accidents."
 	color = "#780162"
 	boozepwr = 25
 	quality = DRINK_VERYGOOD
 	taste_description = "spicy toxins"
 	glass_icon_state = "toxinsspecialglass"
 	glass_name = "Toxins Special"
-	glass_desc = "Whoah, this thing is on FIRE!"
+	glass_desc = "Traditionally lit with a welder while the server is blindfolded, but you don't want to cause an ACTUAL accident here."
 	shot_glass_icon_state = "toxinsspecialglass"
 
 /datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M)
@@ -659,15 +659,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beepsky_smash
 	name = "Beepsky Smash"
-	description = "Drink this and prepare for the LAW."
+	description = "A drink for those who pick fights with automated security."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60 //THE FIST OF THE LAW IS STRONG AND HARD
 	quality = DRINK_GOOD
 	metabolization_rate = 0.5
-	taste_description = "JUSTICE"
+	taste_description = "electrified justice"
 	glass_icon_state = "beepskysmashglass"
 	glass_name = "Beepsky Smash"
-	glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
+	glass_desc = "Heavy, hot and strong. Just like the sting of a stunbaton."
 	overdose_threshold = 40
 	var/datum/brain_trauma/special/beepsky/B
 
@@ -700,26 +700,26 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		M.gain_trauma(/datum/brain_trauma/mild/phobia/security, TRAUMA_RESILIENCE_BASIC)
 
 /datum/reagent/consumable/ethanol/irish_cream
-	name = "Irish Cream"
-	description = "Whiskey-imbued cream, what else would you expect from the Irish?"
+	name = "Zohil Cream"
+	description = "Whiskey-imbued cream."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 50
 	quality = DRINK_NICE
 	taste_description = "creamy alcohol"
 	glass_icon_state = "irishcreamglass"
-	glass_name = "Irish Cream"
-	glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
+	glass_name = "Zohil Cream"
+	glass_desc = "Cream mixed with whiskey. Don't expect to learn anything about the Blueflame from just a drink, though."
 
 /datum/reagent/consumable/ethanol/manly_dorf
-	name = "The Manly Dorf"
-	description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
+	name = "The Shortstop"
+	description = "Beer and ale, brought together in a very grain-flavored mix."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 100 //For the manly only
 	quality = DRINK_NICE
-	taste_description = "hair on your chest and your chin"
+	taste_description = "fire in your chest and windburn on your chin"
 	glass_icon_state = "manlydorfglass"
-	glass_name = "The Manly Dorf"
-	glass_desc = "A manly concoction made from Ale and Beer. Intended for true men only."
+	glass_name = "The Shortstop"
+	glass_desc = "A concoction made from ale and beer. Named after a joke that only short people would order this to prove a point."
 	var/dorf_mode
 
 /datum/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/carbon/human/badlands_chugs)
@@ -742,14 +742,14 @@ 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"
-	description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+	description = "The entire liquor cabinet brought together with enough sugar to hide it."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
 	quality = DRINK_VERYGOOD
 	taste_description = "a mixture of cola and alcohol"
 	glass_icon_state = "longislandicedteaglass"
 	glass_name = "Long Island Iced Tea"
-	glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+	glass_desc = "The entire liquor cabinet brought together with enough sugar to hide it."
 
 
 /datum/reagent/consumable/ethanol/moonshine
@@ -763,103 +763,86 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
 
 /datum/reagent/consumable/ethanol/b52
-	name = "B-52"
-	description = "Coffee, Irish Cream, and cognac. You will get bombed."
+	name = "AM-G"
+	description = "Coffee liquor, Zohil Cream, and cognac."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 85
 	quality = DRINK_GOOD
-	taste_description = "angry and irish"
+	taste_description = "angry and intense"
 	glass_icon_state = "b52glass"
-	glass_name = "B-52"
-	glass_desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
+	glass_name = "AM-G"
+	glass_desc = "Coffee liquor, Zohil Cream, and cognac. Enough to make you hide before the blast."
 	shot_glass_icon_state = "b52glass"
 
 /datum/reagent/consumable/ethanol/b52/on_mob_metabolize(mob/living/M)
 	playsound(M, 'sound/effects/explosion_distant.ogg', 100, FALSE)
 
 /datum/reagent/consumable/ethanol/irishcoffee
-	name = "Irish Coffee"
-	description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
+	name = "Gezenan Coffee"
+	description = "Coffee, and alcohol. Traditionally enjoyed in the morning on lazy days."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
 	quality = DRINK_NICE
 	taste_description = "giving up on the day"
 	glass_icon_state = "irishcoffeeglass"
-	glass_name = "Irish Coffee"
-	glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
+	glass_name = "Gezenan Coffee"
+	glass_desc = "Coffee and alcohol. Traditionally enjoyed in the morning on lazy days."
 
 /datum/reagent/consumable/ethanol/margarita
 	name = "Margarita"
-	description = "On the rocks with salt on the rim. Arriba~!"
+	description = "A fruity, tropical drink with a salted rim around the glass."
 	color = "#8CFF8C" // rgb: 140, 255, 140
 	boozepwr = 35
 	quality = DRINK_NICE
 	taste_description = "dry and salty"
 	glass_icon_state = "margaritaglass"
 	glass_name = "Margarita"
-	glass_desc = "On the rocks with salt on the rim. Arriba~!"
+	glass_desc = "On the rocks with salt on the rim. Apparently the name meant something in a language long lost on Earth."
 
 /datum/reagent/consumable/ethanol/black_russian
-	name = "Black Russian"
-	description = "For the lactose-intolerant. Still as classy as a White Russian."
+	name = "Black Rachnid"
+	description = "An alternative take to the White Gezenan. Doubles as an option for those who can't handle lactose."
 	color = "#360000" // rgb: 54, 0, 0
 	boozepwr = 70
 	quality = DRINK_NICE
 	taste_description = "bitterness"
 	glass_icon_state = "blackrussianglass"
-	glass_name = "Black Russian"
-	glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
+	glass_name = "Black Rachnid"
+	glass_desc = "An alternative take to the White Gezenan. Doubles as an option for those who can't handle lactose."
 
 
 /datum/reagent/consumable/ethanol/manhattan
-	name = "Manhattan"
-	description = "The Detective's undercover drink of choice. He never could stomach gin..."
+	name = "Twelve Crossings"
+	description = "A mixed drink popularized by a murder mystery book series from Teceti."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 30
 	quality = DRINK_NICE
 	taste_description = "mild dryness"
 	glass_icon_state = "manhattanglass"
-	glass_name = "Manhattan"
-	glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
-
-
-/datum/reagent/consumable/ethanol/manhattan_proj
-	name = "Manhattan Project"
-	description = "A scientist's drink of choice, for pondering ways to blow up the sector."
-	color = "#664300" // rgb: 102, 67, 0
-	boozepwr = 45
-	quality = DRINK_VERYGOOD
-	taste_description = "death, the destroyer of worlds"
-	glass_icon_state = "proj_manhattanglass"
-	glass_name = "Manhattan Project"
-	glass_desc = "A scientist's drink of choice, for thinking how to blow up the sector."
-
-
-/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/M)
-	M.set_drugginess(30)
-	return ..()
+	glass_name = "Twelve Crossings"
+	glass_desc = "A mixed drink popularized by a murder mystery book series from Teceti. The Detective's undercover drink of choice. He never could stomach gin..."
 
 /datum/reagent/consumable/ethanol/whiskeysoda
 	name = "Whiskey Soda"
-	description = "For the more refined griffon."
+	description = "Whiskey and soda water, a simple mixed drink."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 70
 	quality = DRINK_NICE
 	taste_description = "soda"
 	glass_icon_state = "whiskeysodaglass2"
 	glass_name = "whiskey soda"
-	glass_desc = "Ultimate refreshment."
+	glass_desc = "Bitter and refreshing."
 
 /datum/reagent/consumable/ethanol/antifreeze
 	name = "Anti-freeze"
-	description = "The ultimate refreshment. Not what it sounds like."
+	description = "The ultimate refreshment. Not actually made of antifreeze!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
 	quality = DRINK_NICE
-	taste_description = "Jack Frost's piss"
+	taste_description = "frigid heat"
 	glass_icon_state = "antifreeze"
 	glass_name = "Anti-freeze"
-	glass_desc = "The ultimate refreshment."
+	glass_desc = "Vodka, cream, and ice. No actual antifreeze included, of course."
 
 /datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
@@ -867,14 +850,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/barefoot
 	name = "Barefoot"
-	description = "Barefoot and pregnant."
+	description = "To be enjoyed on the beach or by a pool. You should keep your shoes on, though."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
 	quality = DRINK_VERYGOOD
 	taste_description = "creamy berries"
 	glass_icon_state = "b&p"
 	glass_name = "Barefoot"
-	glass_desc = "Barefoot and pregnant."
+	glass_desc = "To be enjoyed on the beach or by a pool. You should keep your shoes on, though."
 
 /datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/M)
 	if(ishuman(M)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes.
@@ -893,40 +876,40 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "refreshing cold"
 	glass_icon_state = "snowwhite"
 	glass_name = "Snow White"
-	glass_desc = "A cold refreshment."
+	glass_desc = "A cold refreshment of beer and lemon-lime soda. Not exactly princess material, is it?"
 
 /datum/reagent/consumable/ethanol/demonsblood //Prevents the imbiber from being dragged into a pool of blood by a slaughter demon.
 	name = "Demon's Blood"
-	description = "AHHHH!!!!"
+	description = "A mix of two sodas, rum, and... real blood."
 	color = "#820000" // rgb: 130, 0, 0
 	boozepwr = 75
 	quality = DRINK_VERYGOOD
 	taste_description = "sweet tasting iron"
 	glass_icon_state = "demonsblood"
-	glass_name = "Demons Blood"
-	glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
+	glass_name = "Demon's Blood"
+	glass_desc = "A drink made with the blood of the server or the patron, which usually results in said patron being thrown out. While most substitute real blood for a saline solution, that drink is actually referred to as 'Demon's Sweat'."
 
 /datum/reagent/consumable/ethanol/devilskiss //If eaten by a slaughter demon, the demon will regret it.
 	name = "Devil's Kiss"
-	description = "Creepy time!"
+	description = "Asking for a kiss to go with the blood drawing is pushing it."
 	color = "#A68310" // rgb: 166, 131, 16
 	boozepwr = 70
 	quality = DRINK_VERYGOOD
 	taste_description = "bitter iron"
 	glass_icon_state = "devilskiss"
-	glass_name = "Devils Kiss"
-	glass_desc = "Creepy time!"
+	glass_name = "Devil's Kiss"
+	glass_desc = "The boozier cousin of the Demon's Blood. Typically served in a glass shaped to specifically cut and draw blood from the patron's lip... which deters most."
 
 /datum/reagent/consumable/ethanol/vodkatonic
 	name = "Vodka and Tonic"
-	description = "For when a gin and tonic isn't Russian enough."
+	description = "The stronger sibling of the Gin and Tonic."
 	color = "#0064C8" // rgb: 0, 100, 200
 	boozepwr = 70
 	quality = DRINK_NICE
 	taste_description = "tart bitterness"
 	glass_icon_state = "vodkatonicglass"
-	glass_name = "vodka and tonic"
-	glass_desc = "For when a gin and tonic isn't Russian enough."
+	glass_name = "Vodka and Tonic"
+	glass_desc = "The stronger sibling of the Gin and Tonic."
 
 
 /datum/reagent/consumable/ethanol/ginfizz
@@ -943,55 +926,55 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bahama_mama
 	name = "Bahama Mama"
-	description = "A tropical cocktail with a complex blend of flavors."
+	description = "A tropical cocktail with a complex blend of fruity flavors."
 	color = "#FF7F3B" // rgb: 255, 127, 59
 	boozepwr = 35
 	quality = DRINK_GOOD
 	taste_description = "pineapple, coconut, and a hint of coffee"
 	glass_icon_state = "bahama_mama"
 	glass_name = "Bahama Mama"
-	glass_desc = "A tropical cocktail with a complex blend of flavors."
+	glass_desc = "A tropical cocktail with a complex blend of fruity flavors. It makes you think about going on vacation someday..."
 
 /datum/reagent/consumable/ethanol/singulo
 	name = "Singulo"
-	description = "A blue-space beverage!"
+	description = "Named after a tragic industrial accident!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 35
 	quality = DRINK_VERYGOOD
 	taste_description = "concentrated matter"
 	glass_icon_state = "singulo"
 	glass_name = "Singulo"
-	glass_desc = "A blue-space beverage."
+	glass_desc = "Named after a tragic industrial accident involving a singularity escaping containment. This drink doesn't taste particularly commemorative - it's too enjoyable!"
 
 /datum/reagent/consumable/ethanol/sbiten
 	name = "Sbiten"
-	description = "A spicy Vodka! Might be a little hot for the little guys!"
+	description = "Vodka with capsaicin for the extra feeling of intense warmth."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 70
 	quality = DRINK_GOOD
 	taste_description = "hot and spice"
 	glass_icon_state = "sbitenglass"
 	glass_name = "Sbiten"
-	glass_desc = "A spicy mix of Vodka and Spice. Very hot."
+	glass_desc = "Vodka with capsaicin for the extra feeling of intense warmth. Difficult to take large swallows."
 
 /datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(50 * TEMPERATURE_DAMAGE_COEFFICIENT, 0 , M.dna.species.bodytemp_heat_damage_limit) //310.15 is the normal bodytemp.
 	return ..()
 
 /datum/reagent/consumable/ethanol/red_mead
-	name = "Red Mead"
-	description = "The true Viking drink! Even though it has a strange red color."
+	name = "Drop-pod"
+	description = "A commemorative drink, made in the name of those who died during failed orbital drop-pod landings."
 	color = "#C73C00" // rgb: 199, 60, 0
 	boozepwr = 31 //Red drinks are stronger
 	quality = DRINK_GOOD
 	taste_description = "sweet and salty alcohol"
 	glass_icon_state = "red_meadglass"
-	glass_name = "Red Mead"
-	glass_desc = "A true Viking's beverage, made with the blood of their enemies."
+	glass_name = "Drop-pod"
+	glass_desc = "A commemorative drink, made in the name of those who died during failed orbital drop-pod landings. Technically intended to use the blood of your enemies, but..."
 
 /datum/reagent/consumable/ethanol/mead
 	name = "Mead"
-	description = "A Viking drink, though a cheap one."
+	description = "Fermented honey. The gentler sibling to the beer."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	boozepwr = 30
@@ -999,17 +982,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "sweet, sweet alcohol"
 	glass_icon_state = "meadglass"
 	glass_name = "Mead"
-	glass_desc = "A drink from Valhalla."
+	glass_desc = "Fermented honey. The gentler sibling to the beer - and almost just as old."
 
 /datum/reagent/consumable/ethanol/iced_beer
-	name = "Iced Beer"
-	description = "A beer which is so cold the air around it freezes."
+	name = "Iced beer"
+	description = "Iced beer, served in a chilled glass."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 15
 	taste_description = "refreshingly cold"
 	glass_icon_state = "iced_beerglass"
 	glass_name = "iced beer"
-	glass_desc = "A beer so frosty, the air around it freezes."
+	glass_desc = "Iced beer, served in a chilled glass. It's cold enough to leave a trail in the air."
 
 /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp.
@@ -1017,25 +1000,25 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grog
 	name = "Grog"
-	description = "Watered-down rum, Nanotrasen approves!"
+	description = "Watered-down rum, to really stretch out your alcohol rations. A Belter classic."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 1 //Basically nothing
 	taste_description = "a poor excuse for alcohol"
 	glass_icon_state = "grogglass"
 	glass_name = "Grog"
-	glass_desc = "A fine and cepa drink for Space."
+	glass_desc = "Watered-down rum, to really stretch out your alcohol rations. A Belter classic."
 
 
 /datum/reagent/consumable/ethanol/aloe
 	name = "Aloe"
-	description = "So very, very, very good."
+	description = "Zohil Cream and watermelon juice. Mellows out the alcoholic bite for a mild drink."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
 	quality = DRINK_VERYGOOD
 	taste_description = "sweet 'n creamy"
 	glass_icon_state = "aloe"
 	glass_name = "Aloe"
-	glass_desc = "Very, very, very good."
+	glass_desc = "Zohil Cream and watermelon juice. Mellows out the alcoholic bite for a mild drink."
 
 /datum/reagent/consumable/ethanol/andalusia
 	name = "Andalusia"
@@ -1046,51 +1029,51 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "lemons"
 	glass_icon_state = "andalusia"
 	glass_name = "Andalusia"
-	glass_desc = "A nice, strangely named drink."
+	glass_desc = "A nice, strangely named drink. Theoretically named after a particular region on Terra, but no one's quite sure where."
 
 /datum/reagent/consumable/ethanol/alliescocktail
-	name = "Allies Cocktail"
-	description = "A drink made from your allies. Not as sweet as those made from your enemies."
+	name = "Canton Cocktail"
+	description = "A drink intended to be shared across the Solarian cantons."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
 	quality = DRINK_NICE
 	taste_description = "bitter yet free"
 	glass_icon_state = "alliescocktail"
-	glass_name = "Allies cocktail"
-	glass_desc = "A drink made from your allies."
+	glass_name = "Canton cocktail"
+	glass_desc = "A drink intended to be shared across the Solarian cantons."
 
 /datum/reagent/consumable/ethanol/acid_spit
-	name = "Acid Spit"
-	description = "A drink for the daring, can be deadly if incorrectly prepared!"
+	name = "Cracked Moon"
+	description = "Typically made on a dare by CLIP-BARD crews. It's deadly if incorrectly prepared!"
 	color = "#365000" // rgb: 54, 80, 0
 	boozepwr = 70
 	quality = DRINK_VERYGOOD
-	taste_description = "stomach acid"
+	taste_description = "alien stomach acid"
 	glass_icon_state = "acidspitglass"
-	glass_name = "Acid Spit"
-	glass_desc = "A drink from Nanotrasen. Made from live aliens."
+	glass_name = "Cracked Moon"
+	glass_desc = "Typically made on a dare by CLIP-BARD crews. It's deadly if incorrectly prepared!"
 
 /datum/reagent/consumable/ethanol/amasec
-	name = "Amasec"
-	description = "Official drink of the Nanotrasen Gun-Club!"
+	name = "Ren Kirsi"
+	description = "A Teceian drink mainly enjoyed on The Ring and it's sibling colonies."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
 	quality = DRINK_GOOD
 	taste_description = "dark and metallic"
 	glass_icon_state = "amasecglass"
-	glass_name = "Amasec"
-	glass_desc = "Always handy before COMBAT!!!"
+	glass_name = "Ren Kirsi"
+	glass_desc = "There's no way you're getting your hands on metal shavings from The Ring itself, but it's the thought that counts."
 
 /datum/reagent/consumable/ethanol/changelingsting
 	name = "Changeling Sting"
-	description = "You take a tiny sip and feel a burning sensation..."
+	description = "Made by the superstitous. Keeps the changelings away... whereever they may be."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 50
 	quality = DRINK_GOOD
 	taste_description = "your brain coming out your nose"
 	glass_icon_state = "changelingsting"
 	glass_name = "Changeling Sting"
-	glass_desc = "A stingy drink."
+	glass_desc = "Made by the superstitous. Keeps the changelings away... whereever they may be."
 
 /datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/M)
 	if(M.mind) //Changeling Sting assists in the recharging of changeling chemicals.
@@ -1101,26 +1084,26 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..()
 
 /datum/reagent/consumable/ethanol/irishcarbomb
-	name = "Irish Car Bomb"
-	description = "Mmm, tastes like the free Irish state."
+	name = "Lightspeed"
+	description = "A shot of Zohil cream in a pinch of ale, meant to be downed in one chug - hits you as fast as the name."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 25
 	quality = DRINK_GOOD
-	taste_description = "the spirit of Ireland"
+	taste_description = "the rush of hyperspace"
 	glass_icon_state = "irishcarbomb"
-	glass_name = "Irish Car Bomb"
-	glass_desc = "An Irish car bomb."
+	glass_name = "Lightspeed"
+	glass_desc = "A shot of Zohil cream in a pinch of ale, meant to be downed in one chug - hits you as fast as the name."
 
 /datum/reagent/consumable/ethanol/syndicatebomb
-	name = "Syndicate Bomb"
-	description = "Tastes like terrorism!"
+	name = "Gorlex Surprise"
+	description = "Infamously named after the accusations of Syndicate-led bombings of space installations. It's a blast!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 90
 	quality = DRINK_GOOD
-	taste_description = "purified antagonism"
+	taste_description = "anti-Nanotrasen sentiments"
 	glass_icon_state = "syndicatebomb"
-	glass_name = "Syndicate Bomb"
-	glass_desc = "A syndicate bomb."
+	glass_name = "Gorlex Surprise"
+	glass_desc = "Infamously named after the accusations of Syndicate-led bombings of space installations. It's a blast!"
 
 /datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/M)
 	if(prob(5))
@@ -1128,50 +1111,50 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..()
 
 /datum/reagent/consumable/ethanol/hiveminderaser
-	name = "Hivemind Eraser"
+	name = "Hivemind"
 	description = "A vessel of pure flavor."
 	color = "#FF80FC" // rgb: 255, 128, 252
 	boozepwr = 40
 	quality = DRINK_GOOD
 	taste_description = "psychic links"
 	glass_icon_state = "hiveminderaser"
-	glass_name = "Hivemind Eraser"
-	glass_desc = "For when even mindshields can't save you."
+	glass_name = "Hivemind"
+	glass_desc = "A legend around this drink states that drinking this at the same time as someone else links your mind with theirs. Are you going to find out?"
 
 /datum/reagent/consumable/ethanol/erikasurprise
-	name = "Erika Surprise"
-	description = "The surprise is, it's green!"
+	name = "Terraformer Surprise"
+	description = "It's as green as the first terraforming experiments, allegedly."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 35
 	quality = DRINK_VERYGOOD
 	taste_description = "tartness and bananas"
 	glass_icon_state = "erikasurprise"
-	glass_name = "Erika Surprise"
-	glass_desc = "The surprise is, it's green!"
+	glass_name = "Terraformer Surprise"
+	glass_desc = "It's as green as the first terraforming experiments, allegedly."
 
 /datum/reagent/consumable/ethanol/driestmartini
-	name = "Driest Martini"
-	description = "Only for the experienced. You think you see sand floating in the glass."
+	name = "Saltflat"
+	description = "Nigh-dehydratingly dry. Intended to be a challenge."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 65
 	quality = DRINK_GOOD
 	taste_description = "a beach"
 	glass_icon_state = "driestmartiniglass"
-	glass_name = "Driest Martini"
-	glass_desc = "Only for the experienced. You think you see sand floating in the glass."
+	glass_name = "Saltflat"
+	glass_desc = "Nigh-dehydratingly dry. Intended to be a challenge."
 
 /datum/reagent/consumable/ethanol/bananahonk
-	name = "Banana Honk"
-	description = "A drink from Clown Heaven."
+	name = "Creamtruck"
+	description = "A distinctly non-kid friendly equivalent to the ice cream truck."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#FFFF91" // rgb: 255, 255, 140
 	boozepwr = 60
 	quality = DRINK_GOOD
-	taste_description = "a bad joke"
+	taste_description = "bananas and cream"
 	glass_icon_state = "bananahonkglass"
-	glass_name = "Banana Honk"
-	glass_desc = "A drink from Clown Heaven."
+	glass_name = "Creamtruck"
+	glass_desc = "A distinctly non-kid friendly equivalent to the ice cream truck."
 
 /datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/M)
 	if((ishuman(M) && M.job == "Clown") || ismonkey(M))
@@ -1180,16 +1163,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..() || .
 
 /datum/reagent/consumable/ethanol/silencer
-	name = "Silencer"
-	description = "A drink from Mime Heaven."
+	name = "Choker"
+	description = "It takes a moment of quiet to really appreciate some drinks - this one doesn't give you the illusion of choice."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#664300" // rgb: 102, 67, 0
-	boozepwr = 59 //Proof that clowns are better than mimes right here
+	boozepwr = 59
 	quality = DRINK_GOOD
-	taste_description = "a pencil eraser"
+	taste_description = "peace and quiet"
 	glass_icon_state = "silencerglass"
-	glass_name = "Silencer"
-	glass_desc = "A drink from Mime Heaven."
+	glass_name = "Choker"
+	glass_desc = "It takes a moment of quiet to really appreciate some drinks - this one doesn't give you the illusion of choice."
 
 /datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/M)
 	if(ishuman(M) && M.mind?.miming)
@@ -1200,18 +1183,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/drunkenblumpkin
 	name = "Drunken Blumpkin"
-	description = "A weird mix of whiskey and blumpkin juice."
+	description = "A weird mix of whiskey and... chlorine-pumpkin juice?"
 	color = "#1EA0FF" // rgb: 102, 67, 0
 	boozepwr = 50
 	quality = DRINK_VERYGOOD
 	taste_description = "molasses and a mouthful of pool water"
 	glass_icon_state = "drunkenblumpkin"
 	glass_name = "Drunken Blumpkin"
-	glass_desc = "A drink for the drunks."
+	glass_desc = "A drink for the confused hydropon worker."
 
 /datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour.
 	name = "Whiskey Sour"
-	description = "Lemon juice/whiskey/sugar mixture. Moderate alcohol content."
+	description = "A mix of lemon juice, whiskey, and sugar."
 	color = rgb(255, 201, 49)
 	boozepwr = 35
 	quality = DRINK_GOOD
@@ -1222,35 +1205,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hcider
 	name = "Hard Cider"
-	description = "Apple juice, for adults."
+	description = "The alcoholic sibling to apple cider."
 	color = "#CD6839"
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	boozepwr = 25
 	taste_description = "the season that <i>falls</i> between summer and winter"
 	glass_icon_state = "whiskeyglass"
 	glass_name = "hard cider"
-	glass_desc = "Tastes like autumn... no wait, fall!"
+	glass_desc = "Sharper tasting, alcoholic apple cider."
 	shot_glass_icon_state = "shotglassbrown"
 
-
-/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"
-	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
-	quality = DRINK_VERYGOOD
-	metabolization_rate = 0.1 * REAGENTS_METABOLISM
-	taste_description = "charged metal" // the same as teslium, honk honk.
-	glass_icon_state = "fetching_fizz"
-	glass_name = "Fetching Fizz"
-	glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
-
-
-/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/M)
-	for(var/obj/item/stack/ore/O in orange(3, M))
-		step_towards(O, get_turf(M))
-	return ..()
-
 //Another reference. Heals those in critical condition extremely quickly.
 /datum/reagent/consumable/ethanol/hearty_punch
 	name = "Hearty Punch"
@@ -1262,7 +1226,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "bravado in the face of disaster"
 	glass_icon_state = "hearty_punch"
 	glass_name = "Hearty Punch"
-	glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
+	glass_desc = "An aromatic beverage, served piping hot. According to folktales, it can almost wake the dead."
 
 /datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/M)
 	if(M.health <= 0)
@@ -1295,7 +1259,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "da bomb"
 	glass_icon_state = "atomicbombglass"
 	glass_name = "Atomic Bomb"
-	glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
+	glass_desc = "Devastating to you and everyone around you, especially if you get drunk enough from it."
 
 /datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M)
 	M.set_drugginess(50)
@@ -1353,7 +1317,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	metabolization_rate = 1 * REAGENTS_METABOLISM
 	glass_icon_state = "neurotoxinglass"
 	glass_name = "Neurotoxin"
-	glass_desc = "A drink that is guaranteed to knock you silly."
+	glass_desc = "The story goes that this drink was made on a bet between Cybersun chemists, debating if a drink could be used to put down a suspected Nanotrasen spy. While morphine wasn't <i>supposed</i> to be used, it put them down all the same."
 
 /datum/reagent/consumable/ethanol/neurotoxin/proc/pickt()
 	return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG))
@@ -1365,7 +1329,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	if(prob(20))
 		M.adjustStaminaLoss(10)
 		M.drop_all_held_items()
-		to_chat(M, "<span class='notice'>You cant feel your hands!</span>")
+		to_chat(M, "<span class='notice'>You can't feel your hands!</span>")
 	if(current_cycle > 5)
 		if(prob(20))
 			var/t = pickt()
@@ -1390,17 +1354,17 @@ 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"
-	description = "You just don't get it maaaan."
+	name = "Between the Mandibles"
+	description = "Mushroom-supplied hallucinogens and strong alcohol."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 0
 	boozepwr = 0 //custom drunk effect
 	quality = DRINK_FANTASTIC
 	metabolization_rate = 0.2 * REAGENTS_METABOLISM
-	taste_description = "giving peace a chance"
+	taste_description = "two finger-sized bites on your tongue"
 	glass_icon_state = "hippiesdelightglass"
-	glass_name = "Hippie's Delight"
-	glass_desc = "A drink enjoyed by people during the 1960's."
+	glass_name = "Between the Mandibles"
+	glass_desc = "Named after a request from a clueless spacer who asked for Rachnid venom to be mixed in a house special. While Rachnids don't have venom glands, this'll have you reeling all the same."
 
 /datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/M)
 	if (!M.slurring)
@@ -1436,7 +1400,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/eggnog
 	name = "Eggnog"
-	description = "For enjoying the most wonderful time of the year."
+	description = "For enjoying the Winter Solstice."
 	color = "#fcfdc6" // rgb: 252, 253, 198
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	boozepwr = 1
@@ -1444,34 +1408,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "custard and alcohol"
 	glass_icon_state = "glass_yellow"
 	glass_name = "eggnog"
-	glass_desc = "For enjoying the most wonderful time of the year."
-
-
-/datum/reagent/consumable/ethanol/narsour
-	name = "Nar'Sour"
-	description = "Side effects include self-mutilation and hoarding plasteel."
-	color = RUNE_COLOR_DARKRED
-	boozepwr = 10
-	quality = DRINK_FANTASTIC
-	taste_description = "bloody"
-	glass_icon_state = "narsour"
-	glass_name = "Nar'Sour"
-	glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!"
-
-/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/M)
-	M.cultslurring = min(M.cultslurring + 3, 3)
-	M.stuttering = min(M.stuttering + 3, 3)
-	..()
+	glass_desc = "For enjoying the Winter Solstice."
 
 /datum/reagent/consumable/ethanol/triple_sec
 	name = "Triple Sec"
 	description = "A sweet and vibrant orange liqueur."
 	color = "#ffcc66"
 	boozepwr = 30
-	taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean"
+	taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of distant shores"
 	glass_icon_state = "glass_orange"
 	glass_name = "Triple Sec"
-	glass_desc = "A glass of straight Triple Sec."
+	glass_desc = "A glass of straight triple sec. Citrusy and warm."
 
 /datum/reagent/consumable/ethanol/creme_de_menthe
 	name = "Creme de Menthe"
@@ -1481,17 +1428,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "a minty, cool, and invigorating splash of cold streamwater"
 	glass_icon_state = "glass_green"
 	glass_name = "Creme de Menthe"
-	glass_desc = "You can almost feel the first breath of spring just looking at it."
+	glass_desc = "Bright green and minty - enough to tell you what it's going to taste like."
 
 /datum/reagent/consumable/ethanol/creme_de_cacao
 	name = "Creme de Cacao"
-	description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
+	description = "A chocolatey liqueur excellent for adding dessert notes to beverages."
 	color = "#996633"
 	boozepwr = 20
 	taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol"
 	glass_icon_state = "glass_brown"
 	glass_name = "Creme de Cacao"
-	glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
+	glass_desc = "Creme de Cacao - chocolate-wine, essentially. Not milk chocolate, so expect some bite."
 
 /datum/reagent/consumable/ethanol/creme_de_coconut
 	name = "Creme de Coconut"
@@ -1501,7 +1448,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "a sweet milky flavor with notes of toasted sugar"
 	glass_icon_state = "glass_white"
 	glass_name = "Creme de Coconut"
-	glass_desc = "An unintimidating glass of coconut liqueur."
+	glass_desc = "A white glass of coconut liqueur."
 
 /datum/reagent/consumable/ethanol/quadruple_sec
 	name = "Quadruple Sec"
@@ -1509,10 +1456,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	color = "#cc0000"
 	boozepwr = 35
 	quality = DRINK_GOOD
-	taste_description = "an invigorating bitter freshness which suffuses your being; no enemy of the corporation will go unrobusted this day"
+	taste_description = "an invigorating bitter freshness which suffuses your being; you can take on anyone who messes with your vessel"
 	glass_icon_state = "quadruple_sec"
 	glass_name = "Quadruple Sec"
-	glass_desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though."
+	glass_desc = "A glass of Quadruple Sec. Popularized for being a mixed drink of choice across multiple independent security agencies, and notably among Nanotrasen's internal security culture. It's not recommended to drink while manning a vessel, though!"
 
 /datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/M)
 	//Securidrink in line with the Screwdriver for engineers or Nothing for mimes
@@ -1524,14 +1471,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/quintuple_sec
 	name = "Quintuple Sec"
-	description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE."
+	description = "Law, order and alcohol distilled into one single elixir."
 	color = "#ff3300"
 	boozepwr = 55
 	quality = DRINK_FANTASTIC
-	taste_description = "THE LAW"
+	taste_description = "drinking on duty"
 	glass_icon_state = "quintuple_sec"
 	glass_name = "Quintuple Sec"
-	glass_desc = "Now you are become law, destroyer of clowns."
+	glass_desc = "The logical endpoint of the Quadruple Sec. Often had in the hands of senior security staff, though you <i>really</i> should not be drinking this while on-duty."
 
 /datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M)
 	//Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG..
@@ -1546,14 +1493,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grasshopper
 	name = "Grasshopper"
-	description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this."
+	description = "A fresh and sweet dessert shooter."
 	color = "#00ff00"
 	boozepwr = 25
 	quality = DRINK_GOOD
 	taste_description = "chocolate and mint dancing around your mouth"
 	glass_icon_state = "grasshopper"
 	glass_name = "Grasshopper"
-	glass_desc = "You weren't aware edible beverages could be that green."
+	glass_desc = "Named after a particularly green insect. Theoretically, there's always adding vodka to this and making it a Flying Grasshopper..."
 
 /datum/reagent/consumable/ethanol/stinger
 	name = "Stinger"
@@ -1564,7 +1511,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "a slap on the face in the best possible way"
 	glass_icon_state = "stinger"
 	glass_name = "Stinger"
-	glass_desc = "You wonder what would happen if you pointed this at a heat source..."
+	glass_desc = "A brandy-and-menthe mixed drink to end the day with. While often found in the hands of the upper class, there's nothing wrong with feeling a little fancy."
 
 /datum/reagent/consumable/ethanol/bastion_bourbon
 	name = "Bastion Bourbon"
@@ -1664,13 +1611,13 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sake
 	name = "Sake"
-	description = "A sweet rice wine of questionable legality and extreme potency."
+	description = "A sweet rice wine."
 	color = "#DDDDDD"
 	boozepwr = 70
 	taste_description = "sweet rice wine"
 	glass_icon_state = "sakecup"
 	glass_name = "cup of sake"
-	glass_desc = "A traditional cup of sake."
+	glass_desc = "A cup of sake. Capable of being served hot, cold, or at room temperature, and served in a traditionally-sized little cup."
 
 /datum/reagent/consumable/ethanol/peppermint_patty
 	name = "Peppermint Patty"
@@ -1681,7 +1628,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	quality = DRINK_GOOD
 	glass_icon_state = "peppermint_patty"
 	glass_name = "Peppermint Patty"
-	glass_desc = "A boozy minty hot cocoa that warms your belly on a cold night."
+	glass_desc = "A boozy, minty hot cocoa that warms your belly on a cold night."
 
 /datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M)
 	M.apply_status_effect(/datum/status_effect/throat_soothed)
@@ -1689,15 +1636,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	..()
 
 /datum/reagent/consumable/ethanol/alexander
-	name = "Alexander"
-	description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx."
+	name = "Ash-Shield"
+	description = "While not a traditional trickwine by any means, this mix is said to embolden a user's shield under certain circumstance."
 	color = "#F5E9D3"
 	boozepwr = 50
 	quality = DRINK_GOOD
 	taste_description = "bitter, creamy cacao"
 	glass_icon_state = "alexander"
-	glass_name = "Alexander"
-	glass_desc = "A creamy, indulgent delight that is stronger than it seems."
+	glass_name = "Ash-Shield"
+	glass_desc = "While not a traditional trickwine by any means (and considered in poor taste in mixing), this drink is said to embolden the shield in the imbiber's hand. Just don't let it engender passivity."
 	var/obj/item/shield/mighty_shield
 
 /datum/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/L)
@@ -1721,37 +1668,37 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	..()
 
 /datum/reagent/consumable/ethanol/amaretto_alexander
-	name = "Amaretto Alexander"
-	description = "A weaker version of the Alexander, what it lacks in strength it makes up for in flavor."
+	name = "Happy Huntsman"
+	description = "A cousin of the Ash-Shield, what it lacks in strength (and mysterious power), it makes up for in flavor."
 	color = "#DBD5AE"
 	boozepwr = 35
 	quality = DRINK_VERYGOOD
 	taste_description = "sweet, creamy cacao"
 	glass_icon_state = "alexanderam"
-	glass_name = "Amaretto Alexander"
-	glass_desc = "A creamy, indulgent delight that is in fact as gentle as it seems."
+	glass_name = "Happy Huntsman"
+	glass_desc = "A gentle, creamy drink, enjoyed on rare occasions by the Saint Roumain's followers."
 
 /datum/reagent/consumable/ethanol/sidecar
-	name = "Sidecar"
-	description = "The one ride you'll gladly give up the wheel for."
+	name = "Bridge Bunny"
+	description = "You're happy to not pilot the ship after having one of these."
 	color = "#FFC55B"
 	boozepwr = 45
 	quality = DRINK_GOOD
 	taste_description = "delicious freedom"
 	glass_icon_state = "sidecar"
-	glass_name = "Sidecar"
-	glass_desc = "The one ride you'll gladly give up the wheel for."
+	glass_name = "Bridge Bunny"
+	glass_desc = "You're happy to not pilot the ship after having one of these."
 
 /datum/reagent/consumable/ethanol/between_the_sheets
 	name = "Between the Sheets"
-	description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap."
+	description = "A provocatively named classic."
 	color = "#F4C35A"
 	boozepwr = 55
 	quality = DRINK_GOOD
-	taste_description = "seduction"
+	taste_description = "rum, lemons, and mild embarrassment"
 	glass_icon_state = "between_the_sheets"
 	glass_name = "Between the Sheets"
-	glass_desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy."
+	glass_desc = "Also known as The Maiden's Prayer, if you're not willing to say the original name aloud."
 
 /datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L)
 	..()
@@ -1767,15 +1714,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 			L.adjustFireLoss(-0.2)
 
 /datum/reagent/consumable/ethanol/kamikaze
-	name = "Kamikaze"
-	description = "Divinely windy."
+	name = "Mothball"
+	description = "Vodka, triple sec, and lime juice. Moth dust not usually included."
 	color = "#EEF191"
 	boozepwr = 60
 	quality = DRINK_GOOD
-	taste_description = "divine windiness"
+	taste_description = "fluttery sour-sweetness"
 	glass_icon_state = "kamikaze"
-	glass_name = "Kamikaze"
-	glass_desc = "Divinely windy."
+	glass_name = "Mothball"
+	glass_desc = "Made in an attempt to commemorate the supposed original place mothpeople were created in, though it was since disproven. While moth dust <i>could</i> be used as a garnish, don't go asking for it unless you are one."
 
 /datum/reagent/consumable/ethanol/mojito
 	name = "Mojito"
@@ -1789,15 +1736,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "A drink that looks as refreshing as it tastes."
 
 /datum/reagent/consumable/ethanol/moscow_mule
-	name = "Moscow Mule"
-	description = "A chilly drink that reminds you of the Derelict."
+	name = "Gorlex Gator"
+	description = "A chilly drink made in remembrance of Gorlex IV."
 	color = "#EEF1AA"
 	boozepwr = 30
 	quality = DRINK_GOOD
 	taste_description = "refreshing spiciness"
 	glass_icon_state = "moscow_mule"
-	glass_name = "Moscow Mule"
-	glass_desc = "A chilly drink that reminds you of the Derelict."
+	glass_name = "Gorlex Gator"
+	glass_desc = "A chilly drink made in remembrance of Gorlex IV. It's not a wise idea to go ordering this when the PGF are in town, though."
 
 /datum/reagent/consumable/ethanol/fernet
 	name = "Fernet"
@@ -1806,7 +1753,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	boozepwr = 80
 	taste_description = "utter bitterness"
 	glass_name = "glass of fernet"
-	glass_desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum
+	glass_desc = "A glass of pure Fernet. Intensely bitter and reserved to being a digestive more than something to be enjoyed." //Hi Kevum
 
 /datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M)
 	if(M.nutrition <= NUTRITION_LEVEL_STARVING)
@@ -1816,15 +1763,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..()
 
 /datum/reagent/consumable/ethanol/fernet_cola
-	name = "Fernet Cola"
+	name = "Weldline"
 	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,
 	boozepwr = 25
 	quality = DRINK_NICE
 	taste_description = "sweet relief"
 	glass_icon_state = "godlyblend"
-	glass_name = "glass of fernet cola"
-	glass_desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass."
+	glass_name = "glass of weldline"
+	glass_desc = "A shorn-off cola bottle filled with fernet and cola soft drink. A tradition among cargo workers and hull technicians is to use a welder to cut the cola can in half."
 
 /datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/M)
 	if(M.nutrition <= NUTRITION_LEVEL_STARVING)
@@ -1834,7 +1781,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..()
 
 /datum/reagent/consumable/ethanol/fanciulli
-
 	name = "Fanciulli"
 	description = "What if the Manhattan cocktail ACTUALLY used a bitter herb liquour? Helps you sober up." //also causes a bit of stamina damage to symbolize the afterdrink lazyness
 	color = "#CA933F" // rgb: 202, 147, 63
@@ -1843,7 +1789,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "a sweet sobering mix"
 	glass_icon_state = "fanciulli"
 	glass_name = "glass of fanciulli"
-	glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet."
+	glass_desc = "A glass of Fanciulli: a Manhattan with fernet mixed in. Bitter enough to knock some sense into your drunk self."
 
 /datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/M)
 	M.adjust_nutrition(-5)
@@ -1858,15 +1804,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 
 /datum/reagent/consumable/ethanol/branca_menta
-	name = "Branca Menta"
+	name = "Mirage"
 	description = "A refreshing mixture of bitter Fernet with mint creme liquour."
 	color = "#4B5746" // rgb: 75, 87, 70
 	boozepwr = 35
 	quality = DRINK_GOOD
 	taste_description = "a bitter freshness"
 	glass_icon_state= "minted_fernet"
-	glass_name = "glass of branca menta"
-	glass_desc = "A glass of Branca Menta, perfect for those lazy and hot Sunday summer afternoons." //Get lazy literally by drinking this
+	glass_name = "glass of Mirage"
+	glass_desc = "A glass of fernet and mint creme liquor, enjoyed on the warmer days on Teceti." //Get lazy literally by drinking this
 
 
 /datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/M)
@@ -2014,7 +1960,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "auspicious occasions and bad decisions"
 	glass_icon_state = "champagne_glass"
 	glass_name = "Champagne"
-	glass_desc = "The flute clearly displays the slowly rising bubbles."
+	glass_desc = "A sparkling wine, traditionally served in a flute that clearly displays the slowly rising bubbles."
 
 
 /datum/reagent/consumable/ethanol/wizz_fizz
@@ -2023,7 +1969,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	color = "#4235d0" //Just pretend that the triple-sec was blue curacao.
 	boozepwr = 50
 	quality = DRINK_GOOD
-	taste_description = "friendship! It is magic, after all"
+	taste_description = "whimsy and carbonation"
 	glass_icon_state = "wizz_fizz"
 	glass_name = "Wizz Fizz"
 	glass_desc = "The glass bubbles and froths with an almost magical intensity."
@@ -2037,48 +1983,36 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..()
 
 /datum/reagent/consumable/ethanol/bug_spray
-	name = "Bug Spray"
+	name = "Stunball"
 	description = "A harsh, acrid, bitter drink, for those who need something to brace themselves."
 	color = "#33ff33"
 	boozepwr = 50
 	quality = DRINK_GOOD
-	taste_description = "the pain of ten thousand slain mosquitos"
+	taste_description = "the distinct sense of drinking diluted poison"
 	glass_icon_state = "bug_spray"
-	glass_name = "Bug Spray"
-	glass_desc = "Your eyes begin to water as the sting of alcohol reaches them."
-
-/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M)
-//Bugs should not drink Bug spray.
-	if(ismoth(M) || isflyperson(M) || isspiderperson(M))
-		M.adjustToxLoss(1,0)
-	return ..()
-/datum/reagent/consumable/ethanol/bug_spray/on_mob_metabolize(mob/living/carbon/M)
-
-	if(ismoth(M) || isflyperson(M))
-		M.emote("scream")
-	return ..()
-
+	glass_name = "Stunball"
+	glass_desc = "Made in protest of the Mothball mixed drink being recognized by the Interstellar Bartenders Association, who refute the idea of a singular point of origin. The taste is as spiteful as its history."
 
 /datum/reagent/consumable/ethanol/applejack
 	name = "Applejack"
-	description = "The perfect beverage for when you feel the need to horse around."
+	description = "The officially sponsored drink by the National Association for Anti-Gravity Automobile Dragracing (NAAGAD)."
 	color = "#ff6633"
 	boozepwr = 20
-	taste_description = "an honest day's work at the orchard"
+	taste_description = "resisting gravity through brandy"
 	glass_icon_state = "applejack_glass"
 	glass_name = "Applejack"
-	glass_desc = "You feel like you could drink this all neight."
+	glass_desc = "You lament you can't watch any Agrav Races while out here."
 
 /datum/reagent/consumable/ethanol/jack_rose
-	name = "Jack Rose"
-	description = "A light cocktail perfect for sipping with a slice of pie."
+	name = "Jackalope"
+	description = "A light cocktail named after a famous anti-gravity racer."
 	color = "#ff6633"
 	boozepwr = 15
 	quality = DRINK_NICE
 	taste_description = "a sweet and sour slice of apple"
 	glass_icon_state = "jack_rose"
-	glass_name = "Jack Rose"
-	glass_desc = "Enough of these, and you really will start to suppose your toeses are roses."
+	glass_name = "Jackalope"
+	glass_desc = "Enough of these, and you might feel like you're floating. Just don't think you can pilot!"
 
 /datum/reagent/consumable/ethanol/turbo
 	name = "Turbo"
@@ -2089,11 +2023,11 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "the outlaw spirit"
 	glass_icon_state = "turbo"
 	glass_name = "Turbo"
-	glass_desc = "A turbulent cocktail for outlaw hoverbikers."
+	glass_desc = "A turbulent cocktail for outlaw hoverbikers. Not officially recognized by National Association for Anti-Gravity Automobile Dragracing (NAAGAD)... but they're sticks in the mud, anyway!"
 
 /datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/M)
 	if(prob(4))
-		to_chat(M, "<span class='notice'>[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]</span>")
+		to_chat(M, "<span class='notice'>[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing...")]</span>")
 	M.adjustStaminaLoss(-M.drunkenness * 0.25)
 	return ..()
 
@@ -2106,7 +2040,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "simpler times"
 	glass_icon_state = "old_timer"
 	glass_name = "Old Timer"
-	glass_desc = "WARNING! May cause premature aging!"
+	glass_desc = "You might not be the target audience of this drink if you're still out in the Frontier, though."
 
 /datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/M)
 	if(prob(20))
@@ -2119,9 +2053,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 				N.update_hair()
 				if(N.age > N.dna.species.species_age_max * 0.8)
 					N.become_nearsighted(type)
-					if(N.gender == MALE)
-						N.facial_hairstyle = "Beard (Very Long)"
-						N.update_hair()
 
 				if(N.age > N.dna.species.species_age_max * 1.2) //Best not let people get older than this or i might incur G-ds wrath
 					M.visible_message("<span class='notice'>[M] becomes older than any man should be.. and crumbles into dust!</span>")
@@ -2135,49 +2066,42 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	color = "#ffe65b"
 	boozepwr = 60
 	quality = DRINK_GOOD
-	taste_description = "artifical fruityness"
+	taste_description = "artifical fruitiness"
 	glass_icon_state = "rubberneck"
 	glass_name = "Rubberneck"
-	glass_desc = "A popular drink amongst those adhering to an all synthetic diet."
+	glass_desc = "A popular drink amongst those adhering to an all-synthetic diet, popularized briefly as a counterculture movement."
 
 /datum/reagent/consumable/ethanol/duplex
-	name = "Duplex"
+	name = "North-South"
 	description = "An inseparable combination of two fruity drinks."
 	color = "#50e5cf"
 	boozepwr = 25
 	quality = DRINK_NICE
 	taste_description = "green apples and blue raspberries"
 	glass_icon_state = "duplex"
-	glass_name = "Duplex"
-	glass_desc = "To imbibe one component separately from the other is consider a great faux pas."
+	glass_name = "North-South"
+	glass_desc = "A fruity drink made, apparently, to represent North and South Teceti. You're supposed to hold it in a way that both vials pour together - one on top of the other."
 
 /datum/reagent/consumable/ethanol/trappist
-	name = "Trappist Beer"
-	description = "A strong dark ale brewed by space-monks."
+	name = "Trapper's Beer"
+	description = "A strong dark ale brewed by the Saint Roumain Militia."
 	color = "#390c00"
 	boozepwr = 40
 	quality = DRINK_VERYGOOD
-	taste_description = "dried plums and malt"
+	taste_description = "dried plums, ash, and malt"
 	glass_icon_state = "trappistglass"
-	glass_name = "Trappist Beer"
-	glass_desc = "boozy Catholicism in a glass."
-
-/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/M)
-	if(M.mind.holy_role)
-		M.adjustFireLoss(-2.5, 0)
-		M.jitteriness = max(0, M.jitteriness-1)
-		M.stuttering = max(0, M.stuttering-1)
-	return ..()
+	glass_name = "Trapper's Beer"
+	glass_desc = "The Ashen Huntsman's blessings, in a glass. Despite proclaiming an ascetic lifestyle, it's okay to have a little fun once in a while."
 
 /datum/reagent/consumable/ethanol/blazaam
-	name = "Blazaam"
-	description = "A strange drink that few people seem to remember existing. Doubles as a Berenstain remover."
+	name = "Hyperspace Highball"
+	description = "A strange drink mixed with bluespace crystal flakes, which is already extremely expensive on its own merit."
 	boozepwr = 70
 	quality = DRINK_FANTASTIC
 	taste_description = "alternate realities"
 	glass_icon_state = "blazaamglass"
-	glass_name = "Blazaam"
-	glass_desc = "The glass seems to be sliding between realities. Doubles as a Berenstain remover."
+	glass_name = "Hyperspace Highball"
+	glass_desc = "The glass is seemingly reacting with the bluespace flakes... maybe making this was a poor decision?"
 	var/stored_teleports = 0
 
 /datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/M)
@@ -2192,15 +2116,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	return ..()
 
 /datum/reagent/consumable/ethanol/mauna_loa
-	name = "Mauna Loa"
+	name = "Inner Fire"
 	description = "Extremely hot; not for the faint of heart!"
 	boozepwr = 40
 	color = "#fe8308" // 254, 131, 8
 	quality = DRINK_FANTASTIC
 	taste_description = "fiery, with an aftertaste of burnt flesh"
 	glass_icon_state = "mauna_loa"
-	glass_name = "Mauna Loa"
-	glass_desc = "Lavaland in a drink... mug... volcano... thing."
+	glass_name = "Inner Fire"
+	glass_desc = "Not at all made by the Saint Roumain, this drink still bases itself as a test of will used by the hunters to test their endurance to intense heat... and alcohol."
 
 /datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M)
 	// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
@@ -2219,7 +2143,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "sugary tartness"
 	glass_icon_state = "painkiller"
 	glass_name = "Painkiller"
-	glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better."
+	glass_desc = "A combination of tropical juices and rum. Surely, this will make you feel better."
 
 /datum/reagent/consumable/ethanol/pina_colada
 	name = "Pina Colada"
@@ -2236,12 +2160,12 @@ All effects don't start immediately, but rather get worse over time; the rate is
 /datum/reagent/consumable/ethanol/pruno // pruno mix is in drink_reagents
 	name = "pruno"
 	color = "#E78108"
-	description = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done."
+	description = "Fermented prison wine made from fruit, sugar, and despair."
 	boozepwr = 85
-	taste_description = "your tastebuds being individually shanked"
+	taste_description = "your tastebuds crying out"
 	glass_icon_state = "glass_orange"
 	glass_name = "glass of pruno"
-	glass_desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done."
+	glass_desc = "Fermented prison wine made from fruit, sugar, and despair."
 
 /datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/M)
 	M.adjust_disgust(5)
@@ -2256,7 +2180,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "sweetness followed by a soft sourness and warmth"
 	glass_icon_state = "gingeramaretto"
 	glass_name = "Ginger Amaretto"
-	glass_desc = "The sprig of rosemary adds a nice aroma to the drink, and isn't just to be pretentious afterall!"
+	glass_desc = "Technically intended to come with a sprig of rosemary... but where are you going to get your hands on that?"
 
 /datum/reagent/consumable/ethanol/godfather
 	name = "Godfather"
@@ -2267,28 +2191,28 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "a delightful softened punch"
 	glass_icon_state = "godfather"
 	glass_name = "Godfather"
-	glass_desc = "A classic from old Italy and enjoyed by gangsters, pray the orange peel doesnt end up in your mouth."
+	glass_desc = "Technically still enjoyed by members of the Intersolar Mafia, though the homage is much older. Pray the orange peel doesn't end up in your mouth."
 
 /datum/reagent/consumable/ethanol/godmother
 	name = "Godmother"
-	description = "A twist on a classic, liked more by mature women."
+	description = "A twist on a classic, made as a sibling drink to the Godfather."
 	boozepwr = 50
 	color = "#E68F00"
 	quality = DRINK_GOOD
 	taste_description = "sweetness and a zesty twist"
 	glass_icon_state = "godmother"
 	glass_name = "Godmother"
-	glass_desc = "A lovely fresh smelling cocktail, a true Sicilian delight."
+	glass_desc = "Just as enjoyed (and related to) the Intersolar Mafia. You're technically supposed to drink this alongside someone else having a Godfather."
 
 /datum/reagent/consumable/ethanol/mudders_milk
-	name = "mudder's milk"
+	name = "Miner's Milk"
 	color = "#dfc794"
-	description = "All the protein, vitamins and carbs of your grandma's best turkey dinner, plus 15 percent alcohol."
+	description = "All the protein, vitamins and carbs of two full ration packs, plus 15% alcohol."
 	boozepwr = 15
-	taste_description = "thick, nutty milk with a boozy kick"
+	taste_description = "thick, nut-flavored milk with a boozy kick"
 	glass_icon_state = "muddersmilk"
-	glass_name = "Mudder's Milk"
-	glass_desc = "All the protein, vitamins and carbs of your grandma's best turkey dinner, plus 15 percent alcohol."
+	glass_name = "Miner's Milk"
+	glass_desc = "All the protein, vitamins and carbs of two full ration packs, plus 15% alcohol. Created by Nanotrasen's Mining and Exploration League, and often still enjoyed in the New Gorlex Republic."
 
 /datum/reagent/consumable/ethanol/mudders_milk/on_mob_life(mob/living/carbon/M)
 	if(prob(1))
@@ -2338,15 +2262,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	..()
 
 /datum/reagent/consumable/ethanol/freezer_burn
-	name = "Freezer Burn"
+	name = "Hullbreach"
 	description = "Fire and ice combine in your mouth! Drinking slowly recommended."
 	boozepwr = 40
 	color = "#ba3100"
 	quality = DRINK_FANTASTIC
-	taste_description = "fire and ice"
+	taste_description = "frigid, hot stings"
 	glass_icon_state = "freezer_burn"
-	glass_name = "Freezer Burn"
-	glass_desc = "Fire and ice combine in your mouth! Drinking slowly recommended."
+	glass_name = "Hullbreach"
+	glass_desc = "Fire and ice combine in your mouth, like being pulled out into space."
 
 /datum/reagent/consumable/ethanol/freezer_burn/on_mob_life(mob/living/carbon/M)
 	M.adjustFireLoss(-0.2, 0)
@@ -2374,14 +2298,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/darkest_chocolate
 	name = "Darkest Chocolate"
-	description = "Darkness within darkness awaits you, spaceman!"
+	description = "Darkness within darkness awaits you, spacer!"
 	boozepwr = 40
 	color = "#240c0c"
 	quality = DRINK_FANTASTIC
 	taste_description = "bitter, chocolatey darkness with a note of cream"
 	glass_icon_state = "darkest_chocolate"
 	glass_name = "Darkest Chocolate"
-	glass_desc = "Darkness within darkness awaits you, spaceman!"
+	glass_desc = "Darkness within darkness awaits you, spacer!"
 	var/obj/effect/light_holder
 
 /datum/reagent/consumable/ethanol/darkest_chocolate/on_mob_metabolize(mob/living/M)
@@ -2400,28 +2324,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	to_chat(M, "<span class='notice'>The darkness subsides.</span>")
 	QDEL_NULL(light_holder)
 
-/datum/reagent/consumable/ethanol/archmagus_brew
-	name = "Archmagus' Brew"
-	description = "Said to have been requested by a great Archmagus, hence the name. Tastes like tough love."
-	boozepwr = 40
-	color = "#c75295"
-	quality = DRINK_FANTASTIC
-	taste_description = "tough love"
-	glass_icon_state = "archmagus_brew"
-	glass_name = "Archmagus' Brew"
-	glass_desc = "Said to have been requested by a great Archmagus, hence the name. Tastes like tough love."
-
-/datum/reagent/consumable/ethanol/archmagus_brew/on_mob_life(mob/living/carbon/human/M)
-	if(M.mind && M.mind.spell_list.len != 0)
-		var/spell_improved = FALSE
-		for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list)
-			if(S.clothes_req)
-				S.clothes_req = 0
-				spell_improved = TRUE
-		if(spell_improved)
-			to_chat(M, "<span class='notice'>You suddenly feel like you never needed those garish robes in the first place...</span>")
-	return ..()
-
 /datum/reagent/consumable/ethanol/out_of_lime
 	name = "Out of Lime"
 	description = "A spin on the classic. Artists and street fighters swear by this stuff."
@@ -2440,22 +2342,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 			consumer.facial_hair_color = pick("0ad","a0f","f73","d14","0b5","fc2","084","05e","d22","fa0")
 			consumer.update_hair()
 
-/datum/reagent/consumable/ethanol/cogchamp
-	name = "CogChamp"
-	description = "Now you can fill yourself with the power of Ratvar!"
-	color = rgb(255, 201, 49)
-	boozepwr = 10
-	quality = DRINK_FANTASTIC
-	taste_description = "a brass taste with a hint of oil"
-	glass_icon_state = "cogchamp"
-	glass_name = "CogChamp"
-	glass_desc = "Not one of Ratvar's Four Generals could withstand this!  Qevax Jryy!"
-
-/datum/reagent/consumable/ethanol/cogchamp/on_mob_life(mob/living/carbon/M)
-	M.clockcultslurring = min(M.clockcultslurring + 3, 3)
-	M.stuttering = min(M.stuttering + 3, 3)
-	..()
-
 /datum/reagent/consumable/ethanol/shotinthedark
 	name = "Shot in the Dark"
 	description = "A coconut elixir with a golden tinge."
@@ -2465,7 +2351,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	taste_description = "an incoming bullet"
 	glass_icon_state = "shotinthedark"
 	glass_name = "Shot in the Dark"
-	glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Contains traces of gold from the real bullet inside."
+	glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Contains traces of gold from the real bullet inside... which wouldn't make sense outside of the series it comes from."
 
 /datum/reagent/consumable/ethanol/bullethell
 	name = "Bullet Hell"
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index d359600b0102..8cb74f4ad51e 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -11,7 +11,7 @@
 	taste_description = "oranges"
 	glass_icon_state = "glass_orange"
 	glass_name = "glass of orange juice"
-	glass_desc = "Vitamins! Yay!"
+	glass_desc = "Tart and sweet. It might have pulp, if that's what you wanted."
 
 /datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M)
 	if(M.getOxyLoss() && prob(30))
@@ -26,7 +26,7 @@
 	taste_description = "tomatoes"
 	glass_icon_state = "glass_red"
 	glass_name = "glass of tomato juice"
-	glass_desc = "Are you sure this is tomato juice?"
+	glass_desc = "Some part of you wonders if this could have been a soup at some point."
 
 /datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/M)
 	if(M.getFireLoss() && prob(20))
@@ -41,7 +41,7 @@
 	taste_description = "unbearable sourness"
 	glass_icon_state = "glass_green"
 	glass_name = "glass of lime juice"
-	glass_desc = "A glass of sweet-sour lime juice."
+	glass_desc = "A glass of intensely sour lime juice. You wonder to yourself: how much do you really need to ward off scurvy for it to come to the point?"
 
 /datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M)
 	if(M.getToxLoss() && prob(20))
@@ -56,7 +56,7 @@
 	taste_description = "carrots"
 	glass_icon_state = "carrotjuice"
 	glass_name = "glass of  carrot juice"
-	glass_desc = "It's just like a carrot but without crunching."
+	glass_desc = "Mildly sweet, but it won't actually improve your eyesight all that much beyond the baseline..."
 
 /datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/M)
 	M.adjust_blurriness(-1)
@@ -77,7 +77,7 @@
 	taste_description = "berries"
 	glass_icon_state = "berryjuice"
 	glass_name = "glass of berry juice"
-	glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
+	glass_desc = "Berry juice. Technically a fruit punch all on its own!"
 
 /datum/reagent/consumable/applejuice
 	name = "Apple Juice"
@@ -92,7 +92,7 @@
 	taste_description = "berries"
 	glass_icon_state = "poisonberryjuice"
 	glass_name = "glass of berry juice"
-	glass_desc = "Berry juice. Or maybe it's poison. Who cares?"
+	glass_desc = "Berry juice. Technically a fruit punch all on its own!"
 
 /datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(1, 0)
@@ -106,7 +106,7 @@
 	taste_description = "juicy watermelon"
 	glass_icon_state = "glass_red"
 	glass_name = "glass of watermelon juice"
-	glass_desc = "A glass of watermelon juice."
+	glass_desc = "A glass of watermelon juice. Mild and sweet."
 
 /datum/reagent/consumable/lemonjuice
 	name = "Lemon Juice"
@@ -115,16 +115,16 @@
 	taste_description = "sourness"
 	glass_icon_state  = "lemonglass"
 	glass_name = "glass of lemon juice"
-	glass_desc = "Sour..."
+	glass_desc = "A glass of intensely sour lime juice. You wonder to yourself: how much do you really need to ward off scurvy for it to come to the point?"
 
 /datum/reagent/consumable/banana
 	name = "Banana Juice"
-	description = "The raw essence of a banana. HONK"
+	description = "The raw essence of a banana."
 	color = "#e6d283"
 	taste_description = "banana"
 	glass_icon_state = "banana"
 	glass_name = "glass of banana juice"
-	glass_desc = "The raw essence of a banana. HONK."
+	glass_desc = "While staring down at this glass, some part of you wonders what went through the minds of those who decided to add this to milk."
 
 /datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/M)
 	if((ishuman(M) && M.job == "Clown") || ismonkey(M))
@@ -179,25 +179,25 @@
 	description = "Juice of the potato. Bleh."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#9e8045" // rgb: 48, 32, 0
-	taste_description = "irish sadness"
+	taste_description = "starchy water"
 	glass_icon_state = "glass_brown"
 	glass_name = "glass of potato juice"
-	glass_desc = "Bleh..."
+	glass_desc = "Starchy. It coats your mouth with a filament afterwards, which really isn't helping it's case."
 
 /datum/reagent/consumable/grapejuice
 	name = "Grape Juice"
 	description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
 	color = "#790b79" // dark purple
-	taste_description = "grape soda"
+	taste_description = "grapes"
 
 /datum/reagent/consumable/milk
 	name = "Milk"
-	description = "An opaque white liquid produced by the mammary glands of mammals."
+	description = "An opaque white liquid produced by the mammary glands of mammals, some arthropods, biogenerators, chemical factories..."
 	color = "#DFDFDF" // rgb: 223, 223, 223
 	taste_description = "milk"
 	glass_icon_state = "glass_white"
 	glass_name = "glass of milk"
-	glass_desc = "White and nutritious goodness!"
+	glass_desc = "A glass of frothy milk. You wonder what animal this could have come from, if at all."
 
 /datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(20))
@@ -214,7 +214,7 @@
 	taste_description = "soy milk"
 	glass_icon_state = "glass_white"
 	glass_name = "glass of soy milk"
-	glass_desc = "White and nutritious soy goodness!"
+	glass_desc = "Despite being made from soybeans, it sates the same desire to have an entire glass of milk."
 
 /datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(20))
@@ -224,12 +224,12 @@
 
 /datum/reagent/consumable/cream
 	name = "Cream"
-	description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
+	description = "The fatty, still liquid part of milk."
 	color = "#DFD7AF" // rgb: 223, 215, 175
 	taste_description = "creamy milk"
 	glass_icon_state  = "glass_white"
 	glass_name = "glass of cream"
-	glass_desc = "Ewwww..."
+	glass_desc = "It's a bit thick to drink straight."
 
 /datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/M)
 	if(M.getBruteLoss() && prob(20))
@@ -246,7 +246,7 @@
 	taste_description = "bitterness"
 	glass_icon_state = "glass_brown"
 	glass_name = "glass of coffee"
-	glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
+	glass_desc = "Black coffee, served straight. It'll be pretty bitter without anything else in it!"
 
 /datum/reagent/consumable/coffee/overdose_process(mob/living/M)
 	M.Jitter(5)
@@ -265,13 +265,13 @@
 
 /datum/reagent/consumable/tea
 	name = "Tea"
-	description = "Tasty black tea, it has antioxidants, it's good for you!"
+	description = "Warm, dark tea."
 	color = "#5f4a05"
 	nutriment_factor = 0
-	taste_description = "tart black tea"
+	taste_description = "tart dark tea"
 	glass_icon_state = "teaglass"
 	glass_name = "glass of tea"
-	glass_desc = "Drinking it from here would not seem right."
+	glass_desc = "There's a latent desire to drink this out of a teacup, but there's no time for teatime out here."
 
 /datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -289,25 +289,25 @@
 	description = "Sweet, tangy lemonade. Good for the soul."
 	color = "#FFE978"
 	quality = DRINK_NICE
-	taste_description = "sunshine and summertime"
+	taste_description = "sunshine and distant shores"
 	glass_icon_state = "lemonpitcher"
 	glass_name = "pitcher of lemonade"
-	glass_desc = "This drink leaves you feeling nostalgic for some reason."
+	glass_desc = "Sweet, slightly tart, and refreshing. You feel some misplaced nostalgia when you have this, even though you're not sure you've ever squeezed a lemon before."
 
 /datum/reagent/consumable/tea/arnold_palmer
 	name = "Arnold Palmer"
-	description = "Encourages the patient to go golfing."
+	description = "Iced sweet tea and lemonade."
 	color = "#FFB766"
 	quality = DRINK_NICE
 	nutriment_factor = 2
 	taste_description = "bitter tea"
 	glass_icon_state = "arnold_palmer"
 	glass_name = "Arnold Palmer"
-	glass_desc = "You feel like taking a few golf swings after a few swigs of this."
+	glass_desc = "Iced tea and lemonade. You don't think you know any Arnolds, though."
 
 /datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M)
 	if(prob(5))
-		to_chat(M, "<span class='notice'>[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]</span>")
+		to_chat(M, "<span class='notice'>[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game... whatever that is.")]</span>")
 	..()
 	. = 1
 
@@ -319,7 +319,7 @@
 	taste_description = "bitter coldness"
 	glass_icon_state = "icedcoffeeglass"
 	glass_name = "iced coffee"
-	glass_desc = "A drink to perk you up and refresh you!"
+	glass_desc = "Iced black coffee. It's still going to be pretty bitter on it's own, though!"
 
 /datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -339,7 +339,7 @@
 	taste_description = "bitter coldness and a hint of smoke"
 	glass_icon_state = "hoticecoffee"
 	glass_name = "hot ice coffee"
-	glass_desc = "A sharp drink, this can't have come cheap."
+	glass_desc = "The wonders of fusion mixed into a cup of coffee, resulting in an extremely hot-cold drink."
 
 /datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -353,13 +353,13 @@
 
 /datum/reagent/consumable/icetea
 	name = "Iced Tea"
-	description = "No relation to a certain rap artist/actor."
+	description = "Iced, sweetened tea."
 	color = "#104038" // rgb: 16, 64, 56
 	nutriment_factor = 0
 	taste_description = "sweet tea"
 	glass_icon_state = "icedteaglass"
 	glass_name = "iced tea"
-	glass_desc = "All natural, antioxidant-rich flavour sensation."
+	glass_desc = "A much more appealing way to have tea while dealing with the heat."
 
 /datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -377,61 +377,33 @@
 	color = "#743c05" // rgb: 16, 8, 0
 	taste_description = "cola"
 	glass_icon_state  = "glass_brown"
-	glass_name = "glass of Space Cola"
-	glass_desc = "A glass of refreshing Space Cola."
+	glass_name = "glass of cola"
+	glass_desc = "A carbonated cola. You should drink it before it gets flat!"
 
 /datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(0,M.drowsyness-5)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	..()
 
-/datum/reagent/consumable/nuka_cola
-	name = "Nuka Cola"
-	description = "Cola, cola never changes."
-	color = "#3b6c0e" // rgb: 16, 8, 0
-	quality = DRINK_VERYGOOD
-	taste_description = "the future"
-	glass_icon_state = "nuka_colaglass"
-	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_metabolize(mob/living/L)
-	..()
-	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
-
-/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
-	..()
-
-/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
-	M.Jitter(20)
-	M.set_drugginess(30)
-	M.dizziness +=1.5
-	M.drowsyness = 0
-	M.AdjustSleeping(-40)
-	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
-	..()
-	. = 1
-
-/datum/reagent/consumable/grey_bull
-	name = "Grey Bull"
-	description = "Grey Bull, it gives you gloves!"
+/datum/reagent/consumable/crosstalk
+	name = "Crosstalk"
+	description = "Crosstalk! Share the energy with everyone!"
 	color = "#EEFF00" // rgb: 238, 255, 0
 	quality = DRINK_VERYGOOD
-	taste_description = "carbonated oil"
-	glass_icon_state = "grey_bull_glass"
-	glass_name = "glass of Grey Bull"
-	glass_desc = "Surprisingly it isnt grey."
+	taste_description = "carbonated battery acid with a spoonful of sugar"
+	glass_icon_state = "crosstalk_glass"
+	glass_name = "glass of Crosstalk"
+	glass_desc = "The amount of sugar and chemicals in this drink makes your eyes water."
 
-/datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L)
+/datum/reagent/consumable/crosstalk/on_mob_metabolize(mob/living/L)
 	..()
 	ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, type)
 
-/datum/reagent/consumable/grey_bull/on_mob_end_metabolize(mob/living/L)
+/datum/reagent/consumable/crosstalk/on_mob_end_metabolize(mob/living/L)
 	REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, type)
 	..()
 
-/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/crosstalk/on_mob_life(mob/living/carbon/M)
 	M.Jitter(20)
 	M.dizziness +=1
 	M.drowsyness = 0
@@ -439,16 +411,16 @@
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	..()
 
-/datum/reagent/consumable/spacemountainwind
-	name = "SM Wind"
-	description = "Blows right through you like a space wind."
+/datum/reagent/consumable/comet_trail
+	name = "Comet Trail"
+	description = "A citrusy drink from the Kepori space installation known as The Ring."
 	color = "#c4ff2d" // rgb: 16, 32, 0
 	taste_description = "sweet citrus soda"
-	glass_icon_state = "Space_mountain_wind_glass"
-	glass_name = "glass of Space Mountain Wind"
-	glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
+	glass_icon_state = "Comet_trail_glass"
+	glass_name = "glass of Comet Trail"
+	glass_desc = "A glass of Comet Trail. Taste the stars!"
 
-/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/comet_trail/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(0,M.drowsyness-7)
 	M.AdjustSleeping(-20)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -456,16 +428,16 @@
 	..()
 	. = 1
 
-/datum/reagent/consumable/dr_gibb
-	name = "Dr. Gibb"
-	description = "A delicious blend of 42 different flavours."
+/datum/reagent/consumable/tadrixx
+	name = "Tadrixx"
+	description = "A Kalixcian drink made from a plant that tastes similar to sassafrass, which is used in root beer. A stumpy drake holding a mug of it is on the front."
 	color = "#732a03"
-	taste_description = "cherry soda" // FALSE ADVERTISING
-	glass_icon_state = "dr_gibb_glass"
-	glass_name = "glass of Dr. Gibb"
-	glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply."
+	taste_description = "root beer" // FALSE ADVERTISING
+	glass_icon_state = "tadrixx_glass"
+	glass_name = "glass of Tadrixx"
+	glass_desc = "A cup of fizzy Tadrixx. It smells sweet."
 
-/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/tadrixx/on_mob_life(mob/living/carbon/M)
 	M.drowsyness = max(0,M.drowsyness-6)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	..()
@@ -484,6 +456,38 @@
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	..()
 
+/datum/reagent/consumable/molten
+	name = "Molten Bubbles"
+	description = "A spicy soft drink made from a coca-like plant from Kalixcis. Popularly served both cold -and- hot, depending on the weather."
+	color = "#5f2010"
+	taste_description = "spiced cola"
+	glass_icon_state = "molten_glass"
+	glass_name = "glass of Molten Bubbles"
+	glass_desc = "A glass of Molten Bubbles. The spices tickle your nose."
+
+/datum/reagent/consumable/molten/on_mob_life(mob/living/carbon/M)
+	M.heal_bodypart_damage(1,1,0)
+	if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
+		M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
+	else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1))
+		M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
+	..()
+
+/datum/reagent/consumable/molten/plasma_fizz
+	name = "Plasma Fizz"
+	description = "A  spinoff of the popular Molten Bubbles drink from Kalixcis, made to emulate the flavor of spiced grape instead. It's... not exactly convincing or a very good mix."
+	color = "#5f2010"
+	taste_description = "spiced grape soda"
+	glass_icon_state = "plasma_fizz_glass"
+	glass_name = "glass of Plasma Fizz"
+	glass_desc = "A glass of Plasma Fizz. The spices (and fake grape flavoring) wrinkles your nose."
+
+/datum/reagent/consumable/molten/sand
+	name = "Sandblast Sarsaparilla"
+	description = "Extra refreshing for those long desert days."
+	color = "#af9938"
+	taste_description = "root-beer and asbestos"
+
 /datum/reagent/consumable/lemon_lime
 	name = "Lemon Lime"
 	description = "A tangy substance made of 0.5% natural citrus!"
@@ -499,48 +503,48 @@
 	..()
 
 
-/datum/reagent/consumable/pwr_game
-	name = "Pwr Game"
-	description = "The only drink with the PWR that true gamers crave."
+/datum/reagent/consumable/pacfuel
+	name = "PAC-Fuel"
+	description = "A carbonated energy drink themed after the purple coloration, similar to plasma."
 	color = "#9385bf" // rgb: 58, 52, 75
 	taste_description = "sweet and salty tang"
 	glass_icon_state = "glass_red"
-	glass_name = "glass of Pwr Game"
-	glass_desc = "Goes well with a Vlad's salad."
+	glass_name = "glass of PAC-Fuel"
+	glass_desc = "A glass of PAC-Fuel energy drink. It smells vaguely like acidic cotton candy..."
 
-/datum/reagent/consumable/pwr_game/expose_mob(mob/living/C, method=TOUCH, reac_volume)
+/datum/reagent/consumable/pacfuel/expose_mob(mob/living/C, method=TOUCH, reac_volume)
 	..()
 	if(C?.mind?.get_skill_level(/datum/skill/gaming) >= SKILL_LEVEL_LEGENDARY && method==INGEST && !HAS_TRAIT(C, TRAIT_GAMERGOD))
 		ADD_TRAIT(C, TRAIT_GAMERGOD, "pwr_game")
-		to_chat(C, "<span class='nicegreen'>As you imbibe the Pwr Game, your gamer third eye opens... \
+		to_chat(C, "<span class='nicegreen'>As you imbibe the PAC-Fuel, your gamer third eye opens... \
 		You feel as though a great secret of the universe has been made known to you...</span>")
 
-/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/pacfuel/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	if(prob(10))
 		M?.mind.adjust_experience(/datum/skill/gaming, 5)
 	..()
 
-/datum/reagent/consumable/shamblers
-	name = "Shambler's Juice"
-	description = "~Shake me up some of that Shambler's Juice!~"
+/datum/reagent/consumable/shoal_punch
+	name = "Shoal Punch"
+	description = "Sugary, and from the Shoal."
 	color = "#f00060" // rgb: 94, 0, 38
-	taste_description = "carbonated metallic soda"
+	taste_description = "sugary fruity soda"
 	glass_icon_state = "glass_red"
-	glass_name = "glass of Shambler's juice"
-	glass_desc = "Mmm mm, shambly."
+	glass_name = "glass of Shoal Punch"
+	glass_desc = "It's hard to imagine all those fruits getting condensed into a cup like this."
 
-/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/shoal_punch/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	..()
 /datum/reagent/consumable/sodawater
 	name = "Soda Water"
-	description = "A can of club soda. Why not make a scotch and soda?"
+	description = "A can of club soda."
 	color = "#619494" // rgb: 97, 148, 148
 	taste_description = "carbonated water"
 	glass_icon_state = "glass_clear"
 	glass_name = "glass of soda water"
-	glass_desc = "Soda water. Why not make a scotch and soda?"
+	glass_desc = "Soda water. You feel like you should add something to this..."
 
 /datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -550,12 +554,12 @@
 
 /datum/reagent/consumable/tonic
 	name = "Tonic Water"
-	description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
+	description = "It tastes strange, and it's not like malaria is much of an issue anymore."
 	color = "#709fce"
 	taste_description = "tart and fresh"
 	glass_icon_state = "glass_clear"
 	glass_name = "glass of tonic water"
-	glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+	glass_desc = "Quinine and carbonated water. You really should add something to this..."
 
 /datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -565,17 +569,17 @@
 	..()
 	. = 1
 
-/datum/reagent/consumable/monkey_energy
-	name = "Monkey Energy"
-	description = "The only drink that will make you unleash the ape."
-	color = "#f39b03" // rgb: 243, 155, 3
+/datum/reagent/consumable/xeno_energy
+	name = "Xeno-Energy"
+	description = "An unbearably sugary, fizzy green drink."
+	color = "#88b488" // rgb: 243, 155, 3
 	overdose_threshold = 60
-	taste_description = "barbecue and nostalgia"
-	glass_icon_state = "monkey_energy_glass"
-	glass_name = "glass of Monkey Energy"
-	glass_desc = "You can unleash the ape, but without the pop of the can?"
+	taste_description = "tooth-rotting sweetness"
+	glass_icon_state = "xeno_energy_glass"
+	glass_name = "glass of Xeno Energy"
+	glass_desc = "A glass of Xeno Energy. It seems to swirl and roil outside of the can..."
 
-/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/M)
+/datum/reagent/consumable/xeno_energy/on_mob_life(mob/living/carbon/M)
 	M.Jitter(20)
 	M.dizziness +=1
 	M.drowsyness = 0
@@ -583,18 +587,13 @@
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
 	..()
 
-/datum/reagent/consumable/monkey_energy/on_mob_metabolize(mob/living/L)
+/datum/reagent/consumable/xeno_energy/on_mob_metabolize(mob/living/L)
 	..()
 	if(ismonkey(L))
-		L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy)
+		L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/xeno_energy)
 
-/datum/reagent/consumable/monkey_energy/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy)
-	..()
-
-/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/M)
-	if(prob(15))
-		M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/monkey_energy)
+/datum/reagent/consumable/xeno_energy/on_mob_end_metabolize(mob/living/L)
+	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/xeno_energy)
 	..()
 
 /datum/reagent/consumable/ice
@@ -605,7 +604,7 @@
 	taste_description = "ice"
 	glass_icon_state = "iceglass"
 	glass_name = "glass of ice"
-	glass_desc = "Generally, you're supposed to put something else in there too..."
+	glass_desc = "Generally, you're supposed to put something else in there, too..."
 
 /datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -613,13 +612,13 @@
 
 /datum/reagent/consumable/soy_latte
 	name = "Soy Latte"
-	description = "A nice and tasty beverage while you are reading your hippie books."
+	description = "A hot beverage for those who can't handle the lactose."
 	color = "#664300" // rgb: 102, 67, 0
 	quality = DRINK_NICE
 	taste_description = "creamy coffee"
 	glass_icon_state = "soy_latte"
 	glass_name = "soy latte"
-	glass_desc = "A nice and refreshing beverage while you're reading."
+	glass_desc = "A nice and refreshing beverage. It goes well with a book, if you have the time to read."
 
 /datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -640,7 +639,7 @@
 	taste_description = "bitter cream"
 	glass_icon_state = "cafe_latte"
 	glass_name = "cafe latte"
-	glass_desc = "A nice, strong and refreshing beverage while you're reading."
+	glass_desc = "A nice, strong and refreshing beverage. It goes well with a book, if you have the time to read."
 
 /datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -655,13 +654,13 @@
 
 /datum/reagent/consumable/doctor_delight
 	name = "The Doctor's Delight"
-	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."
+	description = "A homemade curative. A mixture of juices that helps your body heal against most damage, at the cost of leaving you hungry."
 	color = "#FF8CFF" // rgb: 255, 140, 255
 	quality = DRINK_VERYGOOD
 	taste_description = "homely fruit"
 	glass_icon_state = "doctorsdelightglass"
 	glass_name = "Doctor's Delight"
-	glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
+	glass_desc = "A homemade curative. Helps the body heal with the nutrition density, but it leaves a gnawing hunger afterwards."
 
 /datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/M)
 	M.adjustBruteLoss(-0.5, 0)
@@ -683,7 +682,7 @@
 	taste_description = "sweet chocolate"
 	glass_icon_state = "chocolatepudding"
 	glass_name = "chocolate pudding"
-	glass_desc = "Tasty."
+	glass_desc = "Thick, sweet, and chocolatey."
 
 /datum/reagent/consumable/vanillapudding
 	name = "Vanilla Pudding"
@@ -694,7 +693,7 @@
 	taste_description = "sweet vanilla"
 	glass_icon_state = "vanillapudding"
 	glass_name = "vanilla pudding"
-	glass_desc = "Tasty."
+	glass_desc = "Thick, sweet, and pleasantly vanilla."
 
 /datum/reagent/consumable/cherryshake
 	name = "Cherry Shake"
@@ -705,7 +704,7 @@
 	taste_description = "creamy cherry"
 	glass_icon_state = "cherryshake"
 	glass_name = "cherry shake"
-	glass_desc = "A cherry flavored milkshake."
+	glass_desc = "A cherry flavored milkshake. Don't get any on your jumpsuit!"
 
 /datum/reagent/consumable/bluecherryshake
 	name = "Blue Cherry Shake"
@@ -716,33 +715,33 @@
 	taste_description = "creamy blue cherry"
 	glass_icon_state = "bluecherryshake"
 	glass_name = "blue cherry shake"
-	glass_desc = "An exotic blue milkshake."
+	glass_desc = "A blue-cherry milkshake. Generally, the blue is meant to be figurative, but..."
 
 /datum/reagent/consumable/pumpkin_latte
 	name = "Pumpkin Latte"
-	description = "A mix of pumpkin juice and coffee."
+	description = "A mix of spices and coffee. It doesn't actually contain any pumpkin, though."
 	color = "#F4A460"
 	quality = DRINK_VERYGOOD
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	taste_description = "creamy pumpkin"
 	glass_icon_state = "pumpkin_latte"
 	glass_name = "pumpkin latte"
-	glass_desc = "A mix of coffee and pumpkin juice."
+	glass_desc = "A mix of coffee and pumpkin juice would taste a whole lot different than what you're having right now, you know."
 
-/datum/reagent/consumable/gibbfloats
-	name = "Gibb Floats"
-	description = "Ice cream on top of a Dr. Gibb glass."
-	color = "#B22222"
+/datum/reagent/consumable/tadrixxfloat
+	name = "Tadrixx Float"
+	description = "Ice cream on top of a glass of Tadrixx."
+	color = "#533713"
 	quality = DRINK_NICE
 	nutriment_factor = 3 * REAGENTS_METABOLISM
-	taste_description = "creamy cherry"
-	glass_icon_state = "gibbfloats"
-	glass_name = "Gibbfloat"
-	glass_desc = "Dr. Gibb with ice cream on top."
+	taste_description = "creamy root beer"
+	glass_icon_state = "tadrixxfloat"
+	glass_name = "Tadrixxfloat"
+	glass_desc = "A glass of Tadrixx with ice cream on top."
 
 /datum/reagent/consumable/pumpkinjuice
 	name = "Pumpkin Juice"
-	description = "Juiced from real pumpkin."
+	description = "Juiced from real pumpkins."
 	color = "#FFA500"
 	taste_description = "pumpkin"
 
@@ -757,18 +756,18 @@
 	description = "A solution."
 	color = "#EEFF00"
 	quality = DRINK_NICE
-	taste_description = "extreme bitterness"
+	taste_description = "extreme sourness"
 	glass_icon_state = "triplecitrus" //needs own sprite mine are trash //your sprite is great tho
 	glass_name = "glass of triple citrus"
-	glass_desc = "A mixture of citrus juices. Tangy, yet smooth."
+	glass_desc = "A mixture of citrus juices. Intensely sour, and leaves you reeling afterwards."
 
 /datum/reagent/consumable/grape_soda
 	name = "Grape soda"
-	description = "Beloved by children and teetotalers."
+	description = "Artificial grape soda."
 	color = "#E6CDFF"
 	taste_description = "grape soda"
 	glass_name = "glass of grape juice"
-	glass_desc = "It's grape (soda)!"
+	glass_desc = "It's grape soda!"
 
 /datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -776,20 +775,28 @@
 
 /datum/reagent/consumable/milk/chocolate_milk
 	name = "Chocolate Milk"
-	description = "Milk for cool kids."
+	description = "Milk mixed with chocolate powder. Beloved by children everywhere."
 	color = "#7D4E29"
 	quality = DRINK_NICE
 	taste_description = "chocolate milk"
 
+/datum/reagent/consumable/lunapunch
+	name = "Lunapunch"
+	description = "An herbal-sweet carbonated drink with a bitter bite."
+	color = "#7D4E29"
+	quality = DRINK_NICE
+	taste_description = "sweet herbs and lingering bitterness"
+	glass_name = "glass of Lunapunch"
+	glass_desc = "An herbal-sweet soft drink. The bitter bite after each sip is enough to make you wince, but leaves you wanting more."
 /datum/reagent/consumable/hot_coco
-	name = "Hot Coco"
-	description = "Made with love! And coco beans."
+	name = "Hot Cocoa"
+	description = "Made with love and cocoa beans. Or from a vending machine."
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	color = "#4f3a11" // rgb: 64, 48, 16
 	taste_description = "creamy chocolate"
 	glass_icon_state  = "chocolateglass"
-	glass_name = "glass of hot coco"
-	glass_desc = "A favorite winter drink to warm you up."
+	glass_name = "glass of hot cocoa."
+	glass_desc = "A favorite winter drink from the Solar Confederation. Good for warming yourself up."
 
 /datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
@@ -810,7 +817,7 @@
 	taste_description = "mint"
 	glass_icon_state = "glass_green"
 	glass_name = "glass of menthol"
-	glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
+	glass_desc = "Tastes naturally and sharply minty, with a mild numbing sensation."
 
 /datum/reagent/consumable/menthol/on_mob_life(mob/living/L)
 	L.apply_status_effect(/datum/status_effect/throat_soothed)
@@ -818,26 +825,27 @@
 
 /datum/reagent/consumable/grenadine
 	name = "Grenadine"
-	description = "Not cherry flavored!"
+	description = "More blackcurrant than cherry, actually."
 	color = "#EA1D26"
 	taste_description = "sweet pomegranates"
 	glass_name = "glass of grenadine"
-	glass_desc = "Delicious flavored syrup."
+	glass_desc = "Flavored syrup, traditionally used for mixing drinks. Having it straight is certainly a choice."
 
 /datum/reagent/consumable/parsnipjuice
 	name = "Parsnip Juice"
-	description = "Why..."
+	description = "Starchy and uncommon."
 	color = "#FFA500"
 	taste_description = "parsnip"
 	glass_name = "glass of parsnip juice"
+	glass_desc = "It doesn't really count as a soup this way. Maybe it'd better if it was a soup."
 
 /datum/reagent/consumable/pineapplejuice
 	name = "Pineapple Juice"
-	description = "Tart, tropical, and hotly debated."
+	description = "Tart, tropical, and sweet."
 	color = "#F7D435"
 	taste_description = "pineapple"
 	glass_name = "glass of pineapple juice"
-	glass_desc = "Tart, tropical, and hotly debated."
+	glass_desc = "Tart, tropical, and sweet."
 
 /datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
 	name = "Peach Juice"
@@ -845,16 +853,17 @@
 	color = "#E78108"
 	taste_description = "peaches"
 	glass_name = "glass of peach juice"
+	glass_desc = "A glass full of sweet peach juice. Strange, you don't often see it out this far into the Frontier..."
 
 /datum/reagent/consumable/cream_soda
 	name = "Cream Soda"
-	description = "A classic space-American vanilla flavored soft drink."
+	description = "A classic vanilla flavored soft drink."
 	color = "#dcb137"
 	quality = DRINK_VERYGOOD
 	taste_description = "fizzy vanilla"
 	glass_icon_state = "cream_soda"
 	glass_name = "Cream Soda"
-	glass_desc = "A classic space-American vanilla flavored soft drink."
+	glass_desc = "A classic vanilla flavored soft drink."
 
 /datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/M)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
@@ -867,7 +876,7 @@
 	quality = DRINK_NICE
 	taste_description = "sweet ginger spice"
 	glass_name = "Sol Dry"
-	glass_desc = "A soothing, mellow drink made from ginger."
+	glass_desc = "A soothing, mellow drink made from ginger. You can't imagine drinking a carbonated drink while in microgravity, though, nausea or not..."
 
 /datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M)
 	M.adjust_disgust(-5)
@@ -875,13 +884,13 @@
 
 /datum/reagent/consumable/red_queen
 	name = "Red Queen"
-	description = "DRINK ME."
+	description = "You feel inclined to drink it, somehow."
 	color = "#e6ddc3"
 	quality = DRINK_GOOD
 	taste_description = "wonder"
 	glass_icon_state = "red_queen"
 	glass_name = "Red Queen"
-	glass_desc = "DRINK ME."
+	glass_desc = "A cup of red tea. A small note is tied around the handle of it, which asks you to drink it."
 	var/current_size = RESIZE_DEFAULT_SIZE
 
 /datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/H)
@@ -905,11 +914,11 @@
 /datum/reagent/consumable/bungojuice
 	name = "Bungo Juice"
 	color = "#F9E43D"
-	description = "Exotic! You feel like you are on vactation already."
+	description = "A botanical experiment gone right."
 	taste_description = "succulent bungo"
 	glass_icon_state = "glass_yellow"
 	glass_name = "glass of bungo juice"
-	glass_desc = "Exotic! You feel like you are on vactation already."
+	glass_desc = "A botanical experiment in creating a new fruit. It smells faintly citrusy, along with a hint of... banana?"
 
 /datum/reagent/consumable/prunomix
 	name = "pruno mixture"
@@ -927,7 +936,7 @@
 	taste_description = "vegetable"
 	glass_icon_state = "glass_yellow"
 	glass_name = "glass of aloe juice"
-	glass_desc = "A healthy and refreshing juice."
+	glass_desc = "Juiced aloe vera. It's an acquired taste."
 
 /datum/reagent/consumable/aloejuice/on_mob_life(mob/living/M)
 	if(M.getToxLoss() && prob(30))
@@ -943,7 +952,7 @@
 	taste_description = "purple and a hint of opioid."
 	glass_icon_state = "lean"
 	glass_name = "Lean"
-	glass_desc = "A drink that makes your life less miserable."
+	glass_desc = "You just don't often get to see cough syrup out here, and someone had enough to mix it with soda. You're left wondering why."
 
 /datum/reagent/consumable/lean/on_mob_life(mob/living/carbon/M)
 	if(M.slurring < 3)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 4c4ad36b2413..6084311b3507 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -2113,30 +2113,3 @@
 	ADD_TRAIT(M, TRAIT_ALLBREAK, TRAIT_GENERIC)
 	REMOVE_TRAIT(M, TRAIT_NOBREAK, TRAIT_GENERIC)
 	..()
-
-/datum/reagent/medicine/molten_bubbles
-	name = "Molten Bubbles"
-	description = "Refreshing softdrink made for the desert."
-	color = "#3d1916"
-	metabolization_rate = REAGENTS_METABOLISM
-	taste_description = "boiling sugar"
-
-/datum/reagent/medicine/molten_bubbles/on_mob_life(mob/living/carbon/M)
-	M.heal_bodypart_damage(1,1,0)
-	if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
-		M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
-	else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1))
-		M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
-	..()
-
-/datum/reagent/medicine/molten_bubbles/plasma
-	name = "Plasma Bubbles"
-	description = "Molten Bubbles with the refreshing taste of plasma."
-	color = "#852e63"
-	taste_description = "grape flavored cleaning solution"
-
-/datum/reagent/medicine/molten_bubbles/sand
-	name = "Sandblast Sarsaparilla"
-	description = "Extra refreshing for those long desert days."
-	color = "#af9938"
-	taste_description = "root-beer and asbestos"
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index 302d05f0712b..2397d67a1d2c 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -325,18 +325,3 @@ WS End */
 /datum/chemical_reaction/chartreuse
 	results = list(/datum/reagent/medicine/chartreuse = 10)
 	required_reagents = list(/datum/reagent/medicine/puce_essence = 5, /datum/reagent/consumable/tinlux = 5, /datum/reagent/consumable/entpoly = 1)
-
-/datum/chemical_reaction/molten_bubbles
-	results = list(/datum/reagent/medicine/molten_bubbles = 30)
-	required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)
-
-/datum/chemical_reaction/plasma_bubbles
-	results = list(/datum/reagent/medicine/molten_bubbles/plasma = 3)
-	required_reagents = list(/datum/reagent/medicine/molten_bubbles = 3, /datum/reagent/toxin/plasma = 2)
-
-/datum/chemical_reaction/sand_bubbles
-	results = list(/datum/reagent/medicine/molten_bubbles/sand = 3)
-	required_reagents = list(/datum/reagent/medicine/molten_bubbles = 3, /datum/reagent/silicon = 2)
-
-/datum/chemical_reaction/sand_bubbles/plasma			// Subbing plasma bubbles for reg
-	required_reagents = list(/datum/reagent/medicine/molten_bubbles/plasma = 3, /datum/reagent/silicon = 2)
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index ee288feb0bac..149743c47e3c 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -184,12 +184,12 @@ Borg Shaker
 	accepts_reagent_upgrades = FALSE
 
 	reagent_ids = list(/datum/reagent/consumable/applejuice, /datum/reagent/consumable/banana, /datum/reagent/consumable/coffee,
-	/datum/reagent/consumable/cream, /datum/reagent/consumable/dr_gibb, /datum/reagent/consumable/grenadine,
+	/datum/reagent/consumable/cream, /datum/reagent/consumable/tadrixx, /datum/reagent/consumable/grenadine,
 	/datum/reagent/consumable/ice, /datum/reagent/consumable/lemonjuice, /datum/reagent/consumable/lemon_lime,
 	/datum/reagent/consumable/limejuice, /datum/reagent/consumable/menthol, /datum/reagent/consumable/milk,
 	/datum/reagent/consumable/nothing, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/peachjuice,
-	/datum/reagent/consumable/sodawater, /datum/reagent/consumable/space_cola, /datum/reagent/consumable/spacemountainwind,
-	/datum/reagent/consumable/pwr_game, /datum/reagent/consumable/shamblers, /datum/reagent/consumable/soymilk,
+	/datum/reagent/consumable/sodawater, /datum/reagent/consumable/space_cola, /datum/reagent/consumable/comet_trail,
+	/datum/reagent/consumable/pacfuel, /datum/reagent/consumable/shoal_punch, /datum/reagent/consumable/soymilk,
 	/datum/reagent/consumable/space_up, /datum/reagent/consumable/sugar, /datum/reagent/consumable/tea,
 	/datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/tonic, /datum/reagent/water,
 	/datum/reagent/consumable/pineapplejuice, /datum/reagent/consumable/sol_dry,
diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm
index 92327a2ed689..3ddce78ae6e5 100644
--- a/code/modules/religion/religion_sects.dm
+++ b/code/modules/religion/religion_sects.dm
@@ -135,8 +135,6 @@
 	if(iscyborg(L))
 		var/mob/living/silicon/robot/R = L
 		var/charge_amt = 50
-		if(L.mind?.holy_role == HOLY_ROLE_HIGHPRIEST)
-			charge_amt *= 2
 		R.cell?.charge += charge_amt
 		R.visible_message("<span class='notice'>[user] charges [R] with the power of [GLOB.deity]!</span>")
 		to_chat(R, "<span class='boldnotice'>You are charged by the power of [GLOB.deity]!</span>")
diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm
index f9c449c56e9b..e9d76ca8bf5a 100644
--- a/code/modules/religion/religion_structures.dm
+++ b/code/modules/religion/religion_structures.dm
@@ -18,10 +18,6 @@
 	var/can_i_see = FALSE
 	if(isobserver(user))
 		can_i_see = TRUE
-	else if(isliving(user))
-		var/mob/living/L = user
-		if(L.mind?.holy_role)
-			can_i_see = TRUE
 
 	if(!can_i_see || !sect_to_altar)
 		return
@@ -57,62 +53,6 @@
 	pushed_mob.forceMove(loc)
 	return ..()
 
-/obj/structure/altar_of_gods/attackby(obj/item/C, mob/user, params)
-	//If we can sac, we do nothing but the sacrifice instead of typical attackby behavior (IE damage the structure)
-	if(sect_to_altar?.can_sacrifice(C,user))
-		sect_to_altar.on_sacrifice(C,user)
-		return TRUE
-	. = ..()
-	//everything below is assumed you're bibling it up
-	if(!istype(C, /obj/item/storage/book/bible))
-		return
-	if(sect_to_altar)
-		if(!sect_to_altar.rites_list)
-			to_chat(user, "<span class='notice'>Your sect doesn't have any rites to perform!")
-			return
-		var/rite_select = input(user,"Select a rite to perform!","Select a rite",null) in sect_to_altar.rites_list
-		if(!rite_select || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
-			to_chat(user,"<span class ='warning'>You cannot perform the rite at this time.</span>")
-			return
-		var/selection2type = sect_to_altar.rites_list[rite_select]
-		performing_rite = new selection2type(src)
-		if(!performing_rite.perform_rite(user, src))
-			QDEL_NULL(performing_rite)
-		else
-			performing_rite.invoke_effect(user, src)
-			sect_to_altar.adjust_favor(-performing_rite.favor_cost)
-			QDEL_NULL(performing_rite)
-		return
-
-	if(user.mind.holy_role != HOLY_ROLE_HIGHPRIEST)
-		to_chat(user, "<span class='warning'>You are not the high priest, and therefore cannot select a religious sect.")
-		return
-
-	var/list/available_options = generate_available_sects(user)
-	if(!available_options)
-		return
-
-	var/sect_select = input(user,"Select a sect (You CANNOT revert this decision!)","Select a Sect",null) in available_options
-	if(!sect_select || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
-		to_chat(user,"<span class ='warning'>You cannot select a sect at this time.</span>")
-		return
-	var/type_selected = available_options[sect_select]
-	GLOB.religious_sect = new type_selected()
-	for(var/i in GLOB.player_list)
-		if(!isliving(i))
-			continue
-		var/mob/living/am_i_holy_living = i
-		if(!am_i_holy_living.mind?.holy_role)
-			continue
-		GLOB.religious_sect.on_conversion(am_i_holy_living)
-	sect_to_altar = GLOB.religious_sect
-	if(sect_to_altar.altar_icon)
-		icon = sect_to_altar.altar_icon
-	if(sect_to_altar.altar_icon_state)
-		icon_state = sect_to_altar.altar_icon_state
-
-
-
 /obj/structure/altar_of_gods/proc/generate_available_sects(mob/user) //eventually want to add sects you get from unlocking certain achievements
 	. = list()
 	for(var/i in subtypesof(/datum/religion_sect))
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index e39d48e5cc77..517c8691c92d 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -491,6 +491,14 @@
 	build_path = /obj/item/shovel
 	category = list("initial","Misc", "Tool Designs")
 
+/datum/design/pickaxe
+	name = "Pickaxe"
+	id = "pickaxe"
+	build_type = AUTOLATHE | PROTOLATHE
+	materials = list(/datum/material/iron = 1000)
+	build_path = /obj/item/pickaxe
+	category = list("initial","Tools", "Tool Designs")
+
 /datum/design/spade
 	name = "Spade"
 	id = "spade"
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 4b5dd9a49717..b8871b21524e 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -38,7 +38,7 @@
 /obj/item/organ/Initialize()
 	. = ..()
 	if(organ_flags & ORGAN_EDIBLE)
-		AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GORE, null, 10, null, null, null, CALLBACK(src, PROC_REF(OnEatFrom)))
+		AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GORE, null, 10, null, null, null, COLOR_PINK, CALLBACK(src, PROC_REF(OnEatFrom)))
 
 	///When you take a bite you cant jam it in for surgery anymore.
 /obj/item/organ/proc/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm
index 2914d6dda279..4d327c7a8234 100644
--- a/code/modules/vehicles/secway.dm
+++ b/code/modules/vehicles/secway.dm
@@ -47,7 +47,7 @@
 	if(istype(W, /obj/item/reagent_containers/food/snacks/grown/banana))
 		// ignore the occupants because they're presumably too distracted to notice the guy stuffing fruit into their vehicle's exhaust. do segways have exhausts? they do now!
 		user.visible_message("<span class='warning'>[user] begins stuffing [W] into [src]'s tailpipe.</span>", "<span class='warning'>You begin stuffing [W] into [src]'s tailpipe...</span>", ignored_mobs = occupants)
-		if(do_after(user, 30, TRUE, src))
+		if(do_after(user, 30, src))
 			if(user.transferItemToLoc(W, src))
 				user.visible_message("<span class='warning'>[user] stuffs [W] into [src]'s tailpipe.</span>", "<span class='warning'>You stuff [W] into [src]'s tailpipe.</span>", ignored_mobs = occupants)
 				eddie_murphy = W
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 1b7b2d9e5ccb..45dc055e1b21 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -3,7 +3,7 @@
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
 	icon_state = "boozeomat"
 	icon_deny = "boozeomat-deny"
-	products = list(
+	products = list( // All of drink dispenser reagents should be available here.
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
 		/obj/item/reagent_containers/food/drinks/modglass/small = 10,
@@ -11,18 +11,31 @@
 		/obj/item/reagent_containers/food/drinks/modglass/large = 10,
 		/obj/item/reagent_containers/food/drinks/flask = 3,
 		/obj/item/reagent_containers/food/drinks/ice = 10,
+		/obj/item/reagent_containers/food/drinks/waterbottle/large = 6,
 		/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
 		/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
 		/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
+		/obj/item/reagent_containers/food/drinks/bottle/lemonjuice = 4,
+		/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice = 4,
 		/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
 		/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
+		/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch = 4,
 		/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
-		/obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15,
-		/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8,
+		/obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 8,
+		/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 4,
+		/obj/item/reagent_containers/food/drinks/soda_cans/vimukti = 4,
 		/obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
 		/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
+		/obj/item/reagent_containers/food/drinks/mug/tea = 8,
+		/obj/item/reagent_containers/food/drinks/coffee = 8,
 		/obj/item/reagent_containers/food/drinks/ale = 6,
-		/obj/item/reagent_containers/food/drinks/beer = 6,
+		/obj/item/reagent_containers/food/drinks/beer = 8,
 		/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
@@ -38,7 +51,10 @@
 		/obj/item/reagent_containers/food/drinks/bottle/amaretto = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/sake = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/applejack = 5,
+		/obj/item/reagent_containers/food/drinks/bottle/triplesec = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/coconut = 5,
+		/obj/item/reagent_containers/food/drinks/bottle/cacao = 5,
+		/obj/item/reagent_containers/food/drinks/bottle/menthe = 5,
 		/obj/item/reagent_containers/food/drinks/bottle = 15,
 		/obj/item/reagent_containers/food/drinks/bottle/small = 15,
 		/obj/item/garnish/olives = 10,
@@ -46,16 +62,16 @@
 		/obj/item/garnish/umbrellablue = 10,
 		/obj/item/garnish/umbrellagreen = 10
 	)
-	contraband = list(
-		/obj/item/reagent_containers/food/drinks/mug/tea = 12,
-		/obj/item/reagent_containers/food/drinks/bottle/fernet = 5)
+	contraband = list()
 	premium = list(
 		/obj/item/reagent_containers/glass/bottle/ethanol = 4,
+		/obj/item/reagent_containers/glass/bottle/sugar = 3,
+		/obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
 		/obj/item/reagent_containers/food/drinks/bottle/trappist = 5)
 
-	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty 'round this sector?"
-	product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
+	product_slogans = "I hope nobody asks me for a cup of tea...;Alcohol is everyone's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty 'round this sector?"
+	product_ads = "Drink up!;Booze is good for you!;Alcohol is everyone's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 53 FSC!;Award-winning wine!;Maximum alcohol!;Everyone loves beer.;A toast for progress!"
 	req_access = list(ACCESS_BAR)
 	refill_canister = /obj/item/vending_refill/boozeomat
 	default_price = 120
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index 3cff7d3c361d..1c377c309464 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/cigarette
 	name = "\improper ShadyCigs Deluxe"
 	desc = "If you want to get cancer, might as well do it in style."
-	product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
-	product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
+	product_slogans = "Space cigs taste good like a cigarette should.;I'd rather die than switch.;Smoke!;Don't believe the reports - smoke today!"
+	product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 150 FSC.;Award-winning cigs."
 	icon_state = "cigs"
 	products = list(
 		/obj/item/storage/fancy/cigarettes = 5,
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 4a9f4a456eee..84f82d81a2e2 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -1,35 +1,34 @@
 
 /obj/machinery/vending/cola
-	name = "\improper Robust Softdrinks"
-	desc = "A softdrink vendor provided by Robust Industries, LLC."
+	name = "\improper RobustMore Softdrinks"
+	desc = "A softdrink vendor provided by RobustMore DrinkFoods Industries, LLC."
 	icon_state = "Cola_Machine"
-	product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
-	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
+	product_slogans = "RobustMore Softdrinks: More robust than a toolbox to the head!"
+	product_ads = "Refreshing!;Hope you're thirsty!;Over 10 trillion drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks this side of the galaxy."
 	products = list(
 		/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch = 10,
 		/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda = 10,
 		/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 		/obj/item/reagent_containers/food/drinks/waterbottle = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/efuel = 5,
-		/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
-		/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
+		/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy = 5,
+		/obj/item/reagent_containers/food/drinks/soda_cans/vimukti = 6,
+		/obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch = 6)
 	premium = list(
-		/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
 		/obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
-		/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1,
-		/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)
+		/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy = 1,
+		/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1)
 	refill_canister = /obj/item/vending_refill/cola
 	default_price = 45
 	extra_price = 200
 
 
 /obj/item/vending_refill/cola
-	machine_name = "Robust Softdrinks"
+	machine_name = "RobustMore Softdrinks"
 	icon_state = "refill_cola"
 
 /obj/machinery/vending/cola/random
@@ -54,9 +53,9 @@
 
 /obj/machinery/vending/cola/red
 	icon_state = "red_cola"
-	name = "\improper Space Cola Vendor"
-	desc = "It vends cola, in space."
-	product_slogans = "Cola in space!"
+	name = "\improper Master Cola Vendor"
+	desc = "This vending machine offers Master Cola. Master Cola - have a drink from the past!"
+	product_slogans = "Master Cola - have a drink from the past!"
 	light_mask = "red_cola-light-mask"
 	light_color = COLOR_DARK_RED
 
@@ -70,9 +69,9 @@
 
 /obj/machinery/vending/cola/starkist
 	icon_state = "starkist"
-	name = "\improper Star-kist Vendor"
-	desc = "The taste of a star in liquid form."
-	product_slogans = "Drink the stars! Star-kist!"
+	name = "\improper Lunapunch Vendor"
+	desc = "What keeps the colonies running - Lunapunch."
+	product_slogans = "The Colonies run on Lunapunch!"
 	light_mask = "starkist-light-mask"
 	light_color = COLOR_LIGHT_ORANGE
 
@@ -83,27 +82,27 @@
 
 /obj/machinery/vending/cola/pwr_game
 	icon_state = "pwr_game"
-	name = "\improper Pwr Game Vendor"
-	desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads."
-	product_slogans = "The POWER that gamers crave! PWR GAME!"
+	name = "\improper PAC-Fuel Vendor"
+	desc = "PAC-Fuel: stay flying straight. Enter the code on every can for a chance to win gamer merch or industrial equipment!"
+	product_slogans = "Keep flying steady with PAC-Fuel!"
 	light_mask = "pwr_game-light-mask"
 	light_color = COLOR_STRONG_VIOLET
 
 /obj/machinery/vending/cola/shamblers
-	name = "\improper Shambler's Vendor"
-	desc = "~Shake me up some of that Shambler's Juice!~"
+	name = "\improper Shoal Punch Vendor"
+	desc = "Every fruit you could want, at your beak! Shoal Punch!"
 	icon_state = "shamblers_juice"
 	products = list(
 		/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch = 10,
 		/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel = 10,
+		/obj/item/reagent_containers/food/drinks/soda_cans/orange_soda = 10,
 		/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
-		/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10)
-	product_slogans = "~Shake me up some of that Shambler's Juice!~"
-	product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
+		/obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch = 10)
+	product_slogans = "very fruit you could want, at your beak! Shoal Punch!"
+	product_ads = "Every fruit you could want, at your beak!;Don't go flying dry!;Over two trillion served!;Thirsty? Get punched!;Skrikira trikxti skrmikr rakti!;Don't go dry, get Shoal Punch."
 	light_mask = "shamblers-light-mask"
 	light_color = COLOR_MOSTLY_PURE_PINK
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 5dbd8ea733db..3e51271093ad 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/dinnerware
 	name = "\improper Plasteel Chef's Dinnerware Vendor"
 	desc = "A kitchen and restaurant equipment vendor."
-	product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
+	product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils."
 	icon_state = "dinnerware"
 	products = list(
 		/obj/item/storage/bag/tray = 8,
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index d27a1f6ffe6e..c803fa347e9f 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/games
 	name = "\improper Good Clean Fun"
 	desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..."
-	product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
+	product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Fun times forever!"
 	icon_state = "games"
 	products = list(
 		/obj/item/toy/cards/deck = 5,
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 03d532c804e7..5f06b35f76b5 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -2,7 +2,7 @@
 	name = "\improper Liberation Station"
 	desc = "An overwhelming amount of <b>ancient patriotism</b> washes over you just by looking at the machine."
 	icon_state = "liberationstation"
-	product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!"
+	product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!"
 	product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
 	vend_reply = "Remember the name: Liberation Station!"
 	products = list(
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 989bd721a79c..911a190703f4 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -2,8 +2,8 @@
 	name = "\improper Syndicate Donksoft Toy Vendor"
 	desc = "An ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!"
 	icon_state = "syndi"
-	product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
-	product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
+	product_slogans = "Get your cool toys today!;Quality toy weapons for cheap prices!"
+	product_ads = "Feel tough with your toys!;Express your inner child today!;Toy weapons don't kill people, but boredom does!;Who needs responsibilities when you have toy weapons?;Make your next foam fight FUN!"
 	vend_reply = "Come back for more!"
 	circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
 	products = list(/obj/item/gun/ballistic/automatic/toy = 10,
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index d0130d7358fc..45d76a4754fa 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/snack
 	name = "\improper Getmore Chocolate Corp"
-	desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars."
+	desc = "A snack machine courtesy of the RobustMore DrinkFoods LLC."
 	product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
-	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
+	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Have a snack.;Snacks are good for you!;Have something better! Get RobustMore!;Best quality snacks!;We love chocolate!;Try our new jerky!"
 	icon_state = "snack"
 	light_mask = "snack-light-mask"
 	products = list(
@@ -24,7 +24,7 @@
 	input_display_header = "Chef's Food Selection"
 
 /obj/item/vending_refill/snack
-	machine_name = "Getmore Chocolate Corp"
+	machine_name = "RobustMore DrinkFoods LLC"
 
 /obj/machinery/vending/snack/random
 	name = "\improper Random Snackies"
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index 8fefa1015536..a5092cf7373f 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -2,8 +2,8 @@
 	name = "\improper Donksoft Toy Vendor"
 	desc = "Ages 8 and up approved vendor that dispenses toys."
 	icon_state = "nt-donk"
-	product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
-	product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
+	product_slogans = "Get your cool toys today!;Quality toy weapons for cheap prices!"
+	product_ads = "Feel tough with your toys!;Express your inner child today!;Toy weapons don't kill people, but bordeom does!;Who needs responsibilities when you have toy weapons?;Make your next foam fight FUN!"
 	vend_reply = "Come back for more!"
 	light_mask = "donksoft-light-mask"
 	circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index bbc53154aac6..da3fdb134010 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -375,7 +375,7 @@
 	icon_state = "chapdrobe"
 	product_ads = "Are you being bothered by cultists or pesky revenants? Then come and dress like the holy man!;Clothes for men of the cloth!"
 	vend_reply = "Thank you for using the ChapDrobe!"
-	products = list(/obj/item/choice_beacon/holy = 1,
+	products = list(/obj/item/storage/box/holy = 1,
 					/obj/item/storage/backpack/cultpack = 1,
 					/obj/item/clothing/head/beret/service = 1, //WS edit - berets
 					/obj/item/clothing/accessory/pocketprotector/cosmetology = 1,
diff --git a/html/changelogs/AutoChangeLog-pr-3072.yml b/html/changelogs/AutoChangeLog-pr-3072.yml
new file mode 100644
index 000000000000..683d731e0033
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3072.yml
@@ -0,0 +1,4 @@
+author: FalloutFalcon
+changes:
+  - {bugfix: fixed multiple of the do_afters not working due to misplaced args}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3083.yml b/html/changelogs/AutoChangeLog-pr-3083.yml
deleted file mode 100644
index d4960c0dcfeb..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3083.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Skies-Of-Blue
-changes:
-  - {rscadd: several new SUNS-produced genemods have hit the public market! Head to
-      your local gene-clinic and ask about their new dog and rabbit options for more
-      details}
-  - {balance: fox ears have been tweaked to be just as susceptible to sound as cat
-      ears}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3087.yml b/html/changelogs/AutoChangeLog-pr-3087.yml
deleted file mode 100644
index 3ffd70b999fa..000000000000
--- a/html/changelogs/AutoChangeLog-pr-3087.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: PositiveEntropy
-changes:
-  - {rscadd: CLIP now reports the presence of so-called "Flame Troopers" of the Frontiersmen
-      terrorizing their territories...}
-  - {balance: Marine armor has improved armor stats at the cost of the bulk slowing
-      down the wearer.}
-  - {balance: 'Flamethrowers have a slightly improved effective range, as well as
-      higher damage.'}
-  - {imageadd: The Frontiersmen have gotten better tailors and now look sharp and
-      deadly!}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-3119.yml b/html/changelogs/AutoChangeLog-pr-3119.yml
new file mode 100644
index 000000000000..16d0b5a1df03
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3119.yml
@@ -0,0 +1,8 @@
+author: PositiveEntropy
+changes:
+  - {rscadd: 'The Hunters of Illestren have now allowed for Hunter Collignes, Machinists
+      and Flamebearers to now roam the Frontier aboard their humble fleet!'}
+  - {imageadd: The Saint Roumain's Militia has been fully resprited!}
+  - {imageadd: All SRM jobs now have unique HUD icons!}
+  - {imageadd: The Unknown Job HUD icon has been resprited!}
+delete-after: true
diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml
index 5ac112757f39..ae51957de76c 100644
--- a/html/changelogs/archive/2024-06.yml
+++ b/html/changelogs/archive/2024-06.yml
@@ -174,3 +174,80 @@
   - rscdel: Removed 16 unused/removed ruin code files
   - rscdel: Removed a whole lot of old/unused ruin code from misc files
   - tweak: Tweaked various ruins and one ship to fix issues and remove unused items
+2024-06-10:
+  PositiveEntropy:
+  - rscadd: CLIP now reports the presence of so-called "Flame Troopers" of the Frontiersmen
+      terrorizing their territories...
+  - balance: Marine armor has improved armor stats at the cost of the bulk slowing
+      down the wearer.
+  - balance: Flamethrowers have a slightly improved effective range, as well as higher
+      damage.
+  - imageadd: The Frontiersmen have gotten better tailors and now look sharp and deadly!
+  Skies-Of-Blue:
+  - rscadd: several new SUNS-produced genemods have hit the public market! Head to
+      your local gene-clinic and ask about their new dog and rabbit options for more
+      details
+  - balance: fox ears have been tweaked to be just as susceptible to sound as cat
+      ears
+2024-06-11:
+  'CoiledLamb ':
+  - rscadd: Resprites the eggbox
+  Gristlebee:
+  - code_imp: Switchblades are now pathed under obj/kitchen/knife
+  - imageadd: Switchblade sprites moved from items and weapons.dmi to knife.dmi
+  Sadhorizon:
+  - rscadd: Pickaxe was added to the autolathe.
+  meemofcourse:
+  - rscadd: PGF jobs now grant you the Kalixcian Common language
+2024-06-13:
+  FalloutFalcon:
+  - rscdel: Removed alot of chaplain stuff we will never use
+  - rscdel: The chaplain is now just as magic as the average person
+  Gristlebee:
+  - rscadd: Wrecked Factory ruin
+  - rscadd: Indestructible titanium walls
+  - rscadd: Lavaland atmos subtypes for plating, rusted plating, concrete, white and
+      dark turfs
+  - balance: Syndicate Space Simple Mobs have their max temp increased
+  - tweak: Wall_lockers updatepaths on the Aegis
+  - code_imp: Adds ruin to map_catalogue,txt, lavaland.dm and adds it to lavaland.dm
+      areas
+  - rscadd: Techshell box
+  - rscadd: Techshells to the outpost market for 175 credits
+  - tweak: Scatter ion description
+  - balance: Techshell recipes no longer require higher tier stock parts, adjusts
+      scatter laser, scatter ion, dragonsbreath and pulse slug recipes
+  - balance: Buffs scatter lasers, scatter ion and dragonsbreath
+  PositiveEntropy:
+  - rscadd: The Hardliners have now made a proper appearance in the Frontier!
+  Sadhorizon:
+  - rscadd: Added the Sunskipper-class Culinary Vessel.
+  - rscadd: Every drink and booze dispenser drink is in the booze-o-mat now.
+  - rscadd: Added bottles for triple sec, lemon juice, creme de cacao and creme de
+      menthe.
+  - rscdel: Removed the Boyardee-class Entertainment Vessel.
+  - rscdel: Independent chefs no longer get kitchen cqc.
+  - tweak: The "syndicate waiter's outfit" renamed to just "waiter's outfit".
+  - tweak: Indpenedent bartenders now start with a waistcoat.
+  - tweak: Edited waiter's outfit. Also, the role now gets kitchen access.
+  - tweak: Independent cooks now start with laceup shoes.
+  meemofcourse:
+  - rscadd: SUNS 3x6 logo decal, SUNS tiles, SUNS emblem floor decal, Desk and Wall
+      flag, folders, PDA, cards, locker, bedsheets, and headsets.
+2024-06-14:
+  Gristlebee:
+  - bugfix: Posibrains/MMI pilots being permaslept on mech destruction
+2024-06-15:
+  Rye-Rice:
+  - imageadd: Rylie Was Forced To Resprite Concrete when she was 6!
+2024-06-16:
+  DIB-DOG:
+  - rscadd: Added 1 Raksha Helmet to the sergeant's locker on the PGFN Crying Sun
+2024-06-17:
+  meemofcourse:
+  - code_imp: A lot of SUNS decals.
+2024-06-18:
+  '@thestripes, @meemofcourse , @GenericDM ':
+  - tweak: reflavors nearly every drink ingame
+  SomeguyManperson:
+  - rscadd: you can now put organs inside burgers or on pizzas
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index d23ebfae4756..861bb2701699 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi
index 23292b118d6a..e7376425f545 100644
Binary files a/icons/mob/clothing/ears.dmi and b/icons/mob/clothing/ears.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/belt.dmi b/icons/mob/clothing/faction/hardliners/belt.dmi
new file mode 100644
index 000000000000..a864128547d6
Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/belt.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/eyes.dmi b/icons/mob/clothing/faction/hardliners/eyes.dmi
new file mode 100644
index 000000000000..aec97963fd99
Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/eyes.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/head.dmi b/icons/mob/clothing/faction/hardliners/head.dmi
new file mode 100644
index 000000000000..839826a7c426
Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/head.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/suits.dmi b/icons/mob/clothing/faction/hardliners/suits.dmi
new file mode 100644
index 000000000000..05f41eb00d25
Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/suits.dmi differ
diff --git a/icons/mob/clothing/faction/hardliners/uniforms.dmi b/icons/mob/clothing/faction/hardliners/uniforms.dmi
new file mode 100644
index 000000000000..8726f50b2f54
Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/uniforms.dmi differ
diff --git a/icons/mob/clothing/faction/ngr/head.dmi b/icons/mob/clothing/faction/ngr/head.dmi
index 08af6ee9ba08..c370f07aa0f3 100644
Binary files a/icons/mob/clothing/faction/ngr/head.dmi and b/icons/mob/clothing/faction/ngr/head.dmi differ
diff --git a/icons/mob/clothing/faction/srm/head.dmi b/icons/mob/clothing/faction/srm/head.dmi
new file mode 100644
index 000000000000..186d021abeb3
Binary files /dev/null and b/icons/mob/clothing/faction/srm/head.dmi differ
diff --git a/icons/mob/clothing/faction/srm/suits.dmi b/icons/mob/clothing/faction/srm/suits.dmi
new file mode 100644
index 000000000000..801414dceec7
Binary files /dev/null and b/icons/mob/clothing/faction/srm/suits.dmi differ
diff --git a/icons/mob/clothing/faction/srm/uniforms.dmi b/icons/mob/clothing/faction/srm/uniforms.dmi
new file mode 100644
index 000000000000..b43a33a34e8d
Binary files /dev/null and b/icons/mob/clothing/faction/srm/uniforms.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 721de12b60b6..f207b2bfd826 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/armor.dmi b/icons/mob/clothing/head/armor.dmi
index 4cec91ad0110..38adc74f3317 100644
Binary files a/icons/mob/clothing/head/armor.dmi and b/icons/mob/clothing/head/armor.dmi differ
diff --git a/icons/mob/clothing/head/spacesuits.dmi b/icons/mob/clothing/head/spacesuits.dmi
index 12923a0e281c..55a7f69de51f 100644
Binary files a/icons/mob/clothing/head/spacesuits.dmi and b/icons/mob/clothing/head/spacesuits.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index a22e958effd8..fe74923b657d 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index d64a4cbbf04f..4c37ff4d8bff 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
index ee9896871a91..da5075195992 100644
Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ
diff --git a/icons/mob/clothing/suits/toggle.dmi b/icons/mob/clothing/suits/toggle.dmi
index 8ceffd1312c0..99fddcf51169 100644
Binary files a/icons/mob/clothing/suits/toggle.dmi and b/icons/mob/clothing/suits/toggle.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 3926bce0f3b1..dced69dc5b6f 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi
index 740c63c4b370..63dee7bfea44 100644
Binary files a/icons/mob/inhands/misc/food_lefthand.dmi and b/icons/mob/inhands/misc/food_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi
index 1e90ac3cb75a..bb1bd3f960fb 100644
Binary files a/icons/mob/inhands/misc/food_righthand.dmi and b/icons/mob/inhands/misc/food_righthand.dmi differ
diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi
index 56657861f576..c4cae890b54c 100644
Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index df05a9d601e3..17bab47dc9ef 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 1607dc47db22..82d3a62d06bd 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 715fb82d988e..119b420f182a 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index e0818c6853df..4de00230ac76 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/belt.dmi b/icons/obj/clothing/faction/hardliners/belt.dmi
new file mode 100644
index 000000000000..e8925f9c5d36
Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/belt.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/eyes.dmi b/icons/obj/clothing/faction/hardliners/eyes.dmi
new file mode 100644
index 000000000000..2e339c1b510a
Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/eyes.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/head.dmi b/icons/obj/clothing/faction/hardliners/head.dmi
new file mode 100644
index 000000000000..5101eeedce9c
Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/head.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/suits.dmi b/icons/obj/clothing/faction/hardliners/suits.dmi
new file mode 100644
index 000000000000..39da1c952739
Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/suits.dmi differ
diff --git a/icons/obj/clothing/faction/hardliners/uniforms.dmi b/icons/obj/clothing/faction/hardliners/uniforms.dmi
new file mode 100644
index 000000000000..233eb500c826
Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/uniforms.dmi differ
diff --git a/icons/obj/clothing/faction/ngr/head.dmi b/icons/obj/clothing/faction/ngr/head.dmi
index 822766336620..d2258c5565dd 100644
Binary files a/icons/obj/clothing/faction/ngr/head.dmi and b/icons/obj/clothing/faction/ngr/head.dmi differ
diff --git a/icons/obj/clothing/faction/srm/head.dmi b/icons/obj/clothing/faction/srm/head.dmi
new file mode 100644
index 000000000000..8503fda7e3cf
Binary files /dev/null and b/icons/obj/clothing/faction/srm/head.dmi differ
diff --git a/icons/obj/clothing/faction/srm/suits.dmi b/icons/obj/clothing/faction/srm/suits.dmi
new file mode 100644
index 000000000000..031fb45e3ba6
Binary files /dev/null and b/icons/obj/clothing/faction/srm/suits.dmi differ
diff --git a/icons/obj/clothing/faction/srm/uniforms.dmi b/icons/obj/clothing/faction/srm/uniforms.dmi
new file mode 100644
index 000000000000..ec410e52e600
Binary files /dev/null and b/icons/obj/clothing/faction/srm/uniforms.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index fb23d4bc2afe..402ce131a988 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/head/armor.dmi b/icons/obj/clothing/head/armor.dmi
index c6792be933fc..6757e591c853 100644
Binary files a/icons/obj/clothing/head/armor.dmi and b/icons/obj/clothing/head/armor.dmi differ
diff --git a/icons/obj/clothing/head/spacesuits.dmi b/icons/obj/clothing/head/spacesuits.dmi
index 5c2351c7489f..8befad3b380f 100644
Binary files a/icons/obj/clothing/head/spacesuits.dmi and b/icons/obj/clothing/head/spacesuits.dmi differ
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
index 9eaa67f04a42..232a2f6ec2bd 100644
Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ
diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi
index c86acdcbf3e5..2208c8b7cf98 100644
Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ
diff --git a/icons/obj/clothing/suits/toggle.dmi b/icons/obj/clothing/suits/toggle.dmi
index 54df84ad5def..75a2f1a891b3 100644
Binary files a/icons/obj/clothing/suits/toggle.dmi and b/icons/obj/clothing/suits/toggle.dmi differ
diff --git a/icons/obj/deskflags.dmi b/icons/obj/deskflags.dmi
index cf1eaacf5bb3..6a950bcebc4e 100644
Binary files a/icons/obj/deskflags.dmi and b/icons/obj/deskflags.dmi differ
diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi
index 03fdf63dd00b..fa3df8febf1a 100644
Binary files a/icons/obj/drinks/drinks.dmi and b/icons/obj/drinks/drinks.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index 118ce7693637..a200515c324f 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/item/knife.dmi b/icons/obj/item/knife.dmi
index aebfb617ed34..2e95a9154512 100644
Binary files a/icons/obj/item/knife.dmi and b/icons/obj/item/knife.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 12798b6eb2ac..a0ceaebd8383 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index f76e5611c93d..5d23996fb663 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index ea47f805dee9..a6199b8723ef 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 03f2163cddce..df2add959648 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures/signs/sign.dmi b/icons/obj/structures/signs/sign.dmi
index 523953b599c7..f123c03a76e6 100644
Binary files a/icons/obj/structures/signs/sign.dmi and b/icons/obj/structures/signs/sign.dmi differ
diff --git a/icons/obj/structures/signs/wallflags.dmi b/icons/obj/structures/signs/wallflags.dmi
index 4b4696ad9623..837e442f27ca 100644
Binary files a/icons/obj/structures/signs/wallflags.dmi and b/icons/obj/structures/signs/wallflags.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 5e072b68f42d..898805a0fa13 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/turf/decals.dmi b/icons/turf/decals/decals.dmi
similarity index 100%
rename from icons/turf/decals.dmi
rename to icons/turf/decals/decals.dmi
diff --git a/icons/turf/decals/suns_floor.dmi b/icons/turf/decals/suns_floor.dmi
new file mode 100644
index 000000000000..cce105645f23
Binary files /dev/null and b/icons/turf/decals/suns_floor.dmi differ
diff --git a/icons/turf/floors/suns.dmi b/icons/turf/floors/suns.dmi
new file mode 100644
index 000000000000..aa0df610ec55
Binary files /dev/null and b/icons/turf/floors/suns.dmi differ
diff --git a/icons/turf/walls/concrete.dmi b/icons/turf/walls/concrete.dmi
index a201e7ab6375..da6a6e45a4ce 100644
Binary files a/icons/turf/walls/concrete.dmi and b/icons/turf/walls/concrete.dmi differ
diff --git a/icons/turf/walls/hexacrete.dmi b/icons/turf/walls/hexacrete.dmi
index 6866ac7f536f..f120455f46ad 100644
Binary files a/icons/turf/walls/hexacrete.dmi and b/icons/turf/walls/hexacrete.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 152ec8bcc4fb..f119f28c021a 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1304,6 +1304,7 @@
 #include "code\game\objects\items\stacks\tiles\tile_mineral.dm"
 #include "code\game\objects\items\stacks\tiles\tile_reskinning.dm"
 #include "code\game\objects\items\stacks\tiles\tile_types.dm"
+#include "code\game\objects\items\stacks\tiles\tiles_suns.dm"
 #include "code\game\objects\items\storage\backpack.dm"
 #include "code\game\objects\items\storage\bags.dm"
 #include "code\game\objects\items\storage\belt.dm"
@@ -1477,6 +1478,7 @@
 #include "code\game\turfs\open\floor\plasteel_floor.dm"
 #include "code\game\turfs\open\floor\plating.dm"
 #include "code\game\turfs\open\floor\reinf_floor.dm"
+#include "code\game\turfs\open\floor\suns_floor.dm"
 #include "code\game\turfs\open\floor\plating\asteroid.dm"
 #include "code\game\turfs\open\floor\plating\beach.dm"
 #include "code\game\turfs\open\floor\plating\icemoon.dm"
@@ -1958,8 +1960,10 @@
 #include "code\modules\clothing\factions\clip.dm"
 #include "code\modules\clothing\factions\frontiersmen.dm"
 #include "code\modules\clothing\factions\gezena.dm"
+#include "code\modules\clothing\factions\hardliners.dm"
 #include "code\modules\clothing\factions\nanotrasen.dm"
 #include "code\modules\clothing\factions\ngr.dm"
+#include "code\modules\clothing\factions\srm.dm"
 #include "code\modules\clothing\factions\suns.dm"
 #include "code\modules\clothing\glasses\_glasses.dm"
 #include "code\modules\clothing\glasses\engine_goggles.dm"
diff --git a/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt b/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt
new file mode 100644
index 000000000000..712c2a906ffc
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/3109_drinks_lore_update.txt
@@ -0,0 +1,11 @@
+/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game : /obj/item/reagent_containers/food/drinks/soda_cans/pacfuel
+/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime : /obj/item/reagent_containers/food/drinks/soda_cans/orange_soda
+/obj/item/reagent_containers/food/drinks/soda_cans/starkist : /obj/item/reagent_containers/food/drinks/soda_cans/lunapunch
+/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind : /obj/item/reagent_containers/food/drinks/soda_cans/comet_trail
+/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko : /obj/item/reagent_containers/food/drinks/soda_cans/vimukti
+/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb : /obj/item/reagent_containers/food/drinks/soda_cans/tadrixx
+/obj/item/reagent_containers/food/drinks/soda_cans/shamblers : /obj/item/reagent_containers/food/drinks/soda_cans/shoal_punch
+/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull : /obj/item/reagent_containers/food/drinks/soda_cans/crosstalk
+/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy : /obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy
+/obj/item/reagent_containers/food/drinks/britcup : /obj/item/reagent_containers/food/drinks/mug
+/obj/item/reagent_containers/food/drinks/solgovcup : /obj/item/reagent_containers/food/drinks/mug