From 8fe8cf17cb4eb3f0c6cbcf7eb4eee372e76bcb89 Mon Sep 17 00:00:00 2001 From: Bobbanz1 <59128051+Bobbanz1@users.noreply.github.com> Date: Mon, 17 Jul 2023 05:31:42 +0200 Subject: [PATCH] [MODULAR] Allows borgs use the infinite hotel in the ghost cafe (#320) ## 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. 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 :cl: add: Made it so cyborgs can actually interact with the infinite dormitory in the ghost cafe! /:cl: --- .../code/modules/ghostcafe/hilbertshotel_silicon.dm | 8 ++++++++ tgstation.dme | 1 + 2 files changed, 9 insertions(+) create mode 100644 modular_zubbers/code/modules/ghostcafe/hilbertshotel_silicon.dm diff --git a/modular_zubbers/code/modules/ghostcafe/hilbertshotel_silicon.dm b/modular_zubbers/code/modules/ghostcafe/hilbertshotel_silicon.dm new file mode 100644 index 00000000000..ee59bd22e70 --- /dev/null +++ b/modular_zubbers/code/modules/ghostcafe/hilbertshotel_silicon.dm @@ -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) diff --git a/tgstation.dme b/tgstation.dme index 10ead83c9d2..5f1f6ff5ead 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"