Merge pull request #1140 from Fox-McCloud/tweaking-stuff

Tweaks and Fixes 2.0

code/modules/reagents/Chemistry-Machinery.dm

@@ -1027,7 +1027,7 @@
 		"soybeans" = list("soymilk" = 0),
 		"tomato" = list("ketchup" = 0),
 		///obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
-		"ricestalk" = list("rice" = -5),
+		"ricestalk" = list("rice" = 5),
 		"cherries" = list("cherryjelly" = 0),
 		"plastellium" = list("plasticide" = 5),
 	)

code/modules/reagents/Chemistry-Reagents.dm

@@ -2606,6 +2606,12 @@ datum
 						M:adjustToxLoss(1)
 					return
 
+			mojito
+				name = "Mojito"
+				id = "mojito"
+				description = "If it's good enough for Spesscuba, it's good enough for you."
+				color = "#664300" // rgb: 102, 67, 0
+
 			vodka
 				name = "Vodka"
 				id = "vodka"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1118,6 +1118,13 @@ datum
 			required_reagents = list("rum" = 2, "cola" = 1)
 			result_amount = 3
 
+		mojito
+			name = "Mojito"
+			id = "mojito"
+			result = "mojito"
+			required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1)
+			result_amount = 4
+
 		martini
 			name = "Classic Martini"
 			id = "martini"

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -242,6 +242,8 @@
 	New()
 		..()
 		reagents.add_reagent("tea", 30)
+		if(prob(20))
+			reagents.add_reagent("mugwort", 3)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
@@ -308,6 +310,8 @@
 	New()
 		..()
 		reagents.add_reagent("dry_ramen", 30)
+		if(prob(20))
+			reagents.add_reagent("enzyme", 3)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -188,6 +188,14 @@
 					icon_state = "vermouthglass"
 					name = "Glass of Vermouth"
 					desc = "You wonder why you're even drinking this straight."
+				if("triple_citrus")
+					icon_state = "triplecitrus"
+					name = "Glass of Triplecitrus Juice"
+					desc = "As colorful and healthy as it is delicious."
+				if("mojito")
+					icon_state = "mojito"
+					name = "Glass of Mojito"
+					desc = "Fresh from Spesscuba."
 				if("tequilla")
 					icon_state = "tequillaglass"
 					name = "Glass of Tequilla"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1279,6 +1279,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 4)
+		reagents.add_reagent("fake_cheese", 2)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein
@@ -1288,6 +1289,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("beans", 3)
 		reagents.add_reagent("msg",4)
 		bitesize = 2
 

code/modules/reagents/reagent_containers/glass/bottle.dm

@@ -252,6 +252,19 @@
 		..()
 		reagents.add_reagent("formaldehyde", 50)
 
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine
+	name = "Morphine Bottle"
+	desc = "A reagent bottle. Contains morphine."
+	New()
+		..()
+		reagents.add_reagent("morphine", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin
+	name = "Insulin Bottle"
+	desc = "A reagent bottle. Contains insulin."
+	New()
+		..()
+		reagents.add_reagent("insulin", 50)
 
 ////////////////////Traitor Poison Bottle//////////////////////////////
 

code/modules/store/items.dm

@@ -72,7 +72,7 @@
 /datum/storeitem/candle
 	name = "Candles"
 	desc = "A box of chandles. Use them to fool others into thinking you're out for a romantic dinner...or something."
-	typepath = /obj/item/weapon/storage/fancy/candle_box
+	typepath = /obj/item/weapon/storage/fancy/candle_box/full
 	cost = 200
 
 /datum/storeitem/katana