Skip to content

personal shuttle order console now actually checks if you can interact with it #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Paxilmaniac wants to merge 1 commit into
base: master
Choose a base branch
from
Open

personal shuttle order console now actually checks if you can interact with it #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modular_doppler/ships_r_us/code/order_console.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@

/obj/machinery/computer/personal_shuttle_order/ui_interact(mob/user, datum/tgui/ui)
. = ..()
if(!can_interact(user))
return
if(!our_docking_port)
Comment on lines 114 to 118
Copy link
Collaborator

@00-Steven 00-Steven Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all this shouldn't be on ui_interact(...) in the first place, given it's not a proper tgui window- and this proc would handling opening/updating it, not acting upon it
attack_hand(...) or interact(...) would probably serve better, probably the latter due to the can_interact(...) check involved
(note that admin ghosts get to in some cases bypass interact(...) limitations, which may matter in testing)

Copy link
Collaborator

@00-Steven 00-Steven Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably also returning TRUE so it doesn't try to continue other hand stuff

balloon_alert(user, "no linked docking port")
return
Expand Down
Loading