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

Merge pull request #4275 from FalseIncarnate/kitchen

Browse Source 
Removes egg reagent from some foods, fixes reagent removal for foods
This commit is contained in:
Fox McCloud
2016-04-25 04:33:43 -04:00
parent 4e15716dec 68bcfc5d0c
commit 6fbe7d995e
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/snacks.dm
+9
View File
@@ -2206,6 +2206,9 @@
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("gold", 5)
spawn(1)
reagents.del_reagent("egg")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/dough_ball
@@ -2581,6 +2584,9 @@
New()
..()
reagents.add_reagent("nutriment", 6)
spawn(1)
reagents.del_reagent("egg")
reagents.update_total()
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/breadslice
@@ -3013,6 +3019,9 @@
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("sugar", 5)
spawn(1)
reagents.del_reagent("egg")
reagents.update_total()
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/friedbanana
code/modules/reagents/reagent_containers/food/snacks/candy.dm
+21 -12
View File
@@ -66,6 +66,9 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
spawn(1)
reagents.del_reagent("egg")
reagents.update_total()
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/taffy
@@ -287,8 +290,9 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
spawn(1)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green
@@ -381,8 +385,9 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
spawn(1)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green
@@ -475,8 +480,9 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
spawn(1)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green
@@ -627,8 +633,9 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 20)
reagents.del_reagent("sugar")
reagents.update_total()
spawn(1)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green
@@ -701,8 +708,9 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow/New()
..()
reagents.add_reagent("omnizine", 20)
reagents.del_reagent("sugar")
reagents.update_total()
spawn(1)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow
@@ -715,8 +723,9 @@
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow/New()
..()
reagents.add_reagent("sulfonal", 20)
reagents.del_reagent("sugar")
reagents.update_total()
spawn(1)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
// ***********************************************************
code/modules/reagents/reagent_containers/food/snacks/seafood.dm
+3
View File
@@ -63,6 +63,9 @@
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("carpotoxin", 3)
spawn(1)
reagents.del_reagent("egg")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/fishburger