diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 076a0bccd49..5f62fe8f1e0 100755 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -164,6 +164,11 @@ contains = list("/obj/item/weapon/vending_charge/snack") containername = "Snack charge crate" +/datum/supply_packs/charge/liquidfood + name = "LiquidFood Charge" + contains = list("/obj/item/weapon/vending_charge/liquid") + containername = "LiquidFood charge crate" + /* /datum/supply_packs/charge/cart name = "PDA Cart Charge" diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 0f3c1fb7473..68cf95ee14a 100755 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -390,6 +390,20 @@ hidden_prices = "" charge_type = "robotics" +/obj/machinery/vending/liquid + name = "LiquidRation Dispenser" + desc = "All the food you'll ever need to survive!" + icon_state = "liquidfood" + product_paths = "/obj/item/weapon/reagent_containers/food/snacks/liquidfood;/obj/item/weapon/flavor/red;/obj/item/weapon/flavor/blue" +// product_amounts = "6;6;6;6;6;6;6" + product_prices = "1;1;1" + product_slogans = "Enjoy your NanoTrasen LiquidFood Ration! Now with a choice of TWO delicious flavors!" + product_hidden = "" +// product_hideamt = "10" + hidden_prices = "" + product_ads = "Think of it as free survival!;It's even healthy!;Take a quick break, enjoy your ration!" + charge_type = "liquid" + /obj/item/weapon/vending_charge name = "Vending Charge" var/charge_type = "generic" @@ -477,4 +491,9 @@ /*/obj/item/weapon/vending_charge/toxinslab name = "Toxins Lab Charge" charge_type = "toxinslab" - icon_state = "toxinslab-charge"*/ \ No newline at end of file + icon_state = "toxinslab-charge"*/ + +/obj/item/weapon/vending_charge/liquid + name = "LiquidRation Charge" + charge_type = "liquid" + icon_state = "liquidfood-charge" \ No newline at end of file diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 1af2a50a96c..82c9919477c 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -2041,3 +2041,20 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove name = "inflamed appendix" desc = "An appendix which appears to be inflamed." icon_state = "appendixinflamed" + +/obj/item/weapon/flavor + name = "flavoring" + desc = "A sachet of flavoring, designed to be used with LiquidFood rations." + icon = 'food_ingredients.dmi' + +/obj/item/weapon/flavor/red + name = "cherry flavoring" + desc = "A sachet of cherry flavoring, designed to be used with LiquidFood rations." + icon = 'food_ingredients.dmi' + icon_state = "flavor-red" + +/obj/item/weapon/flavor/blue + name = "berry flavoring" + desc = "A sachet of berry flavoring, designed to be used with LiquidFood rations." + icon = 'food_ingredients.dmi' + icon_state = "flavor-blue" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index ecb7bc49f02..f37eac3c707 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -46,6 +46,9 @@ name = "candle" icon = 'candle.dmi' icon_state = "candle4" + liquidfood + name = "LiquidFood ration" + icon_state = "liquidfood" /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index fcdf7dcb846..8de9d005c49 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1508,6 +1508,9 @@ if ("tray") var/obj/item/trash/tray/T = new /obj/item/trash/tray/( M ) M.put_in_hand(T) + if ("liquidfood") + var/obj/item/trash/liquidfood/T = new /obj/item/trash/liquidfood/( M ) + M.put_in_hand(T) return attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index b820fd6c179..b3db1328aa2 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1471,6 +1471,32 @@ reagents.add_reagent("nutriment", 8) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/liquidfood + name = "LiquidFood ration" + icon_state = "liquidfood" + desc = "A bland, tasteless pulp of what you need to survive. Packaged in a airtight bag, which you can drink through a straw. Strangely crunchy." + trash = "liquidfood" + var/flavored = 0 + New() + ..() + reagents.add_reagent("nutriment", 5) + reagents.add_reagent("water", 5) + reagents.add_reagent("tricordrazine", 2) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/liquidfood/red + name = "flavored LiquidFood ration" + icon_state = "liquidfood-red" + desc = "A flavored pulp of nutritional essentials. It has a faint sour apple taste, but still is hard to stomach. Strangely crunchy." + flavored = 1 + + +/obj/item/weapon/reagent_containers/food/snacks/liquidfood/blue + name = "flavored LiquidFood ration" + icon_state = "liquidfood-blue" + desc = "A flavored pulp of nutritional essentials. It has a faint bitter berry taste, but still is hard to stomach. Strangely crunchy." + flavored = 1 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels @@ -2022,6 +2048,29 @@ else ..() +// Liquidfood + Flavoring = Flavored Liquidfood! :P +/obj/item/weapon/reagent_containers/food/snacks/liquidfood/attackby(obj/item/weapon/W as obj, mob/user as mob) + // Check if already flavored + if (istype(W,/obj/item/weapon/flavor) && src.flavored) + user << "You cannot add flavoring to an already flavored ration." + return + + // Red flavoring + else if(istype(W,/obj/item/weapon/flavor/red)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/liquidfood/red(spawnloc) + user << "You add the flavoring." + del(W) + del(src) + + // Blue flavoring + else if(istype(W,/obj/item/weapon/flavor/blue)) + var/turf/spawnloc = foodloc(user, src) + new /obj/item/weapon/reagent_containers/food/snacks/liquidfood/blue(spawnloc) + user << "You add the flavoring." + del(W) + del(src) + /obj/item/weapon/reagent_containers/food/snacks/taco name = "taco" desc = "Take a bite!" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 6e7efe921c0..be5913148a3 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi index eea8240f6d8..277f3bba9f9 100644 Binary files a/icons/obj/food_ingredients.dmi and b/icons/obj/food_ingredients.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index e77570de6ad..2d404f6b020 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 83f460caac1..0af242f94df 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ