cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes hotel rooms and adds new one (#3082)

Browse Source 
## About The Pull Request

Adds a new hotel room as of the request of Leathergnome who also made
said hotel room, all credit goes to him i just PRed it, ontop of that
this PR also fixes
https://github.com/Bubberstation/Bubberstation/pull/3078 as said rooms
were forgotten to be added to the selectable list, shit happens love the
new rooms by the way.

## Why It's Good For The Game

Another dorms room to enjoy and fix for already PRed ones

## Proof Of Testing

Works and Complies on localhost


![image](https://github.com/user-attachments/assets/f29c9158-f512-4d4a-b680-00e500b9ffa7)

## Changelog

🆑
map: Added new Hotel room
fix: Fixed the other hotel rooms not showing up from a different PR
/🆑
This commit is contained in:
Vanilla1040
2025-02-13 18:12:15 -08:00
committed by GitHub
parent d907ebb3be
commit 7d34f23db1
3 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+7 -1
View File
@@ -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