diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index ee638f7b026..9978934ad28 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -101,10 +101,10 @@ 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_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/syndicake" - product_hideamt = "10" + product_hideamt = "6" product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 60662478bb9..dc428a35859 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -241,7 +241,7 @@ icon_state = "fishfingers" New() ..() - reagents.add_reagent("nutriment", 6) + reagents.add_reagent("nutriment", 4) reagents.add_reagent("carpotoxin", 3) bitesize = 3 @@ -325,6 +325,7 @@ New() ..() reagents.add_reagent("nutriment", 6) + reagents.add_reagent("alkysine", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/ghostburger @@ -531,7 +532,7 @@ trash = "waffles" New() ..() - reagents.add_reagent("nutriment", 14) + reagents.add_reagent("nutriment", 10) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/soylenviridians @@ -585,10 +586,11 @@ if(prob(10)) 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("nutriment", 8) + reagents.add_reagent("tricordrazine", 5) bitesize = 2 else - reagents.add_reagent("nutriment", 10) + reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/xemeatpie @@ -812,7 +814,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/meatsteak @@ -849,17 +851,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" @@ -868,8 +870,8 @@ trash = "snack_bowl" New() ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 10) + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("water", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/metroidsoup @@ -889,8 +891,8 @@ New() ..() reagents.add_reagent("nutriment", 2) - reagents.add_reagent("blood", 15) - reagents.add_reagent("water", 10) + reagents.add_reagent("blood", 10) + reagents.add_reagent("water", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/clownstears @@ -899,7 +901,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 @@ -911,8 +913,8 @@ trash = "snack_bowl" New() ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 10) + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("water", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/nettlesoup @@ -922,9 +924,9 @@ trash = "snack_bowl" New() ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("water", 7) - reagents.add_reagent("tricordrazine", 3) + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("water", 5) + reagents.add_reagent("tricordrazine", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/mysterysoup @@ -981,9 +983,9 @@ ..() reagents.add_reagent("water", 10) bitesize = 5 - if(prob(5)) + if(prob(25)) src.desc = "A wish come true!" - reagents.add_reagent("nutriment", 10) + reagents.add_reagent("nutriment", 8) /obj/item/weapon/reagent_containers/food/snacks/hotchili name = "Hot Chili" @@ -1035,7 +1037,7 @@ New() ..() - reagents.add_reagent("nutriment",12) + reagents.add_reagent("nutriment",10) afterattack(obj/O as obj, mob/user as mob) if(istype(O,/obj/structure/sink) && !wrapped) @@ -1103,7 +1105,7 @@ trash = "tray" New() ..() - reagents.add_reagent("nutriment", 14) + reagents.add_reagent("nutriment", 10) reagents.add_reagent("banana", 5) reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) @@ -1126,7 +1128,7 @@ icon_state = "fishandchips" New() ..() - reagents.add_reagent("nutriment", 8) + reagents.add_reagent("nutriment", 6) reagents.add_reagent("carpotoxin", 3) bitesize = 3 @@ -1137,7 +1139,7 @@ trash = "plate" New() ..() - reagents.add_reagent("nutriment", 11) + reagents.add_reagent("nutriment", 6) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich @@ -1147,7 +1149,8 @@ trash = "plate" New() ..() - reagents.add_reagent("nutriment", 12) + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("carbon", 2) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/grilledcheese @@ -1188,10 +1191,10 @@ icon_state = "stew" New() ..() - reagents.add_reagent("nutriment", 20) + reagents.add_reagent("nutriment", 10) 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 @@ -1222,8 +1225,8 @@ trash = "snack_bowl" New() ..() - reagents.add_reagent("nutriment", 12) - reagents.add_reagent("water", 20) + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("water", 5) bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat @@ -1273,7 +1276,7 @@ icon_state = "spesslaw" New() ..() - reagents.add_reagent("nutriment", 14) + reagents.add_reagent("nutriment", 8) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/poppypretzel @@ -1358,7 +1361,8 @@ icon_state = "braincake" New() ..() - reagents.add_reagent("nutriment", 28) + reagents.add_reagent("nutriment", 8) + reagents.add_reagent("alkysine", 8) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/mint @@ -1377,7 +1381,7 @@ trash = "snack_bowl" New() ..() - reagents.add_reagent("nutriment", 10) + reagents.add_reagent("nutriment", 8) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit @@ -1389,7 +1393,8 @@ if(prob(10)) 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("nutriment", 8) + reagents.add_reagent("tricordrazine", 5) bitesize = 2 else reagents.add_reagent("nutriment", 5) @@ -1439,7 +1444,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 40) + reagents.add_reagent("nutriment", 30) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice @@ -1457,7 +1462,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 40) + reagents.add_reagent("nutriment", 30) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice @@ -1494,7 +1499,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 40) + reagents.add_reagent("nutriment", 30) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice @@ -1513,7 +1518,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent("nutriment", 25) reagents.add_reagent("imidazoline", 10) bitesize = 2 @@ -1532,7 +1537,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent("nutriment", 25) bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice @@ -1550,7 +1555,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 25) + reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice name = "Vanilla Cake slice" @@ -1567,7 +1572,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 27) + reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice name = "Orange Cake slice" @@ -1583,7 +1588,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 27) + reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/limecakeslice name = "Lime Cake slice" @@ -1599,7 +1604,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 27) + reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice name = "Lemon Cake slice" @@ -1615,7 +1620,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 27) + reagents.add_reagent("nutriment", 20) /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice name = "Chocolate Cake slice" @@ -1648,7 +1653,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent("nutriment", 20) reagents.add_reagent("sprinkles", 10) bitesize = 3 @@ -1723,7 +1728,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 29) + reagents.add_reagent("nutriment", 15) /obj/item/weapon/reagent_containers/food/snacks/applecakeslice name = "Apple Cake slice" @@ -1739,7 +1744,7 @@ slices_num = 5 New() ..() - reagents.add_reagent("nutriment", 29) + reagents.add_reagent("nutriment", 15) /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice name = "Pumpkin Pie slice"