From 280b5f5e6f358fec49e69091d071d1c63bacb32d Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 8 Oct 2017 05:52:43 +0000
Subject: [PATCH] Adds kinkmates to Metastation and Deltastation (+Box tweaks)
 (#3214)

* adds kinkmates to deltastation

* added kinkmates to metastation

* hides atmos pipes in maint dorms
---
 _maps/map_files/BoxStation/BoxStation.dmm     | 22 +++++++++----------
 .../map_files/Deltastation/DeltaStation2.dmm  | 17 +++++++++-----
 _maps/map_files/MetaStation/MetaStation.dmm   |  6 ++---
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 67f6208e52..15b9f0ff9e 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -2281,7 +2281,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
-	name = "Box emergency shuttle";
+	name = "Box emergency shuttle"
 	},
 /obj/docking_port/stationary{
 	dir = 4;
@@ -42528,14 +42528,14 @@
 	},
 /area/maintenance/port/aft)
 "bTt" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
+/obj/structure/closet/secure_closet/personal,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
 	dir = 4
 	},
-/obj/structure/closet/secure_closet/personal,
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "bTu" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
@@ -42549,9 +42549,9 @@
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "bTw" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible,
 /obj/machinery/light/small,
 /obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/manifold/general/hidden,
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "bTx" = (
@@ -64125,19 +64125,19 @@
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "cUq" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 5
-	},
 /obj/machinery/light/small,
 /obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+	dir = 5
+	},
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "cUr" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 4
-	},
 /obj/structure/bed,
 /obj/item/bedsheet,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "cUs" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b2c40d5672..9ee5a65764 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -97094,8 +97094,7 @@
 /turf/open/floor/plating,
 /area/crew_quarters/theatre/abandoned)
 "dHa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/machinery/vending/kink,
 /turf/open/floor/wood,
 /area/crew_quarters/theatre/abandoned)
 "dHb" = (
@@ -113139,6 +113138,14 @@
 "esH" = (
 /turf/closed/wall,
 /area/maintenance/department/medical/morgue)
+"esI" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
+"esJ" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 
 (1,1,1) = {"
 aaa
@@ -137474,7 +137481,7 @@ dmb
 dnA
 doK
 dqw
-diJ
+esJ
 aJm
 aHW
 aaf
@@ -143545,7 +143552,7 @@ aib
 asx
 atw
 auQ
-aic
+esI
 awX
 aye
 azn
@@ -178674,4 +178681,4 @@ aaa
 aaa
 aaa
 aaa
-"}
\ No newline at end of file
+"}
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 5a1762e989..665b0a39ae 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -28522,7 +28522,7 @@
 	},
 /area/security/checkpoint/engineering)
 "bcO" = (
-/obj/structure/easel,
+/obj/machinery/vending/kink,
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
@@ -64306,10 +64306,10 @@
 /turf/open/space,
 /area/space)
 "ctn" = (
-/obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "cto" = (
@@ -155921,4 +155921,4 @@ aaa
 aaa
 aaa
 aaa
-"}
\ No newline at end of file
+"}