cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Jelly Donuts

Browse Source 
- have a unique sprite frosted/ unfrosted.
- Have jelly in them once more.

Food & Recipes:
- Things involving poison mushrooms have poison in them.
- Xeno meat contains no nutriment, it is all nasty Xenomicro eggs.
- Soups have all their water back
- Wish soup, because apparently everyone likes having all that water in their foods.

Reagents
- Banana is a mysterious reagent that has healing properties to monkeys, and clowns! Perhaps it is that less than 2% difference in clown and monkey DNA?
- Juice is now less effective than tricordizine. Each heals a unique damage type.
- Cream and milk both do about the same thing now (slight chance to heal brute damage).
- Ramen Noodle reagents add to nutriment value once more.

Syntiflesh
- I accidentally a whole catalyst.
- Clonexydone was meant to be a reagent, not a catalyst in the formula.

Feeding monkeys and Xenos
- It is possible now to feed carbon based mobs food, and for all carbon based mobs to feed themselves (except for xenos who cannot pick up items much smaller than bulky sized).
- What this means: You can force feed Monkeys bananas now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1752 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-07-02 00:30:24 +00:00
parent 81f43b1929
commit dfc0156af7
7 changed files with 105 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food.dm
+65 -48
View File
@@ -34,6 +34,7 @@
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corm" //Not a typo
@@ -51,6 +52,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/donut
name = "donut"
@@ -60,12 +62,11 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 1)
src.bitesize = 3
if(prob(30))
src.icon_state = "donut2"
src.name = "frosted donut"
src.bitesize = 3
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 3)
reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
@@ -90,6 +91,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meat/human
name = "-meat"
@@ -106,6 +108,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
@@ -116,6 +119,7 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("carpotoxin", 3)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/bearmeat
name = "bear meat"
@@ -125,6 +129,7 @@
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("hyperzine", 5)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
name = "meat"
@@ -132,7 +137,8 @@
icon_state = "xenomeat"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("xenomicrobes", 6)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "Faggot"
@@ -140,7 +146,7 @@
icon_state = "faggot"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("nutriment", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -149,7 +155,8 @@
icon_state = "donkpocket"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("nutriment", 4)
var/warm = 0
proc/cooltime() //Not working, derp?
if (src.warm)
@@ -350,18 +357,17 @@
/obj/item/weapon/reagent_containers/food/snacks/jellydonut
name = "Jelly Donut"
desc = "Oh so gooey on the inside."
icon_state = "donut1" //Placeholder until I stop being lazy. ie. Never. -- Darem
icon_state = "jdonut1"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 3)
bitesize = 2
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
bitesize = 5
if(prob(30))
src.icon_state = "donut2"
src.icon_state = "jdonut2"
src.name = "Frosted Jelly Donut"
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 6)
bitesize = 3
reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
name = "Soylent Green"
@@ -410,6 +416,32 @@
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon_state = "amanita_pie"
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("psilocybin", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon_state = "plump_pie"
New()
..()
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent("nutriment", 15)
bitesize = 2
else
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
name = "Xeno-pie"
icon_state = "xenomeatpie"
@@ -498,7 +530,7 @@
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("capsaicin", 3)
bitesize = 2
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "Popcorm" //not a typo
@@ -615,7 +647,7 @@
..()
reagents.add_reagent("toxin", 1)
reagents.add_reagent("carbon", 1)
bitesize = 3
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatsteak
name = "Meat steak"
@@ -667,7 +699,8 @@
New()
..()
reagents.add_reagent("nutriment", 10)
bitesize = 2
reagents.add_reagent("water", 10)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -676,7 +709,8 @@
New()
..()
reagents.add_reagent("nutriment", 10)
bitesize = 2
reagents.add_reagent("water", 10)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -685,8 +719,19 @@
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("water", 7)
reagents.add_reagent("tricordrazine", 3)
bitesize = 3
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wishsoup
name = "Wish Soup"
desc = "I wish this was soup."
icon = 'janitor.dmi'
icon_state = "bucket"
New()
..()
reagents.add_reagent("water", 20)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/hotchili
name = "Hot Chili"
@@ -713,7 +758,7 @@
/obj/item/weapon/reagent_containers/food/snacks/telebacon
name = "Tele Bacon"
desc = "It takes a little odd but it is still delicious."
desc = "It tastes a little odd but it is still delicious."
icon_state = "bacon"
var/obj/item/device/radio/beacon/bacon/baconbeacon
bitesize = 2
@@ -1003,32 +1048,4 @@
name = "Vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients "
icon_state = "vegetablepizzaslice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon_state = "amanita_pie"
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("psilocybin", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon_state = "plump_pie"
New()
..()
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent("nutriment", 15)
bitesize = 2
else
reagents.add_reagent("nutriment", 10)
bitesize = 2
bitesize = 2
code/modules/food/recipes_microwave.dm
+7 -3
View File
@@ -609,7 +609,7 @@
*/
/datum/recipe/meatballsoup
reagents = list("water" = 20)
reagents = list("water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot ,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
@@ -618,7 +618,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/meatballsoup
/datum/recipe/vegetablesoup
reagents = list("water" = 20)
reagents = list("water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
@@ -628,7 +628,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
/datum/recipe/nettlesoup
reagents = list("water" = 20)
reagents = list("water" = 10)
items = list(
/obj/item/weapon/grown/nettle,
/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
@@ -636,6 +636,10 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/nettlesoup
/datum/recipe/wishsoup
reagents = list("water" = 20)
result= /obj/item/weapon/reagent_containers/food/snacks/wishsoup
/datum/recipe/hotchili
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,