diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8295f078d35..3302f203b9c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -642,6 +642,15 @@ /obj/item/gun/ballistic/automatic/wt550) crate_name = "auto rifle crate" +/datum/supply_pack/security/armory/wt550ammo + name = "WT-550 Auto Rifle Ammo Crate" + desc = "Contains four 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open." + cost = 3000 + contains = list(/obj/item/ammo_box/magazine/wt550m9, + /obj/item/ammo_box/magazine/wt550m9, + /obj/item/ammo_box/magazine/wt550m9, + /obj/item/ammo_box/magazine/wt550m9) + /datum/supply_pack/security/armory/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. Requires Armory access to open." @@ -676,14 +685,27 @@ /obj/item/mecha_parts/part/ripley_right_leg, /obj/item/mecha_parts/part/ripley_left_leg, /obj/item/stock_parts/capacitor, - /obj/item/stock_parts/scanning_module) + /obj/item/stock_parts/scanning_module, + /obj/item/circuitboard/mecha/ripley/main, + /obj/item/circuitboard/mecha/ripley/peripherals, + /obj/item/mecha_parts/mecha_equipment/drill, + /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) crate_name= "APLU MK-I kit" /datum/supply_pack/engineering/conveyor name = "Conveyor Assembly Crate" - desc = "Keep production moving along with six conveyor belts. Conveyor switch included. If you have any questions, check out the enclosed instruction book." + desc = "Keep production moving along with fifteen conveyor belts. Conveyor switch included. If you have any questions, check out the enclosed instruction book." cost = 1500 contains = list(/obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, + /obj/item/conveyor_construct, /obj/item/conveyor_construct, /obj/item/conveyor_construct, /obj/item/conveyor_construct, @@ -1240,33 +1262,36 @@ /datum/supply_pack/medical/supplies name = "Medical Supplies Crate" - desc = "Contains seven beakers, syringes, and bodybags. Six morphine bottles, four insulin pills. Two charcoal bottles, epinephrine bottles, antitoxin bottles, and large beakers. Finally, a single roll of medical gauze. German doctor not included." + desc = "Contains several medical supplies. German doctor not included." cost = 2000 contains = list(/obj/item/reagent_containers/glass/bottle/charcoal, - /obj/item/reagent_containers/glass/bottle/charcoal, - /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/toxin, /obj/item/reagent_containers/glass/bottle/toxin, /obj/item/reagent_containers/glass/beaker/large, - /obj/item/reagent_containers/glass/beaker/large, - /obj/item/reagent_containers/pill/insulin, - /obj/item/reagent_containers/pill/insulin, - /obj/item/reagent_containers/pill/insulin, /obj/item/reagent_containers/pill/insulin, /obj/item/stack/medical/gauze, /obj/item/storage/box/beakers, /obj/item/storage/box/medsprays, /obj/item/storage/box/syringes, - /obj/item/storage/box/bodybags) + /obj/item/storage/box/bodybags, + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/o2, + /obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/fire, + /obj/item/defibrillator/loaded, + /obj/item/reagent_containers/blood/OMinus, + /obj/item/storage/pill_bottle/mining, + /obj/item/reagent_containers/pill/neurine, + /obj/item/vending_refill/medical) crate_name = "medical supplies crate" +/datum/supply_pack/medical/supplies/fill(obj/structure/closet/crate/C) + for(var/i in 1 to 10) + var/item = pick(contains) + new item(C) + /datum/supply_pack/medical/firstaidoxygen_single name = "Oxygen Deprivation Kit Single-Pack" desc = "Contains three first aid kits focused on helping oxygen deprivation victims." @@ -1835,6 +1860,7 @@ name = "Hydroponics Vending Machines Refills" desc = "When the clown takes all the banana seeds. Contains a NutriMax refill and an MegaSeed Servitor refill." cost = 2000 + crate_type = /obj/structure/closet/crate contains = list(/obj/item/vending_refill/hydroseeds, /obj/item/vending_refill/hydronutrients) crate_name = "hydroponics supply crate" @@ -1961,6 +1987,7 @@ desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!" cost = 2000 contains = list (/obj/item/storage/box/monkeycubes) + crate_type = /obj/structure/closet/crate crate_name = "monkey cube crate" /datum/supply_pack/critter/pug @@ -2346,7 +2373,7 @@ /datum/supply_pack/misc/paper name = "Bureaucracy Crate" - desc = "High stacks of papers on your desk Are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, three folders, two clipboards and two stamps."//that was too forced + desc = "High stacks of papers on your desk Are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, three folders, a laser pointer, two clipboards and two stamps."//that was too forced cost = 1500 contains = list(/obj/structure/filingcabinet/chestdrawer/wheeled, /obj/item/camera_film, @@ -2366,7 +2393,8 @@ /obj/item/clipboard, /obj/item/clipboard, /obj/item/stamp, - /obj/item/stamp/denied) + /obj/item/stamp/denied, + /obj/item/laser_pointer/purple) crate_name = "bureaucracy crate" /datum/supply_pack/misc/fountainpens