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

Food Reagent Update (First Pass)

Browse Source 
Initial update of food reagents to utilize new nutrient reagents

Fixes the blood tomato mutant list to actually allow mutation into
killer tomato.
This commit is contained in:
FalseIncarnate
2015-05-19 18:45:44 -04:00
parent 96ef62e297
commit 1f6ce567f7
3 changed files with 97 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/snacks.dm
+41 -32
View File
@@ -44,7 +44,7 @@
return 0
if(istype(M, /mob/living/carbon))
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 20) + (M.reagents.get_reagent_amount("protein") * 25) + (M.reagents.get_reagent_amount("plantmatter") * 25)
if(M == user) //If you're eating it yourself
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -535,7 +535,7 @@
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("protein", 1)
reagents.add_reagent("egg", 5)
throw_impact(atom/hit_atom)
@@ -635,7 +635,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appendix
@@ -648,7 +648,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed
@@ -699,7 +699,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
reagents.add_reagent("carpotoxin", 3)
src.bitesize = 6
@@ -723,7 +723,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("plantmatter", 3)
reagents.add_reagent("psilocybin", 3)
src.bitesize = 6
@@ -735,7 +735,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/bearmeat
@@ -746,7 +746,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("protein", 12)
reagents.add_reagent("methamphetamine", 5)
src.bitesize = 3
@@ -758,7 +758,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/spidermeat
@@ -767,7 +767,7 @@
icon_state = "spidermeat"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
reagents.add_reagent("toxin", 3)
bitesize = 3
@@ -777,7 +777,7 @@
icon_state = "spiderleg"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
reagents.add_reagent("toxin", 2)
bitesize = 2
@@ -788,7 +788,7 @@
filling_color = "#DB0000"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -799,7 +799,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -1244,7 +1244,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
@@ -1256,7 +1256,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("plantmatter", 6)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "Space Twinkie"
@@ -1297,7 +1297,8 @@
icon_state = "chinese2"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("protein", 2)
reagents.add_reagent("msg",4)
bitesize = 2
@@ -1672,7 +1673,7 @@
New()
..()
reagents.add_reagent("nutriment",10)
reagents.add_reagent("protein",10)
afterattack(obj/O as obj, mob/user as mob, proximity)
if(!proximity) return
@@ -2074,7 +2075,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("plantmatter", 3)
reagents.add_reagent("oculine", 3)
bitesize = 2
@@ -2332,7 +2333,8 @@
filling_color = "#FF7575"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
@@ -2352,7 +2354,8 @@
filling_color = "#8AFF75"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
@@ -2371,7 +2374,8 @@
slices_num = 5
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("protein", 20)
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("toxin", 15)
bitesize = 2
@@ -2457,7 +2461,8 @@
filling_color = "#E6AEDB"
New()
..()
reagents.add_reagent("nutriment", 25)
reagents.add_reagent("protein", 15)
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("mannitol", 10)
bitesize = 2
@@ -2777,7 +2782,8 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 50)
reagents.add_reagent("protein", 30)
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("tomatojuice", 6)
bitesize = 2
@@ -2796,7 +2802,8 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 35)
reagents.add_reagent("plantmatter", 25)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
@@ -2814,7 +2821,8 @@
slices_num = 6
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("plantmatter", 20)
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("oculine", 12)
bitesize = 2
@@ -3119,7 +3127,8 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("plantmatter", 4)
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("radium", 2)
bitesize = 2
@@ -3140,7 +3149,7 @@
icon_state = "spidereggs"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
reagents.add_reagent("toxin", 3)
bitesize = 2
@@ -3317,7 +3326,7 @@
bitesize = 1
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -3327,7 +3336,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/rawmeatball
name = "raw meatball"
@@ -3337,7 +3346,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -3346,7 +3355,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/flatbread
name = "flatbread"
@@ -3375,7 +3384,7 @@
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("plantmatter", 3)
/obj/item/weapon/reagent_containers/food/snacks/ectoplasm
name = "ectoplasm"
code/modules/reagents/reagent_containers/food/snacks/meat.dm
+1 -1
View File
@@ -6,7 +6,7 @@
filling_color = "#FF1C1C"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("protein", 3)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob, params)