From bc6e044e358cdb0497702bfe4e21fc0e4f3826f5 Mon Sep 17 00:00:00 2001
From: fernerr <35879136+fernerr@users.noreply.github.com>
Date: Wed, 9 Sep 2020 23:12:46 +0200
Subject: [PATCH] Adds a small disposalbin in hydroponics (#9900)

---
 code/modules/recycling/disposal.dm            | 18 +++++++++++
 .../Ferner-200906-mapping_hydrodisposal.yml   |  4 +++
 maps/aurora/aurora-4_mainlevel.dmm            | 32 ++++++++++++++++---
 3 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/Ferner-200906-mapping_hydrodisposal.yml

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index f652fa7b6cd..4a8629152dc 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -36,6 +36,24 @@
 	icon_state = "disposal_small"
 	density = FALSE
 
+/obj/machinery/disposal/small/north
+	dir = NORTH
+	pixel_y = -13
+	layer = MOB_LAYER + 0.1
+
+/obj/machinery/disposal/small/south
+	dir = SOUTH
+	pixel_y = 20
+	layer = OBJ_LAYER + 0.3
+
+/obj/machinery/disposal/small/east
+	dir = EAST
+	pixel_x = -12
+
+/obj/machinery/disposal/small/west
+	dir = WEST
+	pixel_x = 11
+
 /obj/machinery/disposal/small/airless
 	uses_air = FALSE
 
diff --git a/html/changelogs/Ferner-200906-mapping_hydrodisposal.yml b/html/changelogs/Ferner-200906-mapping_hydrodisposal.yml
new file mode 100644
index 00000000000..78351f3e9c5
--- /dev/null
+++ b/html/changelogs/Ferner-200906-mapping_hydrodisposal.yml
@@ -0,0 +1,4 @@
+author: Ferner
+delete-after: True
+changes: 
+  - maptweak: "Added a small disposal bin by the entrance of hydroponics as the other one was far away from the main work area."
\ No newline at end of file
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 47ef290e69a..a8dd87967ba 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -48259,6 +48259,7 @@
 "bJW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "bJX" = (
@@ -48598,6 +48599,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "bKS" = (
@@ -48862,6 +48864,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "bLC" = (
@@ -49535,12 +49538,19 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "bMP" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "bMR" = (
@@ -49788,8 +49798,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/disposalpipe/junction{
+	dir = 4;
+	icon_state = "pipe-j2"
 	},
 /turf/simulated/floor/tiled,
 /area/hydroponics)
@@ -60517,6 +60528,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/medbay)
+"fKb" = (
+/obj/effect/floor_decal/corner/green{
+	dir = 6
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled,
+/area/hydroponics)
 "fKZ" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/carpet/rubber,
@@ -60610,8 +60631,7 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/machinery/disposal/small{
-	dir = 8;
+/obj/machinery/disposal/small/west{
 	pixel_x = 12;
 	pixel_y = 1
 	},
@@ -63909,6 +63929,8 @@
 /obj/machinery/light_switch{
 	pixel_x = -26
 	},
+/obj/machinery/disposal/small/east,
+/obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled,
 /area/hydroponics)
 "ofm" = (
@@ -99811,7 +99833,7 @@ bJX
 bKS
 bLD
 bMi
-bLA
+fKb
 bNG
 bOt
 keq