diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index 3cdd4e0ab95..d309b8879be 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 	w_class = WEIGHT_CLASS_SMALL
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	//NOVA EDIT ADDITION - GHOST HOTEL UPDATE
-	var/list/static/hotel_maps = list("Generic", "Apartment")
+	var/list/static/hotel_maps = list("Generic", "Apartment", "Beach Condo")
 	//standart - hilber's hotel room
 	//apartment - see /datum/map_template/ghost_cafe_rooms
 	var/datum/map_template/ghost_cafe_rooms/ghost_cafe_rooms_apartment
@@ -178,6 +178,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 	//NOVA EDIT ADDITION START - GHOST HOTEL UPDATE
 	else if(chosen_room == "Apartment")
 		load_from = ghost_cafe_rooms_apartment
+	else if(chosen_room == "Beach Condo")
+		load_from = ghost_cafe_rooms_apartment
 	//NOVA EDIT ADDITION END
 
 	load_from.load(bottom_left)
diff --git a/modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm b/modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm
index 4bae97660f1..378f16828f8 100644
--- a/modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm
+++ b/modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm
@@ -16,3 +16,7 @@
 /datum/map_template/ghost_cafe_rooms
 	name = "Apartment"
 	mappath = "modular_nova/modules/hotel_rooms/apartment.dmm"
+
+/datum/map_template/ghost_cafe_rooms
+	name = "Beach Condo"
+	mappath = "modular_nova/modules/hotel_rooms/beach_condo.dmm"
diff --git a/modular_nova/modules/hotel_rooms/apartment.dmm b/modular_nova/modules/hotel_rooms/apartment.dmm
index f5db0583a2c..abe9963ca88 100644
--- a/modular_nova/modules/hotel_rooms/apartment.dmm
+++ b/modular_nova/modules/hotel_rooms/apartment.dmm
@@ -130,6 +130,7 @@
 "gQ" = (
 /obj/structure/chair/sofa/corp/corner,
 /obj/machinery/light/warm/directional/east,
+/obj/item/toy/plush/nova/breakdancing_bird,
 /turf/open/floor/carpet,
 /area/misc/hilbertshotel)
 "ho" = (
@@ -349,10 +350,6 @@
 	dir = 8
 	},
 /area/misc/hilbertshotel)
-"Ib" = (
-/obj/item/toy/plush/skyrat/breakdancing_bird,
-/turf/open/floor/carpet,
-/area/misc/hilbertshotel)
 "Ix" = (
 /obj/structure/bed/double,
 /obj/item/bedsheet/random/double,
@@ -769,7 +766,7 @@ oZ
 Gv
 RP
 bz
-Ib
+RP
 RP
 xT
 aS
diff --git a/modular_nova/modules/hotel_rooms/beach_condo.dmm b/modular_nova/modules/hotel_rooms/beach_condo.dmm
new file mode 100644
index 00000000000..df782fcaacf
--- /dev/null
+++ b/modular_nova/modules/hotel_rooms/beach_condo.dmm
@@ -0,0 +1,718 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"br" = (
+/turf/open/misc/beach/sand,
+/area/misc/hilbertshotel)
+"bI" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"bO" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"bW" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/turf/open/floor/iron/kitchen,
+/area/misc/hilbertshotel)
+"ct" = (
+/turf/closed/wall/mineral/wood,
+/area/misc/hilbertshotel)
+"cC" = (
+/obj/structure/dresser,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"cW" = (
+/turf/open/misc/beach/coast{
+	dir = 4
+	},
+/area/misc/hilbertshotel)
+"dI" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/coast{
+	dir = 5
+	},
+/area/misc/hilbertshotel)
+"dS" = (
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"en" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/water/beach,
+/area/misc/hilbertshotel)
+"eH" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/coast{
+	dir = 1
+	},
+/area/misc/hilbertshotel)
+"fy" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/machinery/light/warm/directional/west,
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"fA" = (
+/turf/closed/wall/mineral/sandstone,
+/area/misc/hilbertshotel)
+"hj" = (
+/obj/machinery/door/morgue,
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"hX" = (
+/obj/structure/fluff/beach_umbrella,
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/coast{
+	dir = 1
+	},
+/area/misc/hilbertshotel)
+"ib" = (
+/turf/open/misc/beach/coast/corner{
+	dir = 8
+	},
+/area/misc/hilbertshotel)
+"iQ" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/coast{
+	dir = 9
+	},
+/area/misc/hilbertshotel)
+"jO" = (
+/obj/effect/turf_decal/siding{
+	dir = 4
+	},
+/obj/machinery/door/morgue,
+/turf/open/indestructible/bathroom,
+/area/misc/hilbertshotel)
+"jU" = (
+/obj/machinery/door/airlock/wood,
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"kh" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"kW" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"na" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/carpet/lone,
+/area/misc/hilbertshotel)
+"nb" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"ny" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"oM" = (
+/obj/structure/bed/double/pod,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/item/bedsheet/dorms_double{
+	dir = 8
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"oX" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"ph" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/sand,
+/area/misc/hilbertshotel)
+"qh" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"ra" = (
+/turf/closed/indestructible/rock,
+/area/misc/hilbertshotel)
+"rm" = (
+/turf/open/floor/iron/stairs/old{
+	dir = 1
+	},
+/area/misc/hilbertshotel)
+"rV" = (
+/obj/structure/closet/cabinet,
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"tR" = (
+/obj/machinery/shower/directional/east,
+/turf/open/indestructible/bathroom,
+/area/misc/hilbertshotel)
+"wa" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"wo" = (
+/obj/structure/closet/secure_closet/freezer/kitchen/all_access,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/spawner/random/food_or_drink/three_course_meal,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"wL" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"yc" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"yH" = (
+/turf/closed/indestructible/hoteldoor{
+	icon_state = "door_closed";
+	icon = 'icons/obj/doors/puzzledoor/default.dmi'
+	},
+/area/misc/hilbertshotel)
+"Bo" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+	pixel_x = -2;
+	pixel_y = 6
+	},
+/turf/open/floor/iron/kitchen,
+/area/misc/hilbertshotel)
+"Bs" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"CM" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"Dg" = (
+/obj/structure/toilet{
+	dir = 1
+	},
+/turf/open/indestructible/bathroom,
+/area/misc/hilbertshotel)
+"EI" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/machinery/light/warm/directional/north,
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"FJ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"FN" = (
+/obj/machinery/door/airlock/sandstone{
+	name = "Beach Cabin"
+	},
+/obj/effect/turf_decal/sand,
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"Gj" = (
+/obj/item/toy/beach_ball,
+/obj/effect/light_emitter/interlink,
+/turf/open/water/beach,
+/area/misc/hilbertshotel)
+"Gm" = (
+/obj/structure/chair/sofa/middle{
+	dir = 1
+	},
+/obj/effect/turf_decal/sand,
+/turf/open/misc/beach/sand,
+/area/misc/hilbertshotel)
+"GB" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"GD" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 9
+	},
+/obj/machinery/light/floor{
+	alpha = 0;
+	invisibility = 100;
+	light_range = 10;
+	nightshift_light_power = 10
+	},
+/turf/open/floor/iron/kitchen,
+/area/misc/hilbertshotel)
+"HH" = (
+/turf/open/floor/carpet/cyan,
+/area/misc/hilbertshotel)
+"HK" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/rag,
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"Ib" = (
+/turf/open/misc/beach/coast{
+	dir = 1
+	},
+/area/misc/hilbertshotel)
+"Ig" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"IM" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/item/flashlight/lamp/green{
+	pixel_x = 5;
+	pixel_y = 14
+	},
+/obj/structure/table/wood,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"Jm" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"KQ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"Lg" = (
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"Lp" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/coast/corner{
+	dir = 8
+	},
+/area/misc/hilbertshotel)
+"Lv" = (
+/obj/structure/sink/directional/north,
+/turf/open/indestructible/bathroom,
+/area/misc/hilbertshotel)
+"LF" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/misc/hilbertshotel)
+"MB" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 8
+	},
+/turf/open/floor/iron/kitchen,
+/area/misc/hilbertshotel)
+"ML" = (
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
+	},
+/obj/machinery/light/floor,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"MP" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"Pe" = (
+/obj/structure/chair/sofa/left{
+	dir = 1
+	},
+/obj/effect/turf_decal/sand,
+/turf/open/misc/beach/sand,
+/area/misc/hilbertshotel)
+"PJ" = (
+/turf/open/misc/beach/coast/corner{
+	dir = 4
+	},
+/area/misc/hilbertshotel)
+"Qg" = (
+/obj/structure/chair/sofa/right{
+	dir = 1
+	},
+/obj/effect/turf_decal/sand,
+/turf/open/misc/beach/sand,
+/area/misc/hilbertshotel)
+"Qz" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/turf/open/floor/wood/parquet,
+/area/misc/hilbertshotel)
+"QG" = (
+/obj/structure/curtain/cloth/fancy,
+/turf/closed/indestructible/fakeglass,
+/area/misc/hilbertshotel)
+"Rr" = (
+/obj/machinery/light/floor{
+	alpha = 0;
+	invisibility = 100;
+	light_range = 10;
+	nightshift_light_power = 10
+	},
+/turf/open/indestructible/bathroom,
+/area/misc/hilbertshotel)
+"RL" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/structure/chair/comfy/teal{
+	dir = 8
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"SS" = (
+/obj/effect/light_emitter/interlink,
+/turf/open/misc/beach/coast/corner{
+	dir = 4
+	},
+/area/misc/hilbertshotel)
+"Yg" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/structure/closet/cabinet,
+/obj/item/hairbrush{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+"ZE" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/light/warm/dim/directional/south,
+/turf/open/floor/wood/large,
+/area/misc/hilbertshotel)
+
+(1,1,1) = {"
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+"}
+(2,1,1) = {"
+ra
+en
+en
+en
+en
+dI
+Lp
+br
+fA
+fA
+fA
+fA
+fA
+fA
+ra
+"}
+(3,1,1) = {"
+ra
+en
+en
+en
+en
+iQ
+SS
+br
+fA
+rV
+ct
+tR
+Dg
+fA
+ra
+"}
+(4,1,1) = {"
+ra
+en
+en
+en
+en
+eH
+br
+rm
+FN
+ML
+ct
+Rr
+Lv
+fA
+ra
+"}
+(5,1,1) = {"
+ra
+en
+en
+en
+iQ
+SS
+br
+fA
+fA
+hj
+ct
+jO
+ct
+fA
+ra
+"}
+(6,1,1) = {"
+ra
+en
+en
+en
+eH
+br
+fA
+fA
+cC
+bI
+ct
+yc
+nb
+fA
+ra
+"}
+(7,1,1) = {"
+ra
+en
+en
+iQ
+PJ
+br
+QG
+CM
+ny
+ZE
+ct
+EI
+na
+yH
+ra
+"}
+(8,1,1) = {"
+ra
+en
+en
+hX
+HH
+HH
+QG
+oM
+dS
+Ig
+jU
+KQ
+Bs
+fA
+ra
+"}
+(9,1,1) = {"
+ra
+en
+en
+dI
+cW
+ib
+QG
+IM
+RL
+Yg
+ct
+LF
+wL
+fA
+ra
+"}
+(10,1,1) = {"
+ra
+en
+en
+en
+en
+Ib
+fA
+fA
+ct
+ct
+ct
+hj
+ct
+fA
+ra
+"}
+(11,1,1) = {"
+ra
+en
+en
+en
+en
+Ib
+Pe
+QG
+bO
+wa
+fy
+qh
+kW
+fA
+ra
+"}
+(12,1,1) = {"
+ra
+en
+en
+en
+en
+eH
+Gm
+QG
+Jm
+HK
+oX
+kh
+Qz
+fA
+ra
+"}
+(13,1,1) = {"
+ra
+en
+Gj
+en
+en
+eH
+Qg
+QG
+MP
+GB
+Lg
+GD
+MB
+fA
+ra
+"}
+(14,1,1) = {"
+ra
+en
+en
+en
+iQ
+SS
+br
+fA
+fA
+FJ
+wo
+bW
+Bo
+fA
+ra
+"}
+(15,1,1) = {"
+ra
+en
+en
+iQ
+SS
+ph
+ph
+br
+fA
+fA
+fA
+fA
+fA
+fA
+ra
+"}
+(16,1,1) = {"
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+ra
+"}