Skip to content

fixes cargo not being able to order the full chemistry cart pack #1460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Spyroshark wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fixes cargo not being able to order the full chemistry cart pack #1460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions code/modules/cargo/supply_packs/reagent_packs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
crate_type = /obj/structure/closet/crate/medical

/datum/supply_pack/reagent/chemical_carts
name = "Full Chemistry Cartridge Pack"
desc = "Contains a full set of chem dispenser cartridges with every chemical you'll need for making pharmaceuticals."
cost = PAYCHECK_ASSISTANT * 50 + CARGO_CRATE_VALUE //price may need balancing
name = "Generic Chemistry Cartridge Pack"
desc = "You shouldn't see this."
crate_name = "chemical cartridges crate"

/datum/supply_pack/reagent/chemical_carts/New()
Expand Down Expand Up @@ -42,8 +41,16 @@
/obj/item/reagent_containers/chem_cartridge/small)
crate_name = "empty chemical cartridges crate"

/datum/supply_pack/reagent/chemical_carts/soft_drinks_chem_cartridge //IGNORE THE TYPEPATH PLEASE
name = "Soft Drinks Cartridge Luxury Pack (Full Dispenser)"
/datum/supply_pack/reagent/chemical_carts/chemistry_starter_pack
name = "Full Chemistry Cartridge Pack"
desc = "Contains a full set of chem dispenser cartridges with every chemical you'll need for making pharmaceuticals."
cost = PAYCHECK_ASSISTANT * 50 + CARGO_CRATE_VALUE //price may need balancing

/datum/supply_pack/reagent/chemical_carts/chemistry_starter_pack/set_cart_list()
contains = GLOB.cartridge_list_chems.Copy()

/datum/supply_pack/reagent/chemical_carts/soft_drinks_chem_cartridge
name = "Drinks Cartridge Luxury Pack (Full Dispenser)"
desc = "Contains a full set of chem cartridges of the same size inside a soft drinks dispenser at shift start."
cost = PAYCHECK_ASSISTANT * 8.7 + CARGO_CRATE_VALUE

Expand Down Expand Up @@ -73,7 +80,7 @@
for(var/datum/reagent/reagent_path as anything in GLOB.cartridge_list_chems | GLOB.cartridge_list_botany | GLOB.cartridge_list_booze | GLOB.cartridge_list_drinks)
var/datum/supply_pack/reagent/individual_chem_cart/pack = new
var/name = initial(reagent_path.name)
pack.name = "Crate of [name]"
pack.name = "Single Crate of [name]"
pack.desc = "Contains [volume]u of [name]."
pack.crate_name = "reagent crate ([name])"
pack.id = "[type]([name])"
Expand Down
Loading