cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from ParadiseSS13/master

Browse Source 
Downstream merge
This commit is contained in:
Bone-White
2015-01-11 17:36:57 +00:00
parent ec8f90efd9 f6cb06a34c
commit f8302889d4
138 changed files with 10017 additions and 42736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/snacks.dm
+4 -4
View File
@@ -3112,7 +3112,7 @@
name = "ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
volume = 500
volume = 50
New()
..()
reagents.add_reagent("nutriment", 2)
@@ -3124,7 +3124,7 @@
name = "chocolate ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cup"
volume = 500
volume = 50
New()
..()
reagents.add_reagent("nutriment", 4)
@@ -3140,7 +3140,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/deepfryholder
name = "Deep Fried Foods Holder Obj"
desc = "If you can see this description the code for the deep fryer fucked up."
@@ -3149,7 +3149,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("nutriment", 3)
// Flour + egg = dough
/obj/item/weapon/reagent_containers/food/snacks/flour/attackby(obj/item/weapon/W as obj, mob/user as mob)