diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm
index a336567abc9..d12b5944c45 100644
--- a/code/game/objects/structures/crates_lockers/crates/secure.dm
+++ b/code/game/objects/structures/crates_lockers/crates/secure.dm
@@ -68,8 +68,14 @@
name = "private crate"
desc = "A crate cover designed to only open for who purchased its contents."
icon_state = "privatecrate"
+ ///Account of the person buying the crate if private purchasing.
var/datum/bank_account/buyer_account
+ ///Department of the person buying the crate if buying via the NIRN app.
+ var/datum/bank_account/department/department_account
+ ///Is the secure crate opened or closed?
var/privacy_lock = TRUE
+ ///Is the crate being bought by a person, or a budget card?
+ var/department_purchase = FALSE
/obj/structure/closet/crate/secure/owned/examine(mob/user)
. = ..()
@@ -78,6 +84,9 @@
/obj/structure/closet/crate/secure/owned/Initialize(mapload, datum/bank_account/_buyer_account)
. = ..()
buyer_account = _buyer_account
+ if(istype(buyer_account, /datum/bank_account/department))
+ department_purchase = TRUE
+ department_account = buyer_account
/obj/structure/closet/crate/secure/owned/togglelock(mob/living/user, silent)
if(privacy_lock)
@@ -85,7 +94,7 @@
var/obj/item/card/id/id_card = user.get_idcard(TRUE)
if(id_card)
if(id_card.registered_account)
- if(id_card.registered_account == buyer_account)
+ if(id_card.registered_account == buyer_account || (department_purchase && (id_card.registered_account?.account_job?.paycheck_department) == (department_account.department_id)))
if(iscarbon(user))
add_fingerprint(user)
locked = !locked
diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm
index 892ed7292aa..3cc1f7f48cb 100644
--- a/code/modules/cargo/goodies.dm
+++ b/code/modules/cargo/goodies.dm
@@ -8,24 +8,28 @@
name = ".38 DumDum Speedloader"
desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets."
cost = 350
+ access_view = ACCESS_BRIG
contains = list(/obj/item/ammo_box/c38/dumdum)
/datum/supply_pack/goody/match38
name = ".38 Match Grade Speedloader"
desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots."
cost = 350
+ access_view = ACCESS_BRIG
contains = list(/obj/item/ammo_box/c38/match)
/datum/supply_pack/goody/rubber
name = ".38 Rubber Speedloader"
desc = "Contains one speedloader of bouncy rubber .38 ammunition, for when you want to bounce your shots off anything and everything."
cost = 350
+ access_view = ACCESS_BRIG
contains = list(/obj/item/ammo_box/c38/match/bouncy)
/datum/supply_pack/goody/stingbang
name = "Stingbang Single-Pack"
desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks."
cost = 700
+ access_view = ACCESS_BRIG
contains = list(/obj/item/grenade/stingbang)
/datum/supply_pack/goody/combatknives_single
@@ -38,30 +42,35 @@
name = "Combat Shotgun Single-Pack"
desc = "For when the enemy absolutely needs to be replaced with lead. Contains one Aussec-designed Combat Shotgun, and one Shotgun Bandolier."
cost = 4000
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat, /obj/item/storage/belt/bandolier)
/datum/supply_pack/goody/energy_single
name = "Energy Gun Single-Pack"
desc = "Contains one energy gun, capable of firing both nonlethal and lethal blasts of light."
cost = 1500
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/e_gun)
/datum/supply_pack/goody/hell_single
name = "Hellgun Single-Pack"
desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
cost = 2250
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/laser/hellgun)
/datum/supply_pack/goody/wt550_single
name = "WT-550 Auto Rifle Single-Pack"
desc = "Contains one high-powered, semiautomatic rifles chambered in 4.6x30mm." // "high-powered" lol yea right
cost = 2000
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/ballistic/automatic/wt550)
/datum/supply_pack/goody/wt550ammo_single
name = "WT-550 Auto Rifle Ammo Single-Pack"
desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads."
cost = 900
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/ammo_box/magazine/wt550m9)
/datum/supply_pack/goody/sologamermitts
diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/orderconsole.dm
similarity index 96%
rename from code/modules/cargo/console.dm
rename to code/modules/cargo/orderconsole.dm
index ac95cf078c7..132dd64b351 100644
--- a/code/modules/cargo/console.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -5,7 +5,12 @@
circuit = /obj/item/circuitboard/computer/cargo
light_color = COLOR_BRIGHT_ORANGE
+ ///Can the supply console send the shuttle back and forth? Used in the UI backend.
+ var/can_send = TRUE
+ ///Can this console only send requests?
var/requestonly = FALSE
+ ///Can you approve requests placed for cargo? Works differently between the app and the computer.
+ var/can_approve_requests = TRUE
var/contraband = FALSE
var/self_paid = FALSE
var/safety_warning = "For safety reasons, the automated supply shuttle \
@@ -24,6 +29,8 @@
desc = "Used to request supplies from cargo."
icon_screen = "request"
circuit = /obj/item/circuitboard/computer/cargo/request
+ can_send = FALSE
+ can_approve_requests = FALSE
requestonly = TRUE
/obj/machinery/computer/cargo/Initialize()
@@ -78,6 +85,7 @@
data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE
data["loan"] = !!SSshuttle.shuttle_loan
data["loan_dispatched"] = SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched
+ data["can_send"] = can_send
var/message = "Remember to stamp and send back the supply manifests."
if(SSshuttle.centcom_message)
message = SSshuttle.centcom_message
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index fd438a19f10..74cc72e30d3 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -5,6 +5,7 @@
var/contraband = FALSE
var/cost = 700 // Minimum cost, or infinite points are possible.
var/access = FALSE
+ var/access_view = FALSE
var/access_any = FALSE
var/list/contains = null
var/crate_name = "crate"
@@ -259,6 +260,7 @@
name = "Ammo Crate"
desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of buckshot ammo, three boxes of rubber ammo and special .38 speedloarders. Requires Security access to open."
cost = 2500
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
/obj/item/storage/box/lethalshot,
@@ -276,6 +278,7 @@
name = "Armor Crate"
desc = "Three vests of well-rounded, decently-protective armor. Requires Security access to open."
cost = 1000
+ access_view = ACCESS_SECURITY
contains = list(/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/suit/armor/vest)
@@ -285,6 +288,7 @@
name = "Disabler Crate"
desc = "Three stamina-draining disabler weapons. Requires Security access to open."
cost = 1500
+ access_view = ACCESS_SECURITY
contains = list(/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler)
@@ -294,6 +298,7 @@
name = "Forensics Crate"
desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open."
cost = 2000
+ access_view = ACCESS_MORGUE
contains = list(/obj/item/detective_scanner,
/obj/item/storage/box/evidence,
/obj/item/camera,
@@ -315,6 +320,7 @@
name = "Lasers Crate"
desc = "Contains three lethal, high-energy laser guns. Requires Security access to open."
cost = 2000
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser)
@@ -325,6 +331,7 @@
/datum/supply_pack/security/securitybarriers
name = "Security Barrier Grenades"
desc = "Stem the tide with four Security Barrier grenades. Requires Security access to open."
+ access_view = ACCESS_BRIG
contains = list(/obj/item/grenade/barrier,
/obj/item/grenade/barrier,
/obj/item/grenade/barrier,
@@ -336,6 +343,7 @@
name = "Security Clothing Crate"
desc = "Contains appropriate outfits for the station's private security force. Contains outfits for the Warden, Head of Security, and two Security Officers. Each outfit comes with a rank-appropriate jumpsuit, suit, and beret. Requires Security access to open."
cost = 3000
+ access_view = ACCESS_SECURITY
contains = list(/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/under/rank/security/officer/formal,
/obj/item/clothing/suit/security/officer,
@@ -354,6 +362,7 @@
name = "Stingbang Grenade Pack"
desc = "Contains five \"stingbang\" grenades, perfect for stopping riots and playing morally unthinkable pranks. Requires Security access to open."
cost = 2500
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/storage/box/stingbangs)
crate_name = "stingbang grenade pack crate"
@@ -361,6 +370,7 @@
name = "Security Supplies Crate"
desc = "Contains seven flashbangs, seven teargas grenades, six flashes, and seven handcuffs. Requires Security access to open."
cost = 1000
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/storage/box/flashbangs,
/obj/item/storage/box/teargas,
/obj/item/storage/box/flashes,
@@ -371,6 +381,7 @@
name = "Standard Firing Pins Crate"
desc = "Upgrade your arsenal with 10 standard firing pins. Requires Security access to open."
cost = 2000
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/storage/box/firingpins,
/obj/item/storage/box/firingpins)
crate_name = "firing pins crate"
@@ -379,6 +390,7 @@
name = "Paywall Firing Pins Crate"
desc = "Specialized firing pins with a built-in configurable paywall. Requires Security access to open."
cost = 2500
+ access_view = ACCESS_ARMORY
contains = list(/obj/item/storage/box/firingpins/paywall,
/obj/item/storage/box/firingpins/paywall)
crate_name = "paywall firing pins crate"
@@ -396,6 +408,7 @@
name = "Stun Batons Crate"
desc = "Arm the Civil Protection Forces with three stun batons. Batteries included. Requires Security access to open."
cost = 1000
+ access_view = ACCESS_SECURITY
contains = list(/obj/item/melee/baton/loaded,
/obj/item/melee/baton/loaded,
/obj/item/melee/baton/loaded)
@@ -429,6 +442,7 @@
/datum/supply_pack/security/armory
group = "Armory"
access = ACCESS_ARMORY
+ access_view = ACCESS_ARMORY
crate_type = /obj/structure/closet/crate/secure/weapon
/datum/supply_pack/security/armory/bulletarmor
@@ -643,6 +657,7 @@
name = "Anti-breach Shield Projector Crate"
desc = "Hull breaches again? Say no more with the Nanotrasen Anti-Breach Shield Projector! Uses forcefield technology to keep the air in, and the space out. Contains two shield projectors."
cost = 2500
+ access_view = ACCESS_ENGINE_EQUIP
contains = list(/obj/machinery/shieldgen,
/obj/machinery/shieldgen)
crate_name = "anti-breach shield projector crate"
@@ -651,6 +666,7 @@
name = "APLU MK-I Crate"
desc = "A do-it-yourself kit for building an ALPU MK-I \"Ripley\", designed for lifting and carrying heavy equipment, and other station tasks. Batteries not included."
cost = 2000
+ access_view = ACCESS_ROBOTICS
contains = list(/obj/item/mecha_parts/chassis/ripley,
/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/part/ripley_right_arm,
@@ -678,6 +694,7 @@
name = "Engineering Gear Crate"
desc = "Gear up with three toolbelts, high-visibility vests, welding helmets, hardhats, and two pairs of meson goggles!"
cost = 1300
+ access_view = ACCESS_ENGINE
contains = list(/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
@@ -698,6 +715,7 @@
name = "Insulated Gloves Crate"
desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves."
cost = 2000 //Made of pure-grade bullshittinium
+ access_view = ACCESS_ENGINE_EQUIP
contains = list(/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow)
@@ -720,6 +738,7 @@
name = "P.A.C.M.A.N Generator Crate"
desc = "Engineers can't set up the engine? Not an issue for you, once you get your hands on this P.A.C.M.A.N. Generator! Takes in plasma and spits out sweet sweet energy."
cost = 2500
+ access_view = ACCESS_ENGINE
contains = list(/obj/machinery/power/port_gen/pacman)
crate_name = "PACMAN generator crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
@@ -739,6 +758,7 @@
desc = "Through advanced bluespace-shenanigans, our engineers have managed to fit an entire shuttle engine into one tiny little crate. Requires CE access to open."
cost = 5000
access = ACCESS_CE
+ access_view = ACCESS_CE
contains = list(/obj/structure/shuttle/engine/propulsion/burst/cargo)
crate_name = "shuttle engine crate"
crate_type = /obj/structure/closet/crate/secure/engineering
@@ -747,6 +767,7 @@
/datum/supply_pack/engineering/tools
name = "Toolbox Crate"
desc = "Any robust spaceman is never far from their trusty toolbox. Contains three electrical toolboxes and three mechanical toolboxes."
+ access_view = ACCESS_ENGINE_EQUIP
contains = list(/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
@@ -760,6 +781,7 @@
name = "Portable Air Pump Crate"
desc = "Did someone let the air out of the shuttle again? We've got you covered. Contains two portable air pumps."
cost = 2500
+ access_view = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/pump,
/obj/machinery/portable_atmospherics/pump)
crate_name = "portable air pump crate"
@@ -768,6 +790,7 @@
name = "Portable Scrubber Crate"
desc = "Clean up that pesky plasma leak with your very own set of two portable scrubbers."
cost = 2500
+ access_view = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/portable_atmospherics/scrubber)
crate_name = "portable scrubber crate"
@@ -776,6 +799,7 @@
name = "Huge Portable Scrubber Crate"
desc = "A huge portable scrubber for huge atmospherics mistakes."
cost = 5000
+ access_view = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/scrubber/huge/movable/cargo)
crate_name = "huge portable scrubber crate"
crate_type = /obj/structure/closet/crate/large
@@ -785,6 +809,7 @@
desc = "The pride of Nanotrasen Naval Command. The legendary Bluespace Artillery Cannon is a devastating feat of human engineering and testament to wartime determination. Highly advanced research is required for proper construction. "
cost = 15000
special = TRUE
+ access_view = ACCESS_HEADS
contains = list(/obj/item/circuitboard/machine/bsa/front,
/obj/item/circuitboard/machine/bsa/middle,
/obj/item/circuitboard/machine/bsa/back,
@@ -797,6 +822,7 @@
desc = "Secure the longevity of the current state of humanity within this massive library of scientific knowledge, capable of granting superhuman powers and abilities. Highly advanced research is required for proper construction. Also contains five DNA probes."
cost = 12000
special = TRUE
+ access_view = ACCESS_HEADS
contains = list(
/obj/item/circuitboard/machine/dna_vault,
/obj/item/dna_probe,
@@ -812,6 +838,7 @@
desc = "Contains five DNA probes for use in the DNA vault."
cost = 3000
special = TRUE
+ access_view = ACCESS_HEADS
contains = list(/obj/item/dna_probe,
/obj/item/dna_probe,
/obj/item/dna_probe,
@@ -826,6 +853,7 @@
desc = "Protect the very existence of this station with these Anti-Meteor defenses. Contains three Shield Generator Satellites."
cost = 3000
special = TRUE
+ access_view = ACCESS_HEADS
contains = list(
/obj/machinery/satellite/meteor_shield,
/obj/machinery/satellite/meteor_shield,
@@ -839,6 +867,7 @@
desc = "A control system for the Shield Generator Satellite system."
cost = 5000
special = TRUE
+ access_view = ACCESS_HEADS
contains = list(/obj/item/circuitboard/computer/sat_control)
crate_name= "shield control board crate"
@@ -849,6 +878,7 @@
/datum/supply_pack/engine
group = "Engine Construction"
+ access_view = ACCESS_ENGINE
crate_type = /obj/structure/closet/crate/engineering
/datum/supply_pack/engine/emitter
@@ -960,6 +990,7 @@
name = "50 Empty License Plates"
desc = "Create a bunch of boxes."
cost = 1000 // 50 * 25 + 700 - 1000 = 950 credits profit
+ access_view = ACCESS_SEC_DOORS
contains = list(/obj/item/stack/license_plates/empty/fifty)
crate_name = "empty license plate crate"
@@ -1017,6 +1048,7 @@
desc = "Contains a canister of BZ. Requires Toxins access to open."
cost = 8000
access = ACCESS_TOXINS
+ access_view = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/canister/bz)
crate_name = "BZ canister crate"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1025,6 +1057,7 @@
name = "Carbon Dioxide Canister"
desc = "Contains a canister of Carbon Dioxide."
cost = 3000
+ access_view = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
crate_name = "carbon dioxide canister crate"
crate_type = /obj/structure/closet/crate/large
@@ -1057,6 +1090,7 @@
name = "Large Fuel Tank Crate"
desc = "Contains a high-capacity fuel tank. Keep contents away from open flame."
cost = 2000
+ access_view = ACCESS_ENGINE
contains = list(/obj/structure/reagent_dispensers/fueltank/large)
crate_name = "high-capacity fuel tank crate"
crate_type = /obj/structure/closet/crate/large
@@ -1074,6 +1108,7 @@
desc = "Contains a canister of Nitrous Oxide. Requires Atmospherics access to open."
cost = 3000
access = ACCESS_ATMOSPHERICS
+ access_view = ACCESS_ATMOSPHERICS
contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
crate_name = "nitrous oxide canister crate"
crate_type = /obj/structure/closet/crate/secure
@@ -1108,6 +1143,7 @@
/datum/supply_pack/medical
group = "Medical"
+ access_view = ACCESS_MEDICAL
crate_type = /obj/structure/closet/crate/medical
/datum/supply_pack/medical/bloodpacks
@@ -1234,6 +1270,7 @@
desc = "Contains twelve different bottles, containing several viral samples for virology research. Also includes seven beakers and syringes. Balled-up jeans not included. Requires CMO access to open."
cost = 2500
access = ACCESS_CMO
+ access_view = ACCESS_VIROLOGY
contains = list(/obj/item/reagent_containers/glass/bottle/flu_virion,
/obj/item/reagent_containers/glass/bottle/cold,
/obj/item/reagent_containers/glass/bottle/random_virus,
@@ -1259,6 +1296,7 @@
/datum/supply_pack/science
group = "Science"
+ access_view = ACCESS_RESEARCH
crate_type = /obj/structure/closet/crate/science
/datum/supply_pack/science/plasma
@@ -1266,6 +1304,7 @@
desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open."
cost = 1000
access = ACCESS_TOXINS
+ access_view = ACCESS_TOXINS
contains = list(/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
@@ -1286,6 +1325,7 @@
desc = "The raw core of a flux anomaly, ready to be implosion-compressed into a powerful artifact."
cost = 5000
access = ACCESS_TOXINS
+ access_view = ACCESS_TOXINS
contains = list(/obj/item/raw_anomaly_core/flux)
crate_name = "raw flux anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1295,6 +1335,7 @@
desc = "The raw core of a gravitational anomaly, ready to be implosion-compressed into a powerful artifact."
cost = 5000
access = ACCESS_TOXINS
+ access_view = ACCESS_TOXINS
contains = list(/obj/item/raw_anomaly_core/grav)
crate_name = "raw pyro anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1304,6 +1345,7 @@
desc = "The raw core of a vortex anomaly, ready to be implosion-compressed into a powerful artifact."
cost = 5000
access = ACCESS_TOXINS
+ access_view = ACCESS_TOXINS
contains = list(/obj/item/raw_anomaly_core/vortex)
crate_name = "raw vortex anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1313,6 +1355,7 @@
desc = "The raw core of a bluespace anomaly, ready to be implosion-compressed into a powerful artifact."
cost = 5000
access = ACCESS_TOXINS
+ access_view = ACCESS_TOXINS
contains = list(/obj/item/raw_anomaly_core/bluespace)
crate_name = "raw bluespace anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1322,6 +1365,7 @@
desc = "The raw core of a pyro anomaly, ready to be implosion-compressed into a powerful artifact."
cost = 5000
access = ACCESS_TOXINS
+ access_view = ACCESS_TOXINS
contains = list(/obj/item/raw_anomaly_core/pyro)
crate_name = "raw pyro anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1331,6 +1375,7 @@
desc = "The tools you need to replace those finicky humans with a loyal robot army! Contains four proximity sensors, two empty first aid kits, two health analyzers, two red hardhats, two mechanical toolboxes, and two cleanbot assemblies! Requires Robotics access to open."
cost = 1500
access = ACCESS_ROBOTICS
+ access_view = ACCESS_ROBOTICS
contains = list(/obj/item/assembly/prox_sensor,
/obj/item/assembly/prox_sensor,
/obj/item/assembly/prox_sensor,
@@ -1352,6 +1397,7 @@
name = "RPED crate"
desc = "Need to rebuild the ORM but science got annihialted after a bomb test? Buy this for the most advanced parts NT can give you."
cost = 1500
+ access_view = FALSE
contains = list(/obj/item/storage/part_replacer/cargo)
crate_name = "\improper RPED crate"
@@ -1360,6 +1406,7 @@
desc = "These high powered Shield Wall Generators are guaranteed to keep any unwanted lifeforms on the outside, where they belong! Contains four shield wall generators. Requires Teleporter access to open."
cost = 2000
access = ACCESS_TELEPORTER
+ access_view = ACCESS_TELEPORTER
contains = list(/obj/machinery/power/shieldwallgen,
/obj/machinery/power/shieldwallgen,
/obj/machinery/power/shieldwallgen,
@@ -1390,6 +1437,7 @@
name = "Cytology supplies crate"
desc = "Did out of control specimens pulverize xenobiology? Here is some more supplies for further testing."
cost = 1500
+ access_view = ACCESS_XENOBIOLOGY
contains = list(/obj/structure/microscope,
/obj/item/biopsy_tool,
/obj/item/storage/box/petridish,
@@ -1421,6 +1469,7 @@
name = "High-traction Floor Tiles"
desc = "Make slipping a thing of the past with thirty industrial-grade anti-slip floor tiles!"
cost = 2000
+ access_view = ACCESS_JANITOR
contains = list(/obj/item/stack/tile/noslip/thirty)
crate_name = "high-traction floor tiles crate"
@@ -1428,6 +1477,7 @@
name = "Janitorial Supplies Crate"
desc = "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, rag, and trash bag."
cost = 1000
+ access_view = ACCESS_JANITOR
contains = list(/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
@@ -1537,6 +1587,7 @@
desc = "All the miners died too fast? Assistant wants to get a taste of life off-station? Either way, this kit is the best way to turn a regular crewman into an ore-producing, monster-slaying machine. Contains meson goggles, a pickaxe, advanced mining scanner, cargo headset, ore bag, gasmask, an explorer suit and a miner ID upgrade. Requires QM access to open."
cost = 2000
access = ACCESS_QM
+ access_view = ACCESS_MINING_STATION
contains = list(/obj/item/storage/backpack/duffelbag/mining_conscript)
crate_name = "shaft miner starter kit"
crate_type = /obj/structure/closet/crate/secure
@@ -1586,6 +1637,9 @@
group = "Food & Hydroponics"
crate_type = /obj/structure/closet/crate/freezer
+/datum/supply_pack/organic/hydroponics
+ access_view = ACCESS_HYDROPONICS
+
/datum/supply_pack/organic/hydroponics/beekeeping_suits
name = "Beekeeper Suit Crate"
desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear."
@@ -1637,6 +1691,7 @@
name = "Exotic Seeds Crate"
desc = "Any entrepreneuring botanist's dream. Contains fourteen different seeds, including one replica-pod seed and two mystery seeds!"
cost = 1500
+ access_view = ACCESS_HYDROPONICS
contains = list(/obj/item/seeds/nettle,
/obj/item/seeds/replicapod,
/obj/item/seeds/plump,
@@ -1691,6 +1746,7 @@
crate_name = "party equipment crate"
contraband = TRUE
access = ACCESS_THEATRE
+ access_view = ACCESS_THEATRE
crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/organic/hydroponics
@@ -1832,6 +1888,7 @@
name = "Bird Crate"
desc = "Contains five expert telecommunication birds."
cost = 4000
+ access_view = ACCESS_CE
contains = list(/mob/living/simple_animal/parrot)
crate_name = "parrot crate"
@@ -1845,6 +1902,7 @@
desc = "Not a very dangerous insect, but they do give off a better image than, say, flies or cockroaches."//is that a motherfucking worm reference
contraband = TRUE
cost = 5000
+ access_view = ACCESS_THEATRE
contains = list(/mob/living/simple_animal/butterfly)
crate_name = "entomology samples crate"
@@ -1857,6 +1915,7 @@
name = "Cat Crate"
desc = "The cat goes meow! Comes with a collar and a nice cat toy! Cheeseburger not included."//i can't believe im making this reference
cost = 5000 //Cats are worth as much as corgis.
+ access_view = ACCESS_MEDICAL
contains = list(/mob/living/simple_animal/pet/cat,
/obj/item/clothing/neck/petcollar,
/obj/item/toy/cattoy)
@@ -1873,6 +1932,7 @@
name = "Chicken Crate"
desc = "The chicken goes bwaak!"
cost = 2000
+ access_view = ACCESS_KITCHEN
contains = list( /mob/living/simple_animal/chick)
crate_name = "chicken crate"
@@ -1880,6 +1940,7 @@
name = "Corgi Crate"
desc = "Considered the optimal dog breed by thousands of research scientists, this Corgi is but one dog from the millions of Ian's noble bloodline. Comes with a cute collar!"
cost = 5000
+ access_view = ACCESS_HOP
contains = list(/mob/living/simple_animal/pet/dog/corgi,
/obj/item/clothing/neck/petcollar)
crate_name = "corgi crate"
@@ -1896,6 +1957,7 @@
name = "Cow Crate"
desc = "The cow goes moo!"
cost = 3000
+ access_view = ACCESS_HYDROPONICS
contains = list(/mob/living/simple_animal/cow)
crate_name = "cow crate"
@@ -1903,6 +1965,7 @@
name = "Crab Rocket"
desc = "CRAAAAAAB ROCKET. CRAB ROCKET. CRAB ROCKET. CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB ROCKET. CRAFT. ROCKET. BUY. CRAFT ROCKET. CRAB ROOOCKET. CRAB ROOOOCKET. CRAB CRAB CRAB CRAB CRAB CRAB CRAB CRAB ROOOOOOOOOOOOOOOOOOOOOOCK EEEEEEEEEEEEEEEEEEEEEEEEE EEEETTTTTTTTTTTTAAAAAAAAA AAAHHHHHHHHHHHHH. CRAB ROCKET. CRAAAB ROCKEEEEEEEEEGGGGHHHHTT CRAB CRAB CRAABROCKET CRAB ROCKEEEET."//fun fact: i actually spent like 10 minutes and transcribed the entire video.
cost = 5000
+ access_view = ACCESS_HOS
contains = list(/mob/living/simple_animal/crab)
crate_name = "look sir free crabs"
DropPodOnly = TRUE
@@ -1924,6 +1987,7 @@
name = "Fox Crate"
desc = "The fox goes...? Comes with a collar!"//what does the fox say
cost = 5000
+ access_view = ACCESS_CAPTAIN
contains = list(/mob/living/simple_animal/pet/fox,
/obj/item/clothing/neck/petcollar)
crate_name = "fox crate"
@@ -1932,6 +1996,7 @@
name = "Goat Crate"
desc = "The goat goes baa! Warranty void if used as a replacement for Pete."
cost = 2500
+ access_view = ACCESS_KITCHEN
contains = list(/mob/living/simple_animal/hostile/retaliate/goat)
crate_name = "goat crate"
@@ -1963,6 +2028,7 @@
name = "Snake Crate"
desc = "Tired of these MOTHER FUCKING snakes on this MOTHER FUCKING space station? Then this isn't the crate for you. Contains three poisonous snakes."
cost = 3000
+ access_view = ACCESS_SECURITY
contains = list(/mob/living/simple_animal/hostile/retaliate/poison/snake,
/mob/living/simple_animal/hostile/retaliate/poison/snake,
/mob/living/simple_animal/hostile/retaliate/poison/snake)
@@ -2295,6 +2361,7 @@
name = "Book Crate"
desc = "Surplus from the Nanotrasen Archives, these seven books are sure to be good reads."
cost = 1500
+ access_view = ACCESS_LIBRARY
contains = list(/obj/item/book/codex_gigas,
/obj/item/book/manual/random/,
/obj/item/book/manual/random/,
@@ -2352,6 +2419,7 @@
name = "Funeral Supply crate"
desc = "At the end of the day, someone's gonna want someone dead. Give them a proper send-off with these funeral supplies! Contains a coffin with burial garmets and flowers."
cost = 600
+ access_view = ACCESS_CHAPEL_OFFICE
contains = list(/obj/item/clothing/under/misc/burial,
/obj/item/reagent_containers/food/snacks/grown/harebell,
/obj/item/reagent_containers/food/snacks/grown/poppy/geranium)
@@ -2362,6 +2430,7 @@
name = "Religious Supplies Crate"
desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets."
cost = 4000 // it costs so much because the Space Church needs funding to build a cathedral
+ access_view = ACCESS_CHAPEL_OFFICE
contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/reagent_containers/food/drinks/bottle/holywater,
/obj/item/storage/book/bible/booze,
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index 7f90ab2ec50..f4f9f7dcd35 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -41,7 +41,7 @@
suit = /obj/item/clothing/suit/toggle/labcoat/cmo
l_hand = /obj/item/storage/firstaid/medical
suit_store = /obj/item/flashlight/pen/paramedic
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced/command=1)
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index 5aaf81bf646..76e1f9b3557 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -47,7 +47,7 @@
suit_store = /obj/item/gun/energy/e_gun
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
- backpack_contents = list(/obj/item/melee/baton/loaded=1)
+ backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/modular_computer/tablet/preset/advanced/command=1)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm
index dd8b2400275..d9925d214c0 100644
--- a/code/modules/modular_computers/computers/item/tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/tablet_presets.dm
@@ -38,8 +38,10 @@
/obj/item/modular_computer/tablet/preset/advanced/command/Initialize()
. = ..()
+ var/obj/item/computer_hardware/hard_drive/small/hard_drive = find_hardware_by_name("solid state drive")
install_component(new /obj/item/computer_hardware/sensorpackage)
install_component(new /obj/item/computer_hardware/card_slot/secondary)
+ hard_drive.store_file(new /datum/computer_file/program/budgetorders)
/// Given by the syndicate as part of the contract uplink bundle - loads in the Contractor Uplink.
/obj/item/modular_computer/tablet/syndicate_contract_uplink/preset/uplink/Initialize()
diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm
new file mode 100644
index 00000000000..c2f9f015078
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm
@@ -0,0 +1,280 @@
+/datum/computer_file/program/budgetorders
+ filename = "orderapp"
+ filedesc = "Nanotrasen Internal Requisition Network (NIRN)"
+ program_icon_state = "request"
+ extended_desc = "A request network that utilizes the Nanotrasen Ordering network to purchase supplies using a department budget account."
+ requires_ntnet = TRUE
+ transfer_access = ACCESS_HEADS
+ usage_flags = PROGRAM_LAPTOP | PROGRAM_TABLET
+ size = 20
+ tgui_id = "NtosCargo"
+ ///Are you actually placing orders with it?
+ var/requestonly = TRUE
+ ///Can the tablet see or buy illegal stuff?
+ var/contraband = FALSE
+ ///Is it being bought from a personal account, or is it being done via a budget/cargo?
+ var/self_paid = FALSE
+ ///Can this console approve purchase requests?
+ var/can_approve_requests = FALSE
+ ///What do we say when the shuttle moves with living beings on it.
+ var/safety_warning = "For safety reasons, the automated supply shuttle \
+ cannot transport live organisms, human remains, classified nuclear weaponry, \
+ homing beacons or machinery housing any form of artificial intelligence."
+ ///If you're being raided by pirates, what do you tell the crew?
+ var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible."
+
+/datum/computer_file/program/budgetorders/proc/get_export_categories()
+ . = EXPORT_CARGO
+
+/datum/computer_file/program/budgetorders/proc/is_visible_pack(mob/user, paccess_to_check, var/list/access, var/contraband)
+ if(issilicon(user)) //Borgs can't buy things.
+ return FALSE
+ if(computer.obj_flags & EMAGGED)
+ return TRUE
+ else if(contraband) //Hide contrband when non-emagged.
+ return FALSE
+ if(!paccess_to_check) // No required_access, allow it.
+ return TRUE
+ if(isAdminGhostAI(user))
+ return TRUE
+
+ //Aquire access from the inserted ID card.
+ if(!length(access))
+ var/obj/item/card/id/D
+ var/obj/item/computer_hardware/card_slot/card_slot
+ if(computer)
+ card_slot = computer.all_components[MC_CARD]
+ D = card_slot?.GetID()
+ if(!D)
+ return FALSE
+ access = D.GetAccess()
+
+ if(paccess_to_check in access)
+ return TRUE
+
+ return FALSE
+
+/datum/computer_file/program/budgetorders/ui_data()
+ . = ..()
+ var/list/data = get_header_data()
+ data["location"] = SSshuttle.supply.getStatusText()
+ var/datum/bank_account/buyer = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
+ var/obj/item/card/id/id_card = card_slot?.GetID()
+ if(id_card?.registered_account)
+ if(ACCESS_HEADS in id_card.access)
+ requestonly = FALSE
+ buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department)
+ can_approve_requests = TRUE
+ else
+ requestonly = TRUE
+ can_approve_requests = FALSE
+ else
+ requestonly = TRUE
+ if(buyer)
+ data["points"] = buyer.account_balance
+
+//Otherwise static data, that is being applied in ui_data as the crates visible and buyable are not static, and are determined by inserted ID.
+ data["requestonly"] = requestonly
+ data["supplies"] = list()
+ for(var/pack in SSshuttle.supply_packs)
+ var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
+ if(!is_visible_pack(usr, P.access_view , null, P.contraband) || P.hidden)
+ continue
+ if(!data["supplies"][P.group])
+ data["supplies"][P.group] = list(
+ "name" = P.group,
+ "packs" = list()
+ )
+ if((P.hidden && (P.contraband && !contraband) || (P.special && !P.special_enabled) || P.DropPodOnly))
+ continue
+ data["supplies"][P.group]["packs"] += list(list(
+ "name" = P.name,
+ "cost" = P.cost,
+ "id" = pack,
+ "desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
+ "goody" = P.goody,
+ "access" = P.access
+ ))
+
+//Data regarding the User's capability to buy things.
+ data["has_id"] = id_card
+ data["away"] = SSshuttle.supply.getDockedId() == "supply_away"
+ data["self_paid"] = self_paid
+ data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE
+ data["loan"] = !!SSshuttle.shuttle_loan
+ data["loan_dispatched"] = SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched
+ data["can_send"] = FALSE //There is no situation where I want the app to be able to send the shuttle AWAY from the station, but conversely is fine.
+ data["can_approve_requests"] = can_approve_requests
+ data["app_cost"] = TRUE
+ var/message = "Remember to stamp and send back the supply manifests."
+ if(SSshuttle.centcom_message)
+ message = SSshuttle.centcom_message
+ if(SSshuttle.supplyBlocked)
+ message = blockade_warning
+ data["message"] = message
+ data["cart"] = list()
+ for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
+ data["cart"] += list(list(
+ "object" = SO.pack.name,
+ "cost" = SO.pack.cost,
+ "id" = SO.id,
+ "orderer" = SO.orderer,
+ "paid" = !isnull(SO.paying_account) //paid by requester
+ ))
+
+ data["requests"] = list()
+ for(var/datum/supply_order/SO in SSshuttle.requestlist)
+ data["requests"] += list(list(
+ "object" = SO.pack.name,
+ "cost" = SO.pack.cost,
+ "orderer" = SO.orderer,
+ "reason" = SO.reason,
+ "id" = SO.id
+ ))
+
+ return data
+
+/datum/computer_file/program/budgetorders/ui_act(action, params, datum/tgui/ui)
+ if(..())
+ return
+ var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
+ switch(action)
+ if("send")
+ if(!SSshuttle.supply.canMove())
+ computer.say(safety_warning)
+ return
+ if(SSshuttle.supplyBlocked)
+ computer.say(blockade_warning)
+ return
+ if(SSshuttle.supply.getDockedId() == "supply_home")
+ SSshuttle.supply.export_categories = get_export_categories()
+ SSshuttle.moveShuttle("supply", "supply_away", TRUE)
+ computer.say("The supply shuttle is departing.")
+ computer.investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO)
+ else
+ computer.investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO)
+ computer.say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.")
+ SSshuttle.moveShuttle("supply", "supply_home", TRUE)
+ . = TRUE
+ if("loan")
+ if(!SSshuttle.shuttle_loan)
+ return
+ if(SSshuttle.supplyBlocked)
+ computer.say(blockade_warning)
+ return
+ else if(SSshuttle.supply.mode != SHUTTLE_IDLE)
+ return
+ else if(SSshuttle.supply.getDockedId() != "supply_away")
+ return
+ else
+ SSshuttle.shuttle_loan.loan_shuttle()
+ computer.say("The supply shuttle has been loaned to CentCom.")
+ computer.investigate_log("[key_name(usr)] accepted a shuttle loan event.", INVESTIGATE_CARGO)
+ log_game("[key_name(usr)] accepted a shuttle loan event.")
+ . = TRUE
+ if("add")
+ var/id = text2path(params["id"])
+ var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
+ if(!istype(pack))
+ return
+ if((pack.hidden && (pack.contraband && !contraband) || pack.DropPodOnly))
+ return
+
+ var/name = "*None Provided*"
+ var/rank = "*None Provided*"
+ var/ckey = usr.ckey
+ if(ishuman(usr))
+ var/mob/living/carbon/human/H = usr
+ name = H.get_authentification_name()
+ rank = H.get_assignment(hand_first = TRUE)
+ else if(issilicon(usr))
+ name = usr.real_name
+ rank = "Silicon"
+
+ var/datum/bank_account/account
+ if(self_paid && ishuman(usr))
+ var/mob/living/carbon/human/H = usr
+ var/obj/item/card/id/id_card = H.get_idcard(TRUE)
+ if(!istype(id_card))
+ computer.say("No ID card detected.")
+ return
+ if(istype(id_card, /obj/item/card/id/departmental_budget))
+ computer.say("The [src] rejects [id_card].")
+ return
+ account = id_card.registered_account
+ if(!istype(account))
+ computer.say("Invalid bank account.")
+ return
+
+ var/reason = ""
+ if((requestonly && !self_paid) || !(card_slot?.GetID()))
+ reason = stripped_input("Reason:", name, "")
+ if(isnull(reason) || ..())
+ return
+
+ if(pack.goody && !self_paid)
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
+ computer.say("ERROR: Small crates may only be purchased by private accounts.")
+ return
+
+ if(!self_paid && ishuman(usr) && !account)
+ var/obj/item/card/id/id_card = card_slot?.GetID()
+ account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department)
+
+ var/turf/T = get_turf(src)
+ var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account)
+ SO.generateRequisition(T)
+ if((requestonly && !self_paid) || !(card_slot?.GetID()))
+ SSshuttle.requestlist += SO
+ else
+ SSshuttle.shoppinglist += SO
+ if(self_paid)
+ computer.say("Order processed. The price will be charged to [account.account_holder]'s bank account on delivery.")
+ . = TRUE
+ if("remove")
+ var/id = text2num(params["id"])
+ for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
+ if(SO.id == id)
+ SSshuttle.shoppinglist -= SO
+ . = TRUE
+ break
+ if("clear")
+ SSshuttle.shoppinglist.Cut()
+ . = TRUE
+ if("approve")
+ var/id = text2num(params["id"])
+ for(var/datum/supply_order/SO in SSshuttle.requestlist)
+ if(SO.id == id)
+ var/obj/item/card/id/id_card = card_slot?.GetID()
+ if(id_card && id_card?.registered_account)
+ SO.paying_account = SSeconomy.get_dep_account(id_card?.registered_account?.account_job.paycheck_department)
+ SSshuttle.requestlist -= SO
+ SSshuttle.shoppinglist += SO
+ . = TRUE
+ break
+ if("deny")
+ var/id = text2num(params["id"])
+ for(var/datum/supply_order/SO in SSshuttle.requestlist)
+ if(SO.id == id)
+ SSshuttle.requestlist -= SO
+ . = TRUE
+ break
+ if("denyall")
+ SSshuttle.requestlist.Cut()
+ . = TRUE
+ if("toggleprivate")
+ self_paid = !self_paid
+ . = TRUE
+ if(.)
+ post_signal("supply")
+
+/datum/computer_file/program/budgetorders/proc/post_signal(command)
+
+ var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
+
+ if(!frequency)
+ return
+
+ var/datum/signal/status_signal = new(list("command" = command))
+ frequency.post_signal(src, status_signal)
diff --git a/icons/obj/modular_tablet.dmi b/icons/obj/modular_tablet.dmi
index c1e31c59e17..9ccbef928b9 100644
Binary files a/icons/obj/modular_tablet.dmi and b/icons/obj/modular_tablet.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index a4ef909bccc..0840ced6451 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1693,7 +1693,6 @@
#include "code\modules\cargo\bounty.dm"
#include "code\modules\cargo\bounty_console.dm"
#include "code\modules\cargo\centcom_podlauncher.dm"
-#include "code\modules\cargo\console.dm"
#include "code\modules\cargo\coupon.dm"
#include "code\modules\cargo\export_scanner.dm"
#include "code\modules\cargo\exports.dm"
@@ -1701,6 +1700,7 @@
#include "code\modules\cargo\gondolapod.dm"
#include "code\modules\cargo\goodies.dm"
#include "code\modules\cargo\order.dm"
+#include "code\modules\cargo\orderconsole.dm"
#include "code\modules\cargo\packs.dm"
#include "code\modules\cargo\supplypod.dm"
#include "code\modules\cargo\supplypod_beacon.dm"
@@ -2551,6 +2551,7 @@
#include "code\modules\modular_computers\file_system\programs\atmosscan.dm"
#include "code\modules\modular_computers\file_system\programs\borg_monitor.dm"
#include "code\modules\modular_computers\file_system\programs\bounty_board.dm"
+#include "code\modules\modular_computers\file_system\programs\budgetordering.dm"
#include "code\modules\modular_computers\file_system\programs\card.dm"
#include "code\modules\modular_computers\file_system\programs\cargobounty.dm"
#include "code\modules\modular_computers\file_system\programs\cargoship.dm"
diff --git a/tgui/packages/tgui/interfaces/Cargo.js b/tgui/packages/tgui/interfaces/Cargo.js
index 9854e21833a..584a6996fa7 100644
--- a/tgui/packages/tgui/interfaces/Cargo.js
+++ b/tgui/packages/tgui/interfaces/Cargo.js
@@ -6,6 +6,19 @@ import { formatMoney } from '../format';
import { Window } from '../layouts';
export const Cargo = (props, context) => {
+ return (
+
+
+
+
+
+ );
+};
+
+export const CargoContent = (props, context) => {
const { act, data } = useBackend(context);
const [tab, setTab] = useSharedState(context, 'tab', 'catalog');
const {
@@ -14,53 +27,48 @@ export const Cargo = (props, context) => {
const cart = data.cart || [];
const requests = data.requests || [];
return (
-
-
-
-
-
- setTab('catalog')}>
- Catalog
-
+
+
+
+
+ setTab('catalog')}>
+ Catalog
+
+ 0
+ && 'yellow'}
+ selected={tab === 'requests'}
+ onClick={() => setTab('requests')}>
+ Requests ({requests.length})
+
+ {!requestonly && (
0
+ icon="shopping-cart"
+ textColor={tab !== 'cart'
+ && cart.length > 0
&& 'yellow'}
- selected={tab === 'requests'}
- onClick={() => setTab('requests')}>
- Requests ({requests.length})
+ selected={tab === 'cart'}
+ onClick={() => setTab('cart')}>
+ Checkout ({cart.length})
- {!requestonly && (
- 0
- && 'yellow'}
- selected={tab === 'cart'}
- onClick={() => setTab('cart')}>
- Checkout ({cart.length})
-
- )}
-
-
- {tab === 'catalog' && (
-
- )}
- {tab === 'requests' && (
-
- )}
- {tab === 'cart' && (
-
- )}
-
-
+ )}
+
+
+ {tab === 'catalog' && (
+
+ )}
+ {tab === 'requests' && (
+
+ )}
+ {tab === 'cart' && (
+
+ )}
+
);
};
@@ -75,6 +83,7 @@ const CargoStatus = (props, context) => {
message,
points,
requestonly,
+ can_send,
} = data;
return (
{
)}>
- {docked && !requestonly && (
+ {docked && !requestonly && can_send &&(