From 9441853f6dfeedc3f7e5d528aa965dffdc9b0a22 Mon Sep 17 00:00:00 2001
From: Useroth <useroth@cock.li>
Date: Wed, 22 May 2019 19:28:50 +0200
Subject: [PATCH 1/2] Boltable hotel. Now with mapmerge.

---
 _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 26 +++++++++++++++------
 tgstation.dme                               |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index 99f7f19621..3eb54f8cca 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -509,7 +509,9 @@
 /obj/machinery/button/door{
 	id = "a3";
 	name = "privacy button";
-	pixel_y = -24
+	normaldoorcontrol = 1;
+	pixel_y = -24;
+	specialfunctions = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
@@ -557,7 +559,9 @@
 /obj/machinery/button/door{
 	id = "a4";
 	name = "privacy button";
-	pixel_y = -24
+	normaldoorcontrol = 1;
+	pixel_y = -24;
+	specialfunctions = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
@@ -605,7 +609,9 @@
 /obj/machinery/button/door{
 	id = "a5";
 	name = "privacy button";
-	pixel_y = -24
+	normaldoorcontrol = 1;
+	pixel_y = -24;
+	specialfunctions = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
@@ -653,7 +659,9 @@
 /obj/machinery/button/door{
 	id = "a6";
 	name = "privacy button";
-	pixel_y = -24
+	normaldoorcontrol = 1;
+	pixel_y = -24;
+	specialfunctions = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
@@ -1097,7 +1105,9 @@
 /obj/machinery/button/door{
 	id = "a2";
 	name = "privacy button";
-	pixel_y = 24
+	normaldoorcontrol = 1;
+	pixel_y = 24;
+	specialfunctions = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
@@ -1159,7 +1169,9 @@
 /obj/machinery/button/door{
 	id = "a1";
 	name = "privacy button";
-	pixel_y = 24
+	normaldoorcontrol = 1;
+	pixel_y = 24;
+	specialfunctions = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
@@ -4496,7 +4508,6 @@
 /turf/closed/wall,
 /area/ruin/space/has_grav/hotel/custodial)
 "me" = (
-/mob/living/simple_animal/bot/cleanbot,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -4507,6 +4518,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/mob/living/simple_animal/bot/cleanbot,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/hotel/custodial)
 "mf" = (
diff --git a/tgstation.dme b/tgstation.dme
index ec265f1aea..b3e0c319bc 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1226,13 +1226,13 @@
 #include "code\modules\antagonists\clockcult\clock_scriptures\scripture_scripts.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\_trap_object.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\ark_of_the_clockwork_justicar.dm"
-#include "code\modules\antagonists\clockcult\clock_structures\stargazer.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\clockwork_obelisk.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\eminence_spire.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\heralds_beacon.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\mania_motor.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\ocular_warden.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\ratvar_the_clockwork_justicar.dm"
+#include "code\modules\antagonists\clockcult\clock_structures\stargazer.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\taunting_trail.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\wall_gear.dm"
 #include "code\modules\antagonists\clockcult\clock_structures\trap_triggers\lever.dm"

From 90b62234d64bdc00ef5528407a26141b81615a59 Mon Sep 17 00:00:00 2001
From: Useroth <useroth@cock.li>
Date: Wed, 22 May 2019 20:13:58 +0200
Subject: [PATCH 2/2] Made the hotel booze-o-mat hacked by default.

---
 _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index 3eb54f8cca..c64a73eada 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -1819,7 +1819,9 @@
 /area/ruin/space/has_grav/hotel/bar)
 "fE" = (
 /obj/machinery/vending/boozeomat{
-	req_access_txt = "200"
+	extended_inventory = 1;
+	req_access_txt = "200";
+	scan_id = 0
 	},
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{