Skip to content
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

Add black market items to TGUI req #8073

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+3 −3
Open

Add black market items to TGUI req #8073

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23e7d0d
Add contraband items to asrs ui_static_data
FebrezeNinja Jan 10, 2025
f657939
unwanted downcast? Caused errors in debug
FebrezeNinja Jan 10, 2025
be5c173
Requested change: have supply handle both
FebrezeNinja Jan 11, 2025
ec37b0e
Lint fix
FebrezeNinja Jan 11, 2025
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
6 changes: 3 additions & 3 deletions code/game/supplyshuttle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
if(isnull(pack.contains) && isnull(pack.containertype))
continue

if(!(pack.group in linked_supply_controller.all_supply_groups))
if(!(pack.group in (list() + linked_supply_controller.all_supply_groups + linked_supply_controller.contraband_supply_groups)))
continue

if(!pack.contraband && length(pack.group))
Expand Down Expand Up @@ -407,7 +407,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())

/obj/structure/machinery/computer/supply/asrs/proc/toggle_contraband(contraband_enabled = FALSE)
can_order_contraband = contraband_enabled
for(var/obj/structure/machinery/computer/supply/asrs/computer as anything in linked_supply_controller.bound_supply_computer_list)
for(var/obj/structure/machinery/computer/supply/asrs/computer in linked_supply_controller.bound_supply_computer_list)
harryob marked this conversation as resolved.
Show resolved Hide resolved
if(computer.can_order_contraband)
linked_supply_controller.black_market_enabled = TRUE
return
Expand All @@ -417,7 +417,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())

/// Prevents use of black market, even if it is otherwise enabled. If any computer has black market locked out, it applies across all of the currently established ones.
/obj/structure/machinery/computer/supply/asrs/proc/lock_black_market(market_locked = FALSE)
for(var/obj/structure/machinery/computer/supply/asrs/computer as anything in linked_supply_controller.bound_supply_computer_list)
for(var/obj/structure/machinery/computer/supply/asrs/computer in linked_supply_controller.bound_supply_computer_list)
if(market_locked)
computer.black_market_lockout = TRUE

Expand Down
Loading