cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Bubberstation/Bubberstation into upstream-25-02a

Browse Source
This commit is contained in:
Majkl-J
2025-02-25 06:56:39 -08:00
parent ca02c32f86 22c656f76e
commit 254cd32c93
204 changed files with 9929 additions and 15079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+50 -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", "Corporate Office", "Recovery Wing", "Grotto", "Grotto (Night)")
//standart - hilber's hotel room
//apartment - see /datum/map_template/ghost_cafe_rooms
//beach condo - Beach themed apartment
@@ -20,6 +20,17 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/map_template/ghost_cafe_rooms/library/ghost_cafe_rooms_library
//Skyrat EDIT END
//BUBBER EDIT ADDITION BEGIN - Infinite Dorm Maps Add
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
var/datum/map_template/ghost_cafe_rooms/corporateoffice/ghost_cafe_rooms_corporateoffice
var/datum/map_template/ghost_cafe_rooms/recwing/ghost_cafe_rooms_recwing
var/datum/map_template/ghost_cafe_rooms/grotto/ghost_cafe_rooms_grotto
var/datum/map_template/ghost_cafe_rooms/grotto2/ghost_cafe_rooms_grotto2
//BUBBER EDIT END
var/datum/map_template/hilbertshotel/hotelRoomTemp
var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty
var/datum/map_template/hilbertshotel/lore/hotelRoomTempLore
@@ -44,6 +55,16 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
ghost_cafe_rooms_stationside = new()
ghost_cafe_rooms_library = new()
//SKYRAT EDIT END
//BUBBER EDIT ADDITION BEGIN - Infinite Dorm Maps Add
ghost_cafe_rooms_cultcave = new()
ghost_cafe_rooms_winterwoods = new()
ghost_cafe_rooms_evacuationstation = new()
ghost_cafe_rooms_prisoninfdorm = new()
ghost_cafe_rooms_corporateoffice = new()
ghost_cafe_rooms_recwing = new()
ghost_cafe_rooms_grotto = new()
ghost_cafe_rooms_grotto2 = new()
//BUBBER EDIT END
var/area/currentArea = get_area(src)
if(currentArea.type == /area/ruin/space/has_grav/powered/hilbertresearchfacility/secretroom)
@@ -197,6 +218,33 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
else if(chosen_room == "Library")
load_from = ghost_cafe_rooms_library
//SKYRAT EDIT ADDITION END
//BUBBER EDIT ADDITION BEGIN - Infinite Dorm Maps Add
else if(chosen_room == "Cultist's Cavern")
load_from = ghost_cafe_rooms_cultcave
else if(chosen_room == "Winter Woods")
load_from = ghost_cafe_rooms_winterwoods
else if(chosen_room == "Evacuated Station")
load_from = ghost_cafe_rooms_evacuationstation
else if(chosen_room == "Prison")
load_from = ghost_cafe_rooms_prisoninfdorm
else if(chosen_room == "Corporate Office")
load_from = ghost_cafe_rooms_corporateoffice
else if(chosen_room == "Recovery Wing")
load_from = ghost_cafe_rooms_recwing
else if(chosen_room == "Grotto")
load_from = ghost_cafe_rooms_grotto
else if(chosen_room == "Grotto (Night)")
load_from = ghost_cafe_rooms_grotto2
//BUBBER EDIT END
load_from.load(bottom_left)
activeRooms["[roomNumber]"] = roomReservation
@@ -524,6 +572,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
area_flags = HIDDEN_AREA | NOTELEPORT | UNIQUE_AREA
default_gravity = STANDARD_GRAVITY
/obj/item/abstracthotelstorage
anchored = TRUE
invisibility = INVISIBILITY_ABSTRACT