diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 8fb0460153a..3f8c55f703d 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -840,6 +840,9 @@
afterattack(obj/target, mob/user , flag)
return
+/obj/item/weapon/reagent_containers/food/snacks/grown/
+ icon = 'harvest.dmi'
+
////////////////////////////////////////////////////////////////////////////////
/// FOOD END
////////////////////////////////////////////////////////////////////////////////
@@ -850,7 +853,7 @@
/obj/item/weapon/reagent_containers/food/drinks
name = "drink"
desc = "yummy"
- icon = 'food.dmi'
+ icon = 'drinks.dmi'
icon_state = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
@@ -1395,13 +1398,14 @@
var/subjectjob = null
amount = 1
-
+/* Commented out due to being completly useless. Goddamn goon humor.
/obj/item/weapon/reagent_containers/food/snacks/assburger
name = "assburger"
desc = "This burger gives off an air of awkwardness."
icon_state = "assburger"
amount = 5
heal_amt = 2
+*/
/obj/item/weapon/reagent_containers/food/snacks/brainburger
name = "brainburger"
@@ -1454,7 +1458,7 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger
name = "monkeyburger"
desc = "The cornerstone of every nutritious breakfast."
- icon_state = "mburger"
+ icon_state = "burger"
amount = 5
heal_amt = 2
@@ -1654,9 +1658,7 @@
icon_state = "hotsauce"
amount = 1
-// Work in Process by Darem. Sorry for the mess.
-
-/obj/item/weapon/reagent_containers/food/snacks/grown/berryjam
+/obj/item/weapon/reagent_containers/food/snacks/berryjam
name = "Berry Jam"
desc = "A delightfully sweat flavor of some indescernible berry... you think."
icon_state = "berryjam"
@@ -1720,7 +1722,82 @@
amount = 5
heal_amt = 2
-//End new stuff by Darem
+/obj/item/weapon/reagent_containers/food/snacks/cheesecake
+ name = "Cheese Cake"
+ desc = "DANGEROUSLY cheesy."
+ icon_state = "cheesecake"
+ amount = 5
+ heal_amt = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/plaincake
+ name = "Vanilla Cake"
+ desc = "A plain cake, not a lie."
+ icon_state = "plaincake"
+ amount = 5
+ heal_amt = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/humeatpie
+ name = "-pie"
+ var/hname = ""
+ var/job = null
+ icon_state = "pie" //placeholder
+ desc = "A delicious meatpie."
+ amount = 3
+ heal_amt = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/momeatpie
+ name = "Monkey-pie"
+ icon_state = "pie"
+ desc = "A delicious meatpie."
+ amount = 3
+ heal_amt = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
+ name = "Xeno-pie"
+ icon_state = "pie" //placeholder
+ desc = "A delicious meatpie. Probably heretical."
+ New()
+ var/datum/reagents/R = new/datum/reagents(5)
+ reagents = R
+ R.my_atom = src
+ R.add_reagent("xenomicrobes", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
+ name = "Wing Fang Chu"
+ desc = "A savory dish of alien wing wang in soy."
+ icon_state = "wingfangchu"
+ New()
+ var/datum/reagents/R = new/datum/reagents(5)
+ reagents = R
+ R.my_atom = src
+ R.add_reagent("xenomicrobes", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/chaosdonut
+ name = "Chaos Donut"
+ desc = "Like life, it never quite tastes the same."
+ icon_state = "donut1"
+ heat_amt = 25
+ New()
+ ..()
+ if(rand(1,3) == 1)
+ src.icon_state = "donut2"
+ src.name = "Frosted Chaos Donut"
+ heat_amt = 0
+ drug_amt = 25
+
+/obj/item/weapon/reagent_containers/food/snacks/humankabob
+ name = "-kabob"
+ var/hname = ""
+ var/job = null
+ icon_state = "kabob"
+ amount = 3
+ heal_amt = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
+ name = "Monkey-kabob"
+ icon_state = "kabob"
+ amount = 3
+ heal_amt = 2
///////////////////////////////////////////////Alchohol bottles! -Agouri //////////////////////////
@@ -1996,7 +2073,6 @@
/obj/item/weapon/reagent_containers/food/drinks/shaker
name = "Shaker"
desc = "A metal shaker to mix drinks in."
- icon = 'food.dmi'
icon_state = "shaker"
New()
var/datum/reagents/R = new/datum/reagents(100)
@@ -2007,7 +2083,6 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass
name = "glass"
desc = "Your standard drinking glass."
- icon = 'food.dmi'
icon_state = "glass_empty"
New()
var/datum/reagents/R = new/datum/reagents(50)
@@ -2232,7 +2307,6 @@
/obj/item/weapon/reagent_containers/food/drinks/jar
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
- icon = 'food.dmi'
icon_state = "jar"
item_state = "beaker"
New()
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index 0989a54693d..61e86253b16 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -655,6 +655,7 @@
var/humanmeat_amount = 0
var/donkpocket_amount = 0
var/xenomeat_amount = 0
+ var/milk_amount = 0
var/hotsauce_amount = 0
var/coldsauce_amount = 0
var/soysauce_amount = 0
diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm
index c54ce3113dd..40a7ce9e154 100644
--- a/code/game/machinery/microwave.dm
+++ b/code/game/machinery/microwave.dm
@@ -7,6 +7,7 @@
var/xenomeat_amount = 0
var/humanmeat_amount = 0
var/donkpocket_amount = 0
+ var/milk_amount = 0
var/hotsauce_amount = 0
var/coldsauce_amount = 0
var/soysauce_amount = 0
@@ -18,7 +19,7 @@
/datum/recipe/jellydonut
egg_amount = 1
flour_amount = 1
- extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/berryjam
+ extra_item = /obj/item/weapon/reagent_containers/food/snacks/berryjam
creates = "/obj/item/weapon/reagent_containers/food/snacks/jellydonut"
/datum/recipe/donut
@@ -97,7 +98,7 @@
/datum/recipe/muffin
egg_amount = 2
flour_amount = 1
- extra_item = /obj/item/weapon/reagent_containers/food/drinks/milk
+ milk_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/muffin"
/datum/recipe/eggplantparm // Doesn't work EXACTLY right. The recipe works but it also works if you don't put in any cheese at all.
@@ -112,12 +113,69 @@
/datum/recipe/carrotcake
flour_amount = 3
+ egg_amount = 3
+ milk_amount = 1
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
creates = "/obj/item/weapon/reagent_containers/food/snacks/carrotcake"
+/datum/recipe/cheesecake
+ flour_amount = 3
+ egg_amount = 3
+ cheese_amount = 2
+ milk_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/cheesecake"
-/obj/machinery/microwave/New() // *** After making the recipe above, add it in here! ***
+/datum/recipe/plaincake
+ flour_amount = 3
+ egg_amount = 3
+ milk_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/plaincake"
+
+/datum/recipe/humeatpie
+ flour_amount = 2
+ humanmeat_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/humeatpie"
+
+/datum/recipe/momeatpie
+ flour_amount = 2
+ monkeymeat_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/momeatpie"
+
+/datum/recipe/xemeatpie
+ flour_amount = 2
+ xenomeat_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/xemeatpie"
+
+/datum/recipe/wingfangchu
+ soysauce_amount = 1
+ xenomeat_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/wingfangchu"
+
+/datum/recipe/chaosdonut
+ egg_amount = 1
+ flour_amount = 1
+ coldsauce_amount = 1
+ hotsauce_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/chaosdonut"
+
+/datum/recipe/humankabob
+ humanmeat_amount = 2
+ extra_item = /obj/item/weapon/rods
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/humankabob"
+
+/datum/recipe/monkeykabob
+ monkeymeat_amount = 2
+ extra_item = /obj/item/weapon/rods
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/monkeykabob"
+
+// *** After making the recipe above, add it in here! ***
+// Special Note: When adding recipes to the list, make sure to list recipes with extra_item before similar recipes without
+// one. The reason being that sometimes the FOR loop that searchs through the recipes will just stop
+// at the wrong recipe. It's a hack job but it works until I clean up the microwave code.
+/obj/machinery/microwave/New()
..()
+ src.available_recipes += new /datum/recipe/humankabob(src)
+ src.available_recipes += new /datum/recipe/monkeykabob(src)
src.available_recipes += new /datum/recipe/jellydonut(src)
src.available_recipes += new /datum/recipe/donut(src)
src.available_recipes += new /datum/recipe/monkeyburger(src)
@@ -137,6 +195,14 @@
src.available_recipes += new /datum/recipe/eggplantparm(src)
src.available_recipes += new /datum/recipe/soylenviridians(src)
src.available_recipes += new /datum/recipe/carrotcake(src)
+ src.available_recipes += new /datum/recipe/cheesecake(src)
+ src.available_recipes += new /datum/recipe/plaincake(src)
+ src.available_recipes += new /datum/recipe/humeatpie(src)
+ src.available_recipes += new /datum/recipe/momeatpie(src)
+ src.available_recipes += new /datum/recipe/xemeatpie(src)
+ src.available_recipes += new /datum/recipe/wingfangchu(src)
+ //src.available_recipes += new /datum/recipe/chaosdonut(src) // Commented out until I come up with a better idea.
+
/*******************
@@ -257,6 +323,13 @@ obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob)
src.sauce_amount++
del(O)
+ else if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk))
+ if(src.milk_amount < 5)
+ for(var/mob/V in viewers(src, null))
+ V.show_message(text("\blue [user] adds some milk to the microwave."))
+ src.milk_amount++
+ del(O)
+
else
if(!istype(extra_item, /obj/item)) //Allow one non food item to be added!
user.u_equip(O)
@@ -306,6 +379,7 @@ Please clean it before use!
Monkey Meat:[src.monkeymeat_amount] slabs of meat
Meat Turnovers:[src.donkpocket_amount] turnovers
Various Sauces:[src.sauce_amount] servings.
+Milk:[src.milk_amount] cups of milk.
Other Meat:[src.humanmeat_amount] slabs of meat
[xenodisplay]
@@ -342,7 +416,7 @@ Please clean it before use!
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue The microwave turns on."))
for(var/datum/recipe/R in src.available_recipes) //Look through the recipe list we made above
- if(src.egg_amount == R.egg_amount && src.flour_amount == R.flour_amount && src.monkeymeat_amount == R.monkeymeat_amount && src.humanmeat_amount == R.humanmeat_amount && src.donkpocket_amount == R.donkpocket_amount && src.xenomeat_amount == R.xenomeat_amount && src.hotsauce_amount == R.hotsauce_amount && src.coldsauce_amount == R.coldsauce_amount && src.soysauce_amount == R.soysauce_amount && src.ketchup_amount == R.ketchup_amount) // Check if it's an accepted recipe
+ if(src.egg_amount == R.egg_amount && src.flour_amount == R.flour_amount && src.monkeymeat_amount == R.monkeymeat_amount && src.humanmeat_amount == R.humanmeat_amount && src.donkpocket_amount == R.donkpocket_amount && src.xenomeat_amount == R.xenomeat_amount && src.hotsauce_amount == R.hotsauce_amount && src.coldsauce_amount == R.coldsauce_amount && src.soysauce_amount == R.soysauce_amount && src.ketchup_amount == R.ketchup_amount && src.milk_amount == R.milk_amount) // Check if it's an accepted recipe
var/thing
if(src.extra_item)
if (src.extra_item.type == R.extra_item) thing = 1
@@ -355,6 +429,7 @@ Please clean it before use!
src.monkeymeat_amount = 0
src.humanmeat_amount = 0
src.donkpocket_amount = 0
+ src.milk_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
@@ -366,7 +441,7 @@ Please clean it before use!
if(cooked_item == null) //Oops that wasn't a recipe dummy!!!
- if(src.egg_amount > 0 || src.flour_amount > 0 || src.water_amount > 0 || src.monkeymeat_amount > 0 || src.humanmeat_amount > 0 || src.donkpocket_amount > 0 || src.hotsauce_amount > 0 ||src.coldsauce_amount > 0 || src.soysauce_amount > 0 || src.ketchup_amount > 0 && src.extra_item == null) //Make sure there's something inside though to dirty it
+ if(src.egg_amount > 0 || src.flour_amount > 0 || src.water_amount > 0 || src.monkeymeat_amount > 0 || src.humanmeat_amount > 0 || src.donkpocket_amount > 0 || src.hotsauce_amount > 0 ||src.coldsauce_amount > 0 || src.soysauce_amount > 0 || src.ketchup_amount > 0 || src.milk_amount > 0 && src.extra_item == null) //Make sure there's something inside though to dirty it
src.operating = 1 // Turn it on
src.icon_state = "mw1"
src.updateUsrDialog()
@@ -378,6 +453,7 @@ Please clean it before use!
src.humanmeat_amount = 0
src.monkeymeat_amount = 0
src.donkpocket_amount = 0
+ src.milk_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
@@ -408,6 +484,7 @@ Please clean it before use!
src.humanmeat_amount = 0
src.monkeymeat_amount = 0
src.donkpocket_amount = 0
+ src.milk_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
@@ -443,6 +520,7 @@ Please clean it before use!
src.humanmeat_amount = 0
src.monkeymeat_amount = 0
src.donkpocket_amount = 0
+ src.milk_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
@@ -465,6 +543,12 @@ Please clean it before use!
if(istype(src.being_cooked, /obj/item/weapon/reagent_containers/food/snacks/humanburger))
src.being_cooked.name = humanmeat_name + src.being_cooked.name
src.being_cooked:job = humanmeat_job
+ else if(istype(src.being_cooked, /obj/item/weapon/reagent_containers/food/snacks/humeatpie))
+ src.being_cooked.name = humanmeat_name + src.being_cooked.name
+ src.being_cooked:job = humanmeat_job
+ else if(istype(src.being_cooked, /obj/item/weapon/reagent_containers/food/snacks/humankabob))
+ src.being_cooked.name = humanmeat_name + src.being_cooked.name
+ src.being_cooked:job = humanmeat_job
if(istype(src.being_cooked, /obj/item/weapon/reagent_containers/food/snacks/donkpocket))
src.being_cooked:warm = 1
src.being_cooked.name = "warm " + src.being_cooked.name
@@ -480,7 +564,7 @@ Please clean it before use!
////////////////////////////////////////////////////////////////////////////////////////////////////
-//Meatbread slicing RIGHT BELOW*************
+//Food slicing RIGHT BELOW*************
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/game/machinery/processor.dm b/code/game/machinery/processor.dm
index b6981b26307..628fc7d07cb 100644
--- a/code/game/machinery/processor.dm
+++ b/code/game/machinery/processor.dm
@@ -70,7 +70,7 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
- new /obj/item/weapon/reagent_containers/food/snacks/grown/berryjam(src.loc)
+ new /obj/item/weapon/reagent_containers/food/snacks/berryjam(src.loc)
src.processing = 0
return
diff --git a/icons/misc/old_or_unused.dmi b/icons/misc/old_or_unused.dmi
index 8b1dfed99c4..713924953fd 100644
Binary files a/icons/misc/old_or_unused.dmi and b/icons/misc/old_or_unused.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
new file mode 100644
index 00000000000..653ab755621
Binary files /dev/null and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index 1dbfc06b563..81cd54d66b6 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi
new file mode 100644
index 00000000000..0f063404775
Binary files /dev/null and b/icons/obj/harvest.dmi differ