From cf100c70104a40f2bf5e4fd5f5a9c3f34c4f85c7 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Tue, 3 Dec 2024 00:19:10 +0300 Subject: [PATCH] Fixes Hilbert's rigged analyzer not being able to scan the hotel orb (#88308) ## About The Pull Request Closes #87751 ## Changelog :cl: fix: Fixed Hilbert's rigged analyzer not being able to scan the hotel orb /:cl: --- .../ruins/spaceruin_code/hilbertshotel.dm | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index 157cfbb9e16..7e6a1bf6d63 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -525,25 +525,25 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) worn_icon_state = "analyzer" /obj/item/analyzer/hilbertsanalyzer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if(istype(interacting_with, /obj/item/hilbertshotel)) - if(!Adjacent(interacting_with)) - to_chat(user, span_warning("It's to far away to scan!")) - return ITEM_INTERACT_BLOCKING - var/obj/item/hilbertshotel/sphere = interacting_with - if(sphere.activeRooms.len) - to_chat(user, "Currently Occupied Rooms:") - for(var/roomnumber in sphere.activeRooms) - to_chat(user, roomnumber) - else - to_chat(user, "No currenty occupied rooms.") - if(sphere.storedRooms.len) - to_chat(user, "Vacated Rooms:") - for(var/roomnumber in sphere.storedRooms) - to_chat(user, roomnumber) - else - to_chat(user, "No vacated rooms.") - return ITEM_INTERACT_SUCCESS - return ..() + if(!istype(interacting_with, /obj/item/hilbertshotel)) + return ..() + if(!user.CanReach(interacting_with)) + to_chat(user, span_warning("It's to far away to scan!")) + return ITEM_INTERACT_BLOCKING + var/obj/item/hilbertshotel/sphere = interacting_with + if(sphere.activeRooms.len) + to_chat(user, "Currently Occupied Rooms:") + for(var/roomnumber in sphere.activeRooms) + to_chat(user, roomnumber) + else + to_chat(user, "No currenty occupied rooms.") + if(sphere.storedRooms.len) + to_chat(user, "Vacated Rooms:") + for(var/roomnumber in sphere.storedRooms) + to_chat(user, roomnumber) + else + to_chat(user, "No vacated rooms.") + return ITEM_INTERACT_SUCCESS /obj/effect/landmark/transport/transport_id/hilbert specific_transport_id = HILBERT_LINE_1