Merge pull request #605 from DexeeXI/maps

Long time coming map fixes

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -14192,19 +14192,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/visit)
-"dsy" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
 "dsC" = (
 /obj/effect/spawner/random/clothing/gloves,
 /obj/structure/table,
@@ -21175,13 +21162,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/auxlab/firing_range)
-"fdJ" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/structure/sign/departments/engineering/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
 "fdK" = (
 /obj/machinery/conveyor/inverted{
 	dir = 10;
@@ -35542,6 +35522,20 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/storage_shared)
+"iDX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/sign/departments/engineering/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
 "iEa" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/structure/table/wood,
@@ -54943,13 +54937,6 @@
 /turf/open/floor/iron/dark/textured_half,
 /area/station/service/chapel/storage)
 "nps" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -58417,6 +58404,17 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/hos)
+"ohw" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
 "ohH" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -74911,16 +74909,6 @@
 /obj/effect/turf_decal/bot_white,
 /turf/open/floor/iron/grimy,
 /area/station/service/chapel)
-"slx" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/sign/departments/engineering/directional/north,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/port)
 "slE" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -83098,6 +83086,20 @@
 /obj/structure/filingcabinet/security,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
+"ujR" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/sign/departments/engineering/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/primary/port)
 "ujT" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
@@ -128547,7 +128549,7 @@ dGS
 dGS
 dGS
 vBX
-dsy
+iCO
 nps
 nps
 crT
@@ -128804,9 +128806,9 @@ jPJ
 xTT
 oUk
 dGS
-slx
+iCO
 uED
-fdJ
+nXK
 bPD
 vcB
 vcB
@@ -129061,9 +129063,9 @@ ehj
 ehj
 mPA
 dGS
-iCO
-uED
-ozx
+iDX
+ohw
+ujR
 vcB
 vcB
 dGQ
@@ -129320,7 +129322,7 @@ vYG
 dGS
 iCO
 uED
-nXK
+ozx
 vcB
 qcM
 ieM

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -18224,14 +18224,6 @@
 /area/station/cargo/drone_bay)
 "fMg" = (
 /obj/structure/rack,
-/obj/item/reagent_containers/cup/bottle/acidic_buffer{
-	pixel_x = 7;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/cup/bottle/basic_buffer{
-	pixel_x = -5;
-	pixel_y = 3
-	},
 /obj/item/reagent_containers/cup/bottle/formaldehyde{
 	pixel_x = 1
 	},
@@ -19806,6 +19798,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"gnH" = (
+/obj/effect/spawner/random/structure/table_fancy,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/sign/painting/large/library{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/station/service/library)
 "gnL" = (
 /obj/structure/closet/bombcloset/security,
 /turf/open/floor/iron/smooth,
@@ -34050,12 +34051,8 @@
 	pixel_x = 32
 	},
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/door/window{
-	dir = 8;
-	name = "Secure Art Exhibition";
-	req_access = list("library")
-	},
 /obj/effect/spawner/random/structure/table_fancy,
+/obj/structure/window/reinforced/spawner/directional/west,
 /turf/open/floor/wood,
 /area/station/service/library)
 "kVM" = (
@@ -57169,15 +57166,15 @@
 /turf/open/floor/iron,
 /area/station/command/gateway)
 "spW" = (
-/obj/structure/sign/painting/library_secure{
-	pixel_x = 32
-	},
+/obj/effect/spawner/random/structure/table_fancy,
 /obj/machinery/door/window{
 	dir = 8;
 	name = "Secure Art Exhibition";
 	req_access = list("library")
 	},
-/obj/effect/spawner/random/structure/table_fancy,
+/obj/structure/sign/painting/library_secure{
+	pixel_x = 32
+	},
 /turf/open/floor/wood,
 /area/station/service/library)
 "sqs" = (
@@ -74780,11 +74777,10 @@
 /obj/machinery/camera/directional/east{
 	c_tag = "Library Art Gallery"
 	},
-/obj/structure/window/reinforced/spawner/directional/west,
 /obj/effect/spawner/random/structure/table_fancy,
 /obj/machinery/light/blacklight/directional/north,
-/obj/structure/sign/painting/large/library{
-	dir = 4
+/obj/structure/sign/painting/library_secure{
+	pixel_x = 32
 	},
 /turf/open/floor/wood,
 /area/station/service/library)
@@ -252512,7 +252508,7 @@ kKL
 xUT
 uZn
 kKL
-ttv
+gnH
 prg
 prg
 caY

_maps/map_files/MetaStation/MetaStation.dmm

@@ -11785,14 +11785,6 @@
 /area/station/engineering/atmos)
 "ett" = (
 /obj/structure/rack,
-/obj/item/reagent_containers/cup/bottle/acidic_buffer{
-	pixel_x = 7;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/cup/bottle/basic_buffer{
-	pixel_x = -5;
-	pixel_y = 3
-	},
 /obj/item/reagent_containers/cup/bottle/formaldehyde{
 	pixel_x = 1
 	},