From b061e44873000fa3b7f1191d6ee63507f87eab2c Mon Sep 17 00:00:00 2001
From: nik707 <38332985+nik707@users.noreply.github.com>
Date: Mon, 20 Aug 2018 01:53:05 -0500
Subject: [PATCH 1/2] fixes the fuckin backwards treadmills in the trash
 compactor

---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 6b0804c3ee..96194a7293 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -15166,21 +15166,8 @@
 /area/maintenance/disposal)
 "aNV" = (
 /obj/machinery/conveyor{
-	dir = 4;
-	id = "garbagestacked"
-	},
-/obj/machinery/mineral/stacking_unit_console{
-	dir = 2;
-	machinedir = 8;
-	pixel_x = -32;
-	pixel_y = 32
-	},
-/turf/open/floor/plating,
-/area/maintenance/disposal)
-"aNW" = (
-/obj/machinery/conveyor{
-	dir = 4;
-	id = "garbagestacked"
+	dir = 8;
+	id = "EngLoad"
 	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
@@ -15608,10 +15595,6 @@
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
 "aPg" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "garbage"
-	},
 /obj/structure/disposaloutlet{
 	dir = 4
 	},
@@ -15621,15 +15604,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/maintenance/disposal)
-"aPh" = (
 /obj/machinery/conveyor{
-	dir = 8;
-	id = "garbage"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 10
+	dir = 4;
+	id = "atmosdeliver"
 	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
@@ -15958,8 +15935,9 @@
 	dir = 8
 	},
 /obj/machinery/conveyor{
-	dir = 2;
-	id = "garbage"
+	icon_state = "conveyor_map";
+	dir = 1;
+	id = "EngLoad"
 	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
@@ -52170,8 +52148,9 @@
 /area/medical/sleeper)
 "rax" = (
 /obj/machinery/conveyor{
-	dir = 2;
-	id = "garbage"
+	icon_state = "conveyor_map";
+	dir = 1;
+	id = "EngLoad"
 	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
@@ -100440,8 +100419,8 @@ aaa
 aLm
 aLm
 aNU
+aNV
 dqY
-aPh
 aRv
 sZh
 aLm
@@ -100697,8 +100676,8 @@ aaa
 aLm
 aME
 aNV
+aNV
 dqY
-aPh
 aRw
 sqQ
 aLm
@@ -100953,8 +100932,8 @@ aaa
 aaa
 aLo
 aMF
-aNW
-dqY
+aNV
+aNV
 cvf
 aQn
 sqQ
@@ -101211,7 +101190,7 @@ aaa
 aLo
 aMG
 aNX
-dqY
+aNV
 rax
 aRy
 aSn

From b571c82b00945739f379493b5f23099d0dd22867 Mon Sep 17 00:00:00 2001
From: nik707 <38332985+nik707@users.noreply.github.com>
Date: Mon, 20 Aug 2018 03:12:43 -0500
Subject: [PATCH 2/2] fixes small error

---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 96194a7293..99a1bde2b8 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -15595,6 +15595,10 @@
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
 "aPg" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "garbage"
+	},
 /obj/structure/disposaloutlet{
 	dir = 4
 	},
@@ -15604,10 +15608,6 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/machinery/conveyor{
-	dir = 4;
-	id = "atmosdeliver"
-	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
 "aPi" = (
@@ -15935,9 +15935,8 @@
 	dir = 8
 	},
 /obj/machinery/conveyor{
-	icon_state = "conveyor_map";
-	dir = 1;
-	id = "EngLoad"
+	dir = 2;
+	id = "garbage"
 	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
@@ -47861,6 +47860,19 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
+"eFG" = (
+/obj/machinery/mineral/stacking_unit_console{
+	dir = 2;
+	machinedir = 8;
+	pixel_x = -32;
+	pixel_y = 32
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "EngLoad"
+	},
+/turf/open/floor/plating,
+/area/maintenance/disposal)
 "eHI" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /turf/open/floor/plasteel,
@@ -54195,6 +54207,13 @@
 /obj/structure/sign/warning/vacuum/external,
 /turf/open/floor/plating,
 /area/hallway/secondary/exit/departure_lounge)
+"xer" = (
+/obj/machinery/conveyor{
+	dir = 2;
+	id = "garbage"
+	},
+/turf/open/floor/plating,
+/area/maintenance/disposal)
 "xeB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
@@ -100161,7 +100180,7 @@ aaa
 aaa
 aLn
 aNT
-rax
+xer
 aQo
 aPg
 aRu
@@ -100675,7 +100694,7 @@ aaa
 aaa
 aLm
 aME
-aNV
+eFG
 aNV
 dqY
 aRw