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

Merged
00-Steven merged 4 commits into from
Feb 27, 2026
Merged

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

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f864e79
j
Paxilmaniac Feb 22, 2026
a4a63ce
interact
Paxilmaniac Feb 24, 2026
6acbcdd
single wrong word
Paxilmaniac Feb 25, 2026
65d9ace
adds values to the returns
Paxilmaniac Feb 26, 2026
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
8 changes: 5 additions & 3 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 @@ -7,7 +7,7 @@
name = "Personal Shuttle Order Console"
desc = "A console giving you access to only the sleaziest of shuttle sales services."
id = "personal_shuttle_console"
build_path = /obj/item/circuitboard/computer/personal_shuttle_order
build_path = /obj/item/circuitboard/computer/personal_shuttle_order/station
category = list(
RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_CARGO
)
Expand Down Expand Up @@ -62,7 +62,7 @@
. = ..()
if(our_docking_port)
return
. += span_danger("This shuttle wasn't constructed close enough to a suitable shuttle dock, and will not work.")
. += span_danger("This console wasn't constructed close enough to a suitable shuttle dock, and will not work.")

/// Asks SSshuttle if our set docking port id is around and in range
/obj/machinery/computer/personal_shuttle_order/proc/try_and_find_a_dock()
Expand Down Expand Up @@ -111,8 +111,10 @@
#define PERSONAL_SHUTTLE_CONSOLE_PURCHASE_SHUTTLE "Purchase"
#define PERSONAL_SHUTTLE_CONSOLE_CLEAR_SELECTION "Clear Selection"

/obj/machinery/computer/personal_shuttle_order/ui_interact(mob/user, datum/tgui/ui)
/obj/machinery/computer/personal_shuttle_order/interact(mob/user)
. = ..()
if(!can_interact(user))
return
if(!our_docking_port)
balloon_alert(user, "no linked docking port")
return
Expand Down
Loading