From 93373deded358d64cc57f824c4835b3cc7739bb8 Mon Sep 17 00:00:00 2001 From: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:22:10 -0700 Subject: [PATCH] [Kinda A Priority] Fixes Free Cargo. (#18353) * nice * Can we all agree cargo should be removed * My brain is too small for operators * should move this down --- code/modules/cargo/orderconsole.dm | 6 ++++-- code/modules/shuttle/supply.dm | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 9506361488e..3ad021d4dc1 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -261,9 +261,11 @@ coupon_check.moveToNullspace() applied_coupon = coupon_check break - + //Skyrat Edit Add + var/charge_on_purchase = TRUE var/turf/T = get_turf(src) - var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account, null, applied_coupon) + var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account, null, applied_coupon, charge_on_purchase) + //Skyrat Edit End SO.generateRequisition(T) if(requestonly && !self_paid) SSshuttle.request_list += SO diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 5a3e15f1611..5221b81f015 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -129,7 +129,9 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( var/datum/bank_account/paying_for_this //department orders EARN money for cargo, not the other way around + //Skyrat Edit Add if(!spawning_order.department_destination && spawning_order.charge_on_purchase) + //Skyrat Edit End if(spawning_order.paying_account) //Someone paid out of pocket paying_for_this = spawning_order.paying_account var/list/current_buyer_orders = goodies_by_buyer[spawning_order.paying_account] // so we can access the length a few lines down @@ -147,8 +149,9 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( if(spawning_order.paying_account) paying_for_this.bank_card_talk("Cargo order #[spawning_order.id] rejected due to lack of funds. Credits required: [price]") continue - - if(spawning_order.paying_account) + //Skyrat Edit Add + if(spawning_order.paying_account && spawning_order.charge_on_purchase) + //Skyrat Edit End paying_for_this = spawning_order.paying_account if(spawning_order.pack.goody) LAZYADD(goodies_by_buyer[spawning_order.paying_account], spawning_order)