diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 9c6ed8e88b..37fe9c0977 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -31,12 +31,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/specialops
name = "Special Ops supplies"
- contains = list(/obj/item/weapon/storage/box/emps,
- /obj/item/weapon/grenade/smokebomb,
- /obj/item/weapon/grenade/smokebomb,
- /obj/item/weapon/grenade/smokebomb,
- /obj/item/weapon/pen/reagent/paralysis,
- /obj/item/weapon/grenade/chem_grenade/incendiary)
+ contains = list(
+ /obj/item/weapon/storage/box/emps,
+ /obj/item/weapon/grenade/smokebomb = 3,
+ /obj/item/weapon/pen/reagent/paralysis,
+ /obj/item/weapon/grenade/chem_grenade/incendiary
+ )
cost = 20
containertype = /obj/structure/closet/crate
containername = "Special Ops crate"
@@ -45,13 +45,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/forensics
name = "Auxiliary forensic tools"
- contains = list(/obj/item/weapon/forensics/sample_kit,
- /obj/item/weapon/forensics/sample_kit/powder,
- /obj/item/weapon/storage/box/swabs,
- /obj/item/weapon/storage/box/swabs,
- /obj/item/weapon/storage/box/swabs,
- /obj/item/device/uv_light,
- /obj/item/weapon/reagent_containers/spray/luminol)
+ contains = list(
+ /obj/item/weapon/forensics/sample_kit,
+ /obj/item/weapon/forensics/sample_kit/powder,
+ /obj/item/weapon/storage/box/swabs = 3,
+ /obj/item/device/uv_light,
+ /obj/item/weapon/reagent_containers/spray/luminol
+ )
cost = 30
containertype = /obj/structure/closet/crate
containername = "Auxiliary forensic tools"
@@ -59,18 +59,14 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/food
name = "Kitchen supply crate"
- contains = list(/obj/item/weapon/reagent_containers/food/condiment/flour,
- /obj/item/weapon/reagent_containers/food/condiment/flour,
- /obj/item/weapon/reagent_containers/food/condiment/flour,
- /obj/item/weapon/reagent_containers/food/condiment/flour,
- /obj/item/weapon/reagent_containers/food/drinks/milk,
- /obj/item/weapon/reagent_containers/food/drinks/milk,
- /obj/item/weapon/storage/fancy/egg_box,
- /obj/item/weapon/reagent_containers/food/snacks/tofu,
- /obj/item/weapon/reagent_containers/food/snacks/tofu,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/meat
- )
+ contains = list(
+ /obj/item/weapon/reagent_containers/food/condiment/flour = 6,
+ /obj/item/weapon/reagent_containers/food/drinks/milk = 3,
+ /obj/item/weapon/reagent_containers/food/drinks/soymilk = 2,
+ /obj/item/weapon/storage/fancy/egg_box = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/tofu = 4,
+ /obj/item/weapon/reagent_containers/food/snacks/meat = 4
+ )
cost = 10
containertype = /obj/structure/closet/crate/freezer
containername = "Food crate"
@@ -110,9 +106,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/beanbagammo
name = "Beanbag shells"
- contains = list(/obj/item/weapon/storage/box/beanbags,
- /obj/item/weapon/storage/box/beanbags,
- /obj/item/weapon/storage/box/beanbags)
+ contains = list(/obj/item/weapon/storage/box/beanbags = 3)
cost = 30
containertype = /obj/structure/closet/crate
containername = "Beanbag shells"
@@ -120,12 +114,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/toner
name = "Toner cartridges"
- contains = list(/obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner,
- /obj/item/device/toner)
+ contains = list(/obj/item/device/toner = 6)
cost = 10
containertype = /obj/structure/closet/crate
containername = "Toner cartridges"
@@ -133,20 +122,18 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/party
name = "Party equipment"
- contains = list(/obj/item/weapon/storage/box/drinkingglasses,
- /obj/item/weapon/reagent_containers/food/drinks/shaker,
- /obj/item/weapon/reagent_containers/food/drinks/flask/barflask,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey,
- /obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
- /obj/item/weapon/lipstick/random,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer)
+ contains = list(
+ /obj/item/weapon/storage/box/drinkingglasses,
+ /obj/item/weapon/reagent_containers/food/drinks/shaker,
+ /obj/item/weapon/reagent_containers/food/drinks/flask/barflask,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey,
+ /obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
+ /obj/item/weapon/lipstick/random,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4
+ )
cost = 20
containertype = /obj/structure/closet/crate
containername = "Party equipment"
@@ -154,10 +141,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/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)
+ 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"
group = "Hospitality"
@@ -165,12 +154,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/internals
name = "Internals crate"
- contains = list(/obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/weapon/tank/air,
- /obj/item/weapon/tank/air,
- /obj/item/weapon/tank/air)
+ 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"
@@ -178,29 +165,15 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/evacuation
name = "Emergency equipment"
- contains = list(/obj/item/weapon/storage/toolbox/emergency,
- /obj/item/weapon/storage/toolbox/emergency,
- /obj/item/clothing/suit/storage/hazardvest,
- /obj/item/clothing/suit/storage/hazardvest,
- /obj/item/clothing/suit/storage/vest,
- /obj/item/clothing/suit/storage/vest,
- /obj/item/weapon/tank/emergency_oxygen/engi,
- /obj/item/weapon/tank/emergency_oxygen/engi,
- /obj/item/weapon/tank/emergency_oxygen/engi,
- /obj/item/weapon/tank/emergency_oxygen/engi,
- /obj/item/clothing/suit/space/emergency,
- /obj/item/clothing/suit/space/emergency,
- /obj/item/clothing/suit/space/emergency,
- /obj/item/clothing/suit/space/emergency,
- /obj/item/clothing/head/helmet/space/emergency,
- /obj/item/clothing/head/helmet/space/emergency,
- /obj/item/clothing/head/helmet/space/emergency,
- /obj/item/clothing/head/helmet/space/emergency,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas)
+ 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"
@@ -209,9 +182,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/inflatable
name = "Inflatable barriers"
- contains = list(/obj/item/weapon/storage/briefcase/inflatable,
- /obj/item/weapon/storage/briefcase/inflatable,
- /obj/item/weapon/storage/briefcase/inflatable)
+ contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3)
cost = 20
containertype = /obj/structure/closet/crate
containername = "Inflatable Barrier Crate"
@@ -219,26 +190,23 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/janitor
name = "Janitorial supplies"
- contains = list(/obj/item/weapon/reagent_containers/glass/bucket,
- /obj/item/weapon/mop,
- /obj/item/clothing/under/rank/janitor,
- /obj/item/weapon/cartridge/janitor,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/head/soft/purple,
- /obj/item/weapon/storage/belt/janitor,
- /obj/item/clothing/shoes/galoshes,
- /obj/item/weapon/caution,
- /obj/item/weapon/caution,
- /obj/item/weapon/caution,
- /obj/item/weapon/caution,
- /obj/item/weapon/storage/bag/trash,
- /obj/item/device/lightreplacer,
- /obj/item/weapon/reagent_containers/spray/cleaner,
- /obj/item/weapon/reagent_containers/glass/rag,
- /obj/item/weapon/grenade/chem_grenade/cleaner,
- /obj/item/weapon/grenade/chem_grenade/cleaner,
- /obj/item/weapon/grenade/chem_grenade/cleaner,
- /obj/structure/mopbucket)
+ contains = list(
+ /obj/item/weapon/reagent_containers/glass/bucket,
+ /obj/item/weapon/mop,
+ /obj/item/clothing/under/rank/janitor,
+ /obj/item/weapon/cartridge/janitor,
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/head/soft/purple,
+ /obj/item/weapon/storage/belt/janitor,
+ /obj/item/clothing/shoes/galoshes,
+ /obj/item/weapon/caution = 4,
+ /obj/item/weapon/storage/bag/trash,
+ /obj/item/device/lightreplacer,
+ /obj/item/weapon/reagent_containers/spray/cleaner,
+ /obj/item/weapon/reagent_containers/glass/rag,
+ /obj/item/weapon/grenade/chem_grenade/cleaner = 3,
+ /obj/structure/mopbucket
+ )
cost = 10
containertype = /obj/structure/closet/crate
containername = "Janitorial supplies"
@@ -246,9 +214,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/lightbulbs
name = "Replacement lights"
- contains = list(/obj/item/weapon/storage/box/lights/mixed,
- /obj/item/weapon/storage/box/lights/mixed,
- /obj/item/weapon/storage/box/lights/mixed)
+ contains = list(/obj/item/weapon/storage/box/lights/mixed = 3)
cost = 10
containertype = /obj/structure/closet/crate
containername = "Replacement lights"
@@ -256,10 +222,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/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)
+ 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"
@@ -268,15 +236,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/foam_weapons
name = "Foam Weapon Crate"
contains = list(
- /obj/item/weapon/material/sword/foam,
- /obj/item/weapon/material/sword/foam,
- /obj/item/weapon/material/twohanded/baseballbat/foam,
- /obj/item/weapon/material/twohanded/baseballbat/foam,
- /obj/item/weapon/material/twohanded/spear/foam,
- /obj/item/weapon/material/twohanded/spear/foam,
- /obj/item/weapon/material/twohanded/fireaxe/foam,
- /obj/item/weapon/material/twohanded/fireaxe/foam
- )
+ /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"
@@ -314,29 +278,25 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "Corgi Crate"
group = "Hydroponics"
-/datum/supply_packs/hydroponics // -- Skie
+/datum/supply_packs/hydroponics
name = "Hydroponics Supply Crate"
- contains = list(/obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/glass/bottle/ammonia,
- /obj/item/weapon/reagent_containers/glass/bottle/ammonia,
- /obj/item/weapon/material/hatchet,
- /obj/item/weapon/material/minihoe,
- /obj/item/device/analyzer/plant_analyzer,
- /obj/item/clothing/gloves/botanic_leather,
- /obj/item/clothing/suit/apron,
- /obj/item/weapon/material/minihoe,
- /obj/item/weapon/storage/box/botanydisk
- ) // Updated with new things
+ contains = list(
+ /obj/item/weapon/reagent_containers/spray/plantbgone = 4,
+ /obj/item/weapon/reagent_containers/glass/bottle/ammonia = 2,
+ /obj/item/weapon/material/hatchet,
+ /obj/item/weapon/material/minihoe,
+ /obj/item/device/analyzer/plant_analyzer,
+ /obj/item/clothing/gloves/botanic_leather,
+ /obj/item/clothing/suit/apron,
+ /obj/item/weapon/material/minihoe,
+ /obj/item/weapon/storage/box/botanydisk
+ )
cost = 15
containertype = /obj/structure/closet/crate/hydroponics
containername = "Hydroponics crate"
access = access_hydroponics
group = "Hydroponics"
-//farm animals - useless and annoying, but potentially a good source of food
/datum/supply_packs/cow
name = "Cow crate"
cost = 30
@@ -363,23 +323,25 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/seeds
name = "Seeds crate"
- contains = list(/obj/item/seeds/chiliseed,
- /obj/item/seeds/berryseed,
- /obj/item/seeds/cornseed,
- /obj/item/seeds/eggplantseed,
- /obj/item/seeds/tomatoseed,
- /obj/item/seeds/appleseed,
- /obj/item/seeds/soyaseed,
- /obj/item/seeds/wheatseed,
- /obj/item/seeds/carrotseed,
- /obj/item/seeds/harebell,
- /obj/item/seeds/lemonseed,
- /obj/item/seeds/orangeseed,
- /obj/item/seeds/grassseed,
- /obj/item/seeds/sunflowerseed,
- /obj/item/seeds/chantermycelium,
- /obj/item/seeds/potatoseed,
- /obj/item/seeds/sugarcaneseed)
+ contains = list(
+ /obj/item/seeds/chiliseed,
+ /obj/item/seeds/berryseed,
+ /obj/item/seeds/cornseed,
+ /obj/item/seeds/eggplantseed,
+ /obj/item/seeds/tomatoseed,
+ /obj/item/seeds/appleseed,
+ /obj/item/seeds/soyaseed,
+ /obj/item/seeds/wheatseed,
+ /obj/item/seeds/carrotseed,
+ /obj/item/seeds/harebell,
+ /obj/item/seeds/lemonseed,
+ /obj/item/seeds/orangeseed,
+ /obj/item/seeds/grassseed,
+ /obj/item/seeds/sunflowerseed,
+ /obj/item/seeds/chantermycelium,
+ /obj/item/seeds/potatoseed,
+ /obj/item/seeds/sugarcaneseed
+ )
cost = 10
containertype = /obj/structure/closet/crate/hydroponics
containername = "Seeds crate"
@@ -388,16 +350,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/weedcontrol
name = "Weed control crate"
- contains = list(/obj/item/weapon/material/hatchet,
- /obj/item/weapon/material/hatchet,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/weapon/reagent_containers/spray/plantbgone,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/weapon/grenade/chem_grenade/antiweed,
- /obj/item/weapon/grenade/chem_grenade/antiweed)
+ contains = list(
+ /obj/item/weapon/material/hatchet = 2,
+ /obj/item/weapon/reagent_containers/spray/plantbgone = 4,
+ /obj/item/clothing/mask/gas = 2,
+ /obj/item/weapon/grenade/chem_grenade/antiweed = 2
+ )
cost = 25
containertype = /obj/structure/closet/crate/hydroponics
containername = "Weed control crate"
@@ -406,17 +364,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/exoticseeds
name = "Exotic seeds crate"
- contains = list(/obj/item/seeds/replicapod,
- /obj/item/seeds/replicapod,
- /obj/item/seeds/libertymycelium,
- /obj/item/seeds/reishimycelium,
- /obj/item/seeds/random,
- /obj/item/seeds/random,
- /obj/item/seeds/random,
- /obj/item/seeds/random,
- /obj/item/seeds/random,
- /obj/item/seeds/random,
- /obj/item/seeds/kudzuseed)
+ 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"
@@ -425,16 +379,18 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/medical
name = "Medical crate"
- contains = list(/obj/item/weapon/storage/firstaid/regular,
- /obj/item/weapon/storage/firstaid/fire,
- /obj/item/weapon/storage/firstaid/toxin,
- /obj/item/weapon/storage/firstaid/o2,
- /obj/item/weapon/storage/firstaid/adv,
- /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
- /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
- /obj/item/weapon/reagent_containers/glass/bottle/stoxin,
- /obj/item/weapon/storage/box/syringes,
- /obj/item/weapon/storage/box/autoinjectors)
+ contains = list(
+ /obj/item/weapon/storage/firstaid/regular,
+ /obj/item/weapon/storage/firstaid/fire,
+ /obj/item/weapon/storage/firstaid/toxin,
+ /obj/item/weapon/storage/firstaid/o2,
+ /obj/item/weapon/storage/firstaid/adv,
+ /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
+ /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
+ /obj/item/weapon/reagent_containers/glass/bottle/stoxin,
+ /obj/item/weapon/storage/box/syringes,
+ /obj/item/weapon/storage/box/autoinjectors
+ )
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "Medical crate"
@@ -442,9 +398,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bloodpack
name = "BloodPack crate"
- contains = list(/obj/item/weapon/storage/box/bloodpacks,
- /obj/item/weapon/storage/box/bloodpacks,
- /obj/item/weapon/storage/box/bloodpacks)
+ contains = list(/obj/item/weapon/storage/box/bloodpacks = 3)
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "BloodPack crate"
@@ -452,9 +406,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bodybag
name = "Body bag crate"
- contains = list(/obj/item/weapon/storage/box/bodybags,
- /obj/item/weapon/storage/box/bodybags,
- /obj/item/weapon/storage/box/bodybags)
+ contains = list(/obj/item/weapon/storage/box/bodybags = 3)
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "Body bag crate"
@@ -462,9 +414,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/cryobag
name = "Stasis bag crate"
- contains = list(/obj/item/bodybag/cryobag,
- /obj/item/bodybag/cryobag,
- /obj/item/bodybag/cryobag)
+ contains = list(/obj/item/bodybag/cryobag = 3)
cost = 50
containertype = /obj/structure/closet/crate/medical
containername = "Stasis bag crate"
@@ -472,22 +422,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/virus
name = "Virus sample crate"
-/* contains = list(/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,
- /obj/item/weapon/reagent_containers/glass/bottle/cold,
- /obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion,
- /obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion,
- /obj/item/weapon/reagent_containers/glass/bottle/fake_gbs,
- /obj/item/weapon/reagent_containers/glass/bottle/magnitis,
- /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
- /obj/item/weapon/reagent_containers/glass/bottle/brainrot,
- /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion,
- /obj/item/weapon/storage/box/syringes,
- /obj/item/weapon/storage/box/beakers,
- /obj/item/weapon/reagent_containers/glass/bottle/mutagen)*/
- contains = list(/obj/item/weapon/virusdish/random,
- /obj/item/weapon/virusdish/random,
- /obj/item/weapon/virusdish/random,
- /obj/item/weapon/virusdish/random)
+ contains = list(/obj/item/weapon/virusdish/random = 4)
cost = 25
containertype = "/obj/structure/closet/crate/secure"
containername = "Virus sample crate"
@@ -540,14 +475,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/electrical
name = "Electrical maintenance crate"
- contains = list(/obj/item/weapon/storage/toolbox/electrical,
- /obj/item/weapon/storage/toolbox/electrical,
- /obj/item/clothing/gloves/yellow,
- /obj/item/clothing/gloves/yellow,
- /obj/item/weapon/cell,
- /obj/item/weapon/cell,
- /obj/item/weapon/cell/high,
- /obj/item/weapon/cell/high)
+ contains = list(
+ /obj/item/weapon/storage/toolbox/electrical = 2,
+ /obj/item/clothing/gloves/yellow = 2,
+ /obj/item/weapon/cell = 2,
+ /obj/item/weapon/cell/high = 2
+ )
cost = 15
containertype = /obj/structure/closet/crate
containername = "Electrical maintenance crate"
@@ -555,15 +488,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mechanical
name = "Mechanical maintenance crate"
- contains = list(/obj/item/weapon/storage/belt/utility/full,
- /obj/item/weapon/storage/belt/utility/full,
- /obj/item/weapon/storage/belt/utility/full,
- /obj/item/clothing/suit/storage/hazardvest,
- /obj/item/clothing/suit/storage/hazardvest,
- /obj/item/clothing/suit/storage/hazardvest,
- /obj/item/clothing/head/welding,
- /obj/item/clothing/head/welding,
- /obj/item/clothing/head/hardhat)
+ contains = list(
+ /obj/item/weapon/storage/belt/utility/full = 3,
+ /obj/item/clothing/suit/storage/hazardvest = 3,
+ /obj/item/clothing/head/welding = 2,
+ /obj/item/clothing/head/hardhat
+ )
cost = 10
containertype = /obj/structure/closet/crate
containername = "Mechanical maintenance crate"
@@ -595,30 +525,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/solar
name = "Solar Pack crate"
- contains = list(/obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly,
- /obj/item/solar_assembly, // 21 Solar Assemblies. 1 Extra for the controller,
- /obj/item/weapon/circuitboard/solar_control,
- /obj/item/weapon/tracker_electronics,
- /obj/item/weapon/paper/solar)
+ contains = list(
+ /obj/item/solar_assembly = 21,
+ /obj/item/weapon/circuitboard/solar_control,
+ /obj/item/weapon/tracker_electronics,
+ /obj/item/weapon/paper/solar
+ )
cost = 20
containertype = /obj/structure/closet/crate
containername = "Solar pack crate"
@@ -626,8 +538,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/engine
name = "Emitter crate"
- contains = list(/obj/machinery/power/emitter,
- /obj/machinery/power/emitter)
+ contains = list(/obj/machinery/power/emitter = 2)
cost = 10
containertype = /obj/structure/closet/crate/secure
containername = "Emitter crate"
@@ -636,8 +547,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/engine/field_gen
name = "Field Generator crate"
- contains = list(/obj/machinery/field_generator,
- /obj/machinery/field_generator)
+ contains = list(/obj/machinery/field_generator = 2)
containertype = /obj/structure/closet/crate/secure
containername = "Field Generator crate"
access = access_ce
@@ -653,22 +563,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/engine/collector
name = "Collector crate"
- contains = list(/obj/machinery/power/rad_collector,
- /obj/machinery/power/rad_collector,
- /obj/machinery/power/rad_collector)
+ contains = list(/obj/machinery/power/rad_collector = 3)
containername = "Collector crate"
group = "Engineering"
/datum/supply_packs/engine/PA
name = "Particle Accelerator crate"
cost = 40
- contains = list(/obj/structure/particle_accelerator/fuel_chamber,
- /obj/machinery/particle_accelerator/control_box,
- /obj/structure/particle_accelerator/particle_emitter/center,
- /obj/structure/particle_accelerator/particle_emitter/left,
- /obj/structure/particle_accelerator/particle_emitter/right,
- /obj/structure/particle_accelerator/power_box,
- /obj/structure/particle_accelerator/end_cap)
+ contains = list(
+ /obj/structure/particle_accelerator/fuel_chamber,
+ /obj/machinery/particle_accelerator/control_box,
+ /obj/structure/particle_accelerator/particle_emitter/center,
+ /obj/structure/particle_accelerator/particle_emitter/left,
+ /obj/structure/particle_accelerator/particle_emitter/right,
+ /obj/structure/particle_accelerator/power_box,
+ /obj/structure/particle_accelerator/end_cap
+ )
containertype = /obj/structure/closet/crate/secure
containername = "Particle Accelerator crate"
access = access_ce
@@ -676,9 +586,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/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)
+ 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"
@@ -687,8 +599,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/mecha_odysseus
name = "Circuit Crate (\"Odysseus\")"
- contains = list(/obj/item/weapon/circuitboard/mecha/odysseus/peripherals,
- /obj/item/weapon/circuitboard/mecha/odysseus/main)
+ 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"
@@ -705,16 +619,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/robotics
name = "Robotics assembly crate"
- contains = list(/obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/weapon/storage/toolbox/electrical,
- /obj/item/device/flash,
- /obj/item/device/flash,
- /obj/item/device/flash,
- /obj/item/device/flash,
- /obj/item/weapon/cell/high,
- /obj/item/weapon/cell/high)
+ 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"
@@ -723,18 +633,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/phoron
name = "Phoron assembly crate"
- contains = list(/obj/item/weapon/tank/phoron,
- /obj/item/weapon/tank/phoron,
- /obj/item/weapon/tank/phoron,
- /obj/item/device/assembly/igniter,
- /obj/item/device/assembly/igniter,
- /obj/item/device/assembly/igniter,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/prox_sensor,
- /obj/item/device/assembly/timer,
- /obj/item/device/assembly/timer,
- /obj/item/device/assembly/timer)
+ contains = list(
+ /obj/item/weapon/tank/phoron = 3,
+ /obj/item/device/assembly/igniter = 3,
+ /obj/item/device/assembly/prox_sensor = 3,
+ /obj/item/device/assembly/timer = 3
+ )
cost = 10
containertype = /obj/structure/closet/crate/secure/phoron
containername = "Phoron assembly crate"
@@ -743,16 +647,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/weapons
name = "Weapons crate"
- contains = list(/obj/item/weapon/melee/baton,
- /obj/item/weapon/melee/baton,
- /obj/item/weapon/gun/energy/gun,
- /obj/item/weapon/gun/energy/gun,
- /obj/item/weapon/gun/energy/taser,
- /obj/item/weapon/gun/energy/taser,
- /obj/item/weapon/gun/projectile/colt/detective,
- /obj/item/weapon/gun/projectile/colt/detective,
- /obj/item/weapon/storage/box/flashbangs,
- /obj/item/weapon/storage/box/flashbangs)
+ 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"
@@ -761,10 +662,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/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)
+ 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"
@@ -773,10 +676,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/eweapons
name = "Experimental weapons crate"
- contains = list(/obj/item/weapon/gun/energy/xray,
- /obj/item/weapon/gun/energy/xray,
- /obj/item/weapon/shield/energy,
- /obj/item/weapon/shield/energy)
+ 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"
@@ -785,17 +687,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/armor
num_contained = 5
- contains = list(/obj/item/clothing/suit/storage/vest,
- /obj/item/clothing/suit/storage/vest/officer,
- /obj/item/clothing/suit/storage/vest/warden,
- /obj/item/clothing/suit/storage/vest/hos,
- /obj/item/clothing/suit/storage/vest/pcrc,
- /obj/item/clothing/suit/storage/vest/detective,
- /obj/item/clothing/suit/storage/vest/heavy,
- /obj/item/clothing/suit/storage/vest/heavy/officer,
- /obj/item/clothing/suit/storage/vest/heavy/warden,
- /obj/item/clothing/suit/storage/vest/heavy/hos,
- /obj/item/clothing/suit/storage/vest/heavy/pcrc)
+ contains = list(
+ /obj/item/clothing/suit/storage/vest,
+ /obj/item/clothing/suit/storage/vest/officer,
+ /obj/item/clothing/suit/storage/vest/warden,
+ /obj/item/clothing/suit/storage/vest/hos,
+ /obj/item/clothing/suit/storage/vest/pcrc,
+ /obj/item/clothing/suit/storage/vest/detective,
+ /obj/item/clothing/suit/storage/vest/heavy,
+ /obj/item/clothing/suit/storage/vest/heavy/officer,
+ /obj/item/clothing/suit/storage/vest/heavy/warden,
+ /obj/item/clothing/suit/storage/vest/heavy/hos,
+ /obj/item/clothing/suit/storage/vest/heavy/pcrc
+ )
name = "Armor crate"
cost = 40
@@ -806,18 +710,14 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/riot_gear
name = "Riot gear crate"
- contains = list(/obj/item/weapon/melee/baton,
- /obj/item/weapon/melee/baton,
- /obj/item/weapon/melee/baton,
- /obj/item/weapon/shield/riot,
- /obj/item/weapon/shield/riot,
- /obj/item/weapon/shield/riot,
- /obj/item/weapon/handcuffs,
- /obj/item/weapon/handcuffs,
- /obj/item/weapon/handcuffs,
- /obj/item/weapon/storage/box/flashbangs,
- /obj/item/weapon/storage/box/beanbags,
- /obj/item/weapon/storage/box/handcuffs)
+ contains = list(
+ /obj/item/weapon/melee/baton = 3,
+ /obj/item/weapon/shield/riot = 3,
+ /obj/item/weapon/handcuffs = 3,
+ /obj/item/weapon/storage/box/flashbangs,
+ /obj/item/weapon/storage/box/beanbags,
+ /obj/item/weapon/storage/box/handcuffs
+ )
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "riot gear crate"
@@ -826,10 +726,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/riot_armor
name = "Riot armor set crate"
- contains = list(/obj/item/clothing/head/helmet/riot,
- /obj/item/clothing/suit/armor/riot,
- /obj/item/clothing/gloves/arm_guard/riot,
- /obj/item/clothing/shoes/leg_guard/riot)
+ contains = list(
+ /obj/item/clothing/head/helmet/riot,
+ /obj/item/clothing/suit/armor/riot,
+ /obj/item/clothing/gloves/arm_guard/riot,
+ /obj/item/clothing/shoes/leg_guard/riot
+ )
cost = 30
containertype = /obj/structure/closet/crate/secure
containername = "riot armor set crate"
@@ -838,10 +740,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/ablative_armor
name = "Ablative armor set crate"
- contains = list(/obj/item/clothing/head/helmet/laserproof,
- /obj/item/clothing/suit/armor/laserproof,
- /obj/item/clothing/gloves/arm_guard/laserproof,
- /obj/item/clothing/shoes/leg_guard/laserproof)
+ contains = list(
+ /obj/item/clothing/head/helmet/laserproof,
+ /obj/item/clothing/suit/armor/laserproof,
+ /obj/item/clothing/gloves/arm_guard/laserproof,
+ /obj/item/clothing/shoes/leg_guard/laserproof
+ )
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "ablative armor set crate"
@@ -850,10 +754,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bullet_resistant_armor
name = "Bullet resistant armor set crate"
- contains = list(/obj/item/clothing/head/helmet/bulletproof,
- /obj/item/clothing/suit/armor/bulletproof,
- /obj/item/clothing/gloves/arm_guard/bulletproof,
- /obj/item/clothing/shoes/leg_guard/bulletproof)
+ contains = list(
+ /obj/item/clothing/head/helmet/bulletproof,
+ /obj/item/clothing/suit/armor/bulletproof,
+ /obj/item/clothing/gloves/arm_guard/bulletproof,
+ /obj/item/clothing/shoes/leg_guard/bulletproof
+ )
cost = 35
containertype = /obj/structure/closet/crate/secure
containername = "bullet resistant armor set crate"
@@ -862,10 +768,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/combat_armor
name = "Combat armor set crate"
- contains = list(/obj/item/clothing/head/helmet/combat,
- /obj/item/clothing/suit/armor/combat,
- /obj/item/clothing/gloves/arm_guard/combat,
- /obj/item/clothing/shoes/leg_guard/combat)
+ contains = list(
+ /obj/item/clothing/head/helmet/combat,
+ /obj/item/clothing/suit/armor/combat,
+ /obj/item/clothing/gloves/arm_guard/combat,
+ /obj/item/clothing/shoes/leg_guard/combat
+ )
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "combat armor set crate"
@@ -879,28 +787,28 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
cost = 60
group = "Security"
access = access_armory
- contains = list(/obj/item/clothing/under/tactical,
- /obj/item/clothing/suit/armor/tactical,
- /obj/item/clothing/head/helmet/tactical,
- /obj/item/clothing/mask/balaclava/tactical,
- /obj/item/clothing/glasses/sunglasses/sechud/tactical,
- /obj/item/weapon/storage/belt/security/tactical,
- /obj/item/clothing/shoes/jackboots,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/under/tactical,
- /obj/item/clothing/suit/armor/tactical,
- /obj/item/clothing/head/helmet/tactical,
- /obj/item/clothing/mask/balaclava/tactical,
- /obj/item/clothing/glasses/sunglasses/sechud/tactical,
- /obj/item/weapon/storage/belt/security/tactical,
- /obj/item/clothing/shoes/jackboots,
- /obj/item/clothing/gloves/black)
+ contains = list(
+ /obj/item/clothing/under/tactical,
+ /obj/item/clothing/suit/armor/tactical,
+ /obj/item/clothing/head/helmet/tactical,
+ /obj/item/clothing/mask/balaclava/tactical,
+ /obj/item/clothing/glasses/sunglasses/sechud/tactical,
+ /obj/item/weapon/storage/belt/security/tactical,
+ /obj/item/clothing/shoes/jackboots,
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/under/tactical,
+ /obj/item/clothing/suit/armor/tactical,
+ /obj/item/clothing/head/helmet/tactical,
+ /obj/item/clothing/mask/balaclava/tactical,
+ /obj/item/clothing/glasses/sunglasses/sechud/tactical,
+ /obj/item/weapon/storage/belt/security/tactical,
+ /obj/item/clothing/shoes/jackboots,
+ /obj/item/clothing/gloves/black
+ )
/datum/supply_packs/energyweapons
name = "Energy weapons crate"
- contains = list(/obj/item/weapon/gun/energy/laser,
- /obj/item/weapon/gun/energy/laser,
- /obj/item/weapon/gun/energy/laser)
+ contains = list(/obj/item/weapon/gun/energy/laser = 3)
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "energy weapons crate"
@@ -909,10 +817,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/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,
- /obj/item/weapon/gun/projectile/shotgun/pump/combat)
+ 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"
@@ -921,8 +830,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/erifle
name = "Energy marksman crate"
- contains = list(/obj/item/weapon/gun/energy/sniperrifle,
- /obj/item/weapon/gun/energy/sniperrifle)
+ contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
cost = 90
containertype = /obj/structure/closet/crate/secure
containername = "Energy marksman crate"
@@ -931,10 +839,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/shotgunammo
name = "Ballistic ammunition crate"
- contains = list(/obj/item/weapon/storage/box/shotgunammo,
- /obj/item/weapon/storage/box/shotgunammo,
- /obj/item/weapon/storage/box/shotgunshells,
- /obj/item/weapon/storage/box/shotgunshells)
+ 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"
@@ -943,9 +851,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/ionweapons
name = "Electromagnetic weapons crate"
- contains = list(/obj/item/weapon/gun/energy/ionrifle,
- /obj/item/weapon/gun/energy/ionrifle,
- /obj/item/weapon/storage/box/emps)
+ 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"
@@ -955,8 +864,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/automatic
name = "Automatic weapon crate"
num_contained = 2
- contains = list(/obj/item/weapon/gun/projectile/automatic/wt550,
- /obj/item/weapon/gun/projectile/automatic/z8)
+ 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"
@@ -966,30 +877,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/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)
+ 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
group = "Security"
-/*
-/datum/supply_packs/loyalty
- name = "Loyalty implant crate"
- contains = list (/obj/item/weapon/storage/lockbox/loyalty)
- cost = 60
- containertype = /obj/structure/closet/crate/secure
- containername = "Loyalty implant crate"
- access = access_armory
- group = "Security"
-*/
-
/datum/supply_packs/energy_guns
name = "energy guns crate"
- contains = list(/obj/item/weapon/gun/energy/gun,
- /obj/item/weapon/gun/energy/gun)
+ contains = list(/obj/item/weapon/gun/energy/gun = 2)
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "energy guns crate"
@@ -998,10 +899,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/securitybarriers
name = "Security barrier crate"
- contains = list(/obj/machinery/deployable/barrier,
- /obj/machinery/deployable/barrier,
- /obj/machinery/deployable/barrier,
- /obj/machinery/deployable/barrier)
+ contains = list(/obj/machinery/deployable/barrier = 4)
cost = 20
containertype = /obj/structure/closet/crate/secure/gear
containername = "Security barrier crate"
@@ -1009,10 +907,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/securityshieldgen
name = "Wall shield Generators"
- contains = list(/obj/machinery/shieldwallgen,
- /obj/machinery/shieldwallgen,
- /obj/machinery/shieldwallgen,
- /obj/machinery/shieldwallgen)
+ contains = list(/obj/machinery/shieldwallgen = 4)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "wall shield generators crate"
@@ -1021,26 +916,28 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised
var/num_contained = 4 //number of items picked to be contained in a randomised crate
- 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)
+ 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
@@ -1053,23 +950,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/artscrafts
name = "Arts and Crafts supplies"
- contains = list(/obj/item/weapon/storage/fancy/crayons,
- /obj/item/device/camera,
- /obj/item/device/camera_film,
- /obj/item/device/camera_film,
- /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,
- /obj/item/weapon/wrapping_paper,
- /obj/item/weapon/wrapping_paper)
+ 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"
@@ -1078,10 +974,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/contraband
num_contained = 5
- contains = list(/obj/item/seeds/bloodtomatoseed,
- /obj/item/weapon/storage/pill_bottle/zoom,
- /obj/item/weapon/storage/pill_bottle/happy,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine)
+ contains = list(
+ /obj/item/seeds/bloodtomatoseed,
+ /obj/item/weapon/storage/pill_bottle/zoom,
+ /obj/item/weapon/storage/pill_bottle/happy,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
+ )
name = "Contraband crate"
cost = 30
@@ -1092,16 +990,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/boxes
name = "Empty boxes"
- contains = list(/obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box,
- /obj/item/weapon/storage/box)
+ contains = list(/obj/item/weapon/storage/box = 10)
cost = 10
containertype = "/obj/structure/closet/crate"
containername = "Empty box crate"
@@ -1109,17 +998,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/surgery
name = "Surgery crate"
- contains = list(/obj/item/weapon/cautery,
- /obj/item/weapon/surgicaldrill,
- /obj/item/clothing/mask/breath/medical,
- /obj/item/weapon/tank/anesthetic,
- /obj/item/weapon/FixOVein,
- /obj/item/weapon/hemostat,
- /obj/item/weapon/scalpel,
- /obj/item/weapon/bonegel,
- /obj/item/weapon/retractor,
- /obj/item/weapon/bonesetter,
- /obj/item/weapon/circular_saw)
+ contains = list(
+ /obj/item/weapon/cautery,
+ /obj/item/weapon/surgicaldrill,
+ /obj/item/clothing/mask/breath/medical,
+ /obj/item/weapon/tank/anesthetic,
+ /obj/item/weapon/FixOVein,
+ /obj/item/weapon/hemostat,
+ /obj/item/weapon/scalpel,
+ /obj/item/weapon/bonegel,
+ /obj/item/weapon/retractor,
+ /obj/item/weapon/bonesetter,
+ /obj/item/weapon/circular_saw
+ )
cost = 25
containertype = "/obj/structure/closet/crate/secure"
containername = "Surgery crate"
@@ -1128,15 +1019,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/sterile
name = "Sterile equipment crate"
- contains = list(/obj/item/clothing/under/rank/medical/green,
- /obj/item/clothing/under/rank/medical/green,
- /obj/item/clothing/head/surgery/green,
- /obj/item/clothing/head/surgery/green,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves,
- /obj/item/weapon/storage/belt/medical,
- /obj/item/weapon/storage/belt/medical,
- /obj/item/weapon/storage/belt/medical)
+ contains = list(
+ /obj/item/clothing/under/rank/medical/green = 2,
+ /obj/item/clothing/head/surgery/green = 2,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves,
+ /obj/item/weapon/storage/belt/medical = 3
+ )
cost = 15
containertype = "/obj/structure/closet/crate"
containername = "Sterile equipment crate"
@@ -1144,10 +1033,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/pizza
num_contained = 5
- contains = list(/obj/item/pizzabox/margherita,
- /obj/item/pizzabox/mushroom,
- /obj/item/pizzabox/meat,
- /obj/item/pizzabox/vegetable)
+ contains = list(
+ /obj/item/pizzabox/margherita,
+ /obj/item/pizzabox/mushroom,
+ /obj/item/pizzabox/meat,
+ /obj/item/pizzabox/vegetable
+ )
name = "Surprise pack of five pizzas"
cost = 15
containertype = /obj/structure/closet/crate/freezer
@@ -1156,33 +1047,35 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/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)
+ 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
@@ -1190,21 +1083,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
group = "Miscellaneous"
/datum/supply_packs/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,
- /obj/item/clothing/shoes/black,
- /obj/item/clothing/shoes/leather,
- /obj/item/clothing/suit/wcoat)
+ 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
@@ -1213,9 +1107,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/card_packs
num_contained = 5
- contains = list(/obj/item/weapon/pack/cardemon,
- /obj/item/weapon/pack/spaceball,
- /obj/item/weapon/deck/holder)
+ contains = list(
+ /obj/item/weapon/pack/cardemon,
+ /obj/item/weapon/pack/spaceball,
+ /obj/item/weapon/deck/holder
+ )
name = "Trading Card Crate"
cost = 10
containertype = /obj/structure/closet/crate
@@ -1258,16 +1154,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
group = "Engineering"
access = access_ce
-
-/* /datum/supply_packs/smsmall // Currently nonfunctional, waiting on virgil
- name = "Supermatter Shard"
- contains = list(/obj/machinery/power/supermatter/shard)
- cost = 25
- containertype = /obj/structure/closet/crate/secure/phoron
- containername = "Supermatter shard crate (CAUTION)"
- access = access_ce
- group = "Engineering" */
-
/datum/supply_packs/eftpos
contains = list(/obj/item/device/eftpos)
name = "EFTPOS scanner"
@@ -1314,14 +1200,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/bee_keeper
name = "Beekeeping crate"
- contains = list(/obj/item/beehive_assembly,
- /obj/item/bee_smoker,
- /obj/item/honey_frame,
- /obj/item/honey_frame,
- /obj/item/honey_frame,
- /obj/item/honey_frame,
- /obj/item/honey_frame,
- /obj/item/bee_pack)
+ contains = list(
+ /obj/item/beehive_assembly,
+ /obj/item/bee_smoker,
+ /obj/item/honey_frame = 5,
+ /obj/item/bee_pack
+ )
cost = 40
containertype = /obj/structure/closet/crate/hydroponics
containername = "Beekeeping crate"
@@ -1338,19 +1222,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
group = "Miscellaneous"
/datum/supply_packs/bureaucracy
- contains = list(/obj/item/weapon/clipboard,
- /obj/item/weapon/clipboard,
- /obj/item/weapon/pen/red,
- /obj/item/weapon/pen/blue,
- /obj/item/weapon/pen/blue,
- /obj/item/device/camera_film,
- /obj/item/weapon/folder/blue,
- /obj/item/weapon/folder/red,
- /obj/item/weapon/folder/yellow,
- /obj/item/weapon/hand_labeler,
- /obj/item/weapon/tape_roll,
- /obj/structure/filingcabinet/chestdrawer{anchored = 0},
- /obj/item/weapon/paper_bin)
+ contains = list(
+ /obj/item/weapon/clipboard = 2,
+ /obj/item/weapon/pen/red,
+ /obj/item/weapon/pen/blue,
+ /obj/item/weapon/pen/blue,
+ /obj/item/device/camera_film,
+ /obj/item/weapon/folder/blue,
+ /obj/item/weapon/folder/red,
+ /obj/item/weapon/folder/yellow,
+ /obj/item/weapon/hand_labeler,
+ /obj/item/weapon/tape_roll,
+ /obj/structure/filingcabinet/chestdrawer{anchored = 0},
+ /obj/item/weapon/paper_bin
+ )
name = "Office supplies"
cost = 15
containertype = /obj/structure/closet/crate
@@ -1358,12 +1243,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
group = "Supply"
/datum/supply_packs/radsuit
- contains = list(/obj/item/clothing/suit/radiation,
- /obj/item/clothing/suit/radiation,
- /obj/item/clothing/suit/radiation,
- /obj/item/clothing/head/radiation,
- /obj/item/clothing/head/radiation,
- /obj/item/clothing/head/radiation)
+ contains = list(
+ /obj/item/clothing/suit/radiation = 3,
+ /obj/item/clothing/head/radiation = 3
+ )
name = "Radiation suits package"
cost = 20
containertype = /obj/structure/closet/radiation
@@ -1463,10 +1346,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet/crate/secure
group = "Engineering"
access = access_tech_storage
- contains = list(/obj/item/weapon/stock_parts/micro_laser,
- /obj/item/weapon/stock_parts/capacitor,
- /obj/item/weapon/stock_parts/matter_bin,
- /obj/item/weapon/circuitboard/pacman)
+ contains = list(
+ /obj/item/weapon/stock_parts/micro_laser,
+ /obj/item/weapon/stock_parts/capacitor,
+ /obj/item/weapon/stock_parts/matter_bin,
+ /obj/item/weapon/circuitboard/pacman
+ )
/datum/supply_packs/super_pacman_parts
name = "Super P.A.C.M.A.N. portable generator parts"
@@ -1475,20 +1360,24 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet/crate/secure
group = "Engineering"
access = access_tech_storage
- contains = list(/obj/item/weapon/stock_parts/micro_laser,
- /obj/item/weapon/stock_parts/capacitor,
- /obj/item/weapon/stock_parts/matter_bin,
- /obj/item/weapon/circuitboard/pacman/super)
+ contains = list(
+ /obj/item/weapon/stock_parts/micro_laser,
+ /obj/item/weapon/stock_parts/capacitor,
+ /obj/item/weapon/stock_parts/matter_bin,
+ /obj/item/weapon/circuitboard/pacman/super
+ )
/datum/supply_packs/witch
name = "Witch costume"
containername = "Witch costume"
containertype = /obj/structure/closet
cost = 20
- contains = list(/obj/item/clothing/suit/wizrobe/marisa/fake,
- /obj/item/clothing/shoes/sandal,
- /obj/item/clothing/head/wizard/marisa/fake,
- /obj/item/weapon/staff/broom)
+ contains = list(
+ /obj/item/clothing/suit/wizrobe/marisa/fake,
+ /obj/item/clothing/shoes/sandal,
+ /obj/item/clothing/head/wizard/marisa/fake,
+ /obj/item/weapon/staff/broom
+ )
group = "Miscellaneous"
/datum/supply_packs/randomised/costume_hats
@@ -1497,20 +1386,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet
cost = 10
num_contained = 3
- contains = list(/obj/item/clothing/head/redcoat,
- /obj/item/clothing/head/mailman,
- /obj/item/clothing/head/plaguedoctorhat,
- /obj/item/clothing/head/pirate,
- /obj/item/clothing/head/hasturhood,
- /obj/item/clothing/head/powdered_wig,
- /obj/item/clothing/head/hairflower,
- /obj/item/clothing/head/hairflower/yellow,
- /obj/item/clothing/head/hairflower/blue,
- /obj/item/clothing/head/hairflower/pink,
- /obj/item/clothing/mask/gas/owl_mask,
- /obj/item/clothing/mask/gas/monkeymask,
- /obj/item/clothing/head/helmet/gladiator,
- /obj/item/clothing/head/ushanka)
+ contains = list(
+ /obj/item/clothing/head/redcoat,
+ /obj/item/clothing/head/mailman,
+ /obj/item/clothing/head/plaguedoctorhat,
+ /obj/item/clothing/head/pirate,
+ /obj/item/clothing/head/hasturhood,
+ /obj/item/clothing/head/powdered_wig,
+ /obj/item/clothing/head/hairflower,
+ /obj/item/clothing/head/hairflower/yellow,
+ /obj/item/clothing/head/hairflower/blue,
+ /obj/item/clothing/head/hairflower/pink,
+ /obj/item/clothing/mask/gas/owl_mask,
+ /obj/item/clothing/mask/gas/monkeymask,
+ /obj/item/clothing/head/helmet/gladiator,
+ /obj/item/clothing/head/ushanka
+ )
group = "Miscellaneous"
/datum/supply_packs/spare_pda
@@ -1519,9 +1410,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet/crate
containername = "Spare PDA crate"
group = "Supply"
- contains = list(/obj/item/device/pda,
- /obj/item/device/pda,
- /obj/item/device/pda)
+ contains = list(/obj/item/device/pda = 3)
/datum/supply_packs/randomised/dresses
name = "Womens formal dress locker"
@@ -1529,17 +1418,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containertype = /obj/structure/closet
cost = 15
num_contained = 3
- contains = list(/obj/item/clothing/under/wedding/bride_orange,
- /obj/item/clothing/under/wedding/bride_purple,
- /obj/item/clothing/under/wedding/bride_blue,
- /obj/item/clothing/under/wedding/bride_red,
- /obj/item/clothing/under/wedding/bride_white,
- /obj/item/clothing/under/sundress,
- /obj/item/clothing/under/dress/dress_green,
- /obj/item/clothing/under/dress/dress_pink,
- /obj/item/clothing/under/dress/dress_orange,
- /obj/item/clothing/under/dress/dress_yellow,
- /obj/item/clothing/under/dress/dress_saloon)
+ contains = list(
+ /obj/item/clothing/under/wedding/bride_orange,
+ /obj/item/clothing/under/wedding/bride_purple,
+ /obj/item/clothing/under/wedding/bride_blue,
+ /obj/item/clothing/under/wedding/bride_red,
+ /obj/item/clothing/under/wedding/bride_white,
+ /obj/item/clothing/under/sundress,
+ /obj/item/clothing/under/dress/dress_green,
+ /obj/item/clothing/under/dress/dress_pink,
+ /obj/item/clothing/under/dress/dress_orange,
+ /obj/item/clothing/under/dress/dress_yellow,
+ /obj/item/clothing/under/dress/dress_saloon
+ )
group = "Miscellaneous"
/datum/supply_packs/painters
@@ -1548,22 +1439,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "station painting supplies crate"
containertype = /obj/structure/closet/crate
group = "Engineering"
- contains = list(/obj/item/device/pipe_painter,
- /obj/item/device/pipe_painter,
- /obj/item/device/floor_painter,
- /obj/item/device/floor_painter,
- /obj/item/device/closet_painter,
- /obj/item/device/closet_painter)
-
+ contains = list(
+ /obj/item/device/pipe_painter = 2,
+ /obj/item/device/floor_painter = 2,
+ /obj/item/device/closet_painter = 2
+ )
/datum/supply_packs/randomised/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
- )
+ /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
@@ -1572,32 +1461,29 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/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
- )
+ /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/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
- )
+ /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/engineeringvoidsuits
name = "Engineering voidsuits"
- contains = list(/obj/item/clothing/suit/space/void/engineering,
- /obj/item/clothing/suit/space/void/engineering,
- /obj/item/clothing/head/helmet/space/void/engineering,
- /obj/item/clothing/head/helmet/space/void/engineering,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/shoes/magboots,
- /obj/item/clothing/shoes/magboots,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen)
+ 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"
@@ -1606,16 +1492,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/atmosvoidsuits
name = "Atmospheric voidsuits"
- contains = list(/obj/item/clothing/suit/space/void/atmos,
- /obj/item/clothing/suit/space/void/atmos,
- /obj/item/clothing/head/helmet/space/void/atmos,
- /obj/item/clothing/head/helmet/space/void/atmos,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/shoes/magboots,
- /obj/item/clothing/shoes/magboots,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen)
+ 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"
@@ -1624,14 +1507,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/miningvoidsuits
name = "Mining voidsuits"
- contains = list(/obj/item/clothing/suit/space/void/mining,
- /obj/item/clothing/suit/space/void/mining,
- /obj/item/clothing/head/helmet/space/void/mining,
- /obj/item/clothing/head/helmet/space/void/mining,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen)
+ 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"
@@ -1641,10 +1522,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/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/webbing)
+ 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/webbing
+ )
cost = 15
containertype = "/obj/structure/closet/crate"
containername = "Webbing crate"
@@ -1652,16 +1535,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/securityvoidsuits
name = "Security voidsuits"
- contains = list(/obj/item/clothing/suit/space/void/security,
- /obj/item/clothing/suit/space/void/security,
- /obj/item/clothing/head/helmet/space/void/security,
- /obj/item/clothing/head/helmet/space/void/security,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/shoes/magboots,
- /obj/item/clothing/shoes/magboots,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen)
+ 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"
@@ -1671,10 +1551,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/randomised/holster
name = "Holster crate"
num_contained = 4
- contains = list(/obj/item/clothing/accessory/holster,
- /obj/item/clothing/accessory/holster/armpit,
- /obj/item/clothing/accessory/holster/waist,
- /obj/item/clothing/accessory/holster/hip)
+ contains = list(
+ /obj/item/clothing/accessory/holster,
+ /obj/item/clothing/accessory/holster/armpit,
+ /obj/item/clothing/accessory/holster/waist,
+ /obj/item/clothing/accessory/holster/hip
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Holster crate"
@@ -1683,16 +1565,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/medicalvoidsuits
name = "Medical voidsuits"
- contains = list(/obj/item/clothing/suit/space/void/medical,
- /obj/item/clothing/suit/space/void/medical,
- /obj/item/clothing/head/helmet/space/void/medical,
- /obj/item/clothing/head/helmet/space/void/medical,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/shoes/magboots,
- /obj/item/clothing/shoes/magboots,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen)
+ 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"
@@ -1701,18 +1580,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/securityextragear
name = "Security surplus equipment"
- contains = list(/obj/item/weapon/storage/belt/security,
- /obj/item/weapon/storage/belt/security,
- /obj/item/weapon/storage/belt/security,
- /obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/device/radio/headset/headset_sec/alt,
- /obj/item/device/radio/headset/headset_sec/alt,
- /obj/item/device/radio/headset/headset_sec/alt,
- /obj/item/clothing/suit/storage/hooded/wintercoat/security,
- /obj/item/clothing/suit/storage/hooded/wintercoat/security,
- /obj/item/clothing/suit/storage/hooded/wintercoat/security)
+ contains = list(
+ /obj/item/weapon/storage/belt/security = 3,
+ /obj/item/clothing/glasses/sunglasses/sechud = 3,
+ /obj/item/device/radio/headset/headset_sec/alt = 3,
+ /obj/item/clothing/suit/storage/hooded/wintercoat/security = 3
+ )
cost = 25
containertype = "/obj/structure/closet/crate/secure"
containername = "Security surplus equipment"
@@ -1721,25 +1594,25 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/detectivegear
name = "Forensic investigation equipment"
- contains = list(/obj/item/weapon/storage/box/evidence,
- /obj/item/weapon/storage/box/evidence,
- /obj/item/clothing/suit/storage/vest/detective,
- /obj/item/weapon/cartridge/detective,
- /obj/item/device/radio/headset/headset_sec,
- /obj/item/taperoll/police,
- /obj/item/clothing/glasses/sunglasses,
- /obj/item/device/camera,
- /obj/item/weapon/folder/red,
- /obj/item/weapon/folder/blue,
- /obj/item/weapon/storage/belt/detective,
- /obj/item/clothing/gloves/black,
- /obj/item/device/taperecorder,
- /obj/item/device/mass_spectrometer,
- /obj/item/device/camera_film,
- /obj/item/device/camera_film,
- /obj/item/weapon/storage/photo_album,
- /obj/item/device/reagent_scanner,
- /obj/item/device/flashlight/maglight)
+ contains = list(
+ /obj/item/weapon/storage/box/evidence = 2,
+ /obj/item/clothing/suit/storage/vest/detective,
+ /obj/item/weapon/cartridge/detective,
+ /obj/item/device/radio/headset/headset_sec,
+ /obj/item/taperoll/police,
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/device/camera,
+ /obj/item/weapon/folder/red,
+ /obj/item/weapon/folder/blue,
+ /obj/item/weapon/storage/belt/detective,
+ /obj/item/clothing/gloves/black,
+ /obj/item/device/taperecorder,
+ /obj/item/device/mass_spectrometer,
+ /obj/item/device/camera_film = 2,
+ /obj/item/weapon/storage/photo_album,
+ /obj/item/device/reagent_scanner,
+ /obj/item/device/flashlight/maglight
+ )
cost = 35
containertype = "/obj/structure/closet/crate/secure"
containername = "Forensic equipment"
@@ -1748,26 +1621,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/detectiveclothes
name = "Investigation apparel"
- contains = list(/obj/item/clothing/under/det/black,
- /obj/item/clothing/under/det/black,
- /obj/item/clothing/under/det/grey,
- /obj/item/clothing/under/det/grey,
- /obj/item/clothing/head/det/grey,
- /obj/item/clothing/head/det/grey,
- /obj/item/clothing/under/det,
- /obj/item/clothing/under/det,
- /obj/item/clothing/head/det,
- /obj/item/clothing/head/det,
- /obj/item/clothing/suit/storage/det_trench,
- /obj/item/clothing/suit/storage/det_trench/grey,
- /obj/item/clothing/suit/storage/forensics/red,
- /obj/item/clothing/suit/storage/forensics/blue,
- /obj/item/clothing/under/det/corporate,
- /obj/item/clothing/under/det/corporate,
- /obj/item/clothing/accessory/badge/holo/detective,
- /obj/item/clothing/accessory/badge/holo/detective,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black)
+ contains = list(
+ /obj/item/clothing/under/det/black = 2,
+ /obj/item/clothing/under/det/grey = 2,
+ /obj/item/clothing/head/det/grey = 2,
+ /obj/item/clothing/under/det = 2,
+ /obj/item/clothing/head/det = 2,
+ /obj/item/clothing/suit/storage/det_trench,
+ /obj/item/clothing/suit/storage/det_trench/grey,
+ /obj/item/clothing/suit/storage/forensics/red,
+ /obj/item/clothing/suit/storage/forensics/blue,
+ /obj/item/clothing/under/det/corporate = 2,
+ /obj/item/clothing/accessory/badge/holo/detective = 2,
+ /obj/item/clothing/gloves/black = 2
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Investigation clothing"
@@ -1776,27 +1643,29 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/officergear
name = "Officer equipment"
- contains = list(/obj/item/clothing/suit/storage/vest/officer,
- /obj/item/clothing/head/helmet,
- /obj/item/weapon/cartridge/security,
- /obj/item/clothing/accessory/badge/holo,
- /obj/item/clothing/accessory/badge/holo/cord,
- /obj/item/device/radio/headset/headset_sec,
- /obj/item/weapon/storage/belt/security,
- /obj/item/device/flash,
- /obj/item/weapon/reagent_containers/spray/pepper,
- /obj/item/weapon/grenade/flashbang,
- /obj/item/weapon/melee/baton/loaded,
- /obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/taperoll/police,
- /obj/item/clothing/gloves/black,
- /obj/item/device/hailer,
- /obj/item/device/flashlight/flare,
- /obj/item/clothing/accessory/storage/black_vest,
- /obj/item/clothing/head/soft/sec/corp,
- /obj/item/clothing/under/rank/security/corp,
- /obj/item/weapon/gun/energy/taser,
- /obj/item/device/flashlight/maglight)
+ contains = list(
+ /obj/item/clothing/suit/storage/vest/officer,
+ /obj/item/clothing/head/helmet,
+ /obj/item/weapon/cartridge/security,
+ /obj/item/clothing/accessory/badge/holo,
+ /obj/item/clothing/accessory/badge/holo/cord,
+ /obj/item/device/radio/headset/headset_sec,
+ /obj/item/weapon/storage/belt/security,
+ /obj/item/device/flash,
+ /obj/item/weapon/reagent_containers/spray/pepper,
+ /obj/item/weapon/grenade/flashbang,
+ /obj/item/weapon/melee/baton/loaded,
+ /obj/item/clothing/glasses/sunglasses/sechud,
+ /obj/item/taperoll/police,
+ /obj/item/clothing/gloves/black,
+ /obj/item/device/hailer,
+ /obj/item/device/flashlight/flare,
+ /obj/item/clothing/accessory/storage/black_vest,
+ /obj/item/clothing/head/soft/sec/corp,
+ /obj/item/clothing/under/rank/security/corp,
+ /obj/item/weapon/gun/energy/taser,
+ /obj/item/device/flashlight/maglight
+ )
cost = 30
containertype = "/obj/structure/closet/crate/secure"
containername = "Officer equipment"
@@ -1805,25 +1674,27 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/wardengear
name = "Warden equipment"
- contains = list(/obj/item/clothing/suit/storage/vest/warden,
- /obj/item/clothing/under/rank/warden,
- /obj/item/clothing/under/rank/warden/corp,
- /obj/item/clothing/suit/armor/vest/warden,
- /obj/item/clothing/suit/armor/vest/warden/alt,
- /obj/item/clothing/head/helmet/warden,
- /obj/item/weapon/cartridge/security,
- /obj/item/device/radio/headset/headset_sec,
- /obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/taperoll/police,
- /obj/item/device/hailer,
- /obj/item/clothing/accessory/badge/holo/warden,
- /obj/item/weapon/storage/box/flashbangs,
- /obj/item/weapon/storage/belt/security,
- /obj/item/weapon/reagent_containers/spray/pepper,
- /obj/item/weapon/melee/baton/loaded,
- /obj/item/weapon/storage/box/holobadge,
- /obj/item/clothing/head/beret/sec/corporate/warden,
- /obj/item/device/flashlight/maglight)
+ contains = list(
+ /obj/item/clothing/suit/storage/vest/warden,
+ /obj/item/clothing/under/rank/warden,
+ /obj/item/clothing/under/rank/warden/corp,
+ /obj/item/clothing/suit/armor/vest/warden,
+ /obj/item/clothing/suit/armor/vest/warden/alt,
+ /obj/item/clothing/head/helmet/warden,
+ /obj/item/weapon/cartridge/security,
+ /obj/item/device/radio/headset/headset_sec,
+ /obj/item/clothing/glasses/sunglasses/sechud,
+ /obj/item/taperoll/police,
+ /obj/item/device/hailer,
+ /obj/item/clothing/accessory/badge/holo/warden,
+ /obj/item/weapon/storage/box/flashbangs,
+ /obj/item/weapon/storage/belt/security,
+ /obj/item/weapon/reagent_containers/spray/pepper,
+ /obj/item/weapon/melee/baton/loaded,
+ /obj/item/weapon/storage/box/holobadge,
+ /obj/item/clothing/head/beret/sec/corporate/warden,
+ /obj/item/device/flashlight/maglight
+ )
cost = 45
containertype = "/obj/structure/closet/crate/secure"
containername = "Warden equipment"
@@ -1832,23 +1703,25 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/headofsecgear
name = "Head of security equipment"
- contains = list(/obj/item/clothing/head/helmet/HoS,
- /obj/item/clothing/suit/storage/vest/hos,
- /obj/item/clothing/under/rank/head_of_security/corp,
- /obj/item/clothing/suit/armor/hos,
- /obj/item/clothing/head/helmet/HoS/dermal,
- /obj/item/weapon/cartridge/hos,
- /obj/item/device/radio/headset/heads/hos,
- /obj/item/clothing/glasses/sunglasses/sechud,
- /obj/item/weapon/storage/belt/security,
- /obj/item/device/flash,
- /obj/item/device/hailer,
- /obj/item/clothing/accessory/badge/holo/hos,
- /obj/item/clothing/accessory/holster/waist,
- /obj/item/weapon/melee/telebaton,
- /obj/item/weapon/shield/riot/tele,
- /obj/item/clothing/head/beret/sec/corporate/hos,
- /obj/item/device/flashlight/maglight)
+ contains = list(
+ /obj/item/clothing/head/helmet/HoS,
+ /obj/item/clothing/suit/storage/vest/hos,
+ /obj/item/clothing/under/rank/head_of_security/corp,
+ /obj/item/clothing/suit/armor/hos,
+ /obj/item/clothing/head/helmet/HoS/dermal,
+ /obj/item/weapon/cartridge/hos,
+ /obj/item/device/radio/headset/heads/hos,
+ /obj/item/clothing/glasses/sunglasses/sechud,
+ /obj/item/weapon/storage/belt/security,
+ /obj/item/device/flash,
+ /obj/item/device/hailer,
+ /obj/item/clothing/accessory/badge/holo/hos,
+ /obj/item/clothing/accessory/holster/waist,
+ /obj/item/weapon/melee/telebaton,
+ /obj/item/weapon/shield/riot/tele,
+ /obj/item/clothing/head/beret/sec/corporate/hos,
+ /obj/item/device/flashlight/maglight
+ )
cost = 65
containertype = "/obj/structure/closet/crate/secure"
containername = "Head of security equipment"
@@ -1857,34 +1730,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/securityclothing
name = "Security uniform crate"
- contains = list(/obj/item/weapon/storage/backpack/satchel/sec,
- /obj/item/weapon/storage/backpack/satchel/sec,
- /obj/item/weapon/storage/backpack/security,
- /obj/item/weapon/storage/backpack/security,
- /obj/item/clothing/accessory/armband,
- /obj/item/clothing/accessory/armband,
- /obj/item/clothing/accessory/armband,
- /obj/item/clothing/accessory/armband,
- /obj/item/clothing/under/rank/security,
- /obj/item/clothing/under/rank/security,
- /obj/item/clothing/under/rank/security,
- /obj/item/clothing/under/rank/security,
- /obj/item/clothing/under/rank/security2,
- /obj/item/clothing/under/rank/security2,
- /obj/item/clothing/under/rank/security2,
- /obj/item/clothing/under/rank/security2,
- /obj/item/clothing/under/rank/warden,
- /obj/item/clothing/under/rank/head_of_security,
- /obj/item/clothing/suit/armor/hos/jensen,
- /obj/item/clothing/head/soft/sec,
- /obj/item/clothing/head/soft/sec,
- /obj/item/clothing/head/soft/sec,
- /obj/item/clothing/head/soft/sec,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/weapon/storage/box/holobadge)
+ contains = list(
+ /obj/item/weapon/storage/backpack/satchel/sec = 2,
+ /obj/item/weapon/storage/backpack/security = 2,
+ /obj/item/clothing/accessory/armband = 4,
+ /obj/item/clothing/under/rank/security = 4,
+ /obj/item/clothing/under/rank/security2 = 4,
+ /obj/item/clothing/under/rank/warden,
+ /obj/item/clothing/under/rank/head_of_security,
+ /obj/item/clothing/suit/armor/hos/jensen,
+ /obj/item/clothing/head/soft/sec = 4,
+ /obj/item/clothing/gloves/black = 4,
+ /obj/item/weapon/storage/box/holobadge
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Security uniform crate"
@@ -1893,33 +1751,21 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/navybluesecurityclothing
name = "Navy blue security uniform crate"
- contains = list(/obj/item/weapon/storage/backpack/satchel/sec,
- /obj/item/weapon/storage/backpack/satchel/sec,
- /obj/item/weapon/storage/backpack/security,
- /obj/item/weapon/storage/backpack/security,
- /obj/item/clothing/under/rank/security/navyblue,
- /obj/item/clothing/under/rank/security/navyblue,
- /obj/item/clothing/under/rank/security/navyblue,
- /obj/item/clothing/under/rank/security/navyblue,
- /obj/item/clothing/suit/security/navyofficer,
- /obj/item/clothing/suit/security/navyofficer,
- /obj/item/clothing/suit/security/navyofficer,
- /obj/item/clothing/suit/security/navyofficer,
- /obj/item/clothing/under/rank/warden/navyblue,
- /obj/item/clothing/suit/security/navywarden,
- /obj/item/clothing/under/rank/head_of_security/navyblue,
- /obj/item/clothing/suit/security/navyhos,
- /obj/item/clothing/head/beret/sec/navy/officer,
- /obj/item/clothing/head/beret/sec/navy/officer,
- /obj/item/clothing/head/beret/sec/navy/officer,
- /obj/item/clothing/head/beret/sec/navy/officer,
- /obj/item/clothing/head/beret/sec/navy/warden,
- /obj/item/clothing/head/beret/sec/navy/hos,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/weapon/storage/box/holobadge)
+ contains = list(
+ /obj/item/weapon/storage/backpack/satchel/sec = 2,
+ /obj/item/weapon/storage/backpack/security = 2,
+ /obj/item/clothing/under/rank/security/navyblue = 4,
+ /obj/item/clothing/suit/security/navyofficer = 4,
+ /obj/item/clothing/under/rank/warden/navyblue,
+ /obj/item/clothing/suit/security/navywarden,
+ /obj/item/clothing/under/rank/head_of_security/navyblue,
+ /obj/item/clothing/suit/security/navyhos,
+ /obj/item/clothing/head/beret/sec/navy/officer = 4,
+ /obj/item/clothing/head/beret/sec/navy/warden,
+ /obj/item/clothing/head/beret/sec/navy/hos,
+ /obj/item/clothing/gloves/black = 4,
+ /obj/item/weapon/storage/box/holobadge
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Navy blue security uniform crate"
@@ -1928,33 +1774,20 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/corporatesecurityclothing
name = "Corporate security uniform crate"
- contains = list(/obj/item/weapon/storage/backpack/satchel/sec,
- /obj/item/weapon/storage/backpack/satchel/sec,
- /obj/item/weapon/storage/backpack/security,
- /obj/item/weapon/storage/backpack/security,
- /obj/item/clothing/under/rank/security/corp,
- /obj/item/clothing/under/rank/security/corp,
- /obj/item/clothing/under/rank/security/corp,
- /obj/item/clothing/under/rank/security/corp,
- /obj/item/clothing/head/soft/sec/corp,
- /obj/item/clothing/head/soft/sec/corp,
- /obj/item/clothing/head/soft/sec/corp,
- /obj/item/clothing/head/soft/sec/corp,
- /obj/item/clothing/under/rank/warden/corp,
- /obj/item/clothing/under/rank/head_of_security/corp,
- /obj/item/clothing/head/beret/sec,
- /obj/item/clothing/head/beret/sec,
- /obj/item/clothing/head/beret/sec,
- /obj/item/clothing/head/beret/sec,
- /obj/item/clothing/head/beret/sec/corporate/warden,
- /obj/item/clothing/head/beret/sec/corporate/hos,
- /obj/item/clothing/under/det/corporate,
- /obj/item/clothing/under/det/corporate,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/gloves/black,
- /obj/item/weapon/storage/box/holobadge)
+ contains = list(
+ /obj/item/weapon/storage/backpack/satchel/sec = 2,
+ /obj/item/weapon/storage/backpack/security = 2,
+ /obj/item/clothing/under/rank/security/corp = 4,
+ /obj/item/clothing/head/soft/sec/corp = 4,
+ /obj/item/clothing/under/rank/warden/corp,
+ /obj/item/clothing/under/rank/head_of_security/corp,
+ /obj/item/clothing/head/beret/sec = 4,
+ /obj/item/clothing/head/beret/sec/corporate/warden,
+ /obj/item/clothing/head/beret/sec/corporate/hos,
+ /obj/item/clothing/under/det/corporate = 2,
+ /obj/item/clothing/gloves/black = 4,
+ /obj/item/weapon/storage/box/holobadge
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Corporate security uniform crate"
@@ -1963,13 +1796,15 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/securitybiosuit
name = "Security biohazard gear"
- contains = list(/obj/item/clothing/head/bio_hood/security,
- /obj/item/clothing/under/rank/security,
- /obj/item/clothing/suit/bio_suit/security,
- /obj/item/clothing/shoes/white,
- /obj/item/clothing/mask/gas,
- /obj/item/weapon/tank/oxygen,
- /obj/item/clothing/gloves/latex)
+ contains = list(
+ /obj/item/clothing/head/bio_hood/security,
+ /obj/item/clothing/under/rank/security,
+ /obj/item/clothing/suit/bio_suit/security,
+ /obj/item/clothing/shoes/white,
+ /obj/item/clothing/mask/gas,
+ /obj/item/weapon/tank/oxygen,
+ /obj/item/clothing/gloves/latex
+ )
cost = 35
containertype = "/obj/structure/closet/crate/secure"
containername = "Security biohazard gear"
@@ -1978,18 +1813,12 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/medicalextragear
name = "Medical surplus equipment"
- contains = list(/obj/item/weapon/storage/belt/medical,
- /obj/item/weapon/storage/belt/medical,
- /obj/item/weapon/storage/belt/medical,
- /obj/item/clothing/glasses/hud/health,
- /obj/item/clothing/glasses/hud/health,
- /obj/item/clothing/glasses/hud/health,
- /obj/item/device/radio/headset/headset_med/alt,
- /obj/item/device/radio/headset/headset_med/alt,
- /obj/item/device/radio/headset/headset_med/alt,
- /obj/item/clothing/suit/storage/hooded/wintercoat/medical,
- /obj/item/clothing/suit/storage/hooded/wintercoat/medical,
- /obj/item/clothing/suit/storage/hooded/wintercoat/medical)
+ contains = list(
+ /obj/item/weapon/storage/belt/medical = 3,
+ /obj/item/clothing/glasses/hud/health = 3,
+ /obj/item/device/radio/headset/headset_med/alt = 3,
+ /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Medical surplus equipment"
@@ -1998,21 +1827,23 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/cmogear
name = "Chief medical officer equipment"
- contains = list(/obj/item/weapon/storage/belt/medical,
- /obj/item/device/radio/headset/heads/cmo,
- /obj/item/clothing/under/rank/chief_medical_officer,
- /obj/item/weapon/reagent_containers/hypospray,
- /obj/item/clothing/accessory/stethoscope,
- /obj/item/clothing/glasses/hud/health,
- /obj/item/clothing/suit/storage/toggle/labcoat/cmo,
- /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
- /obj/item/clothing/mask/surgical,
- /obj/item/clothing/shoes/white,
- /obj/item/weapon/cartridge/cmo,
- /obj/item/clothing/gloves/latex,
- /obj/item/device/healthanalyzer,
- /obj/item/device/flashlight/pen,
- /obj/item/weapon/reagent_containers/syringe)
+ contains = list(
+ /obj/item/weapon/storage/belt/medical,
+ /obj/item/device/radio/headset/heads/cmo,
+ /obj/item/clothing/under/rank/chief_medical_officer,
+ /obj/item/weapon/reagent_containers/hypospray,
+ /obj/item/clothing/accessory/stethoscope,
+ /obj/item/clothing/glasses/hud/health,
+ /obj/item/clothing/suit/storage/toggle/labcoat/cmo,
+ /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
+ /obj/item/clothing/mask/surgical,
+ /obj/item/clothing/shoes/white,
+ /obj/item/weapon/cartridge/cmo,
+ /obj/item/clothing/gloves/latex,
+ /obj/item/device/healthanalyzer,
+ /obj/item/device/flashlight/pen,
+ /obj/item/weapon/reagent_containers/syringe
+ )
cost = 60
containertype = "/obj/structure/closet/crate/secure"
containername = "Chief medical officer equipment"
@@ -2021,20 +1852,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/doctorgear
name = "Medical Doctor equipment"
- contains = list(/obj/item/weapon/storage/belt/medical,
- /obj/item/device/radio/headset/headset_med,
- /obj/item/clothing/under/rank/medical,
- /obj/item/clothing/accessory/stethoscope,
- /obj/item/clothing/glasses/hud/health,
- /obj/item/clothing/suit/storage/toggle/labcoat,
- /obj/item/clothing/mask/surgical,
- /obj/item/weapon/storage/firstaid/adv,
- /obj/item/clothing/shoes/white,
- /obj/item/weapon/cartridge/medical,
- /obj/item/clothing/gloves/latex,
- /obj/item/device/healthanalyzer,
- /obj/item/device/flashlight/pen,
- /obj/item/weapon/reagent_containers/syringe)
+ contains = list(
+ /obj/item/weapon/storage/belt/medical,
+ /obj/item/device/radio/headset/headset_med,
+ /obj/item/clothing/under/rank/medical,
+ /obj/item/clothing/accessory/stethoscope,
+ /obj/item/clothing/glasses/hud/health,
+ /obj/item/clothing/suit/storage/toggle/labcoat,
+ /obj/item/clothing/mask/surgical,
+ /obj/item/weapon/storage/firstaid/adv,
+ /obj/item/clothing/shoes/white,
+ /obj/item/weapon/cartridge/medical,
+ /obj/item/clothing/gloves/latex,
+ /obj/item/device/healthanalyzer,
+ /obj/item/device/flashlight/pen,
+ /obj/item/weapon/reagent_containers/syringe
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Medical Doctor equipment"
@@ -2043,20 +1876,22 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/chemistgear
name = "Chemist equipment"
- contains = list(/obj/item/weapon/storage/box/beakers,
- /obj/item/device/radio/headset/headset_med,
- /obj/item/weapon/storage/box/autoinjectors,
- /obj/item/clothing/under/rank/chemist,
- /obj/item/clothing/glasses/science,
- /obj/item/clothing/suit/storage/toggle/labcoat/chemist,
- /obj/item/clothing/mask/surgical,
- /obj/item/clothing/shoes/white,
- /obj/item/weapon/cartridge/chemistry,
- /obj/item/clothing/gloves/latex,
- /obj/item/weapon/reagent_containers/dropper,
- /obj/item/device/healthanalyzer,
- /obj/item/weapon/storage/box/pillbottles,
- /obj/item/weapon/reagent_containers/syringe)
+ contains = list(
+ /obj/item/weapon/storage/box/beakers,
+ /obj/item/device/radio/headset/headset_med,
+ /obj/item/weapon/storage/box/autoinjectors,
+ /obj/item/clothing/under/rank/chemist,
+ /obj/item/clothing/glasses/science,
+ /obj/item/clothing/suit/storage/toggle/labcoat/chemist,
+ /obj/item/clothing/mask/surgical,
+ /obj/item/clothing/shoes/white,
+ /obj/item/weapon/cartridge/chemistry,
+ /obj/item/clothing/gloves/latex,
+ /obj/item/weapon/reagent_containers/dropper,
+ /obj/item/device/healthanalyzer,
+ /obj/item/weapon/storage/box/pillbottles,
+ /obj/item/weapon/reagent_containers/syringe
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Chemist equipment"
@@ -2065,25 +1900,27 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/paramedicgear
name = "Paramedic equipment"
- contains = list(/obj/item/weapon/storage/belt/medical/emt,
- /obj/item/device/radio/headset/headset_med,
- /obj/item/clothing/under/rank/medical/black,
- /obj/item/clothing/accessory/armband/medgreen,
- /obj/item/clothing/glasses/hud/health,
- /obj/item/clothing/suit/storage/toggle/labcoat/emt,
- /obj/item/clothing/under/rank/medical/paramedic,
- /obj/item/clothing/suit/storage/toggle/fr_jacket,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/under/rank/medical/paramedic,
- /obj/item/clothing/accessory/stethoscope,
- /obj/item/weapon/storage/firstaid/adv,
- /obj/item/clothing/shoes/jackboots,
- /obj/item/clothing/gloves/latex,
- /obj/item/device/healthanalyzer,
- /obj/item/weapon/cartridge/medical,
- /obj/item/device/flashlight/pen,
- /obj/item/weapon/reagent_containers/syringe,
- /obj/item/clothing/accessory/storage/white_vest)
+ contains = list(
+ /obj/item/weapon/storage/belt/medical/emt,
+ /obj/item/device/radio/headset/headset_med,
+ /obj/item/clothing/under/rank/medical/black,
+ /obj/item/clothing/accessory/armband/medgreen,
+ /obj/item/clothing/glasses/hud/health,
+ /obj/item/clothing/suit/storage/toggle/labcoat/emt,
+ /obj/item/clothing/under/rank/medical/paramedic,
+ /obj/item/clothing/suit/storage/toggle/fr_jacket,
+ /obj/item/clothing/mask/gas,
+ /obj/item/clothing/under/rank/medical/paramedic,
+ /obj/item/clothing/accessory/stethoscope,
+ /obj/item/weapon/storage/firstaid/adv,
+ /obj/item/clothing/shoes/jackboots,
+ /obj/item/clothing/gloves/latex,
+ /obj/item/device/healthanalyzer,
+ /obj/item/weapon/cartridge/medical,
+ /obj/item/device/flashlight/pen,
+ /obj/item/weapon/reagent_containers/syringe,
+ /obj/item/clothing/accessory/storage/white_vest
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Paramedic equipment"
@@ -2092,78 +1929,40 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/psychiatristgear
name = "Psychiatrist equipment"
- contains = list(/obj/item/clothing/under/rank/psych,
- /obj/item/device/radio/headset/headset_med,
- /obj/item/clothing/under/rank/psych/turtleneck,
- /obj/item/clothing/shoes/laceup,
- /obj/item/clothing/suit/storage/toggle/labcoat,
- /obj/item/clothing/shoes/white,
- /obj/item/weapon/clipboard,
- /obj/item/weapon/folder/white,
- /obj/item/weapon/pen,
- /obj/item/weapon/cartridge/medical)
+ contains = list(
+ /obj/item/clothing/under/rank/psych,
+ /obj/item/device/radio/headset/headset_med,
+ /obj/item/clothing/under/rank/psych/turtleneck,
+ /obj/item/clothing/shoes/laceup,
+ /obj/item/clothing/suit/storage/toggle/labcoat,
+ /obj/item/clothing/shoes/white,
+ /obj/item/weapon/clipboard,
+ /obj/item/weapon/folder/white,
+ /obj/item/weapon/pen,
+ /obj/item/weapon/cartridge/medical
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Psychiatrist equipment"
access = access_psychiatrist
group = "Medical"
-/*
-/datum/supply_packs/geneticistgear
- name = "Geneticist equipment"
- contains = list(/obj/item/weapon/storage/belt/medical,
- /obj/item/device/radio/headset/headset_medsci,
- /obj/item/clothing/under/rank/geneticist,
- /obj/item/clothing/accessory/stethoscope,
- /obj/item/clothing/suit/storage/toggle/labcoat/genetics,
- /obj/item/clothing/mask/surgical,
- /obj/item/clothing/shoes/white,
- /obj/item/clothing/gloves/latex,
- /obj/item/weapon/cartridge/medical,
- /obj/item/device/healthanalyzer,
- /obj/item/device/flashlight/pen,
- /obj/item/weapon/reagent_containers/syringe)
- cost = 15
- containertype = "/obj/structure/closet/crate/secure"
- containername = "Geneticist equipment"
- access = access_genetics
- group = "Medical"
-*/
-
/datum/supply_packs/medicalscrubs
name = "Medical scrubs"
- contains = list(/obj/item/clothing/shoes/white,
- /obj/item/clothing/shoes/white,
- /obj/item/clothing/shoes/white,
- /obj/item/clothing/under/rank/medical/blue,
- /obj/item/clothing/under/rank/medical/blue,
- /obj/item/clothing/under/rank/medical/blue,
- /obj/item/clothing/under/rank/medical/green,
- /obj/item/clothing/under/rank/medical/green,
- /obj/item/clothing/under/rank/medical/green,
- /obj/item/clothing/under/rank/medical/purple,
- /obj/item/clothing/under/rank/medical/purple,
- /obj/item/clothing/under/rank/medical/purple,
- /obj/item/clothing/under/rank/medical/black,
- /obj/item/clothing/under/rank/medical/black,
- /obj/item/clothing/under/rank/medical/black,
- /obj/item/clothing/head/surgery,
- /obj/item/clothing/head/surgery,
- /obj/item/clothing/head/surgery,
- /obj/item/clothing/head/surgery/purple,
- /obj/item/clothing/head/surgery/purple,
- /obj/item/clothing/head/surgery/purple,
- /obj/item/clothing/head/surgery/blue,
- /obj/item/clothing/head/surgery/blue,
- /obj/item/clothing/head/surgery/blue,
- /obj/item/clothing/head/surgery/green,
- /obj/item/clothing/head/surgery/green,
- /obj/item/clothing/head/surgery/green,
- /obj/item/clothing/head/surgery/black,
- /obj/item/clothing/head/surgery/black,
- /obj/item/clothing/head/surgery/black,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves)
+ contains = list(
+ /obj/item/clothing/shoes/white = 3,,
+ /obj/item/clothing/under/rank/medical/blue = 3,
+ /obj/item/clothing/under/rank/medical/green = 3,
+ /obj/item/clothing/under/rank/medical/purple = 3,
+ /obj/item/clothing/under/rank/medical/black = 3,
+ /obj/item/clothing/head/surgery = 3,
+ /obj/item/clothing/head/surgery/purple = 3,
+ /obj/item/clothing/head/surgery/blue = 3,
+ /obj/item/clothing/head/surgery/green = 3,
+ /obj/item/clothing/head/surgery/black = 3,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Medical scrubs crate"
@@ -2172,15 +1971,16 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/autopsy
name = "Autopsy equipment"
- contains = list(/obj/item/weapon/folder/white,
- /obj/item/device/camera,
- /obj/item/device/camera_film,
- /obj/item/device/camera_film,
- /obj/item/weapon/autopsy_scanner,
- /obj/item/weapon/scalpel,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves,
- /obj/item/weapon/pen)
+ contains = list(
+ /obj/item/weapon/folder/white,
+ /obj/item/device/camera,
+ /obj/item/device/camera_film = 2,
+ /obj/item/weapon/autopsy_scanner,
+ /obj/item/weapon/scalpel,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves,
+ /obj/item/weapon/pen
+ )
cost = 20
containertype = "/obj/structure/closet/crate/secure"
containername = "Autopsy equipment crate"
@@ -2189,32 +1989,26 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/medicaluniforms
name = "Medical uniforms"
- contains = list(/obj/item/clothing/shoes/white,
- /obj/item/clothing/shoes/white,
- /obj/item/clothing/shoes/white,
- /obj/item/clothing/under/rank/chief_medical_officer,
- /obj/item/clothing/under/rank/geneticist,
- /obj/item/clothing/under/rank/virologist,
- /obj/item/clothing/under/rank/nursesuit,
- /obj/item/clothing/under/rank/nurse,
- /obj/item/clothing/under/rank/orderly,
- /obj/item/clothing/under/rank/medical,
- /obj/item/clothing/under/rank/medical,
- /obj/item/clothing/under/rank/medical,
- /obj/item/clothing/under/rank/medical/paramedic,
- /obj/item/clothing/under/rank/medical/paramedic,
- /obj/item/clothing/under/rank/medical/paramedic,
- /obj/item/clothing/suit/storage/toggle/labcoat,
- /obj/item/clothing/suit/storage/toggle/labcoat,
- /obj/item/clothing/suit/storage/toggle/labcoat,
- /obj/item/clothing/suit/storage/toggle/labcoat/cmo,
- /obj/item/clothing/suit/storage/toggle/labcoat/emt,
- /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
- /obj/item/clothing/suit/storage/toggle/labcoat/genetics,
- /obj/item/clothing/suit/storage/toggle/labcoat/virologist,
- /obj/item/clothing/suit/storage/toggle/labcoat/chemist,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves)
+ contains = list(
+ /obj/item/clothing/shoes/white = 3,
+ /obj/item/clothing/under/rank/chief_medical_officer,
+ /obj/item/clothing/under/rank/geneticist,
+ /obj/item/clothing/under/rank/virologist,
+ /obj/item/clothing/under/rank/nursesuit,
+ /obj/item/clothing/under/rank/nurse,
+ /obj/item/clothing/under/rank/orderly,
+ /obj/item/clothing/under/rank/medical = 3,
+ /obj/item/clothing/under/rank/medical/paramedic = 3,
+ /obj/item/clothing/suit/storage/toggle/labcoat = 3,
+ /obj/item/clothing/suit/storage/toggle/labcoat/cmo,
+ /obj/item/clothing/suit/storage/toggle/labcoat/emt,
+ /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
+ /obj/item/clothing/suit/storage/toggle/labcoat/genetics,
+ /obj/item/clothing/suit/storage/toggle/labcoat/virologist,
+ /obj/item/clothing/suit/storage/toggle/labcoat/chemist,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Medical uniform crate"
@@ -2223,28 +2017,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/medicalbiosuits
name = "Medical biohazard gear"
- contains = list(/obj/item/clothing/head/bio_hood,
- /obj/item/clothing/head/bio_hood,
- /obj/item/clothing/head/bio_hood,
- /obj/item/clothing/suit/bio_suit,
- /obj/item/clothing/suit/bio_suit,
- /obj/item/clothing/suit/bio_suit,
- /obj/item/clothing/head/bio_hood/virology,
- /obj/item/clothing/suit/bio_suit/virology,
- /obj/item/clothing/suit/bio_suit/cmo,
- /obj/item/clothing/head/bio_hood/cmo,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/clothing/mask/gas,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/tank/oxygen,
- /obj/item/weapon/storage/box/masks,
- /obj/item/weapon/storage/box/gloves)
+ contains = list(
+ /obj/item/clothing/head/bio_hood = 3,
+ /obj/item/clothing/suit/bio_suit = 3,
+ /obj/item/clothing/head/bio_hood/virology = 2,
+ /obj/item/clothing/suit/bio_suit/cmo,
+ /obj/item/clothing/head/bio_hood/cmo,
+ /obj/item/clothing/mask/gas = 5,
+ /obj/item/weapon/tank/oxygen = 5,
+ /obj/item/weapon/storage/box/masks,
+ /obj/item/weapon/storage/box/gloves
+ )
cost = 50
containertype = "/obj/structure/closet/crate/secure"
containername = "Medical biohazard equipment"
@@ -2253,13 +2036,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/portablefreezers
name = "Portable freezers crate"
- contains = list(/obj/item/weapon/storage/box/freezer,
- /obj/item/weapon/storage/box/freezer,
- /obj/item/weapon/storage/box/freezer,
- /obj/item/weapon/storage/box/freezer,
- /obj/item/weapon/storage/box/freezer,
- /obj/item/weapon/storage/box/freezer,
- /obj/item/weapon/storage/box/freezer)
+ contains = list(/obj/item/weapon/storage/box/freezer = 7)
cost = 25
containertype = "/obj/structure/closet/crate/secure"
containername = "Portable freezers"
@@ -2268,21 +2045,23 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/minergear
name = "Shaft miner equipment"
- contains = list(/obj/item/weapon/storage/backpack/industrial,
- /obj/item/weapon/storage/backpack/satchel/eng,
- /obj/item/clothing/suit/storage/hooded/wintercoat/miner,
- /obj/item/device/radio/headset/headset_cargo,
- /obj/item/clothing/under/rank/miner,
- /obj/item/clothing/gloves/black,
- /obj/item/clothing/shoes/black,
- /obj/item/device/analyzer,
- /obj/item/weapon/storage/bag/ore,
- /obj/item/device/flashlight/lantern,
- /obj/item/weapon/shovel,
- /obj/item/weapon/pickaxe,
- /obj/item/weapon/mining_scanner,
- /obj/item/clothing/glasses/material,
- /obj/item/clothing/glasses/meson)
+ contains = list(
+ /obj/item/weapon/storage/backpack/industrial,
+ /obj/item/weapon/storage/backpack/satchel/eng,
+ /obj/item/clothing/suit/storage/hooded/wintercoat/miner,
+ /obj/item/device/radio/headset/headset_cargo,
+ /obj/item/clothing/under/rank/miner,
+ /obj/item/clothing/gloves/black,
+ /obj/item/clothing/shoes/black,
+ /obj/item/device/analyzer,
+ /obj/item/weapon/storage/bag/ore,
+ /obj/item/device/flashlight/lantern,
+ /obj/item/weapon/shovel,
+ /obj/item/weapon/pickaxe,
+ /obj/item/weapon/mining_scanner,
+ /obj/item/clothing/glasses/material,
+ /obj/item/clothing/glasses/meson
+ )
cost = 15
containertype = "/obj/structure/closet/crate/secure"
containername = "Shaft miner equipment"
@@ -2291,18 +2070,18 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/chaplaingear
name = "Chaplain equipment"
- contains = list(/obj/item/clothing/under/rank/chaplain,
- /obj/item/clothing/shoes/black,
- /obj/item/clothing/suit/nun,
- /obj/item/clothing/head/nun_hood,
- /obj/item/clothing/suit/chaplain_hoodie,
- /obj/item/clothing/head/chaplain_hood,
- /obj/item/clothing/suit/holidaypriest,
- /obj/item/clothing/under/wedding/bride_white,
- /obj/item/weapon/storage/backpack/cultpack,
- /obj/item/weapon/storage/fancy/candle_box,
- /obj/item/weapon/storage/fancy/candle_box,
- /obj/item/weapon/storage/fancy/candle_box)
+ contains = list(
+ /obj/item/clothing/under/rank/chaplain,
+ /obj/item/clothing/shoes/black,
+ /obj/item/clothing/suit/nun,
+ /obj/item/clothing/head/nun_hood,
+ /obj/item/clothing/suit/chaplain_hoodie,
+ /obj/item/clothing/head/chaplain_hood,
+ /obj/item/clothing/suit/holidaypriest,
+ /obj/item/clothing/under/wedding/bride_white,
+ /obj/item/weapon/storage/backpack/cultpack,
+ /obj/item/weapon/storage/fancy/candle_box = 3
+ )
cost = 10
containertype = "/obj/structure/closet/crate"
containername = "Chaplain equipment crate"
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 33d5aecddb..ddcbb9cc2c 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -892,8 +892,26 @@
desc = "A kitchen and restaurant equipment vendor."
product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
icon_state = "dinnerware"
- products = list(/obj/item/weapon/tray = 8,/obj/item/weapon/material/kitchen/utensil/fork = 6, /obj/item/weapon/material/kitchen/utensil/knife = 6, /obj/item/weapon/material/kitchen/utensil/spoon = 6, /obj/item/weapon/material/knife = 3,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2)
- contraband = list(/obj/item/weapon/material/kitchen/rollingpin = 2, /obj/item/weapon/material/knife/butch = 2)
+ products = list(
+ /obj/item/weapon/tray = 8,
+ /obj/item/weapon/material/kitchen/utensil/fork = 6,
+ /obj/item/weapon/material/kitchen/utensil/knife = 6,
+ /obj/item/weapon/material/kitchen/utensil/spoon = 6,
+ /obj/item/weapon/material/knife = 3,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,
+ /obj/item/clothing/suit/chef/classic = 2,
+ /obj/item/weapon/storage/toolbox/lunchbox = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/heart = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/cat = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/nt = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/mars = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/cti = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/nymph = 3,
+ /obj/item/weapon/storage/toolbox/lunchbox/syndicate = 3)
+
+
+ contraband = list(/obj/item/weapon/material/kitchen/rollingpin = 2,
+ /obj/item/weapon/material/knife/butch = 2)
/obj/machinery/vending/sovietsoda
name = "BODA"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 0722b5b077..62401902b6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -18,11 +18,10 @@
New()
..()
- for(var/i = 0, i < 6, i++)
+ for(var/i = 1 to 7)
new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
- new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
- for(var/i = 0, i < 3, i++)
- new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+ for(var/i = 1 to 2)
+ new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
return
@@ -43,7 +42,7 @@
New()
..()
- for(var/i = 0, i < 4, i++)
+ for(var/i = 1 to 10)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
return
@@ -61,11 +60,11 @@
New()
..()
- for(var/i = 0, i < 5, i++)
+ for(var/i = 1 to 6)
new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
- for(var/i = 0, i < 3, i++)
+ for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
- for(var/i = 0, i < 2, i++)
+ for(var/i = 1 to 4)
new /obj/item/weapon/storage/fancy/egg_box(src)
return
@@ -84,10 +83,10 @@
New()
..()
- for(var/i = 0, i < 3, i++)
+ for(var/i = 1 to 3)
new /obj/item/weapon/spacecash/c1000(src)
- for(var/i = 0, i < 5, i++)
+ for(var/i = 1 to 4)
new /obj/item/weapon/spacecash/c500(src)
- for(var/i = 0, i < 6, i++)
+ for(var/i = 1 to 5)
new /obj/item/weapon/spacecash/c200(src)
return
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 47a3c5a63e..9496413be7 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -288,9 +288,11 @@ var/list/mechtoys = list(
for(var/typepath in contains)
if(!typepath) continue
- var/atom/B2 = new typepath(A)
- if(SP.amount && B2:amount) B2:amount = SP.amount
- if(slip) slip.info += "[B2.name]" //add the item to the manifest
+ var/number_of_items = max(1, contains[typepath])
+ for(var/j = 1 to number_of_items)
+ var/atom/B2 = new typepath(A)
+ if(SP.amount && B2:amount) B2:amount = SP.amount
+ if(slip) slip.info += "[B2.name]" //add the item to the manifest
//manifest finalisation
if(slip)