From fb5656d889d4e6a82df3867b35810781bf437609 Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Tue, 29 Apr 2025 19:04:18 -0400 Subject: [PATCH] Fix tarkon bounty pad being broken (#3668) ## About The Pull Request TG added it so the pirate pad exports to a separate market that has like 3 things in it (hostages, parrots, cash) and so I added a var on the computer to determine which market it sells to and overrode it to station for interdyne/tarkon pads ## Why It's Good For The Game Fixes #3661 ## Proof Of Testing
Screenshots/Videos ![image](https://github.com/user-attachments/assets/024a375f-79e8-4196-8937-53dc7a94118f)
## Changelog :cl: fix: fixed port tarkon bounty pad returning 0 for all sales /:cl: --- code/modules/antagonists/pirate/pirate_shuttle_equipment.dm | 6 ++++-- modular_zubbers/code/game/machinery/syndiepad.dm | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm index 10544818967..890017564b6 100644 --- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm +++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm @@ -224,6 +224,8 @@ var/interface_type = "CargoHoldTerminal" ///Typecache of things that shouldn't be sold and shouldn't have their contents sold. var/static/list/nosell_typecache + ///Market this terminal sells to, defaults to pirate + var/export_market = EXPORT_MARKET_PIRACY // BUBBER EDIT ADDITION /obj/machinery/computer/piratepad_control/Initialize(mapload) ..() @@ -363,11 +365,11 @@ continue for(var/mob/living/hidden as anything in hidden_mobs) ///Sell mobs, but leave their contents intact. - export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report) + export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report, export_market = export_market) // BUBBER EDIT CHANGE - ORIGINAL: export_single_item(hidden, apply_elastic = FALSE, dry_run = dry_run, external_report = report) ///there are still licing mobs inside that item. Stop, don't sell it ffs. if(locate(/mob/living) in item_on_pad.get_all_contents()) continue - export_item_and_contents(item_on_pad, apply_elastic = FALSE, dry_run = dry_run, delete_unsold = FALSE, external_report = report, ignore_typecache = nosell_typecache, export_market = EXPORT_MARKET_PIRACY) + export_item_and_contents(item_on_pad, apply_elastic = FALSE, dry_run = dry_run, delete_unsold = FALSE, external_report = report, ignore_typecache = nosell_typecache, export_market = export_market) // BUBBER EDIT CHANGE - ORIGINAL: export_item_and_contents(item_on_pad, apply_elastic = FALSE, dry_run = dry_run, delete_unsold = FALSE, external_report = report, ignore_typecache = nosell_typecache, export_market = EXPORT_MARKET_PIRACY) return report /// Prepares to sell the items on the pad diff --git a/modular_zubbers/code/game/machinery/syndiepad.dm b/modular_zubbers/code/game/machinery/syndiepad.dm index 075675b162a..db2a4cfdec1 100644 --- a/modular_zubbers/code/game/machinery/syndiepad.dm +++ b/modular_zubbers/code/game/machinery/syndiepad.dm @@ -63,6 +63,7 @@ icon_keyboard = "syndie_key" warmup_time = SYN_BOUNTY_PAD_WARM_TIME circuit = /obj/item/circuitboard/computer/syndiepad + export_market = EXPORT_MARKET_STATION /// The account to add balance var/credits_account = ACCOUNT_INT