cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/cargo.dm
+16 -11
View File
@@ -137,7 +137,7 @@
switch(type)
if(0)
//The price of the contents of the crate + the price for the crate + the handling fee + the shipment fee
return price + SScargo.get_cratefee() + SScargo.get_handlingfee() + get_shipment_cost()
return price + SScargo.get_cratefee() + SScargo.get_handlingfee_cost(price) + get_shipment_cost()
if(1)
//The price of the contents of the crate + the price of the crate + the shipment fee
return price + SScargo.get_cratefee() + get_shipment_cost()
@@ -275,8 +275,10 @@
for(var/item in get_item_list())
order_data += "<li>[item["name"]]: [item["price"]]电</li>"
order_data += "<li>Crate Fee: [SScargo.get_cratefee()]电</li>"
order_data += "<li>Handling Fee: [SScargo.get_handlingfee()]电</li>"
order_data += "<li>Supplier Fee: [get_shipment_cost()]电</li>"
order_data += "<li>Handling Fee: [SScargo.get_handlingfee_cost(get_value(2))]电</li>"
var/supplier_fee = get_shipment_cost()
if(supplier_fee)
order_data += "<li>Supplier Fee: [supplier_fee]电</li>"
order_data += "</ul>"
return order_data.Join("")
@@ -325,7 +327,9 @@
//Marks a order as rejected - Returns a status message
/datum/cargo_order/proc/set_rejected()
if(status == "submitted")
if(status == "submitted" || status == "approved")
if(paid_by)
return "The order could not be rejected - Already Paid For"
status = "rejected"
time_approved = worldtime2text()
return "The order has been rejected"
@@ -441,20 +445,21 @@
invoice_data += "<p>Shuttle Data</p>"
invoice_data += "<table>"
if(shuttle_fee)
invoice_data += "<tr>"
invoice_data += "<td>Supplier fee:</td>"
invoice_data += "<td>[shuttle_fee]</td>"
invoice_data += "</tr>"
invoice_data += "<tr>"
invoice_data += "<td>Supplier fee::</td>"
invoice_data += "<td>[shuttle_fee]</td>"
invoice_data += "</tr>"
invoice_data += "<tr>"
invoice_data += "<td>Shuttle Time:</td>"
invoice_data += "<td>Elevator Time:</td>"
invoice_data += "<td>[shuttle_time]</td>"
invoice_data += "</tr>"
invoice_data += "<tr>"
invoice_data += "<td>Shuttle Called By:</td>"
invoice_data += "<td>Elevator Called By:</td>"
invoice_data += "<td>[shuttle_called_by]</td>"
invoice_data += "</tr>"
invoice_data += "<tr>"
invoice_data += "<td>Shuttle Recalled By:</td>"
invoice_data += "<td>Elevator Recalled By:</td>"
invoice_data += "<td>[shuttle_recalled_by]</td>"
invoice_data += "</tr>"
invoice_data += "</table>"