mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-07 23:42:44 +00:00
* blacklists disposal outlets from the cargo shuttle (#81532) ## About The Pull Request livrah moment they were seperate typepaths ## Why It's Good For The Game allows for a CC exploit but still a bug ## Changelog 🆑 fix: you may not put disposal outlets on cargo shuttle /🆑 Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com> * blacklists disposal outlets from the cargo shuttle --------- Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
345 lines
15 KiB
Plaintext
345 lines
15 KiB
Plaintext
GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
|
|
/mob/living,
|
|
/obj/docking_port,
|
|
/obj/effect/hierophant,
|
|
/obj/effect/mob_spawn,
|
|
/obj/effect/portal,
|
|
/obj/effect/rune,
|
|
/obj/item/beacon,
|
|
/obj/item/disk/nuclear,
|
|
/obj/item/gps,
|
|
/obj/item/hilbertshotel,
|
|
/obj/item/mail,
|
|
/obj/item/shared_storage,
|
|
/obj/item/swapper,
|
|
/obj/item/warp_cube,
|
|
/obj/machinery/autolathe, // In case you manage to get it to print a beacon while in transit
|
|
/obj/machinery/camera,
|
|
/obj/machinery/disposal,
|
|
/obj/machinery/exodrone_launcher,
|
|
/obj/machinery/fax,
|
|
/obj/machinery/launchpad,
|
|
/obj/machinery/nuclearbomb,
|
|
/obj/machinery/quantumpad,
|
|
/obj/machinery/rnd/production,
|
|
/obj/machinery/syndicatebomb,
|
|
/obj/machinery/teleport/hub,
|
|
/obj/machinery/teleport/station,
|
|
/obj/narsie,
|
|
/obj/projectile/beam/wormhole,
|
|
/obj/structure/blob,
|
|
/obj/structure/checkoutmachine,
|
|
/obj/structure/disposalpipe,
|
|
/obj/structure/disposaloutlet,
|
|
/obj/structure/extraction_point,
|
|
/obj/structure/guardian_beacon,
|
|
/obj/tear_in_reality,
|
|
)))
|
|
|
|
/// How many goody orders we can fit in a lockbox before we upgrade to a crate
|
|
#define GOODY_FREE_SHIPPING_MAX 5
|
|
/// How much to charge oversized goody orders
|
|
#define CRATE_TAX 700
|
|
|
|
/obj/docking_port/mobile/supply
|
|
name = "supply shuttle"
|
|
shuttle_id = "cargo"
|
|
callTime = 600
|
|
|
|
dir = WEST
|
|
port_direction = EAST
|
|
movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
|
|
|
|
/obj/docking_port/mobile/supply/register()
|
|
. = ..()
|
|
SSshuttle.supply = src
|
|
|
|
/obj/docking_port/mobile/supply/canMove()
|
|
if(is_station_level(z))
|
|
return check_blacklist(shuttle_areas)
|
|
return ..()
|
|
|
|
/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances)
|
|
for(var/area/shuttle_area as anything in areaInstances)
|
|
for (var/list/zlevel_turfs as anything in shuttle_area.get_zlevel_turf_lists())
|
|
for(var/turf/shuttle_turf as anything in zlevel_turfs)
|
|
for(var/atom/passenger in shuttle_turf.get_all_contents())
|
|
if((is_type_in_typecache(passenger, GLOB.blacklisted_cargo_types) || HAS_TRAIT(passenger, TRAIT_BANNED_FROM_CARGO_SHUTTLE)) && !istype(passenger, /obj/docking_port))
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/// Returns anything on the cargo blacklist found within areas_to_check back to the turf of the home docking port via Centcom branded supply pod.
|
|
/obj/docking_port/mobile/supply/proc/return_blacklisted_things_home(list/area/areas_to_check, obj/docking_port/stationary/home)
|
|
var/list/stuff_to_send_home = list()
|
|
for(var/area/shuttle_area as anything in areas_to_check)
|
|
for (var/list/zlevel_turfs as anything in shuttle_area.get_zlevel_turf_lists())
|
|
for(var/turf/shuttle_turf as anything in zlevel_turfs)
|
|
for(var/atom/passenger in shuttle_turf.get_all_contents())
|
|
if((is_type_in_typecache(passenger, GLOB.blacklisted_cargo_types) || HAS_TRAIT(passenger, TRAIT_BANNED_FROM_CARGO_SHUTTLE)) && !istype(passenger, /obj/docking_port))
|
|
stuff_to_send_home += passenger
|
|
|
|
if(!length(stuff_to_send_home))
|
|
return FALSE
|
|
|
|
var/obj/structure/closet/supplypod/centcompod/et_go_home = new()
|
|
|
|
for(var/atom/movable/et as anything in stuff_to_send_home)
|
|
et.forceMove(et_go_home)
|
|
|
|
new /obj/effect/pod_landingzone(get_turf(home), et_go_home)
|
|
|
|
return stuff_to_send_home
|
|
|
|
/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)
|
|
if(mode != SHUTTLE_IDLE)
|
|
return 2
|
|
return ..()
|
|
|
|
/obj/docking_port/mobile/supply/check_dock(obj/docking_port/stationary/S, silent)
|
|
. = ..()
|
|
|
|
if(!.)
|
|
return
|
|
|
|
// If we're not trying to dock at Centcom, we don't care.
|
|
if(S.shuttle_id != "cargo_away")
|
|
return
|
|
|
|
// Else we are docking at Centcom, check the blacklist to make sure no contraband was put onto the shuttle mid-transit.
|
|
// If there's anything contrabandy, send these items back to the origin docking port.
|
|
// This is a sort of catch-all Centcom exploit check.
|
|
var/list/stuff_sent_home = return_blacklisted_things_home(shuttle_areas, previous)
|
|
if(!length(stuff_sent_home))
|
|
return
|
|
|
|
for(var/atom/thing_sent_home as anything in stuff_sent_home)
|
|
investigate_log("Blacklisted item found on in-transit Cargo Shuttle: [thing_sent_home] ([thing_sent_home.type])", INVESTIGATE_CARGO)
|
|
|
|
message_admins("Blacklisted item found on in-transit Cargo Shuttle. See cargo logs for more details.")
|
|
SSshuttle.centcom_message = "Contraband found on Cargo Shuttle. This has been returned via drop pod."
|
|
|
|
/obj/docking_port/mobile/supply/initiate_docking()
|
|
if(getDockedId() == "cargo_away") // Buy when we leave home.
|
|
buy()
|
|
create_mail()
|
|
. = ..() // Fly/enter transit.
|
|
if(. != DOCKING_SUCCESS)
|
|
return
|
|
if(getDockedId() == "cargo_away") // Sell when we get home
|
|
sell()
|
|
|
|
/obj/docking_port/mobile/supply/proc/buy()
|
|
SEND_SIGNAL(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY)
|
|
var/list/obj/miscboxes = list() //miscboxes are combo boxes that contain all goody orders grouped
|
|
var/list/misc_order_num = list() //list of strings of order numbers, so that the manifest can show all orders in a box
|
|
var/list/misc_contents = list() //list of lists of items that each box will contain
|
|
var/list/misc_costs = list() //list of overall costs sustained by each buyer.
|
|
|
|
var/list/empty_turfs = list()
|
|
for(var/area/shuttle/shuttle_area as anything in shuttle_areas)
|
|
for(var/turf/open/floor/shuttle_turf in shuttle_area.get_turfs_from_all_zlevels())
|
|
if(shuttle_turf.is_blocked_turf())
|
|
continue
|
|
empty_turfs += shuttle_turf
|
|
|
|
//quickly and greedily handle chef's grocery runs first, there are a few reasons why this isn't attached to the rest of cargo...
|
|
//but the biggest reason is that the chef requires produce to cook and do their job, and if they are using this system they
|
|
//already got let down by the botanists. So to open a new chance for cargo to also screw them over any more than is necessary is bad.
|
|
if(SSshuttle.chef_groceries.len)
|
|
var/obj/structure/closet/crate/freezer/grocery_crate = new(pick_n_take(empty_turfs))
|
|
grocery_crate.name = "kitchen produce freezer"
|
|
investigate_log("Chef's [SSshuttle.chef_groceries.len] sized produce order arrived. Cost was deducted from orderer, not cargo.", INVESTIGATE_CARGO)
|
|
for(var/datum/orderable_item/item as anything in SSshuttle.chef_groceries)//every order
|
|
for(var/amt in 1 to SSshuttle.chef_groceries[item])//every order amount
|
|
new item.item_path(grocery_crate)
|
|
SSshuttle.chef_groceries.Cut() //This lets the console know it can order another round.
|
|
|
|
if(!SSshuttle.shopping_list.len)
|
|
return
|
|
|
|
var/value = 0
|
|
var/purchases = 0
|
|
var/price
|
|
var/pack_cost
|
|
var/list/goodies_by_buyer = list() // if someone orders more than GOODY_FREE_SHIPPING_MAX goodies, we upcharge to a normal crate so they can't carry around 20 combat shotties
|
|
var/list/clean_up_orders = list() // orders to remove since we are done with them
|
|
var/list/forced_briefcases = list() // SKYRAT EDIT ADDITION
|
|
|
|
for(var/datum/supply_order/spawning_order in SSshuttle.shopping_list)
|
|
if(!empty_turfs.len)
|
|
break
|
|
price = spawning_order.get_final_cost()
|
|
|
|
// department orders EARN money for cargo, not the other way around
|
|
var/datum/bank_account/paying_for_this
|
|
if(!spawning_order.department_destination && spawning_order.charge_on_purchase)
|
|
if(spawning_order.paying_account) //Someone paid out of pocket
|
|
paying_for_this = spawning_order.paying_account
|
|
// note this is before we increment, so this is the GOODY_FREE_SHIPPING_MAX + 1th goody to ship. also note we only increment off this step if they successfully pay the fee, so there's no way around it
|
|
if(spawning_order.pack.goody)
|
|
var/list/current_buyer_orders = goodies_by_buyer[spawning_order.paying_account]
|
|
if(LAZYLEN(current_buyer_orders) == GOODY_FREE_SHIPPING_MAX)
|
|
price = round(price + CRATE_TAX)
|
|
paying_for_this.bank_card_talk("Goody order size exceeds free shipping limit: Assessing [CRATE_TAX] credit S&H fee.")
|
|
else
|
|
paying_for_this = SSeconomy.get_dep_account(ACCOUNT_CAR)
|
|
|
|
if(paying_for_this)
|
|
if(!paying_for_this.adjust_money(-price, "Cargo: [spawning_order.pack.name]"))
|
|
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]")
|
|
if(!spawning_order.can_be_cancelled) //only if it absolutly cannot be canceled by the player do we cancel it for them
|
|
SSshuttle.shopping_list -= spawning_order
|
|
clean_up_orders += spawning_order
|
|
continue
|
|
|
|
pack_cost = spawning_order.pack.get_cost()
|
|
if(spawning_order.paying_account && spawning_order.charge_on_purchase) // SKYRAT EDIT CHANGE - ORIGINAL: if(spawning_order.paying_account)
|
|
paying_for_this = spawning_order.paying_account
|
|
if(spawning_order.pack.goody)
|
|
LAZYADD(goodies_by_buyer[spawning_order.paying_account], spawning_order)
|
|
var/receiver_message = "Cargo order #[spawning_order.id] has shipped."
|
|
if(spawning_order.charge_on_purchase)
|
|
receiver_message += " [price] credits have been charged to your bank account"
|
|
paying_for_this.bank_card_talk(receiver_message)
|
|
SSeconomy.track_purchase(paying_for_this, price, spawning_order.pack.name)
|
|
var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR)
|
|
cargo.adjust_money(price - pack_cost) //Cargo gets the handling fee
|
|
value += pack_cost
|
|
|
|
if(!spawning_order.pack.goody && !(spawning_order?.paying_account in forced_briefcases)) // SKYRAT EDIT CHANGE - ORIGINAL : if(!spawning_order.pack.goody)
|
|
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]"))
|
|
|
|
var/from_whom = paying_for_this?.account_holder || "nobody (department order)"
|
|
|
|
investigate_log("Order #[spawning_order.id] ([spawning_order.pack.name], placed by [key_name(spawning_order.orderer_ckey)]), paid by [from_whom] has shipped.", INVESTIGATE_CARGO)
|
|
if(spawning_order.pack.dangerous)
|
|
message_admins("\A [spawning_order.pack.name] ordered by [ADMIN_LOOKUPFLW(spawning_order.orderer_ckey)], paid by [from_whom] has shipped.")
|
|
purchases++
|
|
|
|
// done dealing with order. Time to remove & delete it
|
|
SSshuttle.shopping_list -= spawning_order
|
|
clean_up_orders += spawning_order
|
|
|
|
// we handle packing all the goodies last, since the type of crate we use depends on how many goodies they ordered. If it's more than GOODY_FREE_SHIPPING_MAX
|
|
// then we send it in a crate (including the CRATE_TAX cost), otherwise send it in a free shipping case
|
|
for(var/buyer_key in goodies_by_buyer)
|
|
var/list/buying_account_orders = goodies_by_buyer[buyer_key]
|
|
var/datum/bank_account/buying_account = buyer_key
|
|
var/buyer = buying_account.account_holder
|
|
|
|
if(buying_account_orders.len > GOODY_FREE_SHIPPING_MAX) // no free shipping, send a crate
|
|
var/obj/structure/closet/crate/secure/owned/our_crate = new /obj/structure/closet/crate/secure/owned(pick_n_take(empty_turfs))
|
|
our_crate.buyer_account = buying_account
|
|
/// SKYRAT EDIT ADDITION START - FIXES COMMAND BUDGET CASES BEING UNOPENABLE
|
|
if(istype(our_crate.buyer_account, /datum/bank_account/department))
|
|
our_crate.department_purchase = TRUE
|
|
our_crate.department_account = our_crate.buyer_account
|
|
/// SKYRAT EDIT ADDITION END
|
|
our_crate.name = "goody crate - purchased by [buyer]"
|
|
miscboxes[buyer] = our_crate
|
|
else //free shipping in a case
|
|
miscboxes[buyer] = new /obj/item/storage/lockbox/order(pick_n_take(empty_turfs))
|
|
var/obj/item/storage/lockbox/order/our_case = miscboxes[buyer]
|
|
our_case.buyer_account = buying_account
|
|
/// SKYRAT EDIT ADDITION START - FIXES COMMAND BUDGET CASES BEING UNOPENABLE
|
|
if(istype(our_case.buyer_account, /datum/bank_account/department))
|
|
our_case.department_purchase = TRUE
|
|
our_case.department_account = our_case.buyer_account
|
|
/// SKYRAT EDIT ADDITION END
|
|
miscboxes[buyer].name = "goody case - purchased by [buyer]"
|
|
misc_contents[buyer] = list()
|
|
|
|
for(var/datum/supply_order/our_order as anything in buying_account_orders)
|
|
for (var/item in our_order.pack.contains)
|
|
misc_contents[buyer] += item
|
|
misc_costs[buyer] += our_order.pack.cost
|
|
misc_order_num[buyer] = "[misc_order_num[buyer]]#[our_order.id] "
|
|
|
|
for(var/miscbox in miscboxes)
|
|
var/datum/supply_order/order = new/datum/supply_order()
|
|
order.id = misc_order_num[miscbox]
|
|
order.generateCombo(miscboxes[miscbox], miscbox, misc_contents[miscbox], misc_costs[miscbox])
|
|
qdel(order)
|
|
|
|
//clean up all dealt with orders
|
|
for(var/datum/supply_order/completed_order in clean_up_orders)
|
|
qdel(completed_order)
|
|
|
|
var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
|
|
investigate_log("[purchases] orders in this shipment, worth [value] credits. [cargo_budget.account_balance] credits left.", INVESTIGATE_CARGO)
|
|
|
|
/// Deletes and sells the items on the shuttle
|
|
/obj/docking_port/mobile/supply/proc/sell()
|
|
var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
|
|
var/presale_points = cargo_budget.account_balance
|
|
|
|
if(!GLOB.exports_list.len) // No exports list? Generate it!
|
|
setupExports()
|
|
|
|
var/msg = ""
|
|
|
|
var/datum/export_report/report = new
|
|
|
|
for(var/area/shuttle/shuttle_area as anything in shuttle_areas)
|
|
for (var/list/zlevel_turfs as anything in shuttle_area.get_zlevel_turf_lists())
|
|
for(var/turf/shuttle_turf as anything in zlevel_turfs)
|
|
for(var/atom/movable/exporting_atom in shuttle_turf)
|
|
if(iscameramob(exporting_atom))
|
|
continue
|
|
if(exporting_atom.anchored)
|
|
continue
|
|
export_item_and_contents(exporting_atom, apply_elastic = TRUE, dry_run = FALSE, external_report = report)
|
|
|
|
if(report.exported_atoms)
|
|
report.exported_atoms += "." //ugh
|
|
|
|
for(var/datum/export/exported_datum in report.total_amount)
|
|
var/export_text = exported_datum.total_printout(report)
|
|
if(!export_text)
|
|
continue
|
|
|
|
msg += export_text + "\n"
|
|
cargo_budget.adjust_money(report.total_value[exported_datum])
|
|
|
|
SSshuttle.centcom_message = msg
|
|
investigate_log("contents sold for [cargo_budget.account_balance - presale_points] credits. Contents: [report.exported_atoms ? report.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO)
|
|
|
|
/*
|
|
Generates a box of mail depending on our exports and imports.
|
|
Applied in the cargo shuttle sending/arriving, by building the crate if the round is ready to introduce mail based on the economy subsystem.
|
|
Then, fills the mail crate with mail, by picking applicable crew who can receive mail at the time to sending.
|
|
*/
|
|
/obj/docking_port/mobile/supply/proc/create_mail()
|
|
//Early return if there's no mail waiting to prevent taking up a slot. We also don't send mails on sundays or holidays.
|
|
if(!SSeconomy.mail_waiting || SSeconomy.mail_blocked)
|
|
return
|
|
|
|
//spawn crate
|
|
var/list/empty_turfs = list()
|
|
for(var/area/shuttle/shuttle_area as anything in shuttle_areas)
|
|
for(var/turf/open/floor/shuttle_floor in shuttle_area.get_turfs_from_all_zlevels())
|
|
if(shuttle_floor.is_blocked_turf())
|
|
continue
|
|
empty_turfs += shuttle_floor
|
|
|
|
new /obj/structure/closet/crate/mail/economy(pick(empty_turfs))
|
|
|
|
/// Takes a supply pack, returns the amount we currently have on order (or OVER_ORDER_LIMIT if we are over the hardcap on orders of this type)
|
|
/obj/docking_port/mobile/supply/proc/get_order_count(datum/supply_pack/ordering)
|
|
var/similar_count = 0
|
|
for(var/datum/supply_order/order as anything in (SSshuttle.shopping_list | SSshuttle.request_list))
|
|
if(order.pack == ordering)
|
|
similar_count += 1
|
|
|
|
if(similar_count >= CARGO_MAX_ORDER)
|
|
return OVER_ORDER_LIMIT
|
|
|
|
return similar_count
|
|
|
|
#undef GOODY_FREE_SHIPPING_MAX
|
|
#undef CRATE_TAX
|