awa

code/modules/WVM/wmv_buyer.dm

@@ -67,6 +67,9 @@ GLOBAL_LIST_EMPTY(wasteland_vendor_shop_list)
 		/obj/item/clothing/head/helmet/f13/heavy/salvaged_pa = 30,
 		/obj/item/clothing/suit/armor/power_armor = 75,
 		/obj/item/clothing/head/helmet/f13/power_armor = 75,
+		/obj/item/gun/ballistic/shotgun/toy = 5,
+		/obj/item/gun/ballistic/automatic/toy = 5,
+		/obj/item/toy = 5,
 		/obj/item/melee = 5,
 		/obj/item/melee/transforming = 5,
 		/obj/item/twohanded = 5,
@@ -213,12 +216,12 @@ GLOBAL_LIST_EMPTY(wasteland_vendor_shop_list)
 		/obj/item/export/bottle/patron = 15,
 		/obj/item/card/lowbounty = 75,
 		/obj/item/card/midbounty = 150,
-		/obj/item/card/highbounty = 300,
-		/obj/item/card/kingbounty = 600,
+		/obj/item/card/highbounty = 250,
+		/obj/item/card/kingbounty = 500,
 		// Artifacts: Someone who actually playes needs to test these prices -Kelprunner
-		/obj/item/artifact/common = 250,
-		/obj/item/artifact/uncommon = 500,
-		/obj/item/artifact/rare = 750,
+		/obj/item/artifact/common = 150,
+		/obj/item/artifact/uncommon = 300,
+		/obj/item/artifact/rare = 500,
 	)
 	var/list/quicklisted = list()
 	var/is_grinding = FALSE
@@ -338,13 +341,13 @@ GLOBAL_LIST_EMPTY(wasteland_vendor_shop_list)
 	dat += "<b>Turn your kills into coins today!</b><br>"
 	dat += "Small Roller Bounty Ticket: 75¢<br>"
 	dat += "Medium Roller Bounty Ticket: 150¢<br>"
-	dat += "High Roller Bounty Ticket: 300¢<br>"
-	dat += "King's Bounty Ticket: 600¢<br>"
+	dat += "High Roller Bounty Ticket: 250¢<br>"
+	dat += "King's Bounty Ticket: 500¢<br>"
 	dat += "<br>"
 	dat += "<b>No use for an artifact? Trade it for hard coins!</b><br>"
-	dat += "Lesser Artifact: 250¢<br>"
-	dat += "Standard Artifact: 500¢<br>"
-	dat += "Greater Artifact: 750¢<br>"
+	dat += "Lesser Artifact: 150¢<br>"
+	dat += "Standard Artifact: 300¢<br>"
+	dat += "Greater Artifact: 500¢<br>"
 	dat += "</div>"
 
 	var/datum/browser/popup = new(user, "tradingvendor", "Trading point", 400, 500)

code/modules/cargo/exports/misc_export.dm

@@ -218,6 +218,7 @@
 		/obj/item/gun/energy/laser/wattz/recharger,
 		/obj/item/gun/energy/laser/wattz2ks,
 		/obj/item/gun/ballistic/rocketlauncher,
+		/obj/item/gun/magic/,
 		)
 
 /datum/export/item/uniquegun
@@ -263,6 +264,16 @@
 		/obj/item/gun/ballistic/revolver/shotpistol/flair_gun,
 	)
 
+/datum/export/item/melee
+	cost = 1000
+	unit_name = "melee weapon"
+	export_types = list(
+	/obj/item/melee/powerfist/f13,
+	/obj/item/melee/coyote,
+	/obj/item/melee/onehanded,
+	/obj/item/twohanded,
+	)
+
 /datum/export/item/armorrare
 	cost = 1500
 	unit_name = "quality armor"
@@ -602,6 +613,8 @@
 	cost = 500
 	unit_name = "basic toy"
 	export_types = list(/obj/item/toy,
+						/obj/item/gun/ballistic/shotgun/toy,
+						/obj/item/gun/ballistic/automatic/toy,
 	)
 
 
@@ -727,5 +740,23 @@
 	export_types = list(/obj/structure/closet/crate, /obj/structure/closet/crate/footlocker)
 	exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden, /obj/structure/closet/crate/bin)
 
+/datum/export/item/lowartifact
+	cost = 5000
+	unit_name = "common artifact"
+	export_types = list(/obj/item/artifact/common,
+	)
+
+/datum/export/item/highartifact
+	cost = 15000
+	unit_name = "rare artifact"
+	export_types = list(/obj/item/artifact/rare,
+	)
+
+/datum/export/item/midartifact
+	cost = 10000
+	unit_name = "uncommon artifact"
+	export_types = list(/obj/item/artifact/uncommon,
+	)
+
 /* k_elasticity 0 - the price degredation thing, in case we need it. Might need to be applied to toys in the future. */
 

code/modules/cargo/packs/engineering.dm

@@ -50,9 +50,8 @@
 /datum/supply_pack/engineering/experimentaltools
 	name = "Experimental Tools Crate"
 	desc = "High tech tools. Comes with an experimental welder, jaws of life, and hand drill!"
-	cost = 8000
-	contains = list(/obj/item/storage/belt/utility/full/engi,
-					/obj/item/storage/belt/utility/full/engi)
+	cost = 4000
+	contains = list(/obj/item/storage/belt/utility/full/engi)
 	crate_name = "experimental tools crate"
 	crate_type = /obj/structure/closet/crate/secure/engineering
 
@@ -82,7 +81,8 @@
 	desc = "Two boxes of tier four level parts!"
 	cost = 10000
 	contains = list(/obj/item/storage/box/stockparts/deluxe,
-					/obj/item/storage/box/stockparts/deluxe)
+					/obj/item/storage/box/stockparts/deluxe,
+					/obj/item/storage/part_replacer)
 	crate_name = "deluxe parts crate"
 	crate_type = /obj/structure/closet/crate/secure/engineering
 /*
@@ -260,7 +260,7 @@
 					/obj/item/storage/box/metalfoam)
 	crate_name = "metal foam grenade crate"
 
-/datum/supply_pack/engine/solar // because people have been managing to break power with EMPs lately, and prep for fiat power getting axed
+/datum/supply_pack/engineering/solar // because people have been managing to break power with EMPs lately, and prep for fiat power getting axed
 	name = "Solar Panel Crate"
 	desc = "Go green with this DIY advanced solar array. Contains twenty one solar assemblies, a solar-control circuit board, and tracker. If you have any questions, please check out the enclosed instruction book."
 	cost = 2500

code/modules/cargo/packs/goodies.dm

@@ -9,7 +9,7 @@
 	name = "Insulated Gloves Single-Pack"
 	desc = "The backbone of modern society. Oddly useful for...combat engineers, of all people."
 	cost = 800
-	contains = list(/obj/item/clothing/gloves/color/yellow) 
+	contains = list(/obj/item/clothing/gloves/color/yellow)
 
 
 /datum/supply_pack/goody/toolbox // mostly just to water down coupon probability
@@ -39,7 +39,7 @@
 /datum/supply_pack/goody/beach_ball
 	name = "Beach Ball"
 	desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"
-	cost = 200
+	cost = 500
 	contains = list(/obj/item/toy/beach_ball)
 
 /*

code/modules/cargo/packs/security.dm

@@ -69,7 +69,7 @@
 /datum/supply_pack/security/armorplus
 	name = "Armor - Advanced"
 	desc = "Three sets of specialized armor, express requisition for those in need. Stocks tend to fluctuate."
-	cost = 5000
+	cost = 3000
 	num_contained = 1
 	contains = list(/obj/effect/spawner/lootdrop/f13/uncommon_armor,
 					/obj/effect/spawner/lootdrop/f13/uncommon_armor,
@@ -490,6 +490,41 @@
 		)
 	crate_name = "quality weapon crate"
 
+/datum/supply_pack/security/wands // Wands
+	name = "Magic - Wands"
+	desc = "A crate containing three whole wands. Hand-crafted by the Witches of Winslow, according to the Dallas catalog."
+	cost = 3000
+	num_contained = 3
+	contains = list(
+		/obj/item/gun/magic/wand/kelpmagic/magicmissile/improved,
+		/obj/item/gun/magic/wand/kelpmagic/sparky,
+		/obj/item/gun/magic/wand/kelpmagic/firebolt
+		)
+	crate_name = "quality weapon crate"
+
+/datum/supply_pack/security/staves_basic // T1 Staves
+	name = "Magic - Basic Staves"
+	desc = "A crate containing three basic staves."
+	cost = 5000
+	num_contained = 3
+	contains = list(
+		/obj/item/gun/magic/staff/kelpmagic/magicmissile,
+		/obj/item/gun/magic/staff/kelpmagic/acidstaff,
+		/obj/item/gun/magic/staff/kelpmagic/lightning
+		)
+	crate_name = "quality weapon crate"
+
+/datum/supply_pack/security/staves_advanced // T2 Staves
+	name = "Magic - Advanced Staves"
+	desc = "A crate containing either a staff of fireball or a staff of healing."
+	cost = 5000
+	num_contained = 2
+	contains = list(
+		/obj/item/gun/magic/staff/kelpmagic/healstaff,
+		/obj/item/gun/magic/staff/kelpmagic/fireball
+		)
+	crate_name = "quality weapon crate"
+
 /datum/supply_pack/security/ammo_shipment
 	name = "Ammunition Shipment"
 	desc = "A crate packed full of ammo boxes."