From dee92640a840b8bbddf618b8d77f7e2da31cdd72 Mon Sep 17 00:00:00 2001
From: Cw3040 <wrightjcsc@gmail.com>
Date: Fri, 8 Jun 2018 14:33:40 -0400
Subject: [PATCH 1/3] Cryosleeper Bug Fix

Adds Cyborg weapon modules to var/list/do_not_preserve_items for
Cryosleepers, hopefully eliminating a bug where borg gun modules drop on
cryosleep.
---
 modular_citadel/code/game/machinery/cryopod.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modular_citadel/code/game/machinery/cryopod.dm b/modular_citadel/code/game/machinery/cryopod.dm
index 87089d57fd..8965d2bbf3 100644
--- a/modular_citadel/code/game/machinery/cryopod.dm
+++ b/modular_citadel/code/game/machinery/cryopod.dm
@@ -166,6 +166,9 @@
 	// These items will NOT be preserved
 	var/list/do_not_preserve_items = list (
 		/obj/item/mmi/posibrain
+		/obj/item/gun/energy/disabler/cyborg
+		/obj/item/gun/energy/kinetic_accelerator/cyborg
+		/obj/item/gun/energy/laser/cyborg
 	)
 
 /obj/machinery/cryopod/Initialize()

From 93b97528c012a5f98d59c44dfd84b1d385372739 Mon Sep 17 00:00:00 2001
From: Cw3040 <wrightjcsc@gmail.com>
Date: Fri, 8 Jun 2018 14:48:27 -0400
Subject: [PATCH 2/3] Fixing my syntax errors

to make travis not yell at me
---
 modular_citadel/code/game/machinery/cryopod.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modular_citadel/code/game/machinery/cryopod.dm b/modular_citadel/code/game/machinery/cryopod.dm
index 8965d2bbf3..d4d982d5e6 100644
--- a/modular_citadel/code/game/machinery/cryopod.dm
+++ b/modular_citadel/code/game/machinery/cryopod.dm
@@ -165,9 +165,9 @@
 	)
 	// These items will NOT be preserved
 	var/list/do_not_preserve_items = list (
-		/obj/item/mmi/posibrain
-		/obj/item/gun/energy/disabler/cyborg
-		/obj/item/gun/energy/kinetic_accelerator/cyborg
+		/obj/item/mmi/posibrain,
+		/obj/item/gun/energy/disabler/cyborg,
+		/obj/item/gun/energy/kinetic_accelerator/cyborg,
 		/obj/item/gun/energy/laser/cyborg
 	)
 

From fd1a93907ffca8d58c61a3fa2283160bfa35d6fa Mon Sep 17 00:00:00 2001
From: Cw3040 <wrightjcsc@gmail.com>
Date: Fri, 8 Jun 2018 20:21:10 -0400
Subject: [PATCH 3/3] Box Fix

Accidentally deleted a disposals pipe in Maint, this rectifies that.
---
 _maps/map_files/BoxStation/BoxStation.dmm | 757 +++++++++++-----------
 1 file changed, 379 insertions(+), 378 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 1290ddf469..b46e6f1753 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -41960,6 +41960,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "cbx" = (
@@ -53149,23 +53150,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"dkC" = (
-/obj/machinery/door/airlock/wood{
-	name = "Maintenance Bar"
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "dqu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
-"dqT" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
 "dvO" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -53185,6 +53173,11 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"eiu" = (
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks/beer,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "eyM" = (
 /obj/machinery/mineral/ore_redemption{
 	input_dir = 2;
@@ -53193,18 +53186,16 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
-"ezO" = (
-/obj/structure/mineral_door/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "eHI" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
 	},
 /turf/open/floor/plasteel/floorgrime,
 /area/maintenance/disposal/incinerator)
-"eKN" = (
-/obj/machinery/vending/clothing,
+"eOM" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "eRz" = (
@@ -53222,18 +53213,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
-"eYI" = (
-/obj/item/restraints/legcuffs,
-/obj/item/restraints/handcuffs/fake,
-/obj/structure/bed/dogbed,
-/turf/open/floor/plating,
-/area/maintenance/bar)
 "fcG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
 	},
 /turf/closed/wall/r_wall,
 /area/science/mixing)
+"fip" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 5
+	},
+/turf/closed/wall,
+/area/maintenance/bar)
 "flc" = (
 /obj/machinery/bookbinder,
 /turf/open/floor/plasteel/white,
@@ -53255,6 +53246,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"fFm" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken7"
+	},
+/area/maintenance/bar)
 "fGf" = (
 /obj/machinery/smartfridge/disks,
 /turf/open/floor/plasteel/hydrofloor,
@@ -53264,11 +53260,21 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"fWI" = (
+"fOZ" = (
+/obj/machinery/vending/clothing,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"fQl" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/shaker,
 /turf/open/floor/wood,
 /area/maintenance/bar)
+"fZE" = (
+/obj/item/restraints/legcuffs,
+/obj/item/restraints/handcuffs/fake,
+/obj/structure/bed/dogbed,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "gbq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -53300,9 +53306,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"gxS" = (
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "gLH" = (
 /obj/machinery/door/airlock/external{
 	name = "External Access";
@@ -53313,10 +53316,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
-"gRV" = (
-/obj/machinery/vending/autodrobe,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "gWd" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -53351,6 +53350,17 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port)
+"hiC" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken"
+	},
+/area/maintenance/bar)
+"hsg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/turf/closed/wall,
+/area/maintenance/bar)
 "hRa" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light{
@@ -53363,11 +53373,18 @@
 /obj/item/stock_parts/cell/super,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"idZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
+"hZp" = (
+/obj/structure/table/wood/poker,
+/obj/effect/spawner/lootdrop/gambling,
+/turf/open/floor/wood{
+	icon_state = "wood-broken"
+	},
+/area/maintenance/bar)
+"iaK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood{
+	icon_state = "wood-broken7"
 	},
-/turf/open/floor/wood,
 /area/maintenance/bar)
 "ijc" = (
 /obj/structure/table,
@@ -53383,11 +53400,6 @@
 /obj/item/pen,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"iEy" = (
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/maintenance/bar)
 "iEJ" = (
 /obj/machinery/door/airlock/external{
 	name = "Escape Pod One"
@@ -53397,10 +53409,6 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
-"iGw" = (
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "iNn" = (
 /obj/machinery/camera{
 	c_tag = "Kitchen Cold Room"
@@ -53409,6 +53417,11 @@
 /obj/structure/reagent_dispensers/cooking_oil,
 /turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/kitchen)
+"iVZ" = (
+/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "jbf" = (
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -53446,10 +53459,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"jtl" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/space/nearstation)
+"jsx" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "jAD" = (
 /obj/structure/grille,
 /turf/open/floor/plating/airless,
@@ -53512,12 +53527,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"kds" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "khb" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 10
@@ -53535,6 +53544,11 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
+"kjd" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/maintenance/bar)
 "knx" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering{
@@ -53547,11 +53561,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/gravity_generator)
-"knR" = (
-/obj/structure/table/wood,
-/obj/item/weaponcrafting/receiver,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "kob" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
@@ -53566,6 +53575,11 @@
 	},
 /turf/closed/wall/r_wall,
 /area/science/mixing)
+"kEK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "kOw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
@@ -53577,6 +53591,9 @@
 	},
 /turf/open/floor/plasteel/hydrofloor,
 /area/hallway/secondary/service)
+"kPI" = (
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "kQk" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -53600,6 +53617,20 @@
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall,
 /area/science/circuit)
+"lBy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/vending/games,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"lEg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table/wood,
+/obj/machinery/chem_dispenser/drinks,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"lFY" = (
+/turf/closed/wall,
+/area/maintenance/bar)
 "lMg" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -53610,14 +53641,14 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/science/circuit)
+"lSY" = (
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "mjr" = (
 /obj/machinery/vending/wardrobe/bar_wardrobe,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
-"mtJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/bar)
 "mBv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -53629,6 +53660,16 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
+"mEa" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"mLY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/maintenance/bar)
 "mNi" = (
 /obj/machinery/light_switch{
 	pixel_x = -20
@@ -53641,15 +53682,20 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"mVS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"nnj" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "noK" = (
 /obj/structure/girder,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
-"nwX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/vending/games,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "nxv" = (
 /obj/machinery/power/apc{
 	name = "Construction Area APC";
@@ -53665,12 +53711,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
-"nEe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 5
-	},
-/turf/closed/wall,
-/area/maintenance/bar)
 "nGt" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -53682,14 +53722,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"nKB" = (
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks/beer,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"nRn" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
+"nJJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood{
+	icon_state = "wood-broken"
+	},
 /area/maintenance/bar)
 "nRG" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -53697,29 +53737,24 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"nYh" = (
+/obj/structure/table/wood/poker,
+/obj/item/storage/pill_bottle/dice,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "oce" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
-"ooS" = (
+"opk" = (
 /obj/structure/table/wood/poker,
 /obj/effect/spawner/lootdrop/gambling,
-/turf/open/floor/wood{
-	icon_state = "wood-broken"
-	},
-/area/maintenance/bar)
-"oqQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks,
 /turf/open/floor/wood,
 /area/maintenance/bar)
-"ouu" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
+"oCW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "oDF" = (
@@ -53732,12 +53767,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"oPA" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "oUh" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 1
@@ -53745,9 +53774,15 @@
 /obj/machinery/disposal/bin,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"pDq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
+"pcd" = (
+/obj/machinery/door/airlock/wood{
+	name = "Maintenance Bar"
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"pxN" = (
+/obj/item/weaponcrafting/stock,
+/turf/open/floor/wood,
 /area/maintenance/bar)
 "pHl" = (
 /obj/structure/table,
@@ -53788,28 +53823,24 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/floorgrime,
 /area/science/misc_lab)
-"qbA" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck/syndicate,
+"pVG" = (
+/obj/machinery/computer/cryopod,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"pXH" = (
+/obj/structure/chair/stool/bar,
 /turf/open/floor/wood,
 /area/maintenance/bar)
-"qdB" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood{
-	icon_state = "wood-broken7"
-	},
-/area/maintenance/bar)
+"pYX" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space/nearstation)
 "qeQ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"qit" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken"
-	},
-/area/maintenance/bar)
 "qpv" = (
 /obj/machinery/light{
 	dir = 4
@@ -53822,51 +53853,38 @@
 /obj/structure/grille/broken,
 /turf/open/space/basic,
 /area/space/nearstation)
-"qBv" = (
-/obj/item/clothing/mask/breath/medical,
-/obj/item/tank/internals/anesthetic,
+"qTS" = (
+/obj/effect/spawner/lootdrop/costume,
+/obj/item/electropack/shockcollar,
 /turf/open/floor/plating,
 /area/maintenance/bar)
-"qBQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"qKd" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"qSC" = (
-/obj/machinery/vending/boozeomat,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "rcD" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/closed/wall/r_wall,
 /area/science/circuit)
-"ref" = (
-/turf/closed/wall,
-/area/maintenance/bar)
 "rfW" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plasteel/floorgrime,
 /area/maintenance/disposal/incinerator)
-"rgN" = (
-/obj/structure/reagent_dispensers/keg/aphro/strong,
-/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/plating,
-/area/maintenance/bar)
 "rmX" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/beer,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"rrl" = (
-/obj/effect/spawner/lootdrop/costume,
-/obj/item/electropack/shockcollar,
-/turf/open/floor/plating,
+"rpN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"rvm" = (
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"rGn" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
 /area/maintenance/bar)
 "rKP" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -53874,6 +53892,15 @@
 	},
 /turf/open/floor/plating,
 /area/construction)
+"rLR" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/spray/cleaner,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"rTJ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "saK" = (
 /obj/structure/closet/crate,
 /obj/item/target/alien,
@@ -53886,16 +53913,17 @@
 /obj/item/gun/energy/laser/practice,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"shL" = (
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"sjc" = (
-/obj/machinery/cryopod{
-	dir = 4;
-	tag = "0"
+"scN" = (
+/obj/item/clothing/mask/breath/medical,
+/obj/item/tank/internals/anesthetic,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"sjA" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
 	},
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "slk" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12"
@@ -53908,21 +53936,19 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
-"stg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood{
-	icon_state = "wood-broken"
-	},
-/area/maintenance/bar)
 "sxs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/table,
 /obj/item/shovel/spade,
 /turf/open/floor/plasteel/hydrofloor,
 /area/hallway/secondary/service)
+"sKA" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
 "sLv" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -53965,15 +53991,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
 /area/hallway/secondary/service)
-"tmK" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken6"
+"tfq" = (
+/obj/machinery/cryopod{
+	dir = 4;
+	tag = "0"
 	},
-/area/maintenance/bar)
-"tqe" = (
-/obj/structure/table/wood/poker,
-/obj/effect/spawner/lootdrop/gambling,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"tfA" = (
+/obj/structure/reagent_dispensers/keg/aphro/strong,
+/obj/item/reagent_containers/glass/beaker,
+/turf/open/floor/plating,
 /area/maintenance/bar)
 "trb" = (
 /obj/machinery/light{
@@ -53981,20 +54009,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/courtroom)
-"tEz" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood{
-	icon_state = "wood-broken4"
-	},
+"tsl" = (
+/obj/machinery/vending/autodrobe,
+/turf/open/floor/wood,
 /area/maintenance/bar)
 "tMl" = (
 /obj/effect/turf_decal/loading_area,
 /turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/kitchen)
-"tOc" = (
-/obj/item/weaponcrafting/stock,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "tOq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -54008,6 +54030,10 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
+"uao" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "udp" = (
 /obj/item/crowbar/large,
 /obj/structure/rack,
@@ -54034,14 +54060,9 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"uAK" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"uBG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
+"uAx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
 /area/maintenance/bar)
 "uNu" = (
 /obj/structure/disposalpipe/segment{
@@ -54062,6 +54083,10 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
+"uVh" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
 "uVS" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -54085,11 +54110,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva)
-"vhC" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/closed/wall,
+"vmI" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"vsJ" = (
+/obj/structure/table/wood,
+/obj/item/weaponcrafting/receiver,
+/turf/open/floor/wood,
 /area/maintenance/bar)
 "vxh" = (
 /obj/structure/table,
@@ -54115,22 +54143,11 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"vJu" = (
+"vPe" = (
 /obj/structure/table/wood/poker,
-/obj/item/storage/pill_bottle/dice,
+/obj/item/toy/cards/deck/syndicate,
 /turf/open/floor/wood,
 /area/maintenance/bar)
-"vJW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"vNv" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken7"
-	},
-/area/maintenance/bar)
 "vPE" = (
 /obj/machinery/light{
 	dir = 4
@@ -54138,8 +54155,10 @@
 /obj/machinery/libraryscanner,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"vSH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+"wgE" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "wkN" = (
@@ -54176,10 +54195,6 @@
 /obj/item/stack/sheet/metal/fifty,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"wzn" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/bar)
 "wBd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -54192,27 +54207,11 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
-"wPS" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"wSH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
 "wUY" = (
 /obj/structure/table,
 /obj/item/reagent_containers/glass/bucket,
 /turf/open/floor/plasteel/hydrofloor,
 /area/hallway/secondary/service)
-"xfy" = (
-/obj/machinery/computer/cryopod,
-/turf/closed/wall,
-/area/crew_quarters/dorms)
 "xhV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -54239,26 +54238,28 @@
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
+"xEE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "xIa" = (
 /obj/structure/table,
 /obj/effect/spawner/lootdrop/grille_or_trash,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"xPY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/maintenance/bar)
 "ycu" = (
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
-"ygH" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/spray/cleaner,
-/turf/open/floor/wood,
-/area/maintenance/bar)
+"ydY" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
 
 (1,1,1) = {"
 aaa
@@ -73180,7 +73181,7 @@ aaa
 aaa
 aaa
 aaa
-jtl
+pYX
 aaa
 aoV
 cbj
@@ -73437,7 +73438,7 @@ aaa
 aaa
 aaa
 aaa
-jtl
+pYX
 aaa
 bCq
 cbj
@@ -73694,7 +73695,7 @@ aaa
 aaa
 aaa
 aaa
-jtl
+pYX
 aaa
 bCq
 cbk
@@ -73951,7 +73952,7 @@ aaa
 aaa
 aaa
 aaa
-jtl
+pYX
 aaa
 bCq
 bVy
@@ -74208,7 +74209,7 @@ aaa
 aaa
 aaa
 aaa
-jtl
+pYX
 aaa
 bCq
 bVB
@@ -74465,7 +74466,7 @@ aaa
 aaa
 aaa
 aaa
-jtl
+pYX
 aaa
 bCq
 bVA
@@ -75235,7 +75236,7 @@ aoV
 aoV
 bCq
 bCq
-uAK
+uVh
 bCq
 bCq
 bCq
@@ -75757,14 +75758,14 @@ bCq
 bCq
 bCq
 bYy
-ref
-ref
-xPY
-ref
-ref
-ref
-ref
-ref
+lFY
+lFY
+rTJ
+lFY
+lFY
+lFY
+lFY
+lFY
 bUs
 bLv
 aaa
@@ -76014,14 +76015,14 @@ bVG
 bHE
 bHE
 bHE
-dkC
-tmK
-gxS
-gxS
-qit
-iGw
-iGw
-ref
+pcd
+kjd
+kPI
+kPI
+hiC
+pXH
+pXH
+lFY
 bUs
 bLv
 aaa
@@ -76267,18 +76268,18 @@ bHE
 bHE
 bCq
 bHE
-ref
-ref
-ref
-ref
-ref
-gxS
-vNv
-gxS
-iGw
-qbA
-tqe
-ref
+lFY
+lFY
+lFY
+lFY
+lFY
+kPI
+fFm
+kPI
+pXH
+vPe
+opk
+lFY
 bUs
 bLv
 aaf
@@ -76524,18 +76525,18 @@ bHE
 bHE
 cTF
 bHE
-ref
-wPS
-rrl
-eYI
-ref
-gxS
-gxS
-gxS
-iGw
-vJu
-ooS
-ref
+lFY
+vmI
+qTS
+fZE
+lFY
+kPI
+kPI
+kPI
+pXH
+nYh
+hZp
+lFY
 bUs
 bLv
 aaa
@@ -76781,18 +76782,18 @@ bHE
 bSs
 bCq
 bHE
-ref
-rgN
-iEy
-qBv
-ref
-iGw
-iGw
-vNv
-ouu
-iGw
-iGw
-ref
+lFY
+tfA
+iVZ
+scN
+lFY
+pXH
+pXH
+fFm
+eOM
+pXH
+pXH
+lFY
 bUs
 bLv
 aaa
@@ -77038,18 +77039,18 @@ bRh
 bLu
 bCq
 bHE
-ref
-ref
-wzn
-ref
-ref
-qKd
-qKd
-iGw
-kds
-gxS
-gxS
-ref
+lFY
+lFY
+mEa
+lFY
+lFY
+uao
+uao
+pXH
+wgE
+kPI
+kPI
+lFY
 bUs
 bLv
 aaf
@@ -77295,19 +77296,19 @@ bCq
 bCq
 bCq
 bHE
-ref
-fWI
-gxS
-vNv
-nKB
-gxS
+lFY
+fQl
+kPI
+fFm
+eiu
+kPI
 bSu
-uBG
-stg
-vSH
-tEz
-pDq
-dqT
+kEK
+nJJ
+mVS
+mLY
+rGn
+sKA
 bLv
 aaa
 cjJ
@@ -77552,18 +77553,18 @@ bLv
 aaa
 bLv
 bHE
-ref
-knR
-vJW
-nRn
-oqQ
-qdB
-wSH
-qBQ
-oPA
-nRn
-nwX
-nEe
+lFY
+vsJ
+nnj
+oCW
+lEg
+iaK
+xEE
+rpN
+sjA
+oCW
+lBy
+fip
 bUz
 bLv
 aaa
@@ -77809,18 +77810,18 @@ bLv
 aaf
 bLv
 bUt
-ref
-ygH
-idZ
-tmK
-qSC
-gxS
-qKd
-iGw
-gxS
-qit
-eKN
-vhC
+lFY
+rLR
+jsx
+kjd
+rvm
+kPI
+uao
+pXH
+kPI
+hiC
+fOZ
+hsg
 bUz
 bLv
 aaf
@@ -78066,18 +78067,18 @@ bCq
 aaa
 bLv
 bUs
-ref
-tOc
-vNv
-gxS
-ezO
-gxS
-gxS
-gxS
-gxS
-gxS
-gRV
-vhC
+lFY
+pxN
+fFm
+kPI
+lSY
+kPI
+kPI
+kPI
+kPI
+kPI
+tsl
+hsg
 bUz
 bCq
 aaa
@@ -78323,17 +78324,17 @@ aaa
 aaa
 bTB
 bUv
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
-mtJ
+uAx
+uAx
+uAx
+uAx
+uAx
+uAx
+uAx
+uAx
+uAx
+uAx
+uAx
 car
 bUz
 bCq
@@ -84436,10 +84437,10 @@ arf
 aqa
 atf
 arf
-sjc
-sjc
-sjc
-sjc
+tfq
+tfq
+tfq
+tfq
 arf
 aaa
 aJn
@@ -84692,11 +84693,11 @@ ath
 arf
 apY
 ath
-xfy
-shL
+pVG
+ydY
 ath
-shL
-shL
+ydY
+ydY
 arf
 aaa
 aJn