mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
Ports (most(ok like half)) station traits from tg. Ready for review into TM (#22334)
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life * some changes /fixes * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * more changes * oh right, the murders (uplink price tweaks) * Update code/controllers/subsystem/SSjobs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * compiles * doesnt work but works better * tgui dogs still sleep but I want to sleep * it should finally compile now. Probably. * Update tgui.bundle.js * Sorry IAN, transfer components is shoddy as hell * removes minor uneeded /tgui * also extra line whoops * final stuff * reverting changes I made earlier is hard ok * Weight change, uplink reference * oh right, the hey fucko * Update code/_globalvars/traits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update tgui.bundle.js * pushes * pulls it * Apply suggestions from code review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * more changes, ion rifle blocked on cyb revolution * dipshit remove the debug / tgui pritier and such * tgui * updates tgui again as nanomap was merged * Apply suggestions from code review Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * comment / tgui * every day I worry all day * Full TGUI rebuild + prettier * ah fuck * leave a customer feedback at the link below! * tgui momenr * tgui moment * FUCK I am dumb * vertical TGUI * She T's on my GUI till I * Update tgui.bundle.js * Apply suggestions from code review Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com> * Update code/modules/supply/supply_pack.dm Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com> * IPC can now use robotic hearts / pulse demon hearts and charge * fixes revert not working for hangover / arrivals * tgui moment * hhgreg * fixes that one bug * Every day I worry all day * deconflicted for real this t ime * Update code/datums/station_traits/postive_traits.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * ch-ch-ch-changes * Update SSjobs.dm * Update code/modules/supply/supply_pack.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * deconflicted but won't pass CI * fixes double dipping on traits * my le consoles, they le no work? * Great Great Asset, Asset, Great Great Asset, Asset... * sorry slime mains * fixes borgs being punished heavier * actually fixes it, I was dense * hopefully fixes borg drunk further * makes it compile? * actually makes it compile god whyyyy --------- Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
This commit is contained in:
co-authored by
Luc
Contrabang
Henri215
Ryan
Gaxeer
SteelSlayer
parent
2c7a9b3078
commit
d668a29a60
@@ -104,7 +104,7 @@
|
||||
"supply_type" = order.object.name,
|
||||
"orderedby" = order.orderedby,
|
||||
"department" = order.ordered_by_department?.department_name,
|
||||
"cost" = order.object.cost,
|
||||
"cost" = order.object.get_cost(),
|
||||
"comment" = order.comment,
|
||||
"req_cargo_approval" = order.requires_cargo_approval,
|
||||
"req_head_approval" = order.requires_head_approval,
|
||||
@@ -214,7 +214,7 @@
|
||||
if((pack.hidden && hacked) || (pack.contraband && can_order_contraband) || (pack.special && pack.special_enabled) || (!pack.contraband && !pack.hidden && !pack.special))
|
||||
packs_list.Add(list(list(
|
||||
"name" = pack.name,
|
||||
"cost" = pack.cost,
|
||||
"cost" = pack.get_cost(),
|
||||
"ref" = "[pack.UID()]",
|
||||
"contents" = pack.ui_manifest,
|
||||
"cat" = pack.group)))
|
||||
@@ -333,12 +333,12 @@
|
||||
order.orderedbyaccount = selected_account
|
||||
if(attempt_account_authentification(selected_account, user))
|
||||
var/paid_for = FALSE
|
||||
if(!order.requires_cargo_approval && pay_with_account(selected_account, order.object.cost, "[order.object.name] Crate Purchase", "Cargo Requests Console", user, account_database.vendor_account))
|
||||
if(!order.requires_cargo_approval && pay_with_account(selected_account, order.object.get_cost(), "[order.object.name] Crate Purchase", "Cargo Requests Console", user, account_database.vendor_account))
|
||||
paid_for = TRUE
|
||||
SSeconomy.process_supply_order(order, paid_for) //add order to shopping list
|
||||
else //if its a department account with pin or higher security or need QM approval, go ahead and add this to the departments section in request list
|
||||
SSeconomy.process_supply_order(order, FALSE)
|
||||
if(order.ordered_by_department.crate_auto_approve && order.ordered_by_department.auto_approval_cap >= order.object.cost)
|
||||
if(order.ordered_by_department.crate_auto_approve && order.ordered_by_department.auto_approval_cap >= order.object.get_cost())
|
||||
approve_crate(user, order.ordernum)
|
||||
investigate_log("| [key_name(user)] has placed an order for [order.object.amount] [order.object.name] with reason: '[order.comment]'", "cargo")
|
||||
|
||||
@@ -355,7 +355,7 @@
|
||||
return FALSE
|
||||
order.requires_cargo_approval = FALSE
|
||||
if(account.account_type == ACCOUNT_TYPE_PERSONAL || isnull(order.ordered_by_department))
|
||||
if(pay_with_account(account, order.object.cost, "[pack.name] Crate Purchase", "Cargo Requests Console", user, account_database.vendor_account))
|
||||
if(pay_with_account(account, order.object.get_cost(), "[pack.name] Crate Purchase", "Cargo Requests Console", user, account_database.vendor_account))
|
||||
SSeconomy.process_supply_order(order, TRUE) //send 'er back through
|
||||
return TRUE
|
||||
atom_say("ERROR: Account tied to order cannot pay, auto-denying order")
|
||||
@@ -368,12 +368,12 @@
|
||||
//if they do not have access to this account
|
||||
if(!department_order.ordered_by_department.has_account_access(user.get_access(), user.get_worn_id_account()))
|
||||
//and the dept account doesn't have auto approve enabled (or does and the crate is too expensive for auto approve)
|
||||
if(!department_order.ordered_by_department.crate_auto_approve || department_order.ordered_by_department.auto_approval_cap < pack.cost)
|
||||
if(!department_order.ordered_by_department.crate_auto_approve || department_order.ordered_by_department.auto_approval_cap < pack.get_cost())
|
||||
return //no access!
|
||||
|
||||
///just give the account pin here, its too much work for players to get the department account pin number since approval is access locked anyway
|
||||
if(attempt_account_authentification(account, user, account.account_pin))
|
||||
if(pay_with_account(account, pack.cost, "[pack.name] Crate Purchase", "[src]", user, account_database.vendor_account))
|
||||
if(pay_with_account(account, pack.get_cost(), "[pack.name] Crate Purchase", "[src]", user, account_database.vendor_account))
|
||||
order.requires_head_approval = FALSE
|
||||
SSeconomy.process_supply_order(order, TRUE)
|
||||
investigate_log("| [key_name(user)] has authorized an order for [pack.name]. Remaining Cargo Balance: [cargo_account.credit_balance].", "cargo")
|
||||
@@ -418,7 +418,7 @@
|
||||
SSshuttle.supply.request(SSshuttle.getDock("supply_home"))
|
||||
|
||||
/obj/machinery/computer/supplycomp/proc/pay_for_crate(datum/money_account/customer_account, mob/user, datum/supply_order/order)
|
||||
if(pay_with_account(customer_account, order.object.cost, "Purchase of [order.object.name]", "Cargo Requests Console", user, cargo_account, TRUE))
|
||||
if(pay_with_account(customer_account, order.object.get_cost(), "Purchase of [order.object.name]", "Cargo Requests Console", user, cargo_account, TRUE))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
//create the manifest slip
|
||||
var/obj/item/paper/manifest/slip = new
|
||||
slip.points = object.cost
|
||||
slip.points = object.get_cost()
|
||||
slip.ordernumber = ordernum
|
||||
|
||||
var/stationName = station_name()
|
||||
|
||||
@@ -59,3 +59,6 @@
|
||||
if(length(contains))
|
||||
for(var/j in 1 to num_contained)
|
||||
. += pick(contains)
|
||||
|
||||
/datum/supply_packs/proc/get_cost()
|
||||
return cost * SSeconomy.pack_price_modifier
|
||||
|
||||
Reference in New Issue
Block a user