diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 072c4001fae..973840f5b2e 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -13,6 +13,24 @@ containername = "Belt-miner gear crate" access = access_mining +/datum/supply_pack/misc/rations + name = "Emergency rations" + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4, + ) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "emergency rations" + +/datum/supply_pack/misc/proteinrations + name = "Emergency meat rations" + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 4, + ) + cost = 30 + containertype = /obj/structure/closet/crate/freezer + containername = "emergency meat rations" + /datum/supply_pack/misc/eva_rig name = "eva hardsuit (empty)" contains = list( diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9b67c1ba858..383e2844d7e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -802,7 +802,7 @@ prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3, /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3, - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 20, + /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, //VOREStation Edit, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 5, /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5, diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index 1f5424f55b7..6027bc5eaf7 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -127,3 +127,8 @@ contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) prices = list(/obj/item/device/flash = 600,/obj/item/weapon/reagent_containers/spray/pepper = 800, /obj/item/weapon/gun/projectile/olivaw = 1600, /obj/item/weapon/gun/projectile/giskard = 1200, /obj/item/ammo_magazine/mg/cl32/rubber = 200) */ + +/obj/machinery/vending/fitness/New() + products += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8) + prices += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 10) + ..() diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 942b571aa52..a738179c7f8 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -24,4 +24,9 @@ forceMove(R.vore_selected) R.visible_message("[user] feeds [R] with [src]!") return - ..() \ No newline at end of file + ..() + +/obj/item/trash/liquidprotein + name = "\improper \"LiquidProtein\" ration" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "liquidprotein" \ No newline at end of file diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index b527d242c38..9c5b398f5a3 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -500,3 +500,18 @@ /obj/item/pizzabox/meat/Initialize() pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen(src) + +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein + name = "\improper LiquidProtein Ration" + desc = "A variant of the liquidfood ration, designed for obligate carnivore species. Only barely more appealing than regular liquidfood. Should this be crunchy?" + icon = 'icons/obj/food_vr.dmi' + icon_state = "liquidprotein" + trash = /obj/item/trash/liquidprotein + filling_color = "#A8A8A8" + center_of_mass = list("x"=16, "y"=15) + +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize() + ..() + reagents.add_reagent("protein", 20) + reagents.add_reagent("iron", 3) + bitesize = 4 diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index 95b293d9f41..6eeb3e96356 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/icons/obj/trash_vr.dmi b/icons/obj/trash_vr.dmi new file mode 100644 index 00000000000..6c9d7ea7d3c Binary files /dev/null and b/icons/obj/trash_vr.dmi differ diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index fa120ce6533..17b997d4de5 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -24,9 +24,9 @@ /obj/item/weapon/material/knife/tacknife/survival, /obj/item/weapon/material/knife/machete, /obj/item/clothing/accessory/holster/machete, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2, - /obj/item/device/cataloguer - ) + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/device/cataloguer) /obj/structure/closet/secure_closet/sar name = "field medic locker" @@ -52,7 +52,8 @@ /obj/item/device/healthanalyzer, /obj/item/device/radio/off, /obj/random/medical, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 3, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 2, /obj/item/weapon/tool/crowbar, /obj/item/weapon/extinguisher/mini, /obj/item/weapon/storage/box/freezer, @@ -76,7 +77,8 @@ /obj/item/clothing/gloves/fingerless, /obj/item/device/radio/headset/pilot/alt, /obj/item/device/flashlight, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/storage/box/flare, /obj/item/weapon/cell/device, @@ -113,9 +115,9 @@ /obj/item/weapon/material/knife/machete/deluxe, /obj/item/weapon/gun/energy/frontier/locked/carbine, /obj/item/clothing/accessory/holster/machete, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2, - /obj/item/device/cataloguer - ) + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/device/cataloguer) /obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) diff --git a/maps/submaps/shelters/shelter_1.dmm b/maps/submaps/shelters/shelter_1.dmm index 66eba3541de..022f72ca251 100644 --- a/maps/submaps/shelters/shelter_1.dmm +++ b/maps/submaps/shelters/shelter_1.dmm @@ -17,8 +17,9 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, diff --git a/maps/submaps/shelters/shelter_2.dmm b/maps/submaps/shelters/shelter_2.dmm index b7e87215449..5401d08ef8a 100644 --- a/maps/submaps/shelters/shelter_2.dmm +++ b/maps/submaps/shelters/shelter_2.dmm @@ -38,10 +38,12 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index 4b7e36706fd..fbfb2b3228d 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -37,10 +37,12 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell,