From a7215b3cdbe4cde62cc172b364787c2e02c0077c Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Sun, 11 Feb 2024 14:02:01 +0300 Subject: [PATCH] Fixes Hilbert Hotel room spawns (#1933) Fixed and flavored Co-authored-by: Zergspower --- .../ruins/spaceruin_code/hilbertshotel.dm | 6 ++- .../ghostcafe/code/hilbertshotel_ghost.dm | 4 +- .../modules/hotel_rooms/beach_condo.dmm | 39 +++++++++++++++++-- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index d309b8879be..d99902f448a 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -12,7 +12,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) 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 + var/datum/map_template/ghost_cafe_rooms/apartment/ghost_cafe_rooms_apartment + var/datum/map_template/ghost_cafe_rooms/beach_condo/ghost_cafe_rooms_beach_condo //NOVA EDIT END var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty @@ -34,6 +35,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) hotelRoomTempLore = new() //NOVA EDIT ADDITION - GHOST HOTEL UPDATE ghost_cafe_rooms_apartment = new() + ghost_cafe_rooms_beach_condo = new() //NOVA EDIT END var/area/currentArea = get_area(src) if(currentArea.type == /area/ruin/space/has_grav/powered/hilbertresearchfacility/secretroom) @@ -179,7 +181,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) else if(chosen_room == "Apartment") load_from = ghost_cafe_rooms_apartment else if(chosen_room == "Beach Condo") - load_from = ghost_cafe_rooms_apartment + load_from = ghost_cafe_rooms_beach_condo //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 378f16828f8..9a84d66cb29 100644 --- a/modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm +++ b/modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm @@ -13,10 +13,10 @@ /obj/item/hilbertshotel/ghostdojo/attack_robot(mob/living/user) attack_hand(user) -/datum/map_template/ghost_cafe_rooms +/datum/map_template/ghost_cafe_rooms/apartment name = "Apartment" mappath = "modular_nova/modules/hotel_rooms/apartment.dmm" -/datum/map_template/ghost_cafe_rooms +/datum/map_template/ghost_cafe_rooms/beach_condo name = "Beach Condo" mappath = "modular_nova/modules/hotel_rooms/beach_condo.dmm" diff --git a/modular_nova/modules/hotel_rooms/beach_condo.dmm b/modular_nova/modules/hotel_rooms/beach_condo.dmm index df782fcaacf..db3f1ccf56b 100644 --- a/modular_nova/modules/hotel_rooms/beach_condo.dmm +++ b/modular_nova/modules/hotel_rooms/beach_condo.dmm @@ -22,8 +22,14 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/item/knife/kitchen, /turf/open/floor/iron/kitchen, /area/misc/hilbertshotel) +"cj" = ( +/obj/effect/light_emitter/interlink, +/obj/item/toy/plush/carpplushie, +/turf/open/water/beach, +/area/misc/hilbertshotel) "ct" = ( /turf/closed/wall/mineral/wood, /area/misc/hilbertshotel) @@ -112,8 +118,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/machinery/light_switch/directional/west, /turf/open/floor/wood/parquet, /area/misc/hilbertshotel) +"mH" = ( +/obj/machinery/jukebox{ + req_access = null + }, +/turf/open/misc/beach/sand, +/area/misc/hilbertshotel) "na" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/lone, @@ -172,6 +185,9 @@ /area/misc/hilbertshotel) "tR" = ( /obj/machinery/shower/directional/east, +/obj/structure/drain/big, +/obj/item/soap/deluxe, +/obj/structure/curtain, /turf/open/indestructible/bathroom, /area/misc/hilbertshotel) "wa" = ( @@ -205,6 +221,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/structure/sign/painting/large/library{ + dir = 1 + }, /turf/open/floor/wood, /area/misc/hilbertshotel) "yH" = ( @@ -229,13 +248,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/item/kirbyplants/random, +/obj/structure/bed/dogbed, +/obj/item/toy/plush/shark, /turf/open/floor/wood/large, /area/misc/hilbertshotel) "Dg" = ( /obj/structure/toilet{ - dir = 1 + dir = 4 }, +/obj/structure/window/spawner/directional/north, /turf/open/indestructible/bathroom, /area/misc/hilbertshotel) "EI" = ( @@ -249,6 +270,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/item/kirbyplants/random, /turf/open/floor/wood/parquet, /area/misc/hilbertshotel) "FN" = ( @@ -324,6 +346,10 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/item/pizzabox/margherita{ + pixel_y = 11 + }, +/obj/item/storage/cans/sixbeer, /turf/open/floor/wood/parquet, /area/misc/hilbertshotel) "KQ" = ( @@ -344,12 +370,14 @@ /area/misc/hilbertshotel) "Lv" = ( /obj/structure/sink/directional/north, +/obj/structure/mirror/directional/south, /turf/open/indestructible/bathroom, /area/misc/hilbertshotel) "LF" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 }, +/obj/machinery/light_switch/directional/north, /turf/open/floor/wood, /area/misc/hilbertshotel) "MB" = ( @@ -363,6 +391,7 @@ dir = 4 }, /obj/machinery/light/floor, +/obj/machinery/light_switch/directional/south, /turf/open/floor/wood/large, /area/misc/hilbertshotel) "MP" = ( @@ -419,6 +448,7 @@ /obj/structure/chair/comfy/teal{ dir = 8 }, +/obj/machinery/light_switch/directional/east, /turf/open/floor/wood/large, /area/misc/hilbertshotel) "SS" = ( @@ -436,6 +466,7 @@ pixel_x = 2; pixel_y = 3 }, +/obj/item/serviette_pack, /turf/open/floor/wood/large, /area/misc/hilbertshotel) "ZE" = ( @@ -481,7 +512,7 @@ ra (3,1,1) = {" ra en -en +cj en en iQ @@ -672,7 +703,7 @@ en en iQ SS -br +mH fA fA FJ