Merge branch 'master' into plant-adding

code/modules/cargo/bounties/assistant.dm

@@ -215,3 +215,24 @@
 	description = "Commander Jackson is looking for a fine addition to her exotic weapons collection. She will reward you handsomely for either a Cat or Liz o' Nine Tails."
 	reward = 4000
 	wanted_types = list(/obj/item/melee/chainofcommand/tailwhip)
+
+/datum/bounty/item/assistant/shadow_wood_chair
+	name = "Shadow Wood Chairs"
+	description = "Commander Mat is unhappy with his chair. He claims it hurts his back. Ship some shadow wood chairs to humor him."
+	reward = 1000
+	required_count = 5
+	wanted_types = list(/obj/structure/chair/shadoww)
+
+/datum/bounty/item/assistant/mushroom_chair
+	name = "Mushroom Chairs"
+	description = "Commander Rat is unhappy with his chair. He claims it hurts his back. Ship some mushroom chairs to humor him."
+	reward = 1500
+	required_count = 5
+	wanted_types = list(/obj/structure/chair/gmushroom)
+
+/datum/bounty/item/assistant/plaswood_chair
+	name = "Plaswood Chairs"
+	description = "Commander Cat is unhappy with his chair. He claims it hurts his back. Ship some plaswood chairs to humor him."
+	reward = 2250
+	required_count = 5
+	wanted_types = list(/obj/structure/chair/plaswood)

code/modules/cargo/packs/armory.dm

@@ -189,7 +189,7 @@
 	crate_name = "swat crate"
 
 /datum/supply_pack/security/armory/swattasers //Lesser AEG tbh
-	name = "SWAT tatical tasers Crate"
+	name = "SWAT tactical tasers Crate"
 	desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open."
 	cost = 7000
 	contains = list(/obj/item/gun/energy/e_gun/stun,

code/modules/cargo/packs/costumes_toys.dm

@@ -289,6 +289,30 @@
 	crate_name = "wizard costume crate"
 	crate_type = /obj/structure/closet/crate/wooden
 
+/datum/supply_pack/costumes_toys/magicka
+	name = "Proper Wizard Costume Crate"
+	desc = "Up to four crewmates take on a grand adventure to save their world from certain doom using the robes in this crate!"
+	cost = 7000
+	contraband = TRUE
+	contains = list(/obj/item/staff,
+					/obj/item/staff,
+					/obj/item/staff,
+					/obj/item/staff,
+					/obj/item/clothing/shoes/sandal,
+					/obj/item/clothing/shoes/sandal,
+					/obj/item/clothing/shoes/sandal,
+					/obj/item/clothing/shoes/sandal,
+					/obj/item/clothing/suit/notwizrobe,
+					/obj/item/clothing/head/notwizard,
+					/obj/item/clothing/suit/notwizrobe/red,
+					/obj/item/clothing/head/notwizard/red,
+					/obj/item/clothing/suit/notwizrobe/yellow,
+					/obj/item/clothing/head/notwizard/yellow,
+					/obj/item/clothing/suit/notwizrobe/black,
+					/obj/item/clothing/head/notwizard/black)
+	crate_name = "proper wizard costume crate"
+	crate_type = /obj/structure/closet/crate/wooden
+
 /datum/supply_pack/costumes_toys/randomised/fill(obj/structure/closet/crate/C)
 	var/list/L = contains.Copy()
 	for(var/i in 1 to num_contained)

code/modules/cargo/packs/misc.dm

@@ -350,6 +350,19 @@
 					/obj/item/toner)
 	crate_name = "toner crate"
 
+/datum/supply_pack/misc/wedding
+	name = "Wedding Crate"
+	desc = "Almost everything you need to host a wedding! Don't forget a ring!"
+	cost = 1500
+	contains = list(/obj/item/clothing/under/wedding_dress,
+					/obj/item/clothing/under/tuxedo,
+					/obj/item/storage/belt/cummerbund,
+					/obj/item/bouquet,
+					/obj/item/bouquet/sunflower,
+					/obj/item/bouquet/poppy,
+					/obj/item/reagent_containers/food/drinks/bottle/champagne)
+	crate_name = "wedding crate"
+
 /datum/supply_pack/misc/diamondring
 	name = "Diamond Ring"
 	desc = "Show them your love is like a diamond: unbreakable and forever lasting. Shipped straight from child slave cartels in the space african mines."

code/modules/cargo/packs/organic.dm

@@ -588,7 +588,7 @@
 /datum/supply_pack/organic/seeds
 	name = "Seeds Crate"
 	desc = "Big things have small beginnings. Contains fourteen different seeds."
-	cost = 1250
+	cost = 1300
 	contains = list(/obj/item/seeds/chili,
 					/obj/item/seeds/berry,
 					/obj/item/seeds/corn,