Merge pull request #3 from Citadel-Station-13/master

3

code/modules/vending/medical.dm

@@ -28,7 +28,9 @@
 	contraband = list(/obj/item/reagent_containers/pill/tox = 3,
 		              /obj/item/reagent_containers/pill/morphine = 4,
 		              /obj/item/reagent_containers/pill/charcoal = 6)
-	premium = list(/obj/item/storage/box/hug/medical = 1,
+	premium = list(/obj/item/reagent_containers/medspray/synthflesh = 2,
+				   /obj/item/storage/box/hug/medical = 1,
+				   /obj/item/storage/pill_bottle/psicodine = 2,
 		           /obj/item/reagent_containers/hypospray/medipen = 3,
 		           /obj/item/storage/belt/medical = 3,
 		           /obj/item/wrench/medical = 1,

code/modules/vending/megaseed.dm

@@ -32,7 +32,9 @@
 					/obj/item/seeds/replicapod = 3,
 					/obj/item/seeds/wheat/rice = 3,
 					/obj/item/seeds/soya = 3,
+					/obj/item/seeds/sugarcane = 3,
 					/obj/item/seeds/sunflower = 3,
+					/obj/item/seeds/strawberries = 3,
 					/obj/item/seeds/tea = 3,
 					/obj/item/seeds/tobacco = 3,
 					/obj/item/seeds/tomato = 3,

code/modules/vending/wardrobes.dm

@@ -338,7 +338,8 @@
 					/obj/item/clothing/suit/toggle/labcoat/chemist = 3,
 					/obj/item/storage/backpack/chemistry = 3,
 					/obj/item/storage/backpack/satchel/chem = 3,
-					/obj/item/storage/bag/chemistry = 3)
+					/obj/item/storage/bag/chemistry = 3,
+					/obj/item/fermichem/pHbooklet = 3)//pH indicator)
 	refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
 
 /obj/item/vending_refill/wardrobe/chem_wardrobe