cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

lineswhy

Browse Source
This commit is contained in:
MMMiracles
2015-03-19 19:34:16 -04:00
parent 19fc37003f
commit 9ed41e0510
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/food/snacks_pie.dm
+1 -5
View File
@@ -33,7 +33,6 @@
icon_state = "berryclafoutis"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2)
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/food/snacks/pie/bearypie
name = "beary pie"
@@ -41,9 +40,6 @@
icon_state = "bearypie"
bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
list_reagents = list("nutriment" = 2, "vitamin" = 3)
=======
>>>>>>> b5979a49fe43e9e059e6c165b309df0b1c018087
/obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
name = "meat-pie"
@@ -126,4 +122,4 @@
desc = "A tasty dessert that won't make it through a metal detector."
icon_state = "gappletart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)