Makes the ops handling fee a percentage, removes supplier fee, ability to remove approved orders and bugfixes (#22350)

- qol: "Reduced the crate fee when making operation orders."
 - bugfix: "Fixed the wording in some of the operation programs."
 - bugfix: "Fixed the delivery app showing deliveries it shouldn't."
- bugfix: "The cargo control program now properly display status
messages."
- balance: "Supplier fee was set to 0 for all current suppliers,
eliminating the 20 credit charge per supplier."
- balance: "The operations order handling fee has been turned into a
percentage charge instead, and reduced to 5% by default instead of a
flat 20 credits."
- rscadd: "It is now possible to reject orders that have been approved
but not shipped or paid for."
This commit is contained in:
Casper3667
2026-04-29 18:08:00 +00:00
committed by GitHub
parent c3f65f77d4
commit 36d442beb8
9 changed files with 59 additions and 23 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
var/shuttle_time = 100
/// The additional price an order incurs for ordering a shuttle from this supplier.
var/shuttle_price = 20
var/shuttle_price = 0
/// Whether or not this supplier is available or not.
var/available = TRUE
+1 -1
View File
@@ -132,7 +132,7 @@ then the player gets the profit from selling his own wasted time.
/datum/export/proc/total_printout(contr = 0, emag = 0)
if(!total_cost && !total_amount)
return ""
var/msg = "[total_cost]电: Received [total_amount] "
var/msg = "[total_cost]电: Received [total_amount] "
if(total_cost > 0)
msg = "+" + msg
+1 -1
View File
@@ -11,7 +11,7 @@
. += " Thanks for participating in NanoTrasen Crates Recycling Program."
/datum/export/large/crate/wooden
cost = 25
cost = 15
unit_name = "large wooden crate"
export_types = list(/obj/structure/closet/crate/large)
exclude_types = list()
@@ -36,7 +36,7 @@
data["id_name"] = id_card ? id_card.name : "-----"
//Pass the shipped orders
var/list/order_list = SScargo.get_orders_by_status("shipped", TRUE) + SScargo.get_orders_by_status("approved", TRUE) + SScargo.get_orders_by_status("Unpaid", TRUE, list("shipped", "approved"))
var/list/order_list = SScargo.get_orders_by_status("shipped", TRUE) + SScargo.get_orders_by_status("approved", TRUE) + SScargo.get_orders_by_status("Unpaid", TRUE, list("shipped", "approved", "rejected", "basket", "submitted"))
data["order_list"] = order_list
@@ -72,7 +72,7 @@
//Pass the status message along
data["status_message"] = status_message
data["handling_fee"] = SScargo.get_handlingfee()
data["handling_fee"] = SScargo.get_handlingfee_cost(co.get_value(2))
data["crate_fee"] = SScargo.get_cratefee()
return data