Merge pull request #69 from ARF-SS13/gearharness

Chess area and jukebox 2.0
ARF-SS13 · Aug 30, 2024 · 6923a7f · 6923a7f
2 parents 4e917c8 + d881df0
commit 6923a7f
Show file tree

Hide file tree

Showing 7 changed files with 1,097 additions and 11 deletions.
diff --git a/_maps/map_files/coyote_bayou/foxybar.dmm b/_maps/map_files/coyote_bayou/foxybar.dmm
@@ -60,7 +60,7 @@
 	dir = 4;
 	color = "#3B2B1A"
 	},
-/obj/structure/chair/stool/retro/backed,
+/obj/machinery/jukebox_online,
 /obj/effect/overlay/fog/fog2{
 	plane = -2;
 	alpha = 175
@@ -3598,6 +3598,23 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/f13/fb/bar)
+"uwy" = (
+/obj/effect/decal/cleanable/glitter/blue{
+	color = "#993311";
+	layer = 3
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/obj/effect/overlay/fog/fog2{
+	plane = -2;
+	alpha = 175
+	},
+/turf/open/floor/wood_fancy{
+	color = "#779999"
+	},
+/area/f13/fb/bar)
 "uOS" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4;
@@ -6445,7 +6462,7 @@ bPG
 bPG
 bPG
 thm
-iku
+uwy
 nuu
 goB
 goB

diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm
@@ -80,7 +80,7 @@
 /turf/open/floor/carpet/royalblue,
 /area/hilbertshotel)
 "fW" = (
-/obj/structure/bed,
+/obj/item/reagent_containers/rag/towel,
 /turf/open/floor/plasteel/white,
 /area/hilbertshotel)
 "gP" = (
@@ -121,6 +121,14 @@
 	dir = 10
 	},
 /obj/structure/rack,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
+/obj/item/reagent_containers/rag/towel,
 /turf/open/floor/carpet/royalblue,
 /area/hilbertshotel)
 "jr" = (