Merge branch 'master' into Cargo_MKII

code/modules/cargo/exports/large_objects.dm

@@ -183,7 +183,7 @@
 	worth += gases[/datum/gas/bz]*4
 	worth += gases[/datum/gas/stimulum]*25
 	worth += gases[/datum/gas/hypernoblium]*1000
-	worth += gases[/datum/gas/miasma]*15
+	worth += gases[/datum/gas/miasma]*4
 	worth += gases[/datum/gas/tritium]*7
 	worth += gases[/datum/gas/pluoxium]*6
 	worth += gases[/datum/gas/nitryl]*30

code/modules/cargo/packs.dm

@@ -1,20 +1,20 @@
 /datum/supply_pack
 	var/name = "Crate"
 	var/group = ""
-	var/hidden = FALSE
-	var/contraband = FALSE
+	var/hidden = FALSE //Aka emag only
+	var/contraband = FALSE //Hacking the console with a multitool
 	var/cost = 700 // Minimum cost, or infinite points are possible.
-	var/access = FALSE
-	var/access_any = FALSE
-	var/list/contains = null
-	var/crate_name = "crate"
+	var/access = FALSE //What access does the Crate itself need?
+	var/access_any = FALSE //Do we care about access?
+	var/list/contains = null //What items are in the crate
+	var/crate_name = "crate" //The crate that comes with each order
 	var/desc = ""//no desc by default
-	var/crate_type = /obj/structure/closet/crate
+	var/crate_type = /obj/structure/closet/crate //what kind of crate - Locked crates needed for access locked crates
 	var/dangerous = FALSE // Should we message admins?
 	var/special = FALSE //Event/Station Goals/Admin enabled packs
 	var/special_enabled = FALSE
-	var/DropPodOnly = FALSE//only usable by the Bluespace Drop Pod via the express cargo console
-	var/admin_spawned = FALSE
+	var/DropPodOnly = FALSE //only usable by the Bluespace Drop Pod via the express cargo console
+	var/admin_spawned = FALSE //Can only an admin spawn this crate?
 
 /datum/supply_pack/proc/generate(atom/A)
 	var/obj/structure/closet/crate/C = new crate_type(A)

code/modules/cargo/packs/armory.dm

@@ -87,7 +87,7 @@
 /datum/supply_pack/security/armory/mindshield
 	name = "Mindshield Implants Crate"
 	desc = "Prevent against radical thoughts with three Mindshield implants. Requires Armory access to open."
-	cost = 3000 //Lowered untill cargo rework MK II is done
+	cost = 4000
 	contains = list(/obj/item/storage/lockbox/loyalty)
 	crate_name = "mindshield implant crate"
 

code/modules/cargo/packs/livestock.dm

@@ -112,13 +112,6 @@
 	contains = list(/mob/living/simple_animal/hostile/retaliate/goose)
 	crate_name = "goose crate"
 
-/datum/supply_pack/critter/monkey
-	name = "Monkey Cube Crate"
-	desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!"
-	cost = 2000
-	contains = list (/obj/item/storage/box/monkeycubes)
-	crate_name = "monkey cube crate"
-
 /datum/supply_pack/critter/pug
 	name = "Pug Crate"
 	desc = "Like a normal dog, but... squished. Comes with a nice collar!"

code/modules/cargo/packs/science.dm

@@ -10,6 +10,47 @@
 	group = "Science"
 	crate_type = /obj/structure/closet/crate/science
 
+/* For later
+/datum/supply_pack/science/monkey
+	name = "Ape Cube Crate"
+	desc = "Pss what a new test subject with supper strangth, speed, and love for bananas all at the same time? Say no more... Contains a single ape cube. Dont add water!"
+	contraband = TRUE
+	cost = 2500
+	contains = list (/obj/item/reagent_containers/food/snacks/monkeycube/ape)
+	crate_name = "ape cube crate"
+*/
+
+/datum/supply_pack/science/aliens
+	name = "Advanced Alien Alloy Crate Crate"
+	desc = "Hello brothers from the stars!!! Our fellow brethren have made contact at long last and gave us gifts man! They really did build the prymi- Connection Error- Bro we’ll send you a sheet of advanced alien alloy."
+	cost = 15000
+	contraband = TRUE
+	DropPodOnly = TRUE
+	contains = list(/obj/item/stack/sheet/mineral/abductor)
+	crate_name = "alien bro alloy crate"
+
+/datum/supply_pack/science/beakers
+	name = "Chemistry Beackers Crate"
+	desc = "Glassware for any chemistry lab! Contains four small beakers, three large, two plastic, and one metamaterial. As well as three droppers and two pairs of latex gloves."
+	cost = 1500
+	contains = list(/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker,
+					/obj/item/reagent_containers/glass/beaker/large,
+					/obj/item/reagent_containers/glass/beaker/large,
+					/obj/item/reagent_containers/glass/beaker/large,
+					/obj/item/reagent_containers/glass/beaker/plastic,
+					/obj/item/reagent_containers/glass/beaker/plastic,
+					/obj/item/reagent_containers/glass/beaker/meta,
+					/obj/item/reagent_containers/glass/beaker/noreact,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/reagent_containers/dropper,
+					/obj/item/clothing/gloves/color/latex,
+					/obj/item/clothing/gloves/color/latex)
+	crate_name = "chemistry beaker crate"
+
 /datum/supply_pack/science/robotics/mecha_odysseus
 	name = "Circuit Crate (Odysseus)"
 	desc = "Ever wanted to build your own giant medical robot? Well, now you can! Contains the Odysseus main control board and Odysseus peripherals board. Requires Robotics access to open."
@@ -41,6 +82,33 @@
 					/obj/item/integrated_electronics/wirer)
 	crate_name = "circuitry starter pack crate"
 
+/datum/supply_pack/science/monkey
+	name = "Monkey Cube Crate"
+	desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!"
+	cost = 2000
+	contains = list (/obj/item/storage/box/monkeycubes)
+	crate_name = "monkey cube crate"
+
+/datum/supply_pack/science/nitrilegloves
+	name = "Nitrile Gloves Crate"
+	desc = "Handling toxic chemicals? Well worry not, keep your flesh intact with some nitrile made gloves! Contains three pairs of nitrile gloves."
+	cost = 1500
+	contains = list(/obj/item/clothing/gloves/color/latex/nitrile,
+					/obj/item/clothing/gloves/color/latex/nitrile,
+					/obj/item/clothing/gloves/color/latex/nitrile)
+	crate_name = "nitrile gloves crate"
+
+/datum/supply_pack/science/nuke_b_gone
+	name = "Nuke Defusal Kit"
+	desc = "Contains set of tools to defuse a nuke."
+	cost = 7500 //Usefull for traitors/nukies that fucked up
+	dangerous = TRUE
+	DropPodOnly = TRUE
+	contains = list(/obj/item/nuke_core_container/nt,
+					/obj/item/screwdriver/nuke/nt,
+					/obj/item/paper/guides/nt/nuke_instructions)
+	crate_name = "safe defusal kit storage"
+
 /datum/supply_pack/science/plasma
 	name = "Plasma Assembly Crate"
 	desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open."
@@ -61,6 +129,15 @@
 	crate_name = "plasma assembly crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 
+/datum/supply_pack/science/relic
+	name = "Relic Crate"
+	desc = "Ever want to play with old discounted toys? Look no more. Contains two relics."
+	cost = 1000
+	contraband = TRUE
+	contains = list(/obj/item/relic,
+					/obj/item/relic)
+	crate_name = "relic crate"
+
 /datum/supply_pack/science/robotics
 	name = "Robotics Assembly Crate"
 	desc = "The tools you need to replace those finicky humans with a loyal robot army! Contains three proximity sensors, two high-powered cells, six flashes, and an electrical toolbox. Requires Robotics access to open."
@@ -88,10 +165,30 @@
 	crate_name = "shield generators crate"
 	crate_type = /obj/structure/closet/crate/secure/science
 
+/datum/supply_pack/science/slime
+	name = "Slime Core Crate"
+	desc = "Ran out of slimes? No problem, contains one gray slime core. Requires Xenobio access to open."
+	cost = 1000
+	access = ACCESS_XENOBIOLOGY
+	contains = list(/obj/item/slime_extract/grey)
+	crate_name = "slime core crate"
+	crate_type = /obj/structure/closet/crate/secure/science
+
+/datum/supply_pack/science/supermater
+	name = "Supermatter Extraction Tools Crate"
+	desc = "Contains a set of tools to extract a sliver of supermatter. Consult your CE today!"
+	cost = 7500 //Usefull for traitors that fucked up
+	hidden = TRUE
+	contains = list(/obj/item/nuke_core_container/supermatter,
+					/obj/item/scalpel/supermatter,
+					/obj/item/hemostat/supermatter,
+					/obj/item/paper/guides/antag/supermatter_sliver)
+	crate_name = "supermatter extraction kit crate"
+
 /datum/supply_pack/science/tablets
 	name = "Tablet Crate"
 	desc = "What's a computer? Contains five cargo tablets."
-	cost = 5000
+	cost = 3000
 	contains = list(/obj/item/modular_computer/tablet/preset/cargo,
 					/obj/item/modular_computer/tablet/preset/cargo,
 					/obj/item/modular_computer/tablet/preset/cargo,