Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/reagents/Chemistry-Machinery.dm

@@ -696,6 +696,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
 		/obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("cornoil" = 0),
+		/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = 0),
 
 
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -2077,6 +2077,23 @@ datum
 				..()
 				return
 
+		flour
+			name = "flour"
+			id = "flour"
+			description = "This is what you rub all over yourself to pretend to be a ghost."
+			reagent_state = SOLID
+			nutriment_factor = 1 * REAGENTS_METABOLISM
+			color = "#FFFFFF" // rgb: 0, 0, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				M.nutrition += nutriment_factor
+				..()
+				return
+
+			reaction_turf(var/turf/T, var/volume)
+				src = null
+				if(!istype(T, /turf/space))
+					new /obj/effect/decal/cleanable/flour(T)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////

code/modules/reagents/Chemistry-Recipes.dm

@@ -997,6 +997,14 @@ datum
 			required_catalysts = list("enzyme" = 5)
 			result_amount = 10
 
+		spacebeer
+			name = "Space Beer"
+			id = "spacebeer"
+			result = "beer"
+			required_reagents = list("flour" = 10)
+			required_catalysts = list("enzyme" = 5)
+			result_amount = 10
+
 		vodka
 			name = "Vodka"
 			id = "vodka"

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

@@ -156,6 +156,18 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+/obj/item/weapon/reagent_containers/food/drinks/flour
+	name = "flour sack"
+	desc = "A big bag of flour. Good for baking!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "flour"
+	item_state = "flour"
+	New()
+		..()
+		reagents.add_reagent("flour", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
+
 /obj/item/weapon/reagent_containers/food/drinks/soymilk
 	name = "SoyMilk"
 	desc = "It's soy milk. White and nutritious goodness!"

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

@@ -461,13 +461,13 @@
 		..()
 		reagents.add_reagent("nutriment", 2)
 
-/obj/item/weapon/reagent_containers/food/snacks/flour
+/*/obj/item/weapon/reagent_containers/food/snacks/flour //Has been converted into a reagent. Use that instead of the item!
 	name = "flour"
 	desc = "Some flour"
 	icon_state = "flour"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("nutriment", 1)*/
 
 /obj/item/weapon/reagent_containers/food/snacks/appendix //yes, this is the same as meat. I might do something different in future
 	name = "appendix"