diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm
index 5c1d685e233..69a14317b06 100644
--- a/code/WorkInProgress/Chemistry-Reagents.dm
+++ b/code/WorkInProgress/Chemistry-Reagents.dm
@@ -895,7 +895,7 @@ datum
..()
return
- Wizordrazine //Going to use this for a spell soon, regeneration, it might seem OP, but that's the point.
+ wizordrazine //Going to use this for a spell soon, regeneration, it might seem OP, but that's the point.
name = "Wizordrazine"
id = "wizordrazine"
description = "I don't have to explain shit about Wizordrazine, its magic."
@@ -927,6 +927,10 @@ datum
M:brainloss = max(M:brainloss-3 , 0)
M.disabilities = 0
M.sdisabilities = 0
+ M:eye_blurry = max(M:eye_blurry-5 , 0)
+ M:eye_blind = max(M:eye_blind-5 , 0)
+ M:disabilities &= ~1
+ M:sdisabilities &= ~1
if(M:toxloss) M:toxloss = max(0, M:toxloss-3)
..()
return
@@ -966,7 +970,7 @@ datum
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
- if(M:radiation && prob(80)) M:radiation--
+ if(M:radiation) M:radiation--
..()
return
@@ -1003,7 +1007,7 @@ datum
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:radiation = max(M:radiation-3,0)
- if(M:toxloss && prob(50)) M:toxloss--
+ if(M:toxloss) M:toxloss--
if(prob(15)) M:bruteloss++
..()
return
diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 26b5c4da5e2..2871d621572 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -1603,6 +1603,25 @@
// reagents.add_reagent("nutriment", 2) // this line of code for all the contents.
// bitesize = 3 //This is the amount each bite consumes.
+/obj/item/weapon/reagent_containers/food/snacks/banana
+ name = "Banana"
+ desc = "A banana."
+ icon = 'items.dmi'
+ icon_state = "banana"
+ item_state = "banana"
+ On_Consume()
+ var/mob/M = usr
+ var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
+ M << "\blue You peel the banana."
+ M.put_in_hand(W)
+ W.add_fingerprint(M)
+ New()
+ ..()
+ reagents.add_reagent("banana", 5)
+ bitesize = 5
+ src.pixel_x = rand(-5.0, 5)
+ src.pixel_y = rand(-5.0, 5)
+
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
desc = "Nougat love it or hate it."
@@ -1669,14 +1688,39 @@
..()
reagents.add_reagent("nutriment", 3)
-/obj/item/weapon/reagent_containers/food/snacks/brainburger
- name = "brainburger"
- desc = "A strange looking burger. It looks almost sentient."
- icon_state = "brainburger"
+
+/obj/item/weapon/reagent_containers/food/snacks/tofu
+ name = "Tofu"
+ icon_state = "tofu"
+ desc = "We all love tofu."
New()
..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ reagents.add_reagent("nutriment", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeymeat
+ name = "meat"
+ desc = "A slab of meat"
+ icon_state = "meat"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat
+ name = "carp fillet"
+ desc = "A fillet of spess carp meat"
+ icon_state = "fishfillet"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("carpotoxin", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ name = "meat"
+ desc = "A slab of meat"
+ icon_state = "xenomeat"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "Faggot"
@@ -1703,6 +1747,15 @@
src.name = "donk-pocket"
return
+/obj/item/weapon/reagent_containers/food/snacks/brainburger
+ name = "brainburger"
+ desc = "A strange looking burger. It looks almost sentient."
+ icon_state = "brainburger"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
/obj/item/weapon/reagent_containers/food/snacks/humanburger
name = "-burger"
var/hname = ""
@@ -1723,46 +1776,24 @@
reagents.add_reagent("nutriment", 8)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/omelette
- name = "Omelette Du Fromage"
- desc = "That's all you can say!"
- icon_state = "omelette"
- var/herp = 0
+/obj/item/weapon/reagent_containers/food/snacks/fishburger
+ name = "Fillet -o- Carp Sandwich"
+ desc = "Almost like a carp is yelling some where... Give me back that fillet -o- carp, give me that carp."
+ icon_state = "fishburger"
New()
..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 1
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
- if (W.icon_state == "forkloaded")
- user << "\red You already have omelette on your fork."
- return
- W.icon = 'kitchen.dmi'
- W.icon_state = "forkloaded"
- if (herp)
- world << "[user] takes a piece of omelette with his fork!"
- else
- viewers(3,user) << "[user] takes a piece of omelette with his fork!"
- reagents.remove_reagent("nutriment", 1)
- if (reagents.total_volume <= 0)
- del(src)
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 2
-
-
-/obj/item/weapon/reagent_containers/food/snacks/omeletteforkload
- name = "Omelette Du Fromage"
- desc = "That's all you can say!"
+/obj/item/weapon/reagent_containers/food/snacks/tofuburger
+ name = "Togu Burger"
+ desc = "What.. is that meat?"
+ icon_state = "tofuburger"
New()
..()
- reagents.add_reagent("nutriment", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/muffin
- name = "Muffin"
- desc = "A delicious and spongy little cake"
- icon_state = "muffin"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roburger
name = "roburger"
@@ -1795,38 +1826,83 @@
reagents.add_reagent("nutriment", 2)
bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/monkeymeat
- name = "meat"
- desc = "A slab of meat"
- icon_state = "meat"
+/obj/item/weapon/reagent_containers/food/snacks/clownburger
+ name = "Clown Burger"
+ desc = "This tastes funny..."
+ icon_state = "clownburger"
New()
..()
- reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("nutriment", 4)
+ var/datum/disease/F = new /datum/disease/pierrot_throat(0)
+ var/list/data = list("virus"= F)
+ reagents.add_reagent("blood", 4, data)
+ bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat
- name = "carp fillet"
- desc = "A fillet of spess carp meat"
- icon_state = "fishfillet"
+/obj/item/weapon/reagent_containers/food/snacks/mimeburger
+ name = "Mime Burger"
+ desc = "It's taste defies language."
+ icon_state = "mimeburger"
New()
..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat
- name = "meat"
- desc = "A slab of meat"
- icon_state = "xenomeat"
+/obj/item/weapon/reagent_containers/food/snacks/omelette
+ name = "Omelette Du Fromage"
+ desc = "That's all you can say!"
+ icon_state = "omelette"
+ var/herp = 0
New()
..()
- reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 1
+ attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
+ if (W.icon_state == "forkloaded")
+ user << "\red You already have omelette on your fork."
+ return
+ W.icon = 'kitchen.dmi'
+ W.icon_state = "forkloaded"
+ if (herp)
+ world << "[user] takes a piece of omelette with his fork!"
+ else
+ viewers(3,user) << "[user] takes a piece of omelette with his fork!"
+ reagents.remove_reagent("nutriment", 1)
+ if (reagents.total_volume <= 0)
+ del(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/omeletteforkload
+ name = "Omelette Du Fromage"
+ desc = "That's all you can say!"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin
+ name = "Muffin"
+ desc = "A delicious and spongy little cake"
+ icon_state = "muffin"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
/obj/item/weapon/reagent_containers/food/snacks/pie
- name = "custard pie"
- desc = "It smells delicious. You just want to plant your face in it."
+ name = "Banana Cream Pie"
+ desc = "Just like back home, on clown planet! HONK!"
icon_state = "pie"
New()
..()
- reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("banana",5)
+
+/obj/item/weapon/reagent_containers/food/snacks/berrypie
+ name = "Very Berry Pie"
+ desc = "No black birds, this is a good sign."
+ icon_state = "pie"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("berryjuice", 5)
/obj/item/weapon/reagent_containers/food/snacks/waffles
name = "waffles"
@@ -1868,7 +1944,7 @@
icon_state = "soylent"
New()
..()
- reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("nutriment", 14)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -1880,84 +1956,6 @@
reagents.add_reagent("nutriment", 10)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/carrotcake
- name = "Carrot Cake"
- desc = "A favorite desert of a certain wascally wabbit. Not a lie."
- icon_state = "carrotcake"
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- reagents.add_reagent("imidazoline", 10)
- bitesize = 2
-
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
- W.visible_message(" \red You slice the [src]! ", 1)
- for(var/i=0,i<5,i++)
- new /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice (src.loc)
- del(src)
- return
-
-/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
- name = "Carrot Cake slice"
- desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
- icon_state = "carrotcake_slice"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("imidazoline", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesecake
- name = "Cheese Cake"
- desc = "DANGEROUSLY cheesy."
- icon_state = "cheesecake"
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- bitesize = 2
-
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
- W.visible_message(" \red You slice the [src]! ", 1)
- for(var/i=0,i<5,i++)
- new /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice (src.loc)
- del(src)
- return
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
- name = "Cheese Cake slice"
- desc = "Slice of pure cheestisfaction"
- icon_state = "cheesecake_slice"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/plaincake
- name = "Vanilla Cake"
- desc = "A plain cake, not a lie."
- icon_state = "plaincake"
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
- W.visible_message(" \red You slice the [src]! ", 1)
- for(var/i=0,i<5,i++)
- new /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice (src.loc)
- del(src)
- return
-
-/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
- name = "Vanilla Cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
- icon_state = "plaincake_slice"
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/humeatpie
name = "Meat-pie"
var/hname = ""
@@ -1978,6 +1976,15 @@
reagents.add_reagent("nutriment", 10)
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/tofupie
+ name = "Tofu-pie"
+ icon_state = "meatpie"
+ desc = "A delicious tofu pie."
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
+
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
name = "Xeno-pie"
icon_state = "xenomeatpie"
@@ -2037,6 +2044,35 @@
reagents.add_reagent("nutriment", 8)
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/tofukabob
+ name = "Tofu-kabob"
+ icon_state = "kabob"
+ desc = "A delicious kabob"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cubancarp
+ name = "Cuban Carp"
+ desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
+ icon_state = "cubancarp"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("capsaicin", 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/popcorn
+ name = "Popcorm" //not a typo
+ desc = "Now let's find some cinema."
+ icon_state = "popcorn"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
+
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
@@ -2063,14 +2099,6 @@
reagents.add_reagent("sugar", 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/tofu
- name = "Tofu"
- icon_state = "tofu"
- desc = "We all love tofu."
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
-
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
icon_state = "cheesie_honkers"
@@ -2117,66 +2145,6 @@
reagents.add_reagent("nutriment", 6)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/clownburger
- name = "Clown Burger"
- desc = "This tastes funny..."
- icon_state = "clownburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- var/datum/disease/F = new /datum/disease/pierrot_throat(0)
- var/list/data = list("virus"= F)
- reagents.add_reagent("blood", 4, data)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/mimeburger
- name = "Mime Burger"
- desc = "It's taste defies language."
- icon_state = "mimeburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cubancarp
- name = "Cuban Carp"
- desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
- icon_state = "cubancarp"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- reagents.add_reagent("capsaicin", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/popcorn
- name = "Popcorm" //not a typo
- desc = "Now let's find some cinema."
- icon_state = "popcorn"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
-
-/obj/item/weapon/reagent_containers/food/snacks/fishburger
- name = "Carpburger"
- desc = "Nanotracen: wasting rare ingridients for fastfood since 2548"
- icon_state = "fishburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/tofuburger
- name = "Togu Burger"
- desc = "What.. is that meat?"
- icon_state = "tofuburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -2313,6 +2281,84 @@
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/carrotcake
+ name = "Carrot Cake"
+ desc = "A favorite desert of a certain wascally wabbit. Not a lie."
+ icon_state = "carrotcake"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("imidazoline", 10)
+ bitesize = 2
+
+ attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
+ W.visible_message(" \red You slice the [src]! ", 1)
+ for(var/i=0,i<5,i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice (src.loc)
+ del(src)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
+ name = "Carrot Cake slice"
+ desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
+ icon_state = "carrotcake_slice"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("imidazoline", 2)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesecake
+ name = "Cheese Cake"
+ desc = "DANGEROUSLY cheesy."
+ icon_state = "cheesecake"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ bitesize = 2
+
+ attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
+ W.visible_message(" \red You slice the [src]! ", 1)
+ for(var/i=0,i<5,i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice (src.loc)
+ del(src)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
+ name = "Cheese Cake slice"
+ desc = "Slice of pure cheestisfaction"
+ icon_state = "cheesecake_slice"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/plaincake
+ name = "Vanilla Cake"
+ desc = "A plain cake, not a lie."
+ icon_state = "plaincake"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 25)
+ attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
+ W.visible_message(" \red You slice the [src]! ", 1)
+ for(var/i=0,i<5,i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice (src.loc)
+ del(src)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
+ name = "Vanilla Cake slice"
+ desc = "Just a slice of cake, it is enough for everyone."
+ icon_state = "plaincake_slice"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
+
/obj/item/weapon/reagent_containers/food/snacks/cheesewheel
name = "Cheese wheel"
desc = "A big wheel of delcious Cheddar."
@@ -2345,25 +2391,6 @@
reagents.add_reagent("nutriment", 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/banana
- name = "Banana"
- desc = "A banana."
- icon = 'items.dmi'
- icon_state = "banana"
- item_state = "banana"
- On_Consume()
- var/mob/M = usr
- var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
- M << "\blue You peel the banana."
- M.put_in_hand(W)
- W.add_fingerprint(M)
- New()
- ..()
- reagents.add_reagent("banana", 5)
- bitesize = 5
- src.pixel_x = rand(-5.0, 5)
- src.pixel_y = rand(-5.0, 5)
-
///////////////////////////////////////////////Condiments
//Notes by Darem: The condiments food-subtype is for stuff you don't actually eat but you use to modify existing food. They all
// leave empty containers when used up and can be filled/re-filled with other items. Formatting for first section is identical
diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm
index 2bbc103f607..70cc4ebd467 100644
--- a/code/game/machinery/microwave.dm
+++ b/code/game/machinery/microwave.dm
@@ -50,6 +50,32 @@
extra_item = /obj/item/robot_parts/head
creates = "/obj/item/weapon/reagent_containers/food/snacks/roburger"
+/datum/recipe/xenoburger
+ egg_amount = 0
+ flour_amount = 1
+ xenomeat_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/xenoburger"
+
+/datum/recipe/fishburger
+ carpmeat_amount = 1
+ flour_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/fishburger"
+
+/datum/recipe/tofuburger
+ tofu_amount = 1
+ flour_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/tofuburger"
+
+/datum/recipe/clownburger
+ extra_item = /obj/item/clothing/mask/gas/clown_hat
+ flour_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/clownburger"
+
+/datum/recipe/mimeburger
+ extra_item = /obj/item/clothing/head/beret
+ flour_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/mimeburger"
+
/datum/recipe/waffles
egg_amount = 2
flour_amount = 2
@@ -60,11 +86,6 @@
humanmeat_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/faggot"
-/datum/recipe/pie
- flour_amount = 2
- extra_item = /obj/item/weapon/reagent_containers/food/snacks/banana
- creates = "/obj/item/weapon/reagent_containers/food/snacks/pie"
-
/datum/recipe/donkpocket
flour_amount = 1
extra_item = /obj/item/weapon/reagent_containers/food/snacks/faggot
@@ -74,12 +95,6 @@
donkpocket_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/donkpocket"
-/datum/recipe/xenoburger
- egg_amount = 0
- flour_amount = 1
- xenomeat_amount = 1
- creates = "/obj/item/weapon/reagent_containers/food/snacks/xenoburger"
-
/datum/recipe/meatbread
flour_amount = 3
monkeymeat_amount = 3
@@ -161,11 +176,26 @@
monkeymeat_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/momeatpie"
+/datum/recipe/tofupie
+ flour_amount = 2
+ tofu_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/tofupie"
+
/datum/recipe/xemeatpie
flour_amount = 2
xenomeat_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/xemeatpie"
+/datum/recipe/pie
+ flour_amount = 2
+ extra_item = /obj/item/weapon/reagent_containers/food/snacks/banana
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/pie"
+
+/datum/recipe/berrypie
+ flour_amount = 2
+ berryjuice_amount = 1
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/berrypie"
+
/datum/recipe/wingfangchu
soysauce_amount = 1
xenomeat_amount = 1
@@ -188,6 +218,11 @@
extra_item = /obj/item/stack/rods
creates = "/obj/item/weapon/reagent_containers/food/snacks/monkeykabob"
+/datum/recipe/tofukabob
+ tofu_amount = 2
+ extra_item = /obj/item/stack/rods
+ creates = "/obj/item/weapon/reagent_containers/food/snacks/tofukabob"
+
/datum/recipe/tofubread
tofu_amount = 3
cheese_amount = 3
@@ -204,16 +239,6 @@
cheese_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/cheesyfries"
-/datum/recipe/clownburger
- extra_item = /obj/item/clothing/mask/gas/clown_hat
- flour_amount = 1
- creates = "/obj/item/weapon/reagent_containers/food/snacks/clownburger"
-
-/datum/recipe/mimeburger
- extra_item = /obj/item/clothing/head/beret
- flour_amount = 1
- creates = "/obj/item/weapon/reagent_containers/food/snacks/mimeburger"
-
/datum/recipe/cubancarp
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/chili
flour_amount = 1
@@ -224,16 +249,6 @@
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/corn
creates = "/obj/item/weapon/reagent_containers/food/snacks/popcorn"
-/datum/recipe/fishburger
- carpmeat_amount = 1
- flour_amount = 1
- creates = "/obj/item/weapon/reagent_containers/food/snacks/fishburger"
-
-/datum/recipe/tofuburger
- tofu_amount = 1
- flour_amount = 1
- creates = "/obj/item/weapon/reagent_containers/food/snacks/tofuburger"
-
// *** 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
@@ -242,20 +257,24 @@
..()
src.available_recipes += new /datum/recipe/clownburger(src)
src.available_recipes += new /datum/recipe/mimeburger(src)
+ src.available_recipes += new /datum/recipe/brainburger(src)
+ src.available_recipes += new /datum/recipe/roburger(src)
+ src.available_recipes += new /datum/recipe/fishburger(src)
+ src.available_recipes += new /datum/recipe/tofuburger(src)
+ src.available_recipes += new /datum/recipe/monkeyburger(src)
+ src.available_recipes += new /datum/recipe/humanburger(src)
src.available_recipes += new /datum/recipe/cubancarp(src)
src.available_recipes += new /datum/recipe/humankabob(src)
src.available_recipes += new /datum/recipe/monkeykabob(src)
+ src.available_recipes += new /datum/recipe/tofukabob(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)
- src.available_recipes += new /datum/recipe/humanburger(src)
src.available_recipes += new /datum/recipe/waffles(src)
- src.available_recipes += new /datum/recipe/brainburger(src)
src.available_recipes += new /datum/recipe/faggot(src)
- src.available_recipes += new /datum/recipe/roburger(src)
src.available_recipes += new /datum/recipe/donkpocket(src)
src.available_recipes += new /datum/recipe/donkpocket_warm(src)
src.available_recipes += new /datum/recipe/pie(src)
+ src.available_recipes += new /datum/recipe/berrypie(src)
src.available_recipes += new /datum/recipe/xenoburger(src)
src.available_recipes += new /datum/recipe/meatbread(src)
src.available_recipes += new /datum/recipe/meatbreadhuman(src)
@@ -266,9 +285,11 @@
src.available_recipes += new /datum/recipe/soylentgreen(src)
src.available_recipes += new /datum/recipe/carrotcake(src)
src.available_recipes += new /datum/recipe/cheesecake(src)
+ src.available_recipes += new /datum/recipe/bananabread(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/tofupie(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)
@@ -277,8 +298,6 @@
src.available_recipes += new /datum/recipe/cheesyfries(src)
src.available_recipes += new /datum/recipe/xenomeatbread(src)
src.available_recipes += new /datum/recipe/popcorn(src)
- src.available_recipes += new /datum/recipe/fishburger(src)
- src.available_recipes += new /datum/recipe/tofuburger(src)
diff --git a/tgstation.dme b/tgstation.dme
index 5a28e697c22..eb059938036 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -206,6 +206,7 @@
#include "code\datums\spells\knock.dm"
#include "code\datums\spells\magic_missile.dm"
#include "code\datums\spells\mutate.dm"
+#include "code\datums\spells\regenerate.dm"
#include "code\datums\spells\teleport.dm"
#include "code\defines\atom.dm"
#include "code\defines\client.dm"