diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm
index 9815030402..6fce651362 100644
--- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm
+++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_3.dmm
@@ -439,11 +439,6 @@
 /obj/structure/chair/pew/left,
 /turf/open/floor/wood/wood_tiled,
 /area/hilbertshotel)
-"wG" = (
-/turf/closed/indestructible/wall{
-	icon_state = "iron"
-	},
-/area/hilbertshotel)
 "xn" = (
 /obj/structure/chair{
 	dir = 4
@@ -1257,7 +1252,7 @@ Zg
 Hp
 Fi
 dl
-wG
+Zg
 pu
 tm
 pH
diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm
index c27a608e39..348bc92bcc 100644
--- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm
+++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_garden.dmm
@@ -1,10 +1,26 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"af" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/brflowers,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
 "aA" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/machinery/light/floor,
 /obj/structure/flora/biolumi/flower,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"bg" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
+"dn" = (
+/obj/structure/chair/pew{
+	dir = 1
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "eg" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -44,6 +60,13 @@
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"hY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/chair/pew/left{
+	dir = 1
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "iy" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/structure/flora/ausbushes/ywflowers,
@@ -83,6 +106,12 @@
 /obj/structure/flora/biolumi/lamp,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"lH" = (
+/obj/structure/chair/pew{
+	dir = 4
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "lS" = (
 /obj/structure/flora/tree/spookylog,
 /obj/structure/flora/ausbushes/sparsegrass,
@@ -99,6 +128,10 @@
 /obj/structure/flora/biolumi,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"mQ" = (
+/obj/structure/chair/pew/left,
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "mR" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/machinery/light/floor,
@@ -150,7 +183,8 @@
 "th" = (
 /obj/structure/flora/tree/jungle{
 	pixel_x = -31;
-	pixel_y = 0
+	pixel_y = 0;
+	light_range = 1
 	},
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/ppflowers,
@@ -189,6 +223,18 @@
 /obj/machinery/meter,
 /turf/open/space/bluespace,
 /area/hilbertshotel)
+"uV" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/ywflowers,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
+"vd" = (
+/obj/structure/chair/pew{
+	dir = 8
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "vA" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/brflowers,
@@ -225,8 +271,16 @@
 /turf/open/floor/wood/wood_tiled,
 /area/hilbertshotel)
 "zn" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/ywflowers,
 /turf/closed/indestructible/wood,
 /area/hilbertshotel)
+"zX" = (
+/obj/structure/chair/pew/right{
+	dir = 1
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "Aq" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/structure/flora/ausbushes/brflowers,
@@ -247,6 +301,12 @@
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"Cl" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
 "Cm" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/brflowers,
@@ -266,6 +326,12 @@
 /obj/structure/flora/ausbushes/brflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"Dd" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
 "DH" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/brflowers,
@@ -279,6 +345,13 @@
 /obj/structure/flora/biolumi/lamp,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"Ep" = (
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
 "FO" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3{
@@ -291,6 +364,10 @@
 /obj/structure/flora/biolumi/flower,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"Gj" = (
+/obj/structure/chair/pew,
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "GQ" = (
 /obj/item/candle/infinite,
 /turf/open/floor/wood/wood_tiled,
@@ -305,6 +382,7 @@
 /obj/structure/flora/rock,
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/ppflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
 "Kj" = (
@@ -323,6 +401,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 10
 	},
+/obj/structure/spacevine,
+/obj/structure/flora/ausbushes/ppflowers,
 /turf/closed/indestructible/wood,
 /area/hilbertshotel)
 "Lm" = (
@@ -340,6 +420,10 @@
 	},
 /turf/open/space/bluespace,
 /area/hilbertshotel)
+"Mo" = (
+/obj/structure/spacevine,
+/turf/closed/indestructible/wood,
+/area/hilbertshotel)
 "Mv" = (
 /obj/structure/flora/ausbushes/ywflowers,
 /obj/structure/flora/ausbushes/ywflowers,
@@ -367,11 +451,27 @@
 /obj/structure/flora/ausbushes/brflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"OY" = (
+/obj/structure/chair/pew/left{
+	dir = 4
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "Qc" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/brflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"Qf" = (
+/obj/structure/chair/pew/right,
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
+"QL" = (
+/obj/structure/chair/pew/right{
+	dir = 4
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "Ri" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /turf/open/floor/grass/grass0,
@@ -412,11 +512,23 @@
 /obj/structure/flora/ausbushes/brflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"We" = (
+/obj/structure/chair/pew/left{
+	dir = 8
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "Wh" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"WO" = (
+/obj/structure/chair/pew/right{
+	dir = 8
+	},
+/turf/open/floor/wood/wood_tiled,
+/area/hilbertshotel)
 "WY" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -430,9 +542,11 @@
 /area/hilbertshotel)
 "Xj" = (
 /obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ppflowers,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
 "XX" = (
+/obj/structure/spacevine,
 /turf/closed/indestructible/hoteldoor{
 	icon_state = "door_closed";
 	icon = 'icons/obj/doors/puzzledoor/default.dmi'
@@ -454,16 +568,16 @@
 gm
 gm
 gm
-zn
-zn
+bg
+Ep
 XX
+Mo
+Dd
+af
 zn
+Dd
 zn
-zn
-zn
-zn
-zn
-zn
+af
 gm
 gm
 gm
@@ -471,7 +585,7 @@ gm
 (2,1,1) = {"
 gm
 gm
-zn
+Cl
 Qc
 TH
 rX
@@ -501,20 +615,20 @@ lS
 tu
 CE
 Qc
-zn
+Dd
 gm
 "}
 (4,1,1) = {"
-zn
+Dd
 Zr
 ko
 Wh
 sg
 tY
-tY
-tY
-tY
-tY
+QL
+lH
+lH
+OY
 tY
 aA
 Wh
@@ -541,7 +655,7 @@ Qc
 zn
 "}
 (6,1,1) = {"
-zn
+bg
 Ve
 Cd
 tY
@@ -556,13 +670,13 @@ tY
 tY
 hd
 Qc
-zn
+Ep
 "}
 (7,1,1) = {"
-zn
+Cl
 ph
 oy
-tY
+mQ
 GQ
 tY
 Qc
@@ -571,52 +685,52 @@ Qc
 Kc
 zi
 om
-zi
+hY
 Ox
 CI
-zn
+uV
 "}
 (8,1,1) = {"
 zn
 MX
 vT
-tY
+Gj
 Kj
 tY
 Qc
-Ri
+qq
 th
 vA
 tY
 Kj
-tY
+dn
 RE
 uD
-zn
+Dd
 "}
 (9,1,1) = {"
-zn
+uV
 qq
 Qc
-tY
+Gj
 Kj
 tY
 Qc
-Ri
+qq
 Ve
 Xj
 tY
 Kj
-tY
+dn
 qq
 WY
-zn
+af
 "}
 (10,1,1) = {"
 zn
 ji
 DQ
-tY
+Qf
 GQ
 tY
 Aq
@@ -625,10 +739,10 @@ wK
 Qc
 tY
 GQ
-tY
+zX
 qq
 mO
-zn
+bg
 "}
 (11,1,1) = {"
 zn
@@ -646,10 +760,10 @@ tY
 tY
 qq
 wF
-zn
+uV
 "}
 (12,1,1) = {"
-zn
+Ep
 Ve
 AB
 sg
@@ -664,19 +778,19 @@ tY
 aA
 kq
 uD
-zn
+bg
 "}
 (13,1,1) = {"
-zn
+Dd
 Qc
 ka
 gK
 Vy
 tY
-tY
-tY
-tY
-tY
+We
+vd
+vd
+WO
 tY
 mR
 kq
@@ -686,7 +800,7 @@ zn
 "}
 (14,1,1) = {"
 gm
-zn
+bg
 KC
 Qc
 vA
@@ -716,7 +830,7 @@ vA
 OU
 DH
 vA
-zn
+bg
 LD
 fz
 "}
@@ -724,16 +838,16 @@ fz
 gm
 gm
 gm
+bg
+Cl
+Dd
+Cl
+Dd
 zn
+Ep
 zn
-zn
-zn
-zn
-zn
-zn
-zn
-zn
-zn
+Dd
+Ep
 gj
 uP
 gj
diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm
index 1b135ad9d0..74c041dce7 100644
--- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm
+++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_syndie.dmm
@@ -7,11 +7,11 @@
 	dir = 4;
 	pixel_x = -24
 	},
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/carpet/red,
 /area/hilbertshotel)
 "bk" = (
 /obj/structure/table/reinforced,
-/turf/open/floor/mineral/titanium/tiled/white,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "bK" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -39,7 +39,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/mineral/titanium/tiled/white,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "ch" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3,
@@ -64,7 +64,19 @@
 /turf/open/floor/mineral/plastitanium,
 /area/hilbertshotel)
 "dx" = (
-/turf/open/floor/plasteel/kitchen_coldroom,
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4;
+	piping_layer = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/item/dildo/flared/gigantic,
+/turf/open/floor/mineral/titanium/tiled/white,
 /area/hilbertshotel)
 "dy" = (
 /obj/structure/dresser,
@@ -75,7 +87,7 @@
 /obj/structure/table,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3,
 /obj/structure/table/reinforced,
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "eT" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -100,7 +112,7 @@
 /turf/open/floor/carpet/red,
 /area/hilbertshotel)
 "fR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
 /turf/open/floor/carpet/red,
@@ -110,14 +122,14 @@
 	dir = 1
 	},
 /obj/structure/table,
-/obj/structure/table,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark/telecomms,
+/obj/item/restraints/handcuffs/fake,
+/turf/open/floor/mineral/titanium/tiled/white,
 /area/hilbertshotel)
 "gY" = (
 /obj/machinery/shower{
@@ -133,7 +145,7 @@
 /obj/machinery/vending/kink{
 	shut_up = 1
 	},
-/turf/open/floor/plasteel/dark/telecomms,
+/turf/open/floor/mineral/titanium/tiled/white,
 /area/hilbertshotel)
 "ht" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -145,7 +157,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "hB" = (
 /obj/structure/table/reinforced,
@@ -165,13 +177,13 @@
 	pixel_x = -2;
 	pixel_y = 6
 	},
-/turf/open/floor/mineral/titanium/tiled/white,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "hZ" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -197,13 +209,15 @@
 	dir = 1
 	},
 /obj/machinery/meter,
-/turf/open/floor/plating/airless,
+/obj/structure/lattice,
+/turf/open/space/basic,
 /area/hilbertshotel)
 "jB" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
 	dir = 8
 	},
-/turf/open/floor/plating/airless,
+/obj/structure/lattice,
+/turf/open/space/basic,
 /area/hilbertshotel)
 "lN" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -234,7 +248,8 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 4
+	dir = 4;
+	layer = 2.2
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 9
@@ -243,13 +258,12 @@
 /area/hilbertshotel)
 "mN" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 8
+	dir = 4;
+	layer = 2.2
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+	dir = 8;
+	layer = 2.2
 	},
 /turf/open/floor/plating/smooth/grass/lavaland_jungle,
 /area/hilbertshotel)
@@ -281,10 +295,10 @@
 /obj/machinery/vending/boozeomat{
 	shut_up = 1
 	},
-/turf/open/floor/mineral/titanium/tiled/white,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "op" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
 /turf/open/indestructible/hoteltile,
@@ -293,11 +307,11 @@
 /obj/structure/sink/kitchen{
 	pixel_y = 28
 	},
-/turf/open/floor/mineral/titanium/tiled/white,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "pn" = (
 /obj/machinery/light,
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/carpet/red,
 /area/hilbertshotel)
 "ps" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -310,7 +324,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/hilbertshotel)
 "pH" = (
-/turf/open/floor/mineral/titanium/tiled/white,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "qA" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
@@ -330,7 +344,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 5
 	},
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "rz" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -405,20 +419,21 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel/dark/telecomms,
+/obj/item/electropack/vibrator/small,
+/turf/open/floor/mineral/titanium/tiled/white,
 /area/hilbertshotel)
 "ub" = (
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "uy" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/open/floor/mineral/titanium/tiled/white,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/cafeteria,
 /area/hilbertshotel)
 "uB" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3{
@@ -428,13 +443,14 @@
 /area/hilbertshotel)
 "uN" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/layer3,
-/turf/open/floor/plating/airless,
+/obj/structure/lattice,
+/turf/open/space/basic,
 /area/hilbertshotel)
 "vs" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/carpet/red,
 /area/hilbertshotel)
 "wg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -462,7 +478,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark/telecomms,
+/obj/item/electropack/vibrator,
+/turf/open/floor/mineral/titanium/tiled/white,
 /area/hilbertshotel)
 "wC" = (
 /obj/structure/chair/sofa/corp/left{
@@ -486,6 +503,10 @@
 /obj/structure/flora/junglebush/large,
 /turf/open/floor/grass/grass0,
 /area/hilbertshotel)
+"xP" = (
+/obj/structure/sign/poster/random,
+/turf/closed/indestructible/syndicate,
+/area/hilbertshotel)
 "xT" = (
 /obj/machinery/door/morgue,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -502,20 +523,31 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
+"Al" = (
+/obj/structure/sign/poster/contraband/syndicate_pistol,
+/turf/closed/indestructible/syndicate,
+/area/hilbertshotel)
 "Ao" = (
 /obj/machinery/vending/kink{
 	shut_up = 1
 	},
 /turf/open/floor/plating/smooth/grass/lavaland_jungle,
 /area/hilbertshotel)
+"Ax" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/sign/poster/random,
+/turf/closed/indestructible/syndicate,
+/area/hilbertshotel)
 "AT" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
 /obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
+	dir = 4;
+	layer = 2.2
 	},
 /obj/machinery/light_switch/directional/south,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	layer = 2.2
+	},
 /turf/open/floor/plating/smooth/grass/lavaland_jungle,
 /area/hilbertshotel)
 "Bj" = (
@@ -524,7 +556,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "BH" = (
 /obj/structure/toilet{
@@ -555,11 +587,16 @@
 	},
 /turf/open/indestructible/hoteltile,
 /area/hilbertshotel)
+"CS" = (
+/obj/structure/sign/poster/contraband/syndicate_recruitment,
+/turf/closed/indestructible/syndicate,
+/area/hilbertshotel)
 "DB" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
 	dir = 4
 	},
-/turf/open/floor/plating/airless,
+/obj/structure/lattice,
+/turf/open/space/basic,
 /area/hilbertshotel)
 "Et" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
@@ -569,7 +606,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/carpet/red,
 /area/hilbertshotel)
 "Fs" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -629,11 +666,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 9
 	},
-/turf/open/floor/plasteel/dark/telecomms,
+/obj/item/restraints/handcuffs/fake/kinky,
+/turf/open/floor/mineral/titanium/tiled/white,
 /area/hilbertshotel)
 "JH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "Kn" = (
 /obj/structure/table/wood,
@@ -670,14 +708,17 @@
 /turf/open/floor/mineral/plastitanium,
 /area/hilbertshotel)
 "Nt" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4;
+	piping_layer = 1
 	},
-/turf/open/floor/plasteel/kitchen_coldroom,
+/obj/structure/showcase/machinery/tv,
+/turf/open/floor/mineral/plastitanium,
 /area/hilbertshotel)
 "Nw" = (
 /obj/machinery/telecomms/relay/preset/auto,
-/turf/open/floor/plating/airless,
+/turf/open/floor/catwalk_floor,
 /area/hilbertshotel)
 "Nz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -692,7 +733,11 @@
 "NN" = (
 /obj/machinery/light_switch/directional/south,
 /obj/machinery/light,
-/turf/open/floor/mineral/plastitanium/red,
+/turf/open/floor/carpet/red,
+/area/hilbertshotel)
+"NO" = (
+/obj/structure/sign/poster/contraband/syndicate_logo,
+/turf/closed/indestructible/syndicate,
 /area/hilbertshotel)
 "Op" = (
 /obj/machinery/door/morgue,
@@ -700,12 +745,14 @@
 /area/hilbertshotel)
 "Qn" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+	dir = 4;
+	layer = 2.2
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/layer3,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	layer = 2.2
+	},
 /turf/open/floor/plating/smooth/grass/lavaland_jungle,
 /area/hilbertshotel)
 "QM" = (
@@ -784,7 +831,7 @@
 	dir = 10
 	},
 /obj/structure/table/reinforced,
-/turf/open/floor/plasteel/kitchen_coldroom,
+/turf/open/floor/mineral/plastitanium/red,
 /area/hilbertshotel)
 "XF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
@@ -811,12 +858,12 @@
 /turf/open/floor/carpet/red,
 /area/hilbertshotel)
 "YS" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood/corner,
 /obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
+	layer = 2.2
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4;
+	layer = 2.2
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -824,6 +871,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 5
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8;
+	layer = 2.2
+	},
 /turf/open/floor/plating/smooth/grass/lavaland_jungle,
 /area/hilbertshotel)
 "YX" = (
@@ -869,10 +920,10 @@ So
 TL
 TL
 TL
+xP
 TL
 TL
-TL
-TL
+xP
 TL
 zd
 "}
@@ -883,9 +934,9 @@ hB
 oi
 bk
 TL
-ah
+fE
 as
-TL
+xP
 rF
 wC
 xo
@@ -900,8 +951,8 @@ TL
 oU
 pH
 pH
-TL
-ah
+NO
+fE
 NN
 TL
 Kn
@@ -919,26 +970,26 @@ bV
 uy
 pH
 TL
-ah
-ah
+fE
+fE
 TL
 YA
 qJ
 Ti
 fR
 fE
-TL
+xP
 zd
 "}
 (6,1,1) = {"
 zd
 TL
-dx
+ah
 XB
 JH
 Cw
 Fp
-ah
+fE
 Op
 mN
 Qn
@@ -953,10 +1004,10 @@ zd
 TL
 ub
 ub
-dx
+ah
 TL
 vs
-ah
+fE
 TL
 TL
 TL
@@ -972,10 +1023,10 @@ TL
 Bj
 eK
 ry
-TL
+Al
 vs
 pn
-TL
+CS
 gY
 op
 Nz
@@ -989,10 +1040,10 @@ zd
 TL
 hx
 hx
-Nt
+ht
 TL
 vs
-ah
+fE
 TL
 ch
 Cz
@@ -1015,7 +1066,7 @@ TL
 TL
 wg
 TL
-TL
+xP
 TL
 TL
 zd
@@ -1042,18 +1093,18 @@ zd
 zd
 zd
 uN
-XF
+Ax
 GT
 Kx
 jp
 Zk
 ht
 ah
-ww
+dx
 cm
 rE
 Et
-TL
+xP
 zd
 "}
 (13,1,1) = {"
@@ -1062,7 +1113,7 @@ zd
 DB
 XF
 nk
-Kx
+Nt
 jp
 QM
 fB
@@ -1097,16 +1148,16 @@ zd
 zd
 jB
 TL
+xP
 TL
 TL
+xP
 TL
 TL
+xP
 TL
 TL
-TL
-TL
-TL
-TL
+xP
 TL
 zd
 "}
diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
index 143dc930b4..0fc2b9d413 100644
--- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
@@ -93,14 +93,14 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
 	if(!isturf(loc))
 		if((loc == user) || (loc.loc == user) || (loc.loc in user.contents) || (loc in user.GetAllContents(type)))		//short circuit, first three checks are cheaper and covers almost all cases (loc.loc covers hotel in box in backpack).
 			forceMove(get_turf(user))
-
+	
 	//SPLURT EDIT START
+	// Check if the room is already active, if so, skip room type selection
 	var/chosen_room = "Nothing"
-	if(istype(src, /obj/item/hilbertshotel))
-		// Only show the room type selection if the room limit has not been reached
-		chosen_room = tgui_input_list(user, "Choose your desired room:", "♦️ Time to choose a room ♦️!", hotel_maps)	
-	if(!chosen_room)
-		return FALSE
+	if(!activeRooms["[chosenRoomNumber]"])
+		chosen_room = tgui_input_list(user, "Choose your desired room:", "♦️ Time to choose a room ♦️!", hotel_maps)
+		if(!chosen_room)
+			return FALSE
 	//SPLURT EDIT END
 
 	if(!storageTurf) //Blame subsystems for not allowing this to be in Initialize