mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025
This commit is contained in:
@@ -293,9 +293,6 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
||||
var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
|
||||
var/presale_points = cargo_budget.account_balance
|
||||
|
||||
if(!GLOB.exports_list.len) // No exports list? Generate it!
|
||||
setupExports()
|
||||
|
||||
var/msg = ""
|
||||
|
||||
var/datum/export_report/report = new
|
||||
@@ -310,9 +307,6 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
||||
continue
|
||||
export_item_and_contents(exporting_atom, apply_elastic = TRUE, dry_run = FALSE, external_report = report)
|
||||
|
||||
if(report.exported_atoms)
|
||||
report.exported_atoms += "." //ugh
|
||||
|
||||
for(var/datum/export/exported_datum in report.total_amount)
|
||||
var/export_text = exported_datum.total_printout(report)
|
||||
if(!export_text)
|
||||
@@ -322,7 +316,8 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
||||
cargo_budget.adjust_money(report.total_value[exported_datum])
|
||||
|
||||
SSshuttle.centcom_message = msg
|
||||
investigate_log("contents sold for [cargo_budget.account_balance - presale_points] credits. Contents: [report.exported_atoms ? report.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO)
|
||||
if(report.exported_atoms.len)
|
||||
investigate_log("contents sold for [cargo_budget.account_balance - presale_points] credits. Contents: [report.exported_atoms.Join(",")]. Message: [msg]", INVESTIGATE_CARGO)
|
||||
|
||||
/*
|
||||
Generates a box of mail depending on our exports and imports.
|
||||
|
||||
@@ -80,8 +80,8 @@
|
||||
name = "Deep Space"
|
||||
shuttle_id = "whiteship_away"
|
||||
height = 45 //Width and height need to remain in sync with the size of whiteshipdock.dmm, otherwise we'll get overflow
|
||||
width = 44
|
||||
dheight = 18
|
||||
width = 45
|
||||
dheight = 14
|
||||
dwidth = 18
|
||||
dir = 2
|
||||
shuttlekeys = list(
|
||||
|
||||
Reference in New Issue
Block a user