diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index ea2bd6dafef..fbefa49966c 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -4082,7 +4082,10 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk = 10, /obj/item/weapon/reagent_containers/food/snacks/spagetti = 10, /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10, - /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) + /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10) vend_delay = 15 /obj/machinery/vending/event/food/safe //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// @@ -4473,7 +4476,10 @@ /obj/item/weapon/reagent_containers/food/snacks/wingfangchu = 10, /obj/item/weapon/reagent_containers/food/snacks/wishsoup = 10, /obj/item/weapon/reagent_containers/food/snacks/yellowcurry = 10, - /obj/item/weapon/reagent_containers/food/snacks/zestfish = 10) + /obj/item/weapon/reagent_containers/food/snacks/zestfish = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10) vend_delay = 15 /obj/machinery/vending/event/food/ingredients //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index c4057b34cc5..e09c9b1e5de 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -370,4 +370,16 @@ /obj/item/trash/tgmc_mre name = "\improper CRS ration bag" icon_state = "tgmc_mre_trash" - \ No newline at end of file + +/obj/item/trash/vendor_burger + name = "burger wrapper" + icon_state = "packburger_wrapper" + +/obj/item/trash/vendor_hotdog + name = "hotdog wrapper" + icon_state = "packhotdog_wrapper" + +/obj/item/trash/vendor_burrito + name = "burrito wrapper" + icon_state = "packburrito_wrapper" + diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index 9b9f7d0a08c..390d4e4e8fa 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -349,14 +349,10 @@ MRE Stuff desc = "A packaged [flavor] from a Meal Ready-to-Eat, there is a lengthy list of [pick("obscure", "arcane", "unintelligible", "revolutionary", "sophisticated", "unspellable")] ingredients and addictives printed on the back." . = ..() -/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/attack_self(mob/user as mob) - if (package) - to_chat(user, "You pull open the MRE package!") - playsound(loc,'sound/effects/pageturn2.ogg', 15, 1) - name = "\improper" + flavor - desc = "The contents of a standard issue CRS MRE. This one is " + flavor + "." - icon_state = "tgmcmre_[flavor]" - package = FALSE +/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/unpackage(mob/user as mob) + . = ..() + name = "\improper" + flavor + desc = "The contents of a standard issue CRS MRE. This one is " + flavor + "." /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/proc/determinetype(newflavor) name = "\improper MRE component" + " (" + newflavor + ")" @@ -381,5 +377,6 @@ MRE Stuff icon_state = "tgmcmre_dessert" nutriment_amt = 2 starts_with = list("sugar" = 1) - + + package_open_state = "tgmcmre_[flavor]" nutriment_desc = list("[new_taste]" = nutriment_amt) diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index c91df7e492a..d1c77d3f972 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -158,6 +158,9 @@ /obj/item/weapon/reagent_containers/food/snacks/pistachios = 12, /obj/item/weapon/reagent_containers/food/snacks/semki = 12, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 12, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 12, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 12, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 12, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 12, @@ -188,6 +191,9 @@ /obj/item/weapon/reagent_containers/food/snacks/pistachios = 1, /obj/item/weapon/reagent_containers/food/snacks/semki = 1, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 7, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 7, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 7, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, @@ -1010,6 +1016,9 @@ /obj/item/weapon/reagent_containers/food/snacks/syndicake = 8, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 8, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 8, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 8, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 8, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 8, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 8, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8, @@ -1028,6 +1037,9 @@ /obj/item/weapon/reagent_containers/food/snacks/syndicake = 5, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 5, + /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 5, + /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 5, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 5, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5, diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 9e5d5d6d8f8..aac77fedc84 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 7e9e20670e2..186a7877340 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ