Merge pull request #3104 from Cheridan/stpatties

Happy St Patrick's Day!

code/modules/food/recipes_microwave.dm

@@ -1,16 +1,6 @@
 
 // see code/datums/recipe.dm
 
-
-/* No telebacon. just no...
-/datum/recipe/telebacon
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/meat,
-		/obj/item/device/assembly/signaler
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
-*/
-
 /datum/recipe/friedegg
 	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
 	items = list(
@@ -25,16 +15,6 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
 
-/*
-/datum/recipe/bananaphone
-	reagents = list("mushroomhallucinogen" = 5) //Trippin' balls, man.
-	items = list(
-		/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
-		/obj/item/device/radio
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/bananaphone
-*/
-
 /datum/recipe/jellydonut
 	reagents = list("berryjuice" = 5, "flour" = 5)
 	items = list(
@@ -95,7 +75,6 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/appendix
 
-
 /datum/recipe/brainburger
 	reagents = list("flour" = 5)
 	items = list(
@@ -135,7 +114,6 @@
 	reagents = list("flour" = 5)
 	items = list(
 		/obj/item/clothing/mask/gas/clown_hat,
-		/* /obj/item/weapon/reagent_containers/food/snacks/grown/banana, */
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/clown
 
@@ -262,6 +240,15 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
 
+/datum/recipe/cornedbeef
+	reagents = list("sodiumchloride" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/meat,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
+
 /datum/recipe/eggplantparm
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
@@ -943,7 +930,6 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup
 
-
 /datum/recipe/slimesoup
 	reagents = list("water" = 10, "slimejelly" = 5)
 	items = list(
@@ -957,14 +943,7 @@
 		/obj/item/weapon/ore/clown,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/clownstears
-/*
-/datum/recipe/boiledslimeextract
-	reagents = list("water" = 5)
-	items = list(
-		/obj/item/slime_core,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
-*/
+
 /datum/recipe/braincake
 	reagents = list("milk" = 5, "flour" = 15)
 	items = list(

code/modules/reagents/Chemistry-Reagents.dm

@@ -2830,6 +2830,12 @@ datum
 				..()
 				return
 
+		ethanol/beer/greenbeer
+			name = "Green Beer"
+			id = "greenbeer"
+			description = "An alcoholic beverage made from malted grains, hops, yeast, and water. Dyed a festive green."
+			color = "#A8E61D"
+
 		ethanol/kahlua
 			name = "Kahlua"
 			id = "kahlua"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1802,6 +1802,13 @@ datum/chemical_reaction/pestkiller
 	required_reagents = list ("beer" = 1, "ale" = 2)
 	result_amount = 3
 
+/datum/chemical_reaction/greenbeer
+	name = "Green Beer"
+	id = "greenbeer"
+	result = "greenbeer"
+	required_reagents = list("greencrayonpowder" = 1, "beer" = 10)
+	result_amount = 10
+
 /datum/chemical_reaction/hooch
 	name = "Hooch"
 	id = "hooch"

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

@@ -8,15 +8,7 @@
 	volume = 50
 
 	on_reagent_change()
-		/*if(reagents.reagent_list.len > 1 )
-			icon_state = "glass_brown"
-			name = "Glass of Hooch"
-			desc = "Two or more drinks, mixed together."*/
-		/*else if(reagents.reagent_list.len == 1)
-			for(var/datum/reagent/R in reagents.reagent_list)
-				switch(R.id)*/
 		if (reagents.reagent_list.len > 0)
-			//mrid = R.get_master_reagent_id()
 			switch(reagents.get_master_reagent_id())
 				if("beer")
 					icon_state = "beerglass"
@@ -26,6 +18,10 @@
 					icon_state = "beerglass"
 					name = "Beer glass"
 					desc = "A freezing pint of beer"
+				if("greenbeer")
+					icon_state = "greenbeerglass"
+					name = "Green beer glass"
+					desc = "A freezing pint of green beer. Festive."
 				if("ale")
 					icon_state = "aleglass"
 					name = "Ale glass"

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

@@ -595,6 +595,16 @@
 		reagents.add_reagent("toxin", 2)
 		bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/cornedbeef
+	name = "corned beef and cabbage"
+	desc = "Now you can feel like a real tourist vacationing in Ireland."
+	icon_state = "cornedbeef"
+	trash = /obj/item/trash/plate
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 3
+
 /obj/item/weapon/reagent_containers/food/snacks/faggot
 	name = "faggot"
 	desc = "A great meal all round. Not a cord of wood."
@@ -642,7 +652,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/burger/ghost
 	name = "ghost burger"
 	desc = "Too Spooky!"
-	icon_state = "ghostburger"
+	alpha = 125
 
 /obj/item/weapon/reagent_containers/food/snacks/burger
 	name = "burger"
@@ -755,7 +765,8 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
 	name = "booberry muffin"
-	icon_state = "booberrymuffin"
+	icon_state = "berrymuffin"
+	alpha = 125
 	desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
 
 /obj/item/weapon/reagent_containers/food/snacks/pie
@@ -2410,6 +2421,7 @@
 	name = "not-a-sandwich"
 	desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
 	icon_state = "notasandwich"
+	trash = /obj/item/trash/plate
 	New()
 		..()
 		reagents.add_reagent("nutriment", 6)