mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 09:05:11 +01:00
[MODULAR] Allows borgs use the infinite hotel in the ghost cafe (#320)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request This PR allows the roleplay borgs in the ghost cafe to utilize the infinite dormitory, creating apartments, hotels and joining other players in them! Invite your silicon friend over for a party! I have made this modular as I'm uncertain WHY Skyrat never actually implemented this beforehand as it seemed pretty easy to do. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> Video was made before I noticed the compiler didn't compile the recent changes I had made, however the current version should only let a borg check into a room if they're standing next to the infinite dormitory thing itself rather than from a distance! https://github.com/Bubberstation/Bubberstation/assets/59128051/280c4d6a-da8b-41c2-b056-0280b1b2e996 ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 add: Made it so cyborgs can actually interact with the infinite dormitory in the ghost cafe! /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
This commit is contained in:
@@ -0,0 +1,8 @@
|
||||
// Should let the roleplay borgs interact with the hilberts hotel thingy!
|
||||
/obj/item/hilbertshotel/ghostdojo/attack_robot(mob/living/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
if(!src.Adjacent(user))
|
||||
return
|
||||
return promptAndCheckIn(user, user)
|
||||
@@ -7179,6 +7179,7 @@
|
||||
#include "modular_zubbers\code\modules\dynamic\midround_rulesets.dm"
|
||||
#include "modular_zubbers\code\modules\fluff\flora\ash_flora.dm"
|
||||
#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
|
||||
#include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"
|
||||
#include "modular_zubbers\code\modules\hydroponics\gene_modder.dm"
|
||||
#include "modular_zubbers\code\modules\hydroponics\plant_genes.dm"
|
||||
#include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
|
||||
|
||||
Reference in New Issue
Block a user