From 911cd7fca7bab4e81934da6e22f0ee4a8bcfee6b Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 21 May 2012 17:13:29 +0100 Subject: [PATCH] TG: -Added some positive reagents to certain foods. Revision: r3627 Author: d_h2...@yahoo.com --- code/defines/obj/vending.dm | 2 +- code/modules/food/food.dm | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 789705e5615..38669e57f38 100755 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -113,7 +113,7 @@ desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" icon_state = "snack" product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/obj/item/weapon/reagent_containers/food/drinks/dry_ramen;/obj/item/weapon/reagent_containers/food/snacks/chips;/obj/item/weapon/reagent_containers/food/snacks/sosjerky;/obj/item/weapon/reagent_containers/food/snacks/no_raisin;/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie;/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers" -// product_amounts = "10;10;10;10;10;10;10" +// product_amounts = "6;6;6;6;6;6;6" product_prices = "1;1;1;1;1;1;1" product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/syndicake" diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 3407f714bb5..af8363d9951 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -629,6 +629,7 @@ name = "exceptional plump pie" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" reagents.add_reagent("nutriment", 15) + reagents.add_reagent("tricordrazine", 5) bitesize = 2 else reagents.add_reagent("nutriment", 10) @@ -855,7 +856,7 @@ New() ..() reagents.add_reagent("toxin", 1) - reagents.add_reagent("carbon", 1) + reagents.add_reagent("carbon", 3) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatsteak @@ -906,17 +907,17 @@ reagents.add_reagent("amatoxin", 6) reagents.add_reagent("psilocybin", 3) bitesize = 3 -/* + /obj/item/weapon/reagent_containers/food/snacks/poppypretzel name = "Poppy pretzel" - desc = "" //TODO + desc = "It's all twisted up!" icon_state = "poppypretzel" bitesize = 2 New() ..() reagents.add_reagent("nutriment", 5) bitesize = 2 -*/ + /obj/item/weapon/reagent_containers/food/snacks/meatballsoup name = "Meatball soup" @@ -947,7 +948,7 @@ ..() reagents.add_reagent("nutriment", 2) reagents.add_reagent("blood", 15) - reagents.add_reagent("water", 10) + reagents.add_reagent("water", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/clownstears @@ -956,7 +957,7 @@ icon_state = "clownstears" New() ..() - reagents.add_reagent("nutriment", 1) + reagents.add_reagent("nutriment", 4) reagents.add_reagent("banana", 5) reagents.add_reagent("water", 10) bitesize = 5 @@ -969,7 +970,7 @@ New() ..() reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 10) + reagents.add_reagent("water", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/nettlesoup @@ -980,8 +981,8 @@ New() ..() reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 7) - reagents.add_reagent("tricordrazine", 3) + reagents.add_reagent("water", 5) + reagents.add_reagent("tricordrazine", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/mysterysoup @@ -1038,7 +1039,7 @@ ..() reagents.add_reagent("water", 10) bitesize = 5 - if(prob(5)) + if(prob(25)) src.desc = "A wish come true!" reagents.add_reagent("nutriment", 10) @@ -1205,6 +1206,7 @@ New() ..() reagents.add_reagent("nutriment", 12) + reagents.add_reagent("carbon", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/grilledcheese @@ -1248,7 +1250,7 @@ reagents.add_reagent("nutriment", 20) reagents.add_reagent("tomatojuice", 5) reagents.add_reagent("imidazoline", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent("water", 5) bitesize = 10 /obj/item/weapon/reagent_containers/food/snacks/metroidtoast @@ -1280,7 +1282,7 @@ New() ..() reagents.add_reagent("nutriment", 12) - reagents.add_reagent("water", 20) + reagents.add_reagent("water", 5) bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat @@ -1438,6 +1440,7 @@ name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" reagents.add_reagent("nutriment", 15) + reagents.add_reagent("tricordrazine", 5) bitesize = 2 else reagents.add_reagent("nutriment", 5)