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.

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

Conversation

FebrezeNinja
Copy link
Contributor

@FebrezeNinja FebrezeNinja commented Jan 10, 2025

About the pull request

Fixes #8067
Adds the black market supply packs to the tgui_static_data, which also prevents a window crash.
Removed a cast from toggle_contraband that was preventing sales to the black market.

Explain why it's good for the game

Re-allows use of the black market on the new interface

Testing Photographs and Procedure

Screenshots & Videos

ASRS_TGUI_black_market

Enabled the black market; bought and sold items.

Changelog

🆑
fix: Fixes black market TGUI crash
/:cl:

@cmss13-ci cmss13-ci bot added the Fix Fix one bug, make ten more label Jan 10, 2025
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

you don't need to duplicate all this - just add, in the existing supply/ui_static_data

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

instead of just checking linked_supply_controller.all_supply_groups

code/game/supplyshuttle.dm Show resolved Hide resolved
@harryob harryob marked this pull request as draft January 10, 2025 20:39
@FebrezeNinja FebrezeNinja marked this pull request as ready for review January 11, 2025 08:33
@FebrezeNinja FebrezeNinja requested a review from harryob January 11, 2025 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
Status: Changes Requested
Development

Successfully merging this pull request may close these issues.

unable to use blackmarket
2 participants