mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
[MIRROR] Makes cargo orders and req forms easier to differentiate [MDB IGNORE] (#22227)
* Makes cargo orders and req forms easier to differentiate * Update code/modules/shuttle/supply.dm Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com> * removes one skyrat edit in favor of this * Too much whitespace --------- Co-authored-by: Nick <42454181+Momo8289@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Bloop <vinylspiders@gmail.com> Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
This commit is contained in:
co-authored by
Pinta
Nick
lessthanthree
Bloop
parent
76d520723c
commit
d8a19cf7ae
@@ -313,7 +313,7 @@
|
||||
//create the paper from the SSshuttle.shopping_list
|
||||
if(length(SSshuttle.shopping_list))
|
||||
var/obj/item/paper/requisition_paper = new(get_turf(src))
|
||||
requisition_paper.name = "requisition form"
|
||||
requisition_paper.name = "requisition form - [station_time_timestamp()]"
|
||||
var/requisition_text = "<h2>[station_name()] Supply Requisition</h2>"
|
||||
requisition_text += "<hr/>"
|
||||
requisition_text += "Time of Order: [station_time_timestamp()]<br/><br/>"
|
||||
@@ -332,6 +332,7 @@
|
||||
requisition_text += "- Reason Given: [reason]</br>"
|
||||
requisition_text += "</br></br>"
|
||||
requisition_paper.add_raw_text(requisition_text)
|
||||
requisition_paper.color = "#9ef5ff"
|
||||
requisition_paper.update_appearance()
|
||||
|
||||
ui.user.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO)
|
||||
|
||||
@@ -163,9 +163,9 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
||||
SSshuttle.order_history += spawning_order
|
||||
QDEL_NULL(spawning_order.applied_coupon)
|
||||
|
||||
spawning_order.on_spawn() //SKYRAT EDIT
|
||||
if(!spawning_order.pack.goody && !(spawning_order?.paying_account in forced_briefcases)) //we handle goody crates below //SKYRAT EDIT
|
||||
spawning_order.generate(pick_n_take(empty_turfs))
|
||||
var/obj/structure/closet/crate = spawning_order.generate(pick_n_take(empty_turfs))
|
||||
crate.name += " - #[spawning_order.id]"
|
||||
|
||||
SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[spawning_order.pack.get_cost()]", "[spawning_order.pack.name]"))
|
||||
|
||||
|
||||
@@ -23,6 +23,14 @@
|
||||
/datum/supply_order/proc/on_spawn()
|
||||
return
|
||||
|
||||
/datum/supply_order/generate(atom/A)
|
||||
. = ..()
|
||||
|
||||
if(!.)
|
||||
return
|
||||
|
||||
on_spawn()
|
||||
|
||||
/datum/supply_order/company_import/on_spawn()
|
||||
for(var/company in SScargo_companies.companies)
|
||||
var/datum/cargo_company/comp_datum = SScargo_companies.companies[company]
|
||||
|
||||
Reference in New Issue
Block a user