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

Merge remote-tracking branch 'origin/master' into pupstream-08-19-keepsha

Browse Source 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
#	code/_globalvars/lists/flavor_misc.dm
This commit is contained in:
nevimer
2025-09-03 21:03:51 -04:00
parent 77e8278ce2 b416fa47c6
commit c9956892db
297 changed files with 36404 additions and 17848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+24 -2
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", "Cultist's Cavern", "Winter Woods", "Evacuated Station", "Prison", "Corporate Office", "Recovery Wing", "Grotto", "Grotto (Night)", "Fox Bar", "The Nightclub", "EVA", "Oasis", "Oasis (Night)")
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)", "Fox Bar", "The Nightclub", "EVA", "Oasis", "Oasis (Night)", "Public Pool", "Mini Engineering", "Syndicate Office", "Syndicate Ops Centre")
//standart - hilber's hotel room
//apartment - see /datum/map_template/ghost_cafe_rooms
//beach condo - Beach themed apartment
@@ -34,6 +34,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/map_template/ghost_cafe_rooms/eva/ghost_cafe_rooms_eva
var/datum/map_template/ghost_cafe_rooms/oasis/ghost_cafe_rooms_oasis
var/datum/map_template/ghost_cafe_rooms/oasisalt/ghost_cafe_rooms_oasisalt
var/datum/map_template/ghost_cafe_rooms/pool/ghost_cafe_rooms_pool
var/datum/map_template/ghost_cafe_rooms/engineering/ghost_cafe_rooms_engineering
var/datum/map_template/ghost_cafe_rooms/syndieoffice/ghost_cafe_rooms_syndieoffice
var/datum/map_template/ghost_cafe_rooms/synopcenter/ghost_cafe_rooms_synopcenter
//BUBBER EDIT END
var/datum/map_template/hilbertshotel/hotelRoomTemp
@@ -74,6 +79,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
ghost_cafe_rooms_eva = new()
ghost_cafe_rooms_oasis = new()
ghost_cafe_rooms_oasisalt = new()
ghost_cafe_rooms_pool = new()
ghost_cafe_rooms_engineering = new()
ghost_cafe_rooms_syndieoffice = new()
ghost_cafe_rooms_synopcenter = new()
//BUBBER EDIT END
var/area/currentArea = get_area(src)
@@ -267,6 +277,18 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
else if(chosen_room == "Oasis (Night)")
load_from = ghost_cafe_rooms_oasisalt
else if(chosen_room == "Public Pool")
load_from = ghost_cafe_rooms_pool
else if(chosen_room == "Mini Engineering")
load_from = ghost_cafe_rooms_engineering
else if(chosen_room == "Syndicate Office")
load_from = ghost_cafe_rooms_syndieoffice
else if(chosen_room == "Syndicate Ops Centre")
load_from = ghost_cafe_rooms_synopcenter
//BUBBER EDIT END
@@ -487,7 +509,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
desc = "Stop looking through the bluespace peephole."
button_icon_state = "cancel_peephole"
/datum/action/peephole_cancel/Trigger(mob/clicker, trigger_flags)
/datum/action/peephole_cancel/Trigger(trigger_flags)
. = ..()
to_chat(owner, span_warning("You move away from the peephole."))
owner.reset_perspective()