diff --git a/code/datums/supplypacks/ammunition.dm b/code/datums/supplypacks/ammunition.dm new file mode 100644 index 00000000000..95ca56d4e46 --- /dev/null +++ b/code/datums/supplypacks/ammunition.dm @@ -0,0 +1,42 @@ +/* +* Here is where any supply packs +* related to weapons live. +*/ +/datum/supply_packs/ammunition + group = "Ammunition" + +/datum/supply_packs/randomised/ammunition + group = "Ammunition" + access = access_security + +/datum/supply_packs/ammunition/shotgunammo + name = "Ballistic ammunition crate" + contains = list( + /obj/item/weapon/storage/box/shotgunammo = 2, + /obj/item/weapon/storage/box/shotgunshells = 2 + ) + cost = 60 + containertype = /obj/structure/closet/crate/secure + containername = "ballistic ammunition crate" + access = access_armory + +/datum/supply_packs/randomised/ammunition/autoammo + name = "Automatic weapon ammunition crate" + num_contained = 6 + contains = list( + /obj/item/ammo_magazine/mc9mmt, + /obj/item/ammo_magazine/mc9mmt/rubber, + /obj/item/ammo_magazine/a556 + ) + cost = 20 + containertype = /obj/structure/closet/crate/secure + containername = "Automatic weapon ammunition crate" + access = access_armory + +/datum/supply_packs/security/beanbagammo + name = "Beanbag shells" + contains = list(/obj/item/weapon/storage/box/beanbags = 3) + cost = 30 + containertype = /obj/structure/closet/crate + containername = "Beanbag shells" + access = null \ No newline at end of file diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index 3837bc40267..576e7b10eff 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -5,45 +5,20 @@ /datum/supply_packs/atmos group = "Atmospherics" -/datum/supply_packs/atmos/internals - name = "Internals crate" - contains = list( - /obj/item/clothing/mask/gas = 3, - /obj/item/weapon/tank/air = 3 - ) - cost = 10 - containertype = /obj/structure/closet/crate/internals - containername = "Internals crate" - -/datum/supply_packs/atmos/evacuation - name = "Emergency equipment" - contains = list( - /obj/item/weapon/storage/toolbox/emergency = 2, - /obj/item/clothing/suit/storage/hazardvest = 2, - /obj/item/clothing/suit/storage/vest = 2, - /obj/item/weapon/tank/emergency_oxygen/engi = 4, - /obj/item/clothing/suit/space/emergency = 4, - /obj/item/clothing/head/helmet/space/emergency = 4, - /obj/item/clothing/mask/gas = 4 - ) - cost = 45 - containertype = /obj/structure/closet/crate/internals - containername = "Emergency crate" - /datum/supply_packs/atmos/inflatable name = "Inflatable barriers" contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3) cost = 20 containertype = /obj/structure/closet/crate containername = "Inflatable Barrier Crate" - + /datum/supply_packs/atmos/canister_empty name = "Empty gas canister" cost = 7 containername = "Empty gas canister crate" containertype = /obj/structure/largecrate contains = list(/obj/machinery/portable_atmospherics/canister) - + /datum/supply_packs/atmos/canister_air name = "Air canister" cost = 10 @@ -88,17 +63,19 @@ containertype = /obj/structure/closet/crate/secure/large access = access_atmospherics contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide) - -/datum/supply_packs/atmos/voidsuits - name = "Atmospheric voidsuits" - contains = list( - /obj/item/clothing/suit/space/void/atmos = 2, - /obj/item/clothing/head/helmet/space/void/atmos = 2, - /obj/item/clothing/mask/breath = 2, - /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2, - ) - cost = 45 - containertype = "/obj/structure/closet/crate/secure" - containername = "Atmospheric voidsuit crate" + +/datum/supply_packs/atmos/air_dispenser + contains = list(/obj/machinery/pipedispenser/orderable) + name = "Pipe Dispenser" + cost = 35 + containertype = /obj/structure/closet/crate/secure/large + containername = "Pipe Dispenser Crate" + access = access_atmospherics + +/datum/supply_packs/atmos/disposals_dispenser + contains = list(/obj/machinery/pipedispenser/disposal/orderable) + name = "Disposals Pipe Dispenser" + cost = 35 + containertype = /obj/structure/closet/crate/secure/large + containername = "Disposal Dispenser Crate" access = access_atmospherics \ No newline at end of file diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm new file mode 100644 index 00000000000..f3de0ee4863 --- /dev/null +++ b/code/datums/supplypacks/costumes.dm @@ -0,0 +1,132 @@ +/* +* Here is where any supply packs +* related to weapons live. +*/ +/datum/supply_packs/costumes + group = "Costumes & Clothes" + +/datum/supply_packs/randomised/costumes + group = "Costumes & Clothes" + +/datum/supply_packs/costumes/lasertag + name = "Lasertag equipment" + contains = list( + /obj/item/weapon/gun/energy/lasertag/red, + /obj/item/clothing/suit/redtag, + /obj/item/weapon/gun/energy/lasertag/blue, + /obj/item/clothing/suit/bluetag + ) + containertype = /obj/structure/closet + containername = "Lasertag Closet" + cost = 20 + +/datum/supply_packs/costumes/wizard + name = "Wizard costume" + contains = list( + /obj/item/weapon/staff, + /obj/item/clothing/suit/wizrobe/fake, + /obj/item/clothing/shoes/sandal, + /obj/item/clothing/head/wizard/fake + ) + cost = 20 + containertype = /obj/structure/closet/crate + containername = "Wizard costume crate" + +/datum/supply_packs/costumes/foam_weapons + name = "Foam Weapon Crate" + contains = list( + /obj/item/weapon/material/sword/foam = 2, + /obj/item/weapon/material/twohanded/baseballbat/foam = 2, + /obj/item/weapon/material/twohanded/spear/foam = 2, + /obj/item/weapon/material/twohanded/fireaxe/foam = 2 + ) + cost = 80 + containertype = /obj/structure/closet/crate + containername = "foam weapon crate" + +/datum/supply_packs/randomised/costumes/hats + num_contained = 4 + contains = list( + /obj/item/clothing/head/collectable/chef, + /obj/item/clothing/head/collectable/paper, + /obj/item/clothing/head/collectable/tophat, + /obj/item/clothing/head/collectable/captain, + /obj/item/clothing/head/collectable/beret, + /obj/item/clothing/head/collectable/welding, + /obj/item/clothing/head/collectable/flatcap, + /obj/item/clothing/head/collectable/pirate, + /obj/item/clothing/head/collectable/kitty, + /obj/item/clothing/head/collectable/rabbitears, + /obj/item/clothing/head/collectable/wizard, + /obj/item/clothing/head/collectable/hardhat, + /obj/item/clothing/head/collectable/HoS, + /obj/item/clothing/head/collectable/thunderdome, + /obj/item/clothing/head/collectable/swat, + /obj/item/clothing/head/collectable/slime, + /obj/item/clothing/head/collectable/police, + /obj/item/clothing/head/collectable/slime, + /obj/item/clothing/head/collectable/xenom, + /obj/item/clothing/head/collectable/petehat + ) + name = "Collectable hat crate!" + cost = 200 + containertype = /obj/structure/closet/crate + containername = "Collectable hats crate! Brought to you by Bass.inc!" + +/datum/supply_packs/randomised/costumes/costume + num_contained = 3 + contains = list( + /obj/item/clothing/suit/pirate, + /obj/item/clothing/suit/judgerobe, + /obj/item/clothing/suit/wcoat, + /obj/item/clothing/suit/hastur, + /obj/item/clothing/suit/holidaypriest, + /obj/item/clothing/suit/nun, + /obj/item/clothing/suit/imperium_monk, + /obj/item/clothing/suit/ianshirt, + /obj/item/clothing/under/gimmick/rank/captain/suit, + /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit, + /obj/item/clothing/under/lawyer/purpsuit, + /obj/item/clothing/under/rank/mailman, + /obj/item/clothing/under/dress/dress_saloon, + /obj/item/clothing/suit/suspenders, + /obj/item/clothing/suit/storage/toggle/labcoat/mad, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, + /obj/item/clothing/under/schoolgirl, + /obj/item/clothing/under/owl, + /obj/item/clothing/under/waiter, + /obj/item/clothing/under/gladiator, + /obj/item/clothing/under/soviet, + /obj/item/clothing/under/scratch, + /obj/item/clothing/under/wedding/bride_white, + /obj/item/clothing/suit/chef, + /obj/item/clothing/suit/apron/overalls, + /obj/item/clothing/under/redcoat, + /obj/item/clothing/under/kilt + ) + name = "Costumes crate" + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Actor Costumes" + +/datum/supply_packs/costumes/formal_wear + contains = list( + /obj/item/clothing/head/bowler, + /obj/item/clothing/head/that, + /obj/item/clothing/suit/storage/toggle/internalaffairs, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket, + /obj/item/clothing/under/suit_jacket, + /obj/item/clothing/under/suit_jacket/female, + /obj/item/clothing/under/suit_jacket/really_black, + /obj/item/clothing/under/suit_jacket/red, + /obj/item/clothing/under/lawyer/bluesuit, + /obj/item/clothing/under/lawyer/purpsuit, + /obj/item/clothing/shoes/black = 2, + /obj/item/clothing/shoes/leather, + /obj/item/clothing/suit/wcoat + ) + name = "Formalwear closet" + cost = 30 + containertype = /obj/structure/closet + containername = "Formalwear for the best occasions." \ No newline at end of file diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index 4f1a43cb417..671c9410b6a 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -11,38 +11,6 @@ cost = 10 containertype = /obj/structure/closet/crate containername = "Replacement lights" - -/datum/supply_packs/eng/metal50 - name = "50 metal sheets" - contains = list(/obj/item/stack/material/steel) - amount = 50 - cost = 10 - containertype = /obj/structure/closet/crate - containername = "Metal sheets crate" - -/datum/supply_packs/eng/glass50 - name = "50 glass sheets" - contains = list(/obj/item/stack/material/glass) - amount = 50 - cost = 10 - containertype = /obj/structure/closet/crate - containername = "Glass sheets crate" - -/datum/supply_packs/eng/wood50 - name = "50 wooden planks" - contains = list(/obj/item/stack/material/wood) - amount = 50 - cost = 10 - containertype = /obj/structure/closet/crate - containername = "Wooden planks crate" - -/datum/supply_packs/eng/plastic50 - name = "50 plastic sheets" - contains = list(/obj/item/stack/material/plastic) - amount = 50 - cost = 10 - containertype = /obj/structure/closet/crate - containername = "Plastic sheets crate" /datum/supply_packs/eng/smescoil name = "Superconducting Magnetic Coil" @@ -81,7 +49,7 @@ cost = 8 containertype = /obj/structure/largecrate containername = "fuel tank crate" - + /datum/supply_packs/eng/solar name = "Solar Pack crate" contains = list( @@ -93,7 +61,7 @@ cost = 20 containertype = /obj/structure/closet/crate containername = "Solar pack crate" - + /datum/supply_packs/eng/engine name = "Emitter crate" contains = list(/obj/machinery/power/emitter = 2) @@ -101,26 +69,26 @@ containertype = /obj/structure/closet/crate/secure containername = "Emitter crate" access = access_ce - + /datum/supply_packs/engine/eng/field_gen name = "Field Generator crate" contains = list(/obj/machinery/field_generator = 2) containertype = /obj/structure/closet/crate/secure containername = "Field Generator crate" access = access_ce - + /datum/supply_packs/eng/engine/sing_gen name = "Singularity Generator crate" contains = list(/obj/machinery/the_singularitygen) containertype = /obj/structure/closet/crate/secure containername = "Singularity Generator crate" access = access_ce - + /datum/supply_packs/eng/engine/collector name = "Collector crate" contains = list(/obj/machinery/power/rad_collector = 3) containername = "Collector crate" - + /datum/supply_packs/eng/engine/PA name = "Particle Accelerator crate" cost = 40 @@ -136,47 +104,7 @@ containertype = /obj/structure/closet/crate/secure containername = "Particle Accelerator crate" access = access_ce - -/datum/supply_packs/eng/robotics - name = "Robotics assembly crate" - contains = list( - /obj/item/device/assembly/prox_sensor = 3, - /obj/item/weapon/storage/toolbox/electrical, - /obj/item/device/flash = 4, - /obj/item/weapon/cell/high = 2 - ) - cost = 10 - containertype = /obj/structure/closet/crate/secure/gear - containername = "Robotics assembly" - access = access_robotics - -/datum/supply_packs/eng/robolimbs_basic - name = "Basic robolimb blueprints" - contains = list( - /obj/item/weapon/disk/limb/morpheus, - /obj/item/weapon/disk/limb/xion - ) - cost = 15 - containertype = /obj/structure/closet/crate/secure/gear - containername = "Robolimb blueprints (basic)" - access = access_robotics - -/datum/supply_packs/eng/robolimbs_adv - name = "All robolimb blueprints" - contains = list( - /obj/item/weapon/disk/limb/bishop, - /obj/item/weapon/disk/limb/hesphiastos, - /obj/item/weapon/disk/limb/morpheus, - /obj/item/weapon/disk/limb/veymed, - /obj/item/weapon/disk/limb/wardtakahashi, - /obj/item/weapon/disk/limb/xion, - /obj/item/weapon/disk/limb/zenghu, - ) - cost = 40 - containertype = /obj/structure/closet/crate/secure/gear - containername = "Robolimb blueprints (adv)" - access = access_robotics - + /datum/supply_packs/eng/shield_gen contains = list(/obj/item/weapon/circuitboard/shield_gen) name = "Bubble shield generator circuitry" @@ -184,7 +112,7 @@ containertype = /obj/structure/closet/crate/secure containername = "bubble shield generator circuitry crate" access = access_ce - + /datum/supply_packs/eng/shield_gen_ex contains = list(/obj/item/weapon/circuitboard/shield_gen_ex) name = "Hull shield generator circuitry" @@ -192,7 +120,7 @@ containertype = /obj/structure/closet/crate/secure containername = "hull shield generator circuitry crate" access = access_ce - + /datum/supply_packs/eng/shield_cap contains = list(/obj/item/weapon/circuitboard/shield_cap) name = "Bubble shield capacitor circuitry" @@ -200,7 +128,7 @@ containertype = /obj/structure/closet/crate/secure containername = "shield capacitor circuitry crate" access = access_ce - + /datum/supply_packs/eng/smbig name = "Supermatter Core" contains = list(/obj/machinery/power/supermatter) @@ -208,7 +136,7 @@ containertype = /obj/structure/closet/crate/secure/phoron containername = "Supermatter crate (CAUTION)" access = access_ce - + /datum/supply_packs/eng/teg contains = list(/obj/machinery/power/generator) name = "Mark I Thermoelectric Generator" @@ -216,7 +144,7 @@ containertype = /obj/structure/closet/crate/secure/large containername = "Mk1 TEG crate" access = access_engine - + /datum/supply_packs/eng/circulator contains = list(/obj/machinery/atmospherics/binary/circulator) name = "Binary atmospheric circulator" @@ -224,23 +152,7 @@ containertype = /obj/structure/closet/crate/secure/large containername = "Atmospheric circulator crate" access = access_engine - -/datum/supply_packs/eng/air_dispenser - contains = list(/obj/machinery/pipedispenser/orderable) - name = "Pipe Dispenser" - cost = 35 - containertype = /obj/structure/closet/crate/secure/large - containername = "Pipe Dispenser Crate" - access = access_atmospherics - -/datum/supply_packs/eng/disposals_dispenser - contains = list(/obj/machinery/pipedispenser/disposal/orderable) - name = "Disposals Pipe Dispenser" - cost = 35 - containertype = /obj/structure/closet/crate/secure/large - containername = "Disposal Dispenser Crate" - access = access_atmospherics - + /datum/supply_packs/eng/radsuit contains = list( /obj/item/clothing/suit/radiation = 3, @@ -250,7 +162,7 @@ cost = 20 containertype = /obj/structure/closet/radiation containername = "Radiation suit locker" - + /datum/supply_packs/eng/pacman_parts name = "P.A.C.M.A.N. portable generator parts" cost = 45 @@ -263,7 +175,7 @@ /obj/item/weapon/stock_parts/matter_bin, /obj/item/weapon/circuitboard/pacman ) - + /datum/supply_packs/eng/super_pacman_parts name = "Super P.A.C.M.A.N. portable generator parts" cost = 55 @@ -276,28 +188,3 @@ /obj/item/weapon/stock_parts/matter_bin, /obj/item/weapon/circuitboard/pacman/super ) - -/datum/supply_packs/eng/painters - name = "Station Painting Supplies" - cost = 10 - containername = "station painting supplies crate" - containertype = /obj/structure/closet/crate - contains = list( - /obj/item/device/pipe_painter = 2, - /obj/item/device/floor_painter = 2, - /obj/item/device/closet_painter = 2 - ) - -/datum/supply_packs/eng/voidsuits - name = "Engineering voidsuits" - contains = list( - /obj/item/clothing/suit/space/void/engineering = 2, - /obj/item/clothing/head/helmet/space/void/engineering = 2, - /obj/item/clothing/mask/breath = 2, - /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 - ) - cost = 40 - containertype = "/obj/structure/closet/crate/secure" - containername = "Engineering voidsuit crate" - access = access_engine_equip \ No newline at end of file diff --git a/code/datums/supplypacks/hospitality.dm b/code/datums/supplypacks/hospitality.dm index c35fb6025f4..7eb12f2fd4f 100644 --- a/code/datums/supplypacks/hospitality.dm +++ b/code/datums/supplypacks/hospitality.dm @@ -23,7 +23,7 @@ cost = 20 containertype = /obj/structure/closet/crate containername = "Party equipment" - + /datum/supply_packs/hospitality/barsupplies name = "Bar supplies" contains = list( @@ -42,19 +42,7 @@ cost = 10 containertype = /obj/structure/closet/crate containername = "crate of bar supplies" - -/datum/supply_packs/hospitality/lasertag - name = "Lasertag equipment" - contains = list( - /obj/item/weapon/gun/energy/lasertag/red, - /obj/item/clothing/suit/redtag, - /obj/item/weapon/gun/energy/lasertag/blue, - /obj/item/clothing/suit/bluetag - ) - containertype = /obj/structure/closet - containername = "Lasertag Closet" - cost = 20 - + /datum/supply_packs/randomised/hospitality/ group = "Hospitality" @@ -69,4 +57,5 @@ name = "Surprise pack of five pizzas" cost = 15 containertype = /obj/structure/closet/crate/freezer - containername = "Pizza crate" \ No newline at end of file + containername = "Pizza crate" + diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 11053ee4cd8..624821b5b4e 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -11,35 +11,35 @@ cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Monkey crate" - + /datum/supply_packs/hydro/farwa name = "Farwa crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes) cost = 30 containertype = /obj/structure/closet/crate/freezer containername = "Farwa crate" - + /datum/supply_packs/hydro/neara name = "Neaera crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes) cost = 30 containertype = /obj/structure/closet/crate/freezer containername = "Neaera crate" - + /datum/supply_packs/hydro/stok name = "Stok crate" contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes) cost = 30 containertype = /obj/structure/closet/crate/freezer containername = "Stok crate" - + /datum/supply_packs/hydro/lisa name = "Corgi Crate" contains = list() cost = 50 containertype = /obj/structure/largecrate/animal/corgi containername = "Corgi Crate" - + /datum/supply_packs/hydro/hydroponics name = "Hydroponics Supply Crate" contains = list( @@ -57,28 +57,28 @@ containertype = /obj/structure/closet/crate/hydroponics containername = "Hydroponics crate" access = access_hydroponics - + /datum/supply_packs/hydro/cow name = "Cow crate" cost = 30 containertype = /obj/structure/largecrate/animal/cow containername = "Cow crate" access = access_hydroponics - + /datum/supply_packs/hydro/goat name = "Goat crate" cost = 25 containertype = /obj/structure/largecrate/animal/goat containername = "Goat crate" access = access_hydroponics - + /datum/supply_packs/hydro/chicken name = "Chicken crate" cost = 20 containertype = /obj/structure/largecrate/animal/chick containername = "Chicken crate" access = access_hydroponics - + /datum/supply_packs/hydro/seeds name = "Seeds crate" contains = list( @@ -104,7 +104,7 @@ containertype = /obj/structure/closet/crate/hydroponics containername = "Seeds crate" access = access_hydroponics - + /datum/supply_packs/hydro/weedcontrol name = "Weed control crate" contains = list( @@ -117,28 +117,14 @@ containertype = /obj/structure/closet/crate/hydroponics containername = "Weed control crate" access = access_hydroponics - -/datum/supply_packs/hydro/exoticseeds - name = "Exotic seeds crate" - contains = list( - /obj/item/seeds/replicapod = 2, - /obj/item/seeds/libertymycelium, - /obj/item/seeds/reishimycelium, - /obj/item/seeds/random = 6, - /obj/item/seeds/kudzuseed - ) - cost = 15 - containertype = /obj/structure/closet/crate/hydroponics - containername = "Exotic Seeds crate" - access = access_hydroponics - + /datum/supply_packs/hydro/watertank name = "Water tank crate" contains = list(/obj/structure/reagent_dispensers/watertank) cost = 8 containertype = /obj/structure/largecrate containername = "water tank crate" - + /datum/supply_packs/hydro/bee_keeper name = "Beekeeping crate" contains = list( @@ -151,7 +137,7 @@ containertype = /obj/structure/closet/crate/hydroponics containername = "Beekeeping crate" access = access_hydroponics - + /datum/supply_packs/hydro/tray name = "Empty hydroponics tray" cost = 30 diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm new file mode 100644 index 00000000000..ec72a6a7a7c --- /dev/null +++ b/code/datums/supplypacks/materials.dm @@ -0,0 +1,67 @@ +/* +* Here is where any supply packs +* related to materials live. +*/ + +/datum/supply_packs/materials + group = "Materials" + +/datum/supply_packs/materials/metal50 + name = "50 metal sheets" + contains = list(/obj/item/stack/material/steel) + amount = 50 + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Metal sheets crate" + +/datum/supply_packs/materials/glass50 + name = "50 glass sheets" + contains = list(/obj/item/stack/material/glass) + amount = 50 + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Glass sheets crate" + +/datum/supply_packs/materials/wood50 + name = "50 wooden planks" + contains = list(/obj/item/stack/material/wood) + amount = 50 + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Wooden planks crate" + +/datum/supply_packs/materials/plastic50 + name = "50 plastic sheets" + contains = list(/obj/item/stack/material/plastic) + amount = 50 + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Plastic sheets crate" + +/datum/supply_packs/materials/cardboard_sheets + contains = list(/obj/item/stack/material/cardboard) + name = "50 cardboard sheets" + amount = 50 + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Cardboard sheets crate" + +/datum/supply_packs/materials/carpet + name = "Imported carpet" + containertype = /obj/structure/closet/crate + containername = "Imported carpet crate" + cost = 15 + contains = list( + /obj/item/stack/tile/carpet, + /obj/item/stack/tile/carpet/blue + ) + amount = 50 + + +/datum/supply_packs/misc/linoleum + name = "Linoleum" + containertype = /obj/structure/closet/crate + containername = "Linoleum crate" + cost = 15 + contains = list(/obj/item/stack/tile/linoleum) + amount = 50 \ No newline at end of file diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index ef67cb1a95e..93b779ac1d6 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -4,7 +4,7 @@ */ /datum/supply_packs/med group = "Medical" - + /datum/supply_packs/med/medical name = "Medical crate" contains = list( @@ -22,28 +22,28 @@ cost = 10 containertype = /obj/structure/closet/crate/medical containername = "Medical crate" - + /datum/supply_packs/med/bloodpack name = "BloodPack crate" contains = list(/obj/item/weapon/storage/box/bloodpacks = 3) cost = 10 containertype = /obj/structure/closet/crate/medical containername = "BloodPack crate" - + /datum/supply_packs/med/bodybag name = "Body bag crate" contains = list(/obj/item/weapon/storage/box/bodybags = 3) cost = 10 containertype = /obj/structure/closet/crate/medical containername = "Body bag crate" - + /datum/supply_packs/med/cryobag name = "Stasis bag crate" contains = list(/obj/item/bodybag/cryobag = 3) cost = 50 containertype = /obj/structure/closet/crate/medical containername = "Stasis bag crate" - + /datum/supply_packs/med/surgery name = "Surgery crate" contains = list( @@ -63,7 +63,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Surgery crate" access = access_medical - + /datum/supply_packs/med/sterile name = "Sterile equipment crate" contains = list( @@ -76,21 +76,7 @@ cost = 15 containertype = "/obj/structure/closet/crate" containername = "Sterile equipment crate" - -/datum/supply_packs/med/voidsuits - name = "Medical voidsuits" - contains = list( - /obj/item/clothing/suit/space/void/medical = 2, - /obj/item/clothing/head/helmet/space/void/medical = 2, - /obj/item/clothing/mask/breath = 2, - /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 - ) - cost = 40 - containertype = "/obj/structure/closet/crate/secure" - containername = "Medical voidsuit crate" - access = access_medical_equip - + /datum/supply_packs/med/extragear name = "Medical surplus equipment" contains = list( @@ -103,7 +89,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Medical surplus equipment" access = access_medical - + /datum/supply_packs/med/cmogear name = "Chief medical officer equipment" contains = list( @@ -127,7 +113,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Chief medical officer equipment" access = access_cmo - + /datum/supply_packs/med/doctorgear name = "Medical Doctor equipment" contains = list( @@ -150,7 +136,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Medical Doctor equipment" access = access_medical_equip - + /datum/supply_packs/med/chemistgear name = "Chemist equipment" contains = list( @@ -173,7 +159,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Chemist equipment" access = access_chemistry - + /datum/supply_packs/med/paramedicgear name = "Paramedic equipment" contains = list( @@ -201,7 +187,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Paramedic equipment" access = access_medical_equip - + /datum/supply_packs/med/psychiatristgear name = "Psychiatrist equipment" contains = list( @@ -220,7 +206,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Psychiatrist equipment" access = access_psychiatrist - + /datum/supply_packs/med/medicalscrubs name = "Medical scrubs" contains = list( @@ -241,7 +227,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Medical scrubs crate" access = access_medical_equip - + /datum/supply_packs/med/autopsy name = "Autopsy equipment" contains = list( @@ -258,7 +244,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Autopsy equipment crate" access = access_morgue - + /datum/supply_packs/med/medicaluniforms name = "Medical uniforms" contains = list( @@ -285,7 +271,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Medical uniform crate" access = access_medical_equip - + /datum/supply_packs/med/medicalbiosuits name = "Medical biohazard gear" contains = list( @@ -303,11 +289,19 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Medical biohazard equipment" access = access_medical_equip - + /datum/supply_packs/med/portablefreezers name = "Portable freezers crate" contains = list(/obj/item/weapon/storage/box/freezer = 7) cost = 25 containertype = "/obj/structure/closet/crate/secure" containername = "Portable freezers" - access = access_medical_equip \ No newline at end of file + access = access_medical_equip + +/datum/supply_packs/med/virus + name = "Virus sample crate" + contains = list(/obj/item/weapon/virusdish/random = 4) + cost = 25 + containertype = "/obj/structure/closet/crate/secure" + containername = "Virus sample crate" + access = access_cmo \ No newline at end of file diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index a64a6e44e72..6193f929f43 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -8,116 +8,6 @@ /datum/supply_packs/randomised/misc group = "Miscellaneous" -/datum/supply_packs/misc/wizard - name = "Wizard costume" - contains = list( - /obj/item/weapon/staff, - /obj/item/clothing/suit/wizrobe/fake, - /obj/item/clothing/shoes/sandal, - /obj/item/clothing/head/wizard/fake - ) - cost = 20 - containertype = /obj/structure/closet/crate - containername = "Wizard costume crate" - -/datum/supply_packs/misc/foam_weapons - name = "Foam Weapon Crate" - contains = list( - /obj/item/weapon/material/sword/foam = 2, - /obj/item/weapon/material/twohanded/baseballbat/foam = 2, - /obj/item/weapon/material/twohanded/spear/foam = 2, - /obj/item/weapon/material/twohanded/fireaxe/foam = 2 - ) - cost = 80 - containertype = /obj/structure/closet/crate - containername = "foam weapon crate" - -/datum/supply_packs/randomised/misc/hats - num_contained = 4 - contains = list( - /obj/item/clothing/head/collectable/chef, - /obj/item/clothing/head/collectable/paper, - /obj/item/clothing/head/collectable/tophat, - /obj/item/clothing/head/collectable/captain, - /obj/item/clothing/head/collectable/beret, - /obj/item/clothing/head/collectable/welding, - /obj/item/clothing/head/collectable/flatcap, - /obj/item/clothing/head/collectable/pirate, - /obj/item/clothing/head/collectable/kitty, - /obj/item/clothing/head/collectable/rabbitears, - /obj/item/clothing/head/collectable/wizard, - /obj/item/clothing/head/collectable/hardhat, - /obj/item/clothing/head/collectable/HoS, - /obj/item/clothing/head/collectable/thunderdome, - /obj/item/clothing/head/collectable/swat, - /obj/item/clothing/head/collectable/slime, - /obj/item/clothing/head/collectable/police, - /obj/item/clothing/head/collectable/slime, - /obj/item/clothing/head/collectable/xenom, - /obj/item/clothing/head/collectable/petehat - ) - name = "Collectable hat crate!" - cost = 200 - containertype = /obj/structure/closet/crate - containername = "Collectable hats crate! Brought to you by Bass.inc!" - -/datum/supply_packs/randomised/misc/costume - num_contained = 3 - contains = list( - /obj/item/clothing/suit/pirate, - /obj/item/clothing/suit/judgerobe, - /obj/item/clothing/suit/wcoat, - /obj/item/clothing/suit/hastur, - /obj/item/clothing/suit/holidaypriest, - /obj/item/clothing/suit/nun, - /obj/item/clothing/suit/imperium_monk, - /obj/item/clothing/suit/ianshirt, - /obj/item/clothing/under/gimmick/rank/captain/suit, - /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit, - /obj/item/clothing/under/lawyer/purpsuit, - /obj/item/clothing/under/rank/mailman, - /obj/item/clothing/under/dress/dress_saloon, - /obj/item/clothing/suit/suspenders, - /obj/item/clothing/suit/storage/toggle/labcoat/mad, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, - /obj/item/clothing/under/schoolgirl, - /obj/item/clothing/under/owl, - /obj/item/clothing/under/waiter, - /obj/item/clothing/under/gladiator, - /obj/item/clothing/under/soviet, - /obj/item/clothing/under/scratch, - /obj/item/clothing/under/wedding/bride_white, - /obj/item/clothing/suit/chef, - /obj/item/clothing/suit/apron/overalls, - /obj/item/clothing/under/redcoat, - /obj/item/clothing/under/kilt - ) - name = "Costumes crate" - cost = 10 - containertype = /obj/structure/closet/crate - containername = "Actor Costumes" - -/datum/supply_packs/misc/formal_wear - contains = list( - /obj/item/clothing/head/bowler, - /obj/item/clothing/head/that, - /obj/item/clothing/suit/storage/toggle/internalaffairs, - /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket, - /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket, - /obj/item/clothing/under/suit_jacket, - /obj/item/clothing/under/suit_jacket/female, - /obj/item/clothing/under/suit_jacket/really_black, - /obj/item/clothing/under/suit_jacket/red, - /obj/item/clothing/under/lawyer/bluesuit, - /obj/item/clothing/under/lawyer/purpsuit, - /obj/item/clothing/shoes/black = 2, - /obj/item/clothing/shoes/leather, - /obj/item/clothing/suit/wcoat - ) - name = "Formalwear closet" - cost = 30 - containertype = /obj/structure/closet - containername = "Formalwear for the best occasions." /datum/supply_packs/randomised/misc/card_packs num_contained = 5 @@ -138,33 +28,6 @@ containertype = /obj/structure/closet/crate containername = "EFTPOS crate" -/datum/supply_packs/misc/cardboard_sheets - contains = list(/obj/item/stack/material/cardboard) - name = "50 cardboard sheets" - amount = 50 - cost = 10 - containertype = /obj/structure/closet/crate - containername = "Cardboard sheets crate" - -/datum/supply_packs/misc/carpet - name = "Imported carpet" - containertype = /obj/structure/closet/crate - containername = "Imported carpet crate" - cost = 15 - contains = list( - /obj/item/stack/tile/carpet, - /obj/item/stack/tile/carpet/blue - ) - amount = 50 - -/datum/supply_packs/misc/linoleum - name = "Linoleum" - containertype = /obj/structure/closet/crate - containername = "Linoleum crate" - cost = 15 - contains = list(/obj/item/stack/tile/linoleum) - amount = 50 - /datum/supply_packs/misc/witch name = "Witch costume" containername = "Witch costume" @@ -220,35 +83,6 @@ /obj/item/clothing/under/dress/dress_saloon ) -/datum/supply_packs/randomised/misc/exosuit_mod - num_contained = 1 - contains = list( - /obj/item/device/kit/paint/ripley, - /obj/item/device/kit/paint/ripley/death, - /obj/item/device/kit/paint/ripley/flames_red, - /obj/item/device/kit/paint/ripley/flames_blue - ) - name = "Random APLU modkit" - cost = 200 - containertype = /obj/structure/closet/crate - containername = "heavy crate" - -/datum/supply_packs/randomised/misc/exosuit_mod/durand - contains = list( - /obj/item/device/kit/paint/durand, - /obj/item/device/kit/paint/durand/seraph, - /obj/item/device/kit/paint/durand/phazon - ) - name = "Random Durand exosuit modkit" - -/datum/supply_packs/randomised/misc/exosuit_mod/gygax - contains = list( - /obj/item/device/kit/paint/gygax, - /obj/item/device/kit/paint/gygax/darkgygax, - /obj/item/device/kit/paint/gygax/recitence - ) - name = "Random Gygax exosuit modkit" - /datum/supply_packs/misc/chaplaingear name = "Chaplain equipment" contains = list( @@ -265,4 +99,85 @@ ) cost = 10 containertype = "/obj/structure/closet/crate" - containername = "Chaplain equipment crate" \ No newline at end of file + containername = "Chaplain equipment crate" + +/datum/supply_packs/misc/artscrafts + name = "Arts and Crafts supplies" + contains = list( + /obj/item/weapon/storage/fancy/crayons, + /obj/item/device/camera, + /obj/item/device/camera_film = 2, + /obj/item/weapon/storage/photo_album, + /obj/item/weapon/packageWrap, + /obj/item/weapon/reagent_containers/glass/paint/red, + /obj/item/weapon/reagent_containers/glass/paint/green, + /obj/item/weapon/reagent_containers/glass/paint/blue, + /obj/item/weapon/reagent_containers/glass/paint/yellow, + /obj/item/weapon/reagent_containers/glass/paint/purple, + /obj/item/weapon/reagent_containers/glass/paint/black, + /obj/item/weapon/reagent_containers/glass/paint/white, + /obj/item/weapon/contraband/poster, + /obj/item/weapon/wrapping_paper = 3 + ) + cost = 10 + containertype = "/obj/structure/closet/crate" + containername = "Arts and Crafts crate" + +/datum/supply_packs/misc/painters + name = "Station Painting Supplies" + cost = 10 + containername = "station painting supplies crate" + containertype = /obj/structure/closet/crate + contains = list( + /obj/item/device/pipe_painter = 2, + /obj/item/device/floor_painter = 2, + /obj/item/device/closet_painter = 2 + ) + +/datum/supply_packs/misc/hoverpod + name = "Hoverpod Shipment" + contains = list() + cost = 80 + containertype = /obj/structure/largecrate/hoverpod + containername = "Hoverpod Crate" + +/datum/supply_packs/randomised/misc/webbing + name = "Webbing crate" + num_contained = 4 + contains = list( + /obj/item/clothing/accessory/storage/black_vest, + /obj/item/clothing/accessory/storage/brown_vest, + /obj/item/clothing/accessory/storage/white_vest, + /obj/item/clothing/accessory/storage/black_drop_pouches, + /obj/item/clothing/accessory/storage/brown_drop_pouches, + /obj/item/clothing/accessory/storage/white_drop_pouches, + /obj/item/clothing/accessory/storage/webbing + ) + cost = 15 + containertype = "/obj/structure/closet/crate" + containername = "Webbing crate" + +/datum/supply_packs/atmos/internals + name = "Internals crate" + contains = list( + /obj/item/clothing/mask/gas = 3, + /obj/item/weapon/tank/air = 3 + ) + cost = 10 + containertype = /obj/structure/closet/crate/internals + containername = "Internals crate" + +/datum/supply_packs/atmos/evacuation + name = "Emergency equipment" + contains = list( + /obj/item/weapon/storage/toolbox/emergency = 2, + /obj/item/clothing/suit/storage/hazardvest = 2, + /obj/item/clothing/suit/storage/vest = 2, + /obj/item/weapon/tank/emergency_oxygen/engi = 4, + /obj/item/clothing/suit/space/emergency = 4, + /obj/item/clothing/head/helmet/space/emergency = 4, + /obj/item/clothing/mask/gas = 4 + ) + cost = 45 + containertype = /obj/structure/closet/crate/internals + containername = "Emergency crate" \ No newline at end of file diff --git a/code/datums/supplypacks/operations.dm b/code/datums/supplypacks/operations.dm deleted file mode 100644 index f64b21353e3..00000000000 --- a/code/datums/supplypacks/operations.dm +++ /dev/null @@ -1,75 +0,0 @@ -/* -* Here is where any supply packs -* related to operations live. -*/ -/datum/supply_packs/ops - group = "Operations" - -/datum/supply_packs/ops/mule - name = "Mulebot Crate" - contains = list() - cost = 20 - containertype = /obj/structure/largecrate/animal/mulebot - containername = "Mulebot Crate" - -/datum/supply_packs/ops/cargotrain - name = "Cargo Train Tug" - contains = list(/obj/vehicle/train/cargo/engine) - cost = 45 - containertype = /obj/structure/largecrate - containername = "Cargo Train Tug Crate" - -/datum/supply_packs/ops/cargotrailer - name = "Cargo Train Trolley" - contains = list(/obj/vehicle/train/cargo/trolley) - cost = 15 - containertype = /obj/structure/largecrate - containername = "Cargo Train Trolley Crate" - -/datum/supply_packs/ops/hoverpod - name = "Hoverpod Shipment" - contains = list() - cost = 80 - containertype = /obj/structure/largecrate/hoverpod - containername = "Hoverpod Crate" - -/datum/supply_packs/ops/artscrafts - name = "Arts and Crafts supplies" - contains = list( - /obj/item/weapon/storage/fancy/crayons, - /obj/item/device/camera, - /obj/item/device/camera_film = 2, - /obj/item/weapon/storage/photo_album, - /obj/item/weapon/packageWrap, - /obj/item/weapon/reagent_containers/glass/paint/red, - /obj/item/weapon/reagent_containers/glass/paint/green, - /obj/item/weapon/reagent_containers/glass/paint/blue, - /obj/item/weapon/reagent_containers/glass/paint/yellow, - /obj/item/weapon/reagent_containers/glass/paint/purple, - /obj/item/weapon/reagent_containers/glass/paint/black, - /obj/item/weapon/reagent_containers/glass/paint/white, - /obj/item/weapon/contraband/poster, - /obj/item/weapon/wrapping_paper = 3 - ) - cost = 10 - containertype = "/obj/structure/closet/crate" - containername = "Arts and Crafts crate" - -/datum/supply_packs/randomised/ops - group = "Operations" - -/datum/supply_packs/randomised/ops/webbing - name = "Webbing crate" - num_contained = 4 - contains = list( - /obj/item/clothing/accessory/storage/black_vest, - /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/clothing/accessory/storage/white_vest, - /obj/item/clothing/accessory/storage/black_drop_pouches, - /obj/item/clothing/accessory/storage/brown_drop_pouches, - /obj/item/clothing/accessory/storage/white_drop_pouches, - /obj/item/clothing/accessory/storage/webbing - ) - cost = 15 - containertype = "/obj/structure/closet/crate" - containername = "Webbing crate" \ No newline at end of file diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm new file mode 100644 index 00000000000..4a8c91714b5 --- /dev/null +++ b/code/datums/supplypacks/robotics.dm @@ -0,0 +1,103 @@ +/* +* Here is where any supply packs +* related to robotics tasks live. +*/ + +/datum/supply_packs/robotics + group = "Robotics" + +/datum/supply_packs/randomised/robotics + group = "Robotics" + access = access_robotics + +/datum/supply_packs/eng/robotics + name = "Robotics assembly crate" + contains = list( + /obj/item/device/assembly/prox_sensor = 3, + /obj/item/weapon/storage/toolbox/electrical, + /obj/item/device/flash = 4, + /obj/item/weapon/cell/high = 2 + ) + cost = 10 + containertype = /obj/structure/closet/crate/secure/gear + containername = "Robotics assembly" + access = access_robotics + +/datum/supply_packs/robotics/robolimbs_basic + name = "Basic robolimb blueprints" + contains = list( + /obj/item/weapon/disk/limb/morpheus, + /obj/item/weapon/disk/limb/xion + ) + cost = 15 + containertype = /obj/structure/closet/crate/secure/gear + containername = "Robolimb blueprints (basic)" + access = access_robotics + +/datum/supply_packs/robotics/robolimbs_adv + name = "All robolimb blueprints" + contains = list( + /obj/item/weapon/disk/limb/bishop, + /obj/item/weapon/disk/limb/hesphiastos, + /obj/item/weapon/disk/limb/morpheus, + /obj/item/weapon/disk/limb/veymed, + /obj/item/weapon/disk/limb/wardtakahashi, + /obj/item/weapon/disk/limb/xion, + /obj/item/weapon/disk/limb/zenghu, + ) + cost = 40 + containertype = /obj/structure/closet/crate/secure/gear + containername = "Robolimb blueprints (adv)" + access = access_robotics + +/datum/supply_packs/robotics/mecha_ripley + name = "Circuit Crate (\"Ripley\" APLU)" + contains = list( + /obj/item/weapon/book/manual/ripley_build_and_repair, + /obj/item/weapon/circuitboard/mecha/ripley/main, + /obj/item/weapon/circuitboard/mecha/ripley/peripherals + ) + cost = 30 + containertype = /obj/structure/closet/crate/secure + containername = "APLU \"Ripley\" Circuit Crate" + access = access_robotics + +/datum/supply_packs/robotics/mecha_odysseus + name = "Circuit Crate (\"Odysseus\")" + contains = list( + /obj/item/weapon/circuitboard/mecha/odysseus/peripherals, + /obj/item/weapon/circuitboard/mecha/odysseus/main + ) + cost = 25 + containertype = /obj/structure/closet/crate/secure + containername = "\"Odysseus\" Circuit Crate" + access = access_robotics + +/datum/supply_packs/randomised/robotics/exosuit_mod + num_contained = 1 + contains = list( + /obj/item/device/kit/paint/ripley, + /obj/item/device/kit/paint/ripley/death, + /obj/item/device/kit/paint/ripley/flames_red, + /obj/item/device/kit/paint/ripley/flames_blue + ) + name = "Random APLU modkit" + cost = 200 + containertype = /obj/structure/closet/crate + containername = "heavy crate" + +/datum/supply_packs/randomised/robotics/exosuit_mod/durand + contains = list( + /obj/item/device/kit/paint/durand, + /obj/item/device/kit/paint/durand/seraph, + /obj/item/device/kit/paint/durand/phazon + ) + name = "Random Durand exosuit modkit" + +/datum/supply_packs/randomised/robotics/exosuit_mod/gygax + contains = list( + /obj/item/device/kit/paint/gygax, + /obj/item/device/kit/paint/gygax/darkgygax, + /obj/item/device/kit/paint/gygax/recitence + ) + name = "Random Gygax exosuit modkit" \ No newline at end of file diff --git a/code/datums/supplypacks/science.dm b/code/datums/supplypacks/science.dm index 433caeff6f2..28187873b88 100644 --- a/code/datums/supplypacks/science.dm +++ b/code/datums/supplypacks/science.dm @@ -4,14 +4,6 @@ */ /datum/supply_packs/sci group = "Security" - -/datum/supply_packs/sci/virus - name = "Virus sample crate" - contains = list(/obj/item/weapon/virusdish/random = 4) - cost = 25 - containertype = "/obj/structure/closet/crate/secure" - containername = "Virus sample crate" - access = access_cmo /datum/supply_packs/sci/coolanttank name = "Coolant tank crate" @@ -20,29 +12,6 @@ containertype = /obj/structure/largecrate containername = "coolant tank crate" -/datum/supply_packs/sci/mecha_ripley - name = "Circuit Crate (\"Ripley\" APLU)" - contains = list( - /obj/item/weapon/book/manual/ripley_build_and_repair, - /obj/item/weapon/circuitboard/mecha/ripley/main, - /obj/item/weapon/circuitboard/mecha/ripley/peripherals - ) - cost = 30 - containertype = /obj/structure/closet/crate/secure - containername = "APLU \"Ripley\" Circuit Crate" - access = access_robotics - -/datum/supply_packs/sci/mecha_odysseus - name = "Circuit Crate (\"Odysseus\")" - contains = list( - /obj/item/weapon/circuitboard/mecha/odysseus/peripherals, - /obj/item/weapon/circuitboard/mecha/odysseus/main - ) - cost = 25 - containertype = /obj/structure/closet/crate/secure - containername = "\"Odysseus\" Circuit Crate" - access = access_robotics - /datum/supply_packs/sci/phoron name = "Phoron assembly crate" contains = list( @@ -54,4 +23,19 @@ cost = 10 containertype = /obj/structure/closet/crate/secure/phoron containername = "Phoron assembly crate" - access = access_tox_storage \ No newline at end of file + access = access_tox_storage + +/datum/supply_packs/sci/exoticseeds + name = "Exotic seeds crate" + contains = list( + /obj/item/seeds/replicapod = 2, + /obj/item/seeds/libertymycelium, + /obj/item/seeds/reishimycelium, + /obj/item/seeds/random = 6, + /obj/item/seeds/kudzuseed + ) + cost = 15 + containertype = /obj/structure/closet/crate/hydroponics + containername = "Exotic Seeds crate" + access = access_hydroponics + diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index cc730151218..909c2bb84fe 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -5,54 +5,11 @@ /datum/supply_packs/security group = "Security" access = access_security - -/datum/supply_packs/security/beanbagammo - name = "Beanbag shells" - contains = list(/obj/item/weapon/storage/box/beanbags = 3) - cost = 30 - containertype = /obj/structure/closet/crate - containername = "Beanbag shells" - access = null - -/datum/supply_packs/security/weapons - name = "Weapons crate" - contains = list( - /obj/item/weapon/melee/baton = 2, - /obj/item/weapon/gun/energy/gun = 2, - /obj/item/weapon/gun/energy/taser = 2, - /obj/item/weapon/gun/projectile/colt/detective = 2, - /obj/item/weapon/storage/box/flashbangs = 2 - ) - cost = 40 - containertype = /obj/structure/closet/crate/secure/weapon - containername = "Weapons crate" - -/datum/supply_packs/security/flareguns - name = "Flare guns crate" - contains = list( - /obj/item/weapon/gun/projectile/sec/flash, - /obj/item/ammo_magazine/c45m/flash, - /obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare, - /obj/item/weapon/storage/box/flashshells - ) - cost = 25 - containertype = /obj/structure/closet/crate/secure/weapon - containername = "Flare gun crate" - -/datum/supply_packs/security/eweapons - name = "Experimental weapons crate" - contains = list( - /obj/item/weapon/gun/energy/xray = 2, - /obj/item/weapon/shield/energy = 2) - cost = 125 - containertype = /obj/structure/closet/crate/secure/weapon - containername = "Experimental weapons crate" - access = access_armory /datum/supply_packs/randomised/security group = "Security" access = access_security - + /datum/supply_packs/randomised/security/armor num_contained = 5 contains = list( @@ -73,7 +30,7 @@ cost = 40 containertype = /obj/structure/closet/crate/secure containername = "Armor crate" - + /datum/supply_packs/security/riot_gear name = "Riot gear crate" contains = list( @@ -101,7 +58,7 @@ containertype = /obj/structure/closet/crate/secure containername = "riot armor set crate" access = access_armory - + /datum/supply_packs/security/ablative_armor name = "Ablative armor set crate" contains = list( @@ -114,7 +71,7 @@ containertype = /obj/structure/closet/crate/secure containername = "ablative armor set crate" access = access_armory - + /datum/supply_packs/security/bullet_resistant_armor name = "Bullet resistant armor set crate" contains = list( @@ -127,7 +84,7 @@ containertype = /obj/structure/closet/crate/secure containername = "bullet resistant armor set crate" access = access_armory - + /datum/supply_packs/security/combat_armor name = "Combat armor set crate" contains = list( @@ -140,7 +97,7 @@ containertype = /obj/structure/closet/crate/secure containername = "combat armor set crate" access = access_armory - + /datum/supply_packs/security/tactical name = "Tactical suits" containertype = /obj/structure/closet/crate/secure @@ -165,90 +122,7 @@ /obj/item/clothing/shoes/jackboots, /obj/item/clothing/gloves/black ) - -/datum/supply_packs/security/energyweapons - name = "Energy weapons crate" - contains = list(/obj/item/weapon/gun/energy/laser = 3) - cost = 50 - containertype = /obj/structure/closet/crate/secure - containername = "energy weapons crate" - access = access_armory - -/datum/supply_packs/security/shotgun - name = "Shotgun crate" - contains = list( - /obj/item/weapon/storage/box/shotgunammo, - /obj/item/weapon/storage/box/shotgunshells, - /obj/item/weapon/gun/projectile/shotgun/pump/combat = 2 - ) - cost = 65 - containertype = /obj/structure/closet/crate/secure - containername = "Shotgun crate" - access = access_armory - -/datum/supply_packs/security/erifle - name = "Energy marksman crate" - contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2) - cost = 90 - containertype = /obj/structure/closet/crate/secure - containername = "Energy marksman crate" - access = access_armory - -/datum/supply_packs/security/shotgunammo - name = "Ballistic ammunition crate" - contains = list( - /obj/item/weapon/storage/box/shotgunammo = 2, - /obj/item/weapon/storage/box/shotgunshells = 2 - ) - cost = 60 - containertype = /obj/structure/closet/crate/secure - containername = "ballistic ammunition crate" - access = access_armory - -/datum/supply_packs/security/ionweapons - name = "Electromagnetic weapons crate" - contains = list( - /obj/item/weapon/gun/energy/ionrifle = 2, - /obj/item/weapon/storage/box/emps - ) - cost = 50 - containertype = /obj/structure/closet/crate/secure - containername = "electromagnetic weapons crate" - access = access_armory - -/datum/supply_packs/randomised/security/automatic - name = "Automatic weapon crate" - num_contained = 2 - contains = list( - /obj/item/weapon/gun/projectile/automatic/wt550, - /obj/item/weapon/gun/projectile/automatic/z8 - ) - cost = 90 - containertype = /obj/structure/closet/crate/secure - containername = "Automatic weapon crate" - access = access_armory - -/datum/supply_packs/randomised/security/autoammo - name = "Automatic weapon ammunition crate" - num_contained = 6 - contains = list( - /obj/item/ammo_magazine/mc9mmt, - /obj/item/ammo_magazine/mc9mmt/rubber, - /obj/item/ammo_magazine/a556 - ) - cost = 20 - containertype = /obj/structure/closet/crate/secure - containername = "Automatic weapon ammunition crate" - access = access_armory - -/datum/supply_packs/security/energy_guns - name = "energy guns crate" - contains = list(/obj/item/weapon/gun/energy/gun = 2) - cost = 50 - containertype = /obj/structure/closet/crate/secure - containername = "energy guns crate" - access = access_armory - + /datum/supply_packs/security/securitybarriers name = "Security barrier crate" contains = list(/obj/machinery/deployable/barrier = 4) @@ -256,7 +130,7 @@ containertype = /obj/structure/closet/crate/secure/gear containername = "Security barrier crate" access = null - + /datum/supply_packs/security/securityshieldgen name = "Wall shield Generators" contains = list(/obj/machinery/shieldwallgen = 4) @@ -264,20 +138,7 @@ containertype = /obj/structure/closet/crate/secure containername = "wall shield generators crate" access = access_teleporter - -/datum/supply_packs/security/voidsuits - name = "Security voidsuits" - contains = list( - /obj/item/clothing/suit/space/void/security = 2, - /obj/item/clothing/head/helmet/space/void/security = 2, - /obj/item/clothing/mask/breath = 2, - /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 - ) - cost = 55 - containertype = "/obj/structure/closet/crate/secure" - containername = "Security voidsuit crate" - + /datum/supply_packs/randomised/security/holster name = "Holster crate" num_contained = 4 @@ -290,7 +151,7 @@ cost = 15 containertype = "/obj/structure/closet/crate/secure" containername = "Holster crate" - + /datum/supply_packs/security/extragear name = "Security surplus equipment" contains = list( @@ -303,7 +164,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Security surplus equipment" access = null - + /datum/supply_packs/security/detectivegear name = "Forensic investigation equipment" contains = list( @@ -330,7 +191,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Forensic equipment" access = access_forensics_lockers - + /datum/supply_packs/security/detectiveclothes name = "Investigation apparel" contains = list( @@ -351,7 +212,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Investigation clothing" access = access_forensics_lockers - + /datum/supply_packs/security/officergear name = "Officer equipment" contains = list( @@ -381,7 +242,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Officer equipment" access = access_brig - + /datum/supply_packs/security/wardengear name = "Warden equipment" contains = list( @@ -409,7 +270,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Warden equipment" access = access_armory - + /datum/supply_packs/security/headofsecgear name = "Head of security equipment" contains = list( @@ -435,7 +296,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Head of security equipment" access = access_hos - + /datum/supply_packs/security/securityclothing name = "Security uniform crate" contains = list( @@ -454,7 +315,7 @@ cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Security uniform crate" - + /datum/supply_packs/security/navybluesecurityclothing name = "Navy blue security uniform crate" contains = list( @@ -475,7 +336,7 @@ cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Navy blue security uniform crate" - + /datum/supply_packs/security/corporatesecurityclothing name = "Corporate security uniform crate" contains = list( @@ -495,7 +356,7 @@ cost = 20 containertype = "/obj/structure/closet/crate/secure" containername = "Corporate security uniform crate" - + /datum/supply_packs/security/biosuit name = "Security biohazard gear" contains = list( @@ -510,17 +371,3 @@ cost = 35 containertype = "/obj/structure/closet/crate/secure" containername = "Security biohazard gear" - -/datum/supply_packs/security/bolt_rifles_competitive - name = "Competitive shooting crate" - contains = list( - /obj/item/device/assembly/timer, - /obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice = 2, - /obj/item/ammo_magazine/clip/a762/practice = 4, - /obj/item/target = 2, - /obj/item/target/alien = 2, - /obj/item/target/syndicate = 2 - ) - cost = 40 - containertype = /obj/structure/closet/crate/secure/weapon - containername = "Weapons crate" \ No newline at end of file diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index a8c207e2933..ec3841a58dc 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -3,7 +3,7 @@ * related to civilian tasks live */ /datum/supply_packs/supply - group = "Supply" + group = "Supplies" /datum/supply_packs/supply/food @@ -19,14 +19,14 @@ cost = 10 containertype = /obj/structure/closet/crate/freezer containername = "Food crate" - + /datum/supply_packs/supply/toner name = "Toner cartridges" contains = list(/obj/item/device/toner = 6) cost = 10 containertype = /obj/structure/closet/crate containername = "Toner cartridges" - + /datum/supply_packs/supply/janitor name = "Janitorial supplies" contains = list( @@ -49,14 +49,14 @@ cost = 10 containertype = /obj/structure/closet/crate containername = "Janitorial supplies" - + /datum/supply_packs/supply/boxes name = "Empty boxes" contains = list(/obj/item/weapon/storage/box = 10) cost = 10 containertype = "/obj/structure/closet/crate" containername = "Empty box crate" - + /datum/supply_packs/supply/bureaucracy contains = list( /obj/item/weapon/clipboard = 2, @@ -76,28 +76,14 @@ cost = 15 containertype = /obj/structure/closet/crate containername = "Office supplies crate" - - + /datum/supply_packs/supply/spare_pda name = "Spare PDAs" cost = 10 containertype = /obj/structure/closet/crate containername = "Spare PDA crate" contains = list(/obj/item/device/pda = 3) - -/datum/supply_packs/supply/voidsuits - name = "Mining voidsuits" - contains = list( - /obj/item/clothing/suit/space/void/mining = 2, - /obj/item/clothing/head/helmet/space/void/mining = 2, - /obj/item/clothing/mask/breath = 2, - /obj/item/weapon/tank/oxygen = 2 - ) - cost = 35 - containertype = "/obj/structure/closet/crate/secure" - containername = "Mining voidsuit crate" - access = access_mining - + /datum/supply_packs/supply/minergear name = "Shaft miner equipment" contains = list( @@ -120,4 +106,25 @@ cost = 15 containertype = "/obj/structure/closet/crate/secure" containername = "Shaft miner equipment" - access = access_mining \ No newline at end of file + access = access_mining + +/datum/supply_packs/supply/mule + name = "Mulebot Crate" + contains = list() + cost = 20 + containertype = /obj/structure/largecrate/animal/mulebot + containername = "Mulebot Crate" + +/datum/supply_packs/supply/cargotrain + name = "Cargo Train Tug" + contains = list(/obj/vehicle/train/cargo/engine) + cost = 45 + containertype = /obj/structure/largecrate + containername = "Cargo Train Tug Crate" + +/datum/supply_packs/supply/cargotrailer + name = "Cargo Train Trolley" + contains = list(/obj/vehicle/train/cargo/trolley) + cost = 15 + containertype = /obj/structure/largecrate + containername = "Cargo Train Trolley Crate" \ No newline at end of file diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm new file mode 100644 index 00000000000..f246bfd78f5 --- /dev/null +++ b/code/datums/supplypacks/voidsuits.dm @@ -0,0 +1,75 @@ +/* +* Here is where any supply packs +* related to voidsuits live. +*/ + +/datum/supply_packs/voidsuits + group = "Voidsuits" + +/datum/supply_packs/voidsuits/atmos + name = "Atmospheric voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/atmos = 2, + /obj/item/clothing/head/helmet/space/void/atmos = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/weapon/tank/oxygen = 2, + ) + cost = 45 + containertype = "/obj/structure/closet/crate/secure" + containername = "Atmospheric voidsuit crate" + access = access_atmospherics + +/datum/supply_packs/voidsuits/engineering + name = "Engineering voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/engineering = 2, + /obj/item/clothing/head/helmet/space/void/engineering = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/weapon/tank/oxygen = 2 + ) + cost = 40 + containertype = "/obj/structure/closet/crate/secure" + containername = "Engineering voidsuit crate" + access = access_engine_equip + +/datum/supply_packs/voidsuits/medical + name = "Medical voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/medical = 2, + /obj/item/clothing/head/helmet/space/void/medical = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/weapon/tank/oxygen = 2 + ) + cost = 40 + containertype = "/obj/structure/closet/crate/secure" + containername = "Medical voidsuit crate" + access = access_medical_equip + +/datum/supply_packs/voidsuits/security + name = "Security voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/security = 2, + /obj/item/clothing/head/helmet/space/void/security = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/weapon/tank/oxygen = 2 + ) + cost = 55 + containertype = "/obj/structure/closet/crate/secure" + containername = "Security voidsuit crate" + +/datum/supply_packs/voidsuits/supply + name = "Mining voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/mining = 2, + /obj/item/clothing/head/helmet/space/void/mining = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/weapon/tank/oxygen = 2 + ) + cost = 35 + containertype = "/obj/structure/closet/crate/secure" + containername = "Mining voidsuit crate" + access = access_mining \ No newline at end of file diff --git a/code/datums/supplypacks/weaponry.dm b/code/datums/supplypacks/weaponry.dm new file mode 100644 index 00000000000..ad86a4c50d8 --- /dev/null +++ b/code/datums/supplypacks/weaponry.dm @@ -0,0 +1,119 @@ +/* +* Here is where any supply packs +* related to weapons live. +*/ + +/datum/supply_packs/weaponry + group = "Weaponry" + +/datum/supply_packs/randomised/weaponry + group = "Weaponry" + access = access_security + +/datum/supply_packs/weaponry/weapons + name = "Weapons crate" + contains = list( + /obj/item/weapon/melee/baton = 2, + /obj/item/weapon/gun/energy/gun = 2, + /obj/item/weapon/gun/energy/taser = 2, + /obj/item/weapon/gun/projectile/colt/detective = 2, + /obj/item/weapon/storage/box/flashbangs = 2 + ) + cost = 40 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Weapons crate" + +/datum/supply_packs/weaponry/flareguns + name = "Flare guns crate" + contains = list( + /obj/item/weapon/gun/projectile/sec/flash, + /obj/item/ammo_magazine/c45m/flash, + /obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare, + /obj/item/weapon/storage/box/flashshells + ) + cost = 25 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Flare gun crate" + +/datum/supply_packs/weaponry/eweapons + name = "Experimental weapons crate" + contains = list( + /obj/item/weapon/gun/energy/xray = 2, + /obj/item/weapon/shield/energy = 2) + cost = 125 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Experimental weapons crate" + access = access_armory + +/datum/supply_packs/weaponry/energyweapons + name = "Energy weapons crate" + contains = list(/obj/item/weapon/gun/energy/laser = 3) + cost = 50 + containertype = /obj/structure/closet/crate/secure + containername = "energy weapons crate" + access = access_armory + +/datum/supply_packs/weaponry/shotgun + name = "Shotgun crate" + contains = list( + /obj/item/weapon/storage/box/shotgunammo, + /obj/item/weapon/storage/box/shotgunshells, + /obj/item/weapon/gun/projectile/shotgun/pump/combat = 2 + ) + cost = 65 + containertype = /obj/structure/closet/crate/secure + containername = "Shotgun crate" + access = access_armory + +/datum/supply_packs/weaponry/erifle + name = "Energy marksman crate" + contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2) + cost = 90 + containertype = /obj/structure/closet/crate/secure + containername = "Energy marksman crate" + access = access_armory + +/datum/supply_packs/weaponry/ionweapons + name = "Electromagnetic weapons crate" + contains = list( + /obj/item/weapon/gun/energy/ionrifle = 2, + /obj/item/weapon/storage/box/emps + ) + cost = 50 + containertype = /obj/structure/closet/crate/secure + containername = "electromagnetic weapons crate" + access = access_armory + +/datum/supply_packs/randomised/weaponry/automatic + name = "Automatic weapon crate" + num_contained = 2 + contains = list( + /obj/item/weapon/gun/projectile/automatic/wt550, + /obj/item/weapon/gun/projectile/automatic/z8 + ) + cost = 90 + containertype = /obj/structure/closet/crate/secure + containername = "Automatic weapon crate" + access = access_armory + +/datum/supply_packs/weaponry/energy_guns + name = "energy guns crate" + contains = list(/obj/item/weapon/gun/energy/gun = 2) + cost = 50 + containertype = /obj/structure/closet/crate/secure + containername = "energy guns crate" + access = access_armory + +/datum/supply_packs/weaponry/bolt_rifles_competitive + name = "Competitive shooting crate" + contains = list( + /obj/item/device/assembly/timer, + /obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice = 2, + /obj/item/ammo_magazine/clip/a762/practice = 4, + /obj/item/target = 2, + /obj/item/target/alien = 2, + /obj/item/target/syndicate = 2 + ) + cost = 40 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Weapons crate" \ No newline at end of file diff --git a/polaris.dme b/polaris.dme index fd5b2e63e43..42a3f64e9ef 100644 --- a/polaris.dme +++ b/polaris.dme @@ -195,18 +195,23 @@ #include "code\datums\repositories\cameras.dm" #include "code\datums\repositories\crew.dm" #include "code\datums\repositories\repository.dm" +#include "code\datums\supplypacks\ammunition.dm" #include "code\datums\supplypacks\atmospherics.dm" #include "code\datums\supplypacks\contraband.dm" +#include "code\datums\supplypacks\costumes.dm" #include "code\datums\supplypacks\engineering.dm" #include "code\datums\supplypacks\hospitality.dm" #include "code\datums\supplypacks\hydroponics.dm" +#include "code\datums\supplypacks\materials.dm" #include "code\datums\supplypacks\medical.dm" #include "code\datums\supplypacks\misc.dm" -#include "code\datums\supplypacks\operations.dm" +#include "code\datums\supplypacks\robotics.dm" #include "code\datums\supplypacks\science.dm" #include "code\datums\supplypacks\security.dm" #include "code\datums\supplypacks\supply.dm" #include "code\datums\supplypacks\supplypacks.dm" +#include "code\datums\supplypacks\voidsuits.dm" +#include "code\datums\supplypacks\weaponry.dm" #include "code\datums\underwear\bottom.dm" #include "code\datums\underwear\socks.dm" #include "code\datums\underwear\top.dm"