From 61fb48b7bee2203feef8be8d4036d1f8de4f50c3 Mon Sep 17 00:00:00 2001
From: ariaworld <143797359+ariaworld@users.noreply.github.com>
Date: Sat, 13 Jan 2024 20:31:54 +0100
Subject: [PATCH] Jukebox in apartment 1, layer of lamp

---
 .../templates/hilbertshotel_templates/apartment_1.dmm | 11 ++++++++++-
 .../templates/hilbertshotel_templates/apartment_2.dmm |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm
index c9741c6de5..0f5e7eadcf 100644
--- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm
+++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_1.dmm
@@ -220,6 +220,15 @@
 	},
 /turf/open/floor/carpet,
 /area/hilbertshotel)
+"pX" = (
+/obj/machinery/jukebox{
+	icon_state = "telescreen";
+	name = "modern jukebox";
+	desc = "A modern music player.";
+	area_limited = 1
+	},
+/turf/closed/indestructible/wall,
+/area/hilbertshotel)
 "st" = (
 /obj/machinery/door/morgue,
 /turf/open/floor/plasteel/kitchen_coldroom,
@@ -788,7 +797,7 @@ Ib
 WN
 Ib
 Ib
-xT
+pX
 aS
 kh
 xT
diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm
index d95e29e0e1..c9873c91a4 100644
--- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm
+++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_2.dmm
@@ -163,7 +163,8 @@
 /obj/structure/table/wood/fancy,
 /obj/item/flashlight/lamp/green{
 	pixel_x = 5;
-	pixel_y = 14
+	pixel_y = 14;
+	layer = 4.1
 	},
 /obj/machinery/light_switch/directional/east,
 /turf/open/floor/carpet/purple,