Skip to content

Commit

Permalink
Fixes Hilbert Hotel and adds a beach condo (#795)
Browse files Browse the repository at this point in the history
* beachboyssong.ogg

* plant

* byebye tree
  • Loading branch information
Zergspower authored and FFMirrorBot committed Feb 8, 2024
1 parent 107a5d8 commit 55ec45f
Show file tree
Hide file tree
Showing 4 changed files with 727 additions and 6 deletions.
4 changes: 3 additions & 1 deletion code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions modular_nova/modules/ghostcafe/code/hilbertshotel_ghost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
7 changes: 2 additions & 5 deletions modular_nova/modules/hotel_rooms/apartment.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -769,7 +766,7 @@ oZ
Gv
RP
bz
Ib
RP
RP
xT
aS
Expand Down
Loading

0 comments on commit 55ec45f

Please sign in to comment.