mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 14:08:31 +01:00
More Hotel Rooms (Banging In The SM Chamber And Cooling Off In The Pool Edition (Also Syndicates Again, As A Bonus)) (#4487)
## About The Pull Request This PR adds two more ghost cafe infinidorms - an engineering themed one and a swimming pool one. - The engineering one includes fake emitters (reskinned watertanks) and a fake supermatter - the soupermatter, a highly classified variant of the supermatter that you can use a bowl on to get soup (it's a var edited prison serving tray). - The pool one consists of a changing room, a showers, and a rather sizeable pool. Swimming pools are cool, but they're ass to set up, and most pools in-game just lack that proper indoors public swimming pool aesthetic. In addition, it also adds the two hotel rooms by JustMeTheIInd, as they're damn nice and it'd be a shame for them not to see the light of day. None of the items should be dangerous, the most severe one I could find was an armoured vest. Credit to JustMeTheIInd for the rooms. https://github.com/Bubberstation/Bubberstation/pull/3160/files#diff-75825709fd371bc0ef4b3f40f95ff91a223a2ccd7b4705f7759ec35a5315a624 ## Why It's Good For The Game More variety! This gives players more options as to where to locate their scenes when using the ghost cafe. In addition, you can finally, _finally,_ shag in the supermatter and not get bwoinked by admins for it (probably, anyhow. I didn't test to see if an admin would ban you for using this hotel room). ## Proof Of Testing <details> <summary>Screenshots</summary> _In each of these the lizard is located at the player spawn point._ <img width="902" height="836" alt="Screenshot 2025-08-18 155624" src="https://github.com/user-attachments/assets/d1ed2457-a2c2-4d28-987e-4c33a107948f" /> <img width="912" height="834" alt="Screenshot 2025-08-18 155513" src="https://github.com/user-attachments/assets/0602b75c-97c5-4114-92e1-2c4041c57e35" /> <img width="915" height="867" alt="Screenshot 2025-08-18 155907" src="https://github.com/user-attachments/assets/221c9437-aa42-4d2e-b80b-a7c2eb9795e0" /> <img width="920" height="886" alt="Screenshot 2025-08-18 160016" src="https://github.com/user-attachments/assets/a8b90980-1a6b-4626-b129-2e70c63e62e7" /> </details> <img width="482" height="140" alt="Screenshot 2025-08-18 154834" src="https://github.com/user-attachments/assets/04eba1e4-c5f6-43ee-b357-ae9a378da0e0" /> _The infamous soupermatter at work._ ## Changelog 🆑 add: Four new inifidorm dooms: Mini Engineering, Public Pool, Sydicate Office, and Syndicate Ops Centre. The two Syndicate rooms were originally made by JustMeTheIInd. /🆑
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user