diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index ddd37d72a8b..7709b3c6327 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
 	//SKYRAT EDIT ADDITION - GHOST HOTEL UPDATE + EXTRA STUFF
-	var/static/list/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library")
+	var/static/list/hotel_maps = list("Generic", "Apartment", "Beach Condo", "Station Side", "Library", "Cultist's Cavern", "Winter Woods", "Evacuated Station", "Prison")
 	//standart - hilber's hotel room
 	//apartment - see /datum/map_template/ghost_cafe_rooms
 	//beach condo - Beach themed apartment
@@ -24,6 +24,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 	var/datum/map_template/ghost_cafe_rooms/cultcave/ghost_cafe_rooms_cultcave
 	var/datum/map_template/ghost_cafe_rooms/winterwoods/ghost_cafe_rooms_winterwoods
 	var/datum/map_template/ghost_cafe_rooms/evacuationstation/ghost_cafe_rooms_evacuationstation
+	var/datum/map_template/ghost_cafe_rooms/prisoninfdorm/ghost_cafe_rooms_prisoninfdorm
 	//BUBBER EDIT END
 
 	var/datum/map_template/hilbertshotel/hotelRoomTemp
@@ -54,6 +55,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 	ghost_cafe_rooms_cultcave = new()
 	ghost_cafe_rooms_winterwoods = new()
 	ghost_cafe_rooms_evacuationstation = new()
+	ghost_cafe_rooms_prisoninfdorm = new()
 	//BUBBER EDIT END
 
 	var/area/currentArea = get_area(src)
@@ -217,6 +219,10 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 
 	else if(chosen_room == "Evacuated Station")
 		load_from = ghost_cafe_rooms_evacuationstation
+
+	else if(chosen_room == "Prison")
+		load_from = ghost_cafe_rooms_prisoninfdorm
+
 	//BUBBER EDIT END
 
 
diff --git a/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm b/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
index 05198ae0c54..1cf136ee858 100644
--- a/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
+++ b/modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
@@ -54,3 +54,7 @@
 /datum/map_template/ghost_cafe_rooms/evacuationstation
 	name = "Evacuated Station"
 	mappath = "modular_skyrat/modules/hotel_rooms/evacuationstation.dmm"
+
+/datum/map_template/ghost_cafe_rooms/prisoninfdorm
+	name = "Prison"
+	mappath = "modular_skyrat/modules/hotel_rooms/prisoninfdorm.dmm"
diff --git a/modular_skyrat/modules/hotel_rooms/prisoninfdorm.dmm b/modular_skyrat/modules/hotel_rooms/prisoninfdorm.dmm
new file mode 100644
index 00000000000..3eb9854434a
--- /dev/null
+++ b/modular_skyrat/modules/hotel_rooms/prisoninfdorm.dmm
@@ -0,0 +1,96 @@
+"av" = (/obj/machinery/hydroponics/constructable/fullupgrade,/obj/machinery/hydroponics/constructable/fullupgrade,/obj/machinery/light/directional/west,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"cm" = (/obj/machinery/oven/range,/obj/structure/window/reinforced{dir = 1},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"cP" = (/obj/structure/closet/generic,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"di" = (/obj/structure/chair/stool/directional/south,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"eP" = (/obj/item/wallframe/status_display,/turf/closed/indestructible/reinforced,/area/misc/hilbertshotel)
+"eV" = (/obj/item/storage/box/nif_ghost_box/ghost_role,/obj/structure/closet/crate/trashcart/laundry,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"fH" = (/obj/item/reagent_containers/cup/bottle/hexacrocin{pixel_x = -9},/obj/machinery/light/very_dim/directional/north,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"ga" = (/obj/machinery/door/airlock,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"hz" = (/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/obj/item/stack/license_plates/empty/fifty,/obj/structure/closet/crate/preopen,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"ik" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder{pixel_y = 10; pixel_x = -5},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"kP" = (/obj/structure/closet/crate/hydroponics,/obj/item/reagent_containers/cup/beaker/large,/obj/item/reagent_containers/cup/beaker/large,/obj/item/reagent_containers/cup/beaker/large,/obj/item/storage/bag/plants,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"kX" = (/obj/structure/hoop{dir = 8},/obj/effect/turf_decal/trimline/white/filled/line{dir = 4},/obj/machinery/light/directional/east,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"lD" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/closet/secure_closet/freezer/kitchen/all_access,/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"mk" = (/obj/machinery/vending/hydronutrients{default_price = 0; extra_price = 0; fair_market_price = 0},/turf/open/floor/grass,/area/misc/hilbertshotel)
+"mX" = (/obj/machinery/light/warm/dim/directional/east,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"nG" = (/obj/machinery/prisongate,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"og" = (/obj/machinery/grill,/obj/machinery/griddle,/obj/structure/window/reinforced{dir = 1},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"rT" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs{pixel_y = 2; pixel_x = 5},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"rZ" = (/obj/structure/chair/greyscale{dir = 1},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"sv" = (/obj/structure/table,/obj/machinery/light/floor,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"ui" = (/obj/structure/window/reinforced/spawner/directional/north{dir = 4},/obj/item/shovel/spade{pixel_x = 4; pixel_y = 4},/obj/item/hatchet{pixel_x = 10; pixel_y = 5},/obj/item/secateurs{pixel_y = 5; pixel_x = -10},/obj/item/plant_analyzer{pixel_y = -2},/obj/structure/table/glass,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"uk" = (/obj/effect/turf_decal/trimline/white/filled/line{dir = 6},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"uC" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/vending/dinnerware{default_price = 0; extra_price = 0; fair_market_price = 0},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"vT" = (/obj/machinery/light/directional/south,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"ws" = (/obj/machinery/vending/security/noaccess,/obj/item/toy/figure/secofficer{pixel_y = 16},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"xh" = (/obj/structure/chair/greyscale,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"xI" = (/obj/machinery/biogenerator,/obj/structure/window/reinforced/spawner/directional/north,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"yi" = (/obj/structure/table,/obj/item/toy/cards/deck/cas{pixel_y = 10; pixel_x = 8},/obj/item/toy/cards/deck/cas/black,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"yr" = (/obj/effect/decal/cleanable/cum/femcum,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"yD" = (/obj/structure/sign/poster/official/walk,/turf/closed/indestructible/reinforced,/area/misc/hilbertshotel)
+"yV" = (/obj/effect/turf_decal/trimline/white/filled/line{dir = 10},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"zo" = (/obj/structure/sink/kitchen/directional/east,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"zx" = (/obj/structure/table/reinforced{pixel_y = 0},/obj/item/storage/box/prisoner{pixel_y = 4; pixel_x = -6},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"zU" = (/obj/structure/hoop{dir = 4},/obj/effect/turf_decal/trimline/white/filled/line{dir = 8},/obj/machinery/light/directional/west,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Ab" = (/obj/item/toy/basketball{pixel_x = 0},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"AP" = (/obj/structure/chair/comfy/black,/obj/item/clothing/glasses/hypno{pixel_y = 8; pixel_x = -3},/obj/item/toy/figure/hos,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"BT" = (/obj/machinery/light/directional/south,/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"Cf" = (/obj/machinery/hydroponics/constructable/fullupgrade,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"Ck" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/jacket/straight_jacket{pixel_y = -5},/obj/item/clothing/mask/muzzle{pixel_y = 5},/obj/item/clothing/glasses/blindfold{pixel_y = 7},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Cm" = (/obj/structure/window/reinforced{dir = 8},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"Cx" = (/obj/machinery/plate_press,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Cz" = (/turf/closed/indestructible/hoteldoor{icon_state = "door_closed"; icon = 'icons/obj/doors/puzzledoor/default.dmi'},/area/misc/hilbertshotel)
+"CD" = (/obj/structure/window/reinforced/spawner/directional/east,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"CZ" = (/obj/structure/sign/poster/contraband/got_wood,/turf/closed/indestructible/reinforced,/area/misc/hilbertshotel)
+"El" = (/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"Fa" = (/obj/structure/falsewall/reinforced,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Fp" = (/obj/structure/window/reinforced/spawner/directional/east,/obj/structure/window/reinforced/spawner/directional/north,/obj/machinery/seed_extractor,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"FV" = (/turf/closed/indestructible/fakeglass,/area/misc/hilbertshotel)
+"Gw" = (/obj/machinery/washing_machine,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"GA" = (/turf/open/floor/iron/edge{dir = 1},/area/misc/hilbertshotel)
+"Hq" = (/turf/open/floor/grass,/area/misc/hilbertshotel)
+"Io" = (/obj/machinery/door/airlock/security/glass,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Iu" = (/obj/structure/bed/double,/obj/effect/spawner/random/bedsheet/double,/turf/open/floor/iron/edge{dir = 1},/area/misc/hilbertshotel)
+"Jq" = (/obj/machinery/washing_machine,/obj/item/toy/figure/prisoner{pixel_y = 10},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"La" = (/obj/machinery/door/airlock/hatch,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Lw" = (/obj/structure/sign/poster/official/boombox,/turf/closed/indestructible/reinforced,/area/misc/hilbertshotel)
+"LF" = (/obj/structure/table,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"LV" = (/turf/closed/indestructible/reinforced,/area/misc/hilbertshotel)
+"Md" = (/obj/structure/table/reinforced,/obj/item/kitchen/rollingpin{pixel_x = -10; pixel_y = 5},/obj/item/knife/kitchen{pixel_y = 5; pixel_x = 10},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"MR" = (/obj/machinery/vending/dorms/prison,/obj/item/toy/figure/assistant{pixel_y = 16},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Nt" = (/obj/machinery/door/window{dir = 8},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"NN" = (/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Od" = (/obj/machinery/door/window/brigdoor/left/directional/east,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"Oj" = (/obj/effect/turf_decal/trimline/white/filled/line{dir = 9},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"OY" = (/obj/structure/window/reinforced/spawner/directional/north,/turf/open/floor/grass,/area/misc/hilbertshotel)
+"PR" = (/obj/machinery/light/directional/north,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"QG" = (/obj/effect/turf_decal/trimline/white/filled/line{dir = 1},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"QJ" = (/obj/machinery/vending/hydroseeds{default_price = 0; extra_price = 0; fair_market_price = 0},/obj/structure/window/reinforced/spawner/directional/east,/obj/item/toy/figure/botanist{pixel_y = 16},/turf/open/floor/grass,/area/misc/hilbertshotel)
+"Si" = (/obj/structure/table/reinforced,/obj/structure/table/reinforced,/obj/machinery/processor,/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"SZ" = (/obj/structure/table,/obj/item/toy/figure/ian{pixel_x = 8},/obj/item/toy/figure/hop{pixel_y = 2},/obj/item/toy/figure/ian{pixel_x = -4; pixel_y = 2},/obj/item/toy/figure/ian{pixel_x = 0},/obj/item/toy/figure/ian{pixel_x = 4; pixel_y = 2},/obj/item/toy/figure/ian{pixel_x = -8},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"TT" = (/obj/structure/closet,/obj/item/market_uplink,/obj/effect/spawner/random/entertainment/coin,/obj/effect/spawner/random/entertainment/coin,/obj/item/gun/ballistic/automatic/l6_saw/toy,/obj/effect/spawner/random/entertainment/toy_figure,/obj/item/pen/sleepy,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Vt" = (/obj/machinery/deepfryer,/obj/structure/window/reinforced{dir = 1},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"VM" = (/obj/machinery/vending/sustenance,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/item/toy/figure/chef{pixel_y = 15},/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"XN" = (/obj/structure/bed,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"YN" = (/obj/effect/turf_decal/trimline/white/filled/line,/turf/open/floor/iron,/area/misc/hilbertshotel)
+"YR" = (/obj/machinery/smartfridge,/turf/open/floor/iron/checker,/area/misc/hilbertshotel)
+"Za" = (/obj/item/clothing/mask/leatherwhip{pixel_x = -9; pixel_y = 4},/turf/open/floor/iron,/area/misc/hilbertshotel)
+"Zj" = (/obj/effect/turf_decal/trimline/white/filled/line{dir = 5},/turf/open/floor/iron,/area/misc/hilbertshotel)
+
+(1,1,1) = {"
+LVLVLVLVLVFVFVFVFVFVFVLVLVLVLV
+LVGAPRIuLVOjQGQGQGQGZjLVAPfHLV
+LVNNNNNNLVzUNNAbNNNNkXLVyrZaLV
+LVgaePCZCZyVYNYNYNYNukLVFaLVLV
+LVNNMRPRNNNNNNNNNNNNNNPReVJqLV
+LVNNNNNNNNNNNNNNNNdiNNdiNNGwLV
+LVxIOYFpNNxhxhNNsvCxhzCxsvNNLV
+LVCfHquiNNyiSZNNVMuCogcmVtlDLV
+LVavHqOdNNLFLFNNCmElElElElElLV
+LVzoHqCDNNrZrZNNNtElikSiMdElLV
+LVkPmkQJNNvTNNNNYRElElBTElElLV
+LVLVyDFVFVLwIonGLVLVLVLVLVLVLV
+LVcPrTzxwsPRNNNNNNNNPRLaNNmXLV
+CzNNNNNNNNNNNNNNNNTTCkLVNNXNLV
+LVLVLVLVLVLVLVLVLVLVLVLVLVLVLV
+"}