diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index a5437ee512f..522859128ac 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -1628,7 +1628,7 @@ bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sosjerky - name = "Scardy's Private Reserve Beef Jerky" + name = "Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" desc = "Beef jerky made from the finest space cows." New() @@ -1647,12 +1647,21 @@ /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie name = "Space Twinkie" icon_state = "space_twinkie" - desc = "Will probably survive longer then you will." + desc = "Guaranteed to survive longer then you will." New() ..() reagents.add_reagent("sugar", 4) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers + name = "Cheesie Honkers" + icon_state = "cheesie_honkers" + desc = "Bite sized cheesie snacks that will honk all over your mouth" + New() + ..() + reagents.add_reagent("nutriment", 4) + bitesize = 2 + ///////////////////////////////////////////////Condiments //Notes by Darem: The condiments food-subtype is for stuff you don't actually eat but you use to modify existing food. They all // leave empty containers when used up and can be filled/re-filled with other items. However, they start already full with diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 90d42b9d791..37bc88c70aa 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -581,11 +581,11 @@ product_hideamt = "5" /obj/machinery/vending/snack - name = "snack machine" - desc = "Just a placeholder until we get food figured out. :munch:" + name = "Getmore Chocolate Corp" + 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/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" - product_amounts = "10;10;10;10;10" + product_paths = "/obj/item/weapon/reagent_containers/food/snacks/candy;/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" product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_hidden = "/obj/item/weapon/reagent_containers/food/snacks/donut" product_hideamt = "6" @@ -596,7 +596,7 @@ desc = "A softdrink vendor provided by Robust Industries, LLC." icon_state = "Cola_Machine" product_paths = "/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind;/obj/item/weapon/reagent_containers/food/drinks/dr_gibb;/obj/item/weapon/reagent_containers/food/drinks/starkist;/obj/item/weapon/reagent_containers/food/drinks/space_up" - product_amounts = "10;10;10;10;10" + product_amounts = "10;10;10;0;10" product_slogans = "Robust Softdrinks: More robust then a toolbox to the head!" product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/thirteenloko" product_hideamt = "5" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 8491654cce0..8e3eb13575d 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ