Merge pull request #3277 from Kelprunner/yet-another-cargo-fix-god-damn

Cargo abuse fixes and NVGs (Good to merge if it passes checks)

code/modules/cargo/exports/materials.dm

@@ -81,18 +81,18 @@
 		/obj/item/shard)
 
 /datum/export/material/adamantine
-	cost = 100
+	cost = 1000
 	material_id = /datum/material/adamantine
 	message = "cm3 of pre-war ingots"
 	export_types = list(/obj/item/stack/sheet/mineral/adamantine,
 	/obj/item/ingot/adamantine)
 
-/* 
+/*
 /datum/export/material/prewar
 	cost = 15
 	material_id = /datum/material/prewar
 	message = "cm3 of prewar alloy"
-	export_types = (/obj/item/stack/sheet/prewar) 
+	export_types = (/obj/item/stack/sheet/prewar)
 */
 
 /datum/export/material/mythril
@@ -121,28 +121,28 @@
 
 /datum/export/material/expalloy
 	cost = 100 // Limited, unless clinic goes out of their way, which takes time.
-	message = " "
+	message = ""
 	unit_name = "polymer alloy"
 	material_id = /datum/material/leather
 	export_types = list(/obj/item/stack/sheet/mineral/abductor)
 
 /datum/export/material/bone
-	cost = 20
-	message = " "
+	cost = 40
+	message = ""
 	unit_name = "bone"
 	material_id = /datum/material/bone
 	export_types = list(/obj/item/stack/sheet/bone)
 
 /datum/export/material/sinew
-	cost = 10
-	message = " "
+	cost = 15
+	message = ""
 	unit_name = "pieces of sinew"
 	material_id = /datum/material/sinew
 	export_types = list(/obj/item/stack/sheet/sinew)
 
 /datum/export/material/chitin
 	cost = 100
-	message = " "
+	message = ""
 	unit_name = "pieces of chitin"
 	material_id = /datum/material/chitin
 	export_types = list(/obj/item/stack/sheet/animalhide/chitin)

code/modules/cargo/exports/misc_export.dm

@@ -734,7 +734,7 @@
 	)
 
 /datum/export/item/nucrate // Hopefully this one works
-	cost = 500
+	cost = 200
 	k_elasticity = 0
 	unit_name = "crate"
 	export_types = list(/obj/structure/closet/crate, /obj/structure/closet/crate/footlocker)

code/modules/cargo/packs/goodies.dm

@@ -27,7 +27,7 @@
 /datum/supply_pack/goody/valentine
 	name = "Valentine Card"
 	desc = "Make an impression on that special someone! Comes with one valentine card and a free candy heart!"
-	cost = 150
+	cost = 400
 	contains = list(/obj/item/valentine, /obj/item/reagent_containers/food/snacks/candyheart)
 
 /datum/supply_pack/goody/beeplush
@@ -53,17 +53,17 @@
 /datum/supply_pack/goody/grapementat
 	name = "Grape Mentats"
 	desc = "A tin of delicious grape flavored mental stimulants."
-	cost = 200 //export value is 200
+	cost = 400 //export value is 200
 	contains = list(/obj/item/storage/pill_bottle/chem_tin/mentats/grape)
 
 /datum/supply_pack/goody/orangementat
 	name = "Orange Mentats"
 	desc = "A tin of delicious orange flavored mental stimulants."
-	cost = 200
+	cost = 400
 	contains = list(/obj/item/storage/pill_bottle/chem_tin/mentats/orange)
 
 /datum/supply_pack/goody/berrymentat
 	name = "Berry Mentats"
 	desc = "A tin of delicious berry flavored mental stimulants."
-	cost = 200
+	cost = 400
 	contains = list(/obj/item/storage/pill_bottle/chem_tin/mentats/berry)

code/modules/cargo/packs/materials.dm

@@ -17,28 +17,28 @@
 	goody = PACK_GOODY_PUBLIC
 	name = "50 Cardboard Sheets"
 	desc = "Create a bunch of boxes."
-	cost = 300 //thrice their export value
+	cost = 400 //thrice their export value
 	contains = list(/obj/item/stack/sheet/cardboard/fifty)
 
 /datum/supply_pack/materials/glass50
 	goody = PACK_GOODY_PUBLIC
 	name = "50 Glass Sheets"
 	desc = "Let some nice light in with fifty glass sheets!"
-	cost = 300 //double their export value
+	cost = 400 //double their export value
 	contains = list(/obj/item/stack/sheet/glass/fifty)
 
 /datum/supply_pack/materials/metal50
 	goody = PACK_GOODY_PUBLIC
 	name = "50 Metal Sheets"
 	desc = "Any construction project begins with a good stack of fifty metal sheets!"
-	cost = 300 //double their export value
+	cost = 400 //double their export value
 	contains = list(/obj/item/stack/sheet/metal/fifty)
 
 /datum/supply_pack/materials/brick50
 	goody = PACK_GOODY_PUBLIC
 	name = "50 Bricks"
 	desc = "Set a nice foundation with brick and mortar!"
-	cost = 300 //double their export value
+	cost = 400 //double their export value
 	contains = list(/obj/item/stack/sheet/mineral/brick/fifty)
 
 /datum/supply_pack/materials/plasteel20
@@ -52,14 +52,14 @@
 	goody = PACK_GOODY_PUBLIC
 	name = "50 Plastic Sheets"
 	desc = "Build a limitless amount of toys with fifty plastic sheets!"
-	cost = 200 // double their export
+	cost = 400 // double their export
 	contains = list(/obj/item/stack/sheet/plastic/twenty)
 
 /datum/supply_pack/materials/sandstone30
 	goody = PACK_GOODY_PUBLIC
 	name = "30 Sandstone Blocks"
 	desc = "Neither sandy nor stoney, these thirty blocks will still get the job done."
-	cost = 150 // five times their export
+	cost = 400 // five times their export
 	contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty)
 
 /datum/supply_pack/materials/wood50

code/modules/cargo/packs/medical.dm

@@ -73,37 +73,37 @@
 /datum/supply_pack/medical/firstaidbruises_single
 	name = "Bruise Treatment Kit Single-Pack"
 	desc = "A single brute first-aid kit, perfect for recovering from being crushed by a super-mutant. Did you know people get crushed by super-mutants all the time? Interesting..."
-	cost = 250
+	cost = 400
 	contains = list(/obj/item/storage/firstaid/brute)
 
 /datum/supply_pack/medical/firstaidburns_single
 	name = "Burn Treatment Kit Single-Pack"
 	desc = "A single burn first-aid kit. The advertisement displays a winking Brotherhood scribe giving a thumbs up, saying \"Mistakes happen!\""
-	cost = 250
+	cost = 400
 	contains = list(/obj/item/storage/firstaid/fire)
 
 /datum/supply_pack/medical/firstaid_single
 	name = "First Aid Kit Single-Pack"
 	desc = "A single first-aid kit, fit for healing most types of bodily harm."
-	cost = 250
+	cost = 500
 	contains = list(/obj/item/storage/firstaid/regular)
 
 /datum/supply_pack/medical/firstaidoxygen_single
 	name = "Oxygen Deprivation Kit Single-Pack"
 	desc = "A single oxygen deprivation first-aid kit, marketed heavily to those with crippling fears of asphyxiation."
-	cost = 250
+	cost = 400
 	contains = list(/obj/item/storage/firstaid/o2)
 
 /datum/supply_pack/medical/firstaidtoxins_single
 	name = "Toxin Treatment Kit Single-Pack"
 	desc = "A single first aid kit focused on healing damage dealt by heavy toxins."
-	cost = 250
+	cost = 400
 	contains = list(/obj/item/storage/firstaid/toxin)
 
 /datum/supply_pack/medical/tacticalkit
 	name = "Tactical Treatment Kit Single-Pack"
 	desc = "A single first aid kit focused on getting people out of a bad situation."
-	cost = 7500
+	cost = 5000
 	contains = list(/obj/item/storage/firstaid/tactical)
 
 /datum/supply_pack/medical/potions
@@ -119,7 +119,7 @@
 /datum/supply_pack/emergency/medicalemergency
 	name = "Emergency Medical Supplies" //Almost all of this can be ordered seperatly for a much cheaper price, but the HUD increases it.
 	desc = "Emergency supplies for a front-line medic. Contains two boxes of body bags, a defib unit, medical belt, toxin bottles, epipens, and several types of medical kits."
-	cost = 10000
+	cost = 7500
 	contains = list(/obj/item/storage/box/bodybags,
 					/obj/item/storage/box/bodybags,
 					/obj/item/defibrillator/loaded,
@@ -161,7 +161,7 @@
 /datum/supply_pack/medical/iv_drip
 	name = "IV Drip Crate"
 	desc = "Contains a single IV drip stand for intravenous delivery."
-	cost = 200
+	cost = 400
 	contains = list(/obj/machinery/iv_drip)
 	crate_name = "iv drip crate"
 /*
@@ -240,11 +240,11 @@
 ///////////////////////////// Medical Kits ///////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-/*
+
 /datum/supply_pack/medical/sprays
 	name = "Medical Sprays"
 	desc = "Contains two cans of Styptic Spray, Silver Sulfadiazine Spray, Synthflesh Spray and Sterilizer Compound Spray."
-	cost = 2250
+	cost = 2000
 	contains = list(/obj/item/reagent_containers/medspray/styptic,
 					/obj/item/reagent_containers/medspray/styptic,
 					/obj/item/reagent_containers/medspray/silver_sulf,
@@ -258,21 +258,20 @@
 /datum/supply_pack/medical/advrad
 	name = "Radiation Treatment Crate Deluxe"
 	desc = "A crate for when radiation is out of hand... Contains two radaway pouches, one bottle of radx, as well as a radiation treatment deluxe pill bottle!"
-	cost = 3500
+	cost = 1200
 	contains = list(/obj/item/storage/pill_bottle/antirad_plus,
 					/obj/item/storage/pill_bottle/mutarad,
 					/obj/item/storage/firstaid/radbgone,
-					/obj/item/storage/firstaid/radbgone,
-					/obj/item/geiger_counter,
-					/obj/item/geiger_counter)
+					/obj/item/storage/firstaid/radbgone)
+
 	crate_name = "radiation protection crate"
 	crate_type = /obj/structure/closet/crate/radiation
 
 
 /datum/supply_pack/medical/medipen_variety
 	name = "Medipen Variety-Pak"
 	desc = "Contains eight different medipens in three different varieties, to assist in quickly treating seriously injured patients."
-	cost = 2000
+	cost = 1200
 	contains = list(/obj/item/reagent_containers/hypospray/medipen/,
 					/obj/item/reagent_containers/hypospray/medipen/,
 					/obj/item/reagent_containers/hypospray/medipen/ekit,
@@ -283,7 +282,6 @@
 					/obj/item/reagent_containers/hypospray/medipen/blood_loss)
 
 	crate_name = "medipen crate"
-*/
 
 /datum/supply_pack/medical/chems
 	name = "Mixed Chems"

code/modules/cargo/packs/misc.dm

@@ -103,7 +103,7 @@
 /datum/supply_pack/misc/coloredsheets
 	name = "Bedsheet Crate"
 	desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets."
-	cost = 250
+	cost = 400
 	contains = list(/obj/item/bedsheet/blue,
 					/obj/item/bedsheet/green,
 					/obj/item/bedsheet/orange,
@@ -330,21 +330,21 @@
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Basic"
 	desc = "A basic C.A.M.P. packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 100
+	cost = 400
 	contains = list(/obj/item/survivalcapsule)
 
 /datum/supply_pack/misc/capsuleluxury
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Luxury"
 	desc = "A luxury C.A.M.P. capsule packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 400
+	cost = 600
 	contains = list(/obj/item/survivalcapsule/luxury)
 
 /datum/supply_pack/misc/capsuleluxuryelite
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Luxury Elite"
 	desc = "A luxury bar C.A.M.P. capsule packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 600
+	cost = 800
 	contains = list(/obj/item/survivalcapsule/luxuryelite)
 
 /datum/supply_pack/misc/capsulesuper
@@ -386,36 +386,36 @@
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Cook-N-Go"
 	desc = "A rapid, ready to deploy field mess kitchen. C.A.M.P. packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 300
+	cost = 400
 	contains = list(/obj/item/survivalcapsule/kitchen)
 
 /datum/supply_pack/misc/capsulefarm
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Farm-N-Go"
 	desc = "A ready to go, loaded farming plot with three brahmin, and a small living quarter. C.A.M.P. packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 300
+	cost = 400
 	contains = list(/obj/item/survivalcapsule/farm)
 
 /datum/supply_pack/misc/capsulefortune
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Occult"
 	desc = "A camp with three brahmin and all your supernatural needs. C.A.M.P. packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 300
+	cost = 400
 	contains = list(/obj/item/survivalcapsule/fortuneteller)
 
 /datum/supply_pack/misc/capsulesmith
 	goody = PACK_GOODY_PUBLIC
 	name = "C.A.M.P. Capsule - Blacksmithery"
 	desc = "An all-in-one smithery, with a workbench, lathe, and forge as its key components. C.A.M.P. packed and designed by the Texarkana Trade Union.  Shake it and throw it!"
-	cost = 300
+	cost = 400
 	contains = list(/obj/item/survivalcapsule/blacksmith)
 
 
 /datum/supply_pack/misc/carpet
 	goody = PACK_GOODY_PUBLIC
 	name = "Classic Carpet Single-Pack"
 	desc = "Plasteel floor tiles getting on your nerves? This 50 units stack of extra soft carpet will tie any room together."
-	cost = 200
+	cost = 400
 	contains = list(/obj/item/stack/tile/carpet/fifty)
 
 /datum/supply_pack/misc/carpet/black
@@ -429,7 +429,7 @@
 /datum/supply_pack/misc/carpet/premium
 	name = "Monochrome Carpet Single-Pack"
 	desc = "Exotic carpets for all your decorating needs. This 30 units stack of extra soft carpet will tie any room together."
-	cost = 250
+	cost = 400
 	contains = list(/obj/item/stack/tile/carpet/monochrome/thirty)
 
 /datum/supply_pack/misc/carpet/premium/blackred

code/modules/cargo/packs/security.dm

@@ -79,6 +79,22 @@
 					/obj/effect/spawner/lootdrop/f13/rare_armor)
 	crate_name = "armor crate"
 
+/datum/supply_pack/security/nvgpack
+	name = "Utility - Night Vision"
+	desc = "A single set of Night Vision Goggles. Because you're just not tactical enough until you have a set of NODs on, even if it's the middle of the day."
+	cost = 10000
+	num_contained = 1
+	contains = list(/obj/item/clothing/glasses/night)
+	crate_name = "armor crate"
+
+/datum/supply_pack/security/nvgpack_upgr
+	name = "Utility - Prescription Night Vision"
+	desc = "A set of NVGs, now adjusted for those with terrible vision! Wearing these doesn't make you less of a nerd, however."
+	cost = 12500
+	num_contained = 1
+	contains = list(/obj/item/clothing/glasses/night/prescription)
+	crate_name = "armor crate"
+
 /datum/supply_pack/security/ec
 	name = "Ammo - Energy Cell"
 	desc = "Three fully charged energy cells."

code/modules/cargo/packs/skillbooks.dm

@@ -63,13 +63,13 @@
 
 /datum/supply_pack/skillbooks/trapper
 	name = "Guide to Minelaying"
-	desc = ""
+	desc = "Because you really want someone to have a bad day. At some point. Eventually."
 	cost = 10000
 	contains = list(/obj/item/book/granter/trait/trekking)
 
 /datum/supply_pack/skillbooks/polis
 	name = "Vigilante's Journal"
-	desc = "An old journal, writted by someone with the will to do right but cut short..."
+	desc = "An old journal, written by someone with the will to do right but whose life was cut short..."
 	cost = 5000
 	contains = list(/obj/item/book/granter/crafting_recipe/polis)