diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 47752fd594..58a5e9a0ef 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -654,6 +654,59 @@ //other +/datum/recipe/donkpocket + items = list( + /obj/item/reagent_container/food/snacks/dough, + /obj/item/reagent_container/food/snacks/meatball, + ) + result = /obj/item/reagent_container/food/snacks/microwavable/donkpocket //SPECIAL + +/datum/recipe/microwavesnack/proc/warm_up(obj/item/reagent_container/food/snacks/microwavable/being_cooked) + being_cooked.warm = 1 + being_cooked.reagents.add_reagent("bread", 1) + being_cooked.reagents.add_reagent("meatprotein", 1) + being_cooked.name = "Warm " + being_cooked.name + being_cooked.desc = being_cooked.warm_desc + +/datum/recipe/microwavesnack/make_food(obj/container as obj) + var/obj/item/reagent_container/food/snacks/microwavable/being_cooked = ..(container) + warm_up(being_cooked) + return being_cooked + +/datum/recipe/microwavesnack/warm/make_food(obj/container as obj) + var/obj/item/reagent_container/food/snacks/microwavable/being_cooked = locate() in container + if(being_cooked && !being_cooked.warm) + warm_up(being_cooked) + return being_cooked + +/datum/recipe/microwavesnack/donkpocket/warm + reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour + items = list( + /obj/item/reagent_container/food/snacks/microwavable/donkpocket, + ) + result = /obj/item/reagent_container/food/snacks/microwavable/donkpocket //SPECIAL + +/datum/recipe/microwavesnack/packaged_burrito/warm + reagents = list() //Literally just stealing this from the donk pocket code with barely any understanding of what it means. Here's hoping! + items = list( + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito, + ) + result = /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito //SPECIAL + +/datum/recipe/microwavesnack/packaged_burger/warm + reagents = list() + items = list( + /obj/item/reagent_container/food/snacks/microwavable/packaged_burger, + ) + result = /obj/item/reagent_container/food/snacks/microwavable/packaged_burger //SPECIAL + +/datum/recipe/microwavesnack/packaged_hdogs/warm + reagents = list() + items = list( + /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs, + ) + result = /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs //SPECIAL + /datum/recipe/hotdog items = list( /obj/item/reagent_container/food/snacks/bun, @@ -678,38 +731,6 @@ ) result = /obj/item/reagent_container/food/snacks/pancakes -/datum/recipe/donkpocket - items = list( - /obj/item/reagent_container/food/snacks/dough, - /obj/item/reagent_container/food/snacks/meatball, - ) - result = /obj/item/reagent_container/food/snacks/donkpocket //SPECIAL - -/datum/recipe/donkpocket/proc/warm_up(obj/item/reagent_container/food/snacks/donkpocket/being_cooked) - being_cooked.warm = 1 - being_cooked.reagents.add_reagent("tricordrazine", 5) - being_cooked.bitesize = 6 - being_cooked.name = "Warm " + being_cooked.name - being_cooked.cooltime() - -/datum/recipe/donkpocket/make_food(obj/container as obj) - var/obj/item/reagent_container/food/snacks/donkpocket/being_cooked = ..(container) - warm_up(being_cooked) - return being_cooked - -/datum/recipe/donkpocket/warm - reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour - items = list( - /obj/item/reagent_container/food/snacks/donkpocket, - ) - result = /obj/item/reagent_container/food/snacks/donkpocket //SPECIAL - -/datum/recipe/donkpocket/warm/make_food(obj/container as obj) - var/obj/item/reagent_container/food/snacks/donkpocket/being_cooked = locate() in container - if(being_cooked && !being_cooked.warm) - warm_up(being_cooked) - return being_cooked - /datum/recipe/muffin reagents = list("milk" = 5, "sugar" = 5) items = list( diff --git a/code/game/gamemodes/colonialmarines/huntergames.dm b/code/game/gamemodes/colonialmarines/huntergames.dm index e5afa82434..0a819f51e4 100644 --- a/code/game/gamemodes/colonialmarines/huntergames.dm +++ b/code/game/gamemodes/colonialmarines/huntergames.dm @@ -66,7 +66,7 @@ \ 75; /obj/item/stack/medical/bruise_pack, \ 75; /obj/item/stack/medical/ointment, \ - 75; /obj/item/reagent_container/food/snacks/donkpocket, \ + 75; /obj/item/reagent_container/food/snacks/microwavable/donkpocket, \ \ 100; /obj/item/cell/high, \ 100; /obj/item/tool/wirecutters, \ diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 220772e98b..b8a3c56801 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -183,7 +183,7 @@ if (istype(contents_item, /obj/item/reagent_container/food/snacks/meat)) //any meat items_measures[display_name] = "slab of meat" items_measures_p[display_name] = "slabs of meat" - if (istype(contents_item, /obj/item/reagent_container/food/snacks/donkpocket)) + if (istype(contents_item, /obj/item/reagent_container/food/snacks/microwavable/donkpocket)) display_name = "Turnovers" items_measures[display_name] = "turnover" items_measures_p[display_name] = "turnovers" diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 8daba6187a..8922b12733 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -51,9 +51,10 @@ product_ads = "Kepler Crisps! Try a snack that's out of this world!;Eat an EAT!" icon_state = "snack" products = list( - /obj/item/reagent_container/food/snacks/packaged_burger = 12, - /obj/item/reagent_container/food/snacks/packaged_burrito = 12, - /obj/item/reagent_container/food/snacks/packaged_hdogs =12, + /obj/item/reagent_container/food/snacks/microwavable/donkpocket = 12, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burger = 12, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = 12, + /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs =12, /obj/item/reagent_container/food/snacks/kepler_crisps = 12, /obj/item/reagent_container/food/snacks/kepler_crisps/flamehot = 12, /obj/item/reagent_container/food/snacks/wy_chips/pepper = 12, @@ -64,9 +65,10 @@ ) prices = list( - /obj/item/reagent_container/food/snacks/packaged_burger = 5, - /obj/item/reagent_container/food/snacks/packaged_burrito = 5, - /obj/item/reagent_container/food/snacks/packaged_hdogs = 5, + /obj/item/reagent_container/food/snacks/microwavable/donkpocket = 5, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burger = 5, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = 5, + /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs = 5, /obj/item/reagent_container/food/snacks/kepler_crisps = 3, /obj/item/reagent_container/food/snacks/kepler_crisps/flamehot = 5, /obj/item/reagent_container/food/snacks/wy_chips/pepper = 3, @@ -81,9 +83,10 @@ product_slogans = "" product_ads = "" products = list( - /obj/item/reagent_container/food/snacks/packaged_burger = 40, - /obj/item/reagent_container/food/snacks/packaged_burrito = 40, - /obj/item/reagent_container/food/snacks/packaged_hdogs = 40, + /obj/item/reagent_container/food/snacks/microwavable/donkpocket = 40, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = 40, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burger = 40, + /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs = 40, ) /obj/structure/machinery/vending/cola diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 35f34d9d80..9a99cf315c 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -736,26 +736,6 @@ reagents.add_reagent("meatprotein", 6) bitesize = 2 -/obj/item/reagent_container/food/snacks/donkpocket - name = "Donk-pocket" - desc = "The food of choice for the seasoned traitor." - icon_state = "donkpocket" - filling_color = "#DEDEAB" - var/warm = 0 - -/obj/item/reagent_container/food/snacks/donkpocket/Initialize() - . = ..() - reagents.add_reagent("meatprotein", 2) - reagents.add_reagent("bread", 2) - -/obj/item/reagent_container/food/snacks/donkpocket/proc/cooltime() //Not working, derp? - if(warm) - spawn(4200) - if(!QDELETED(src)) //not qdel'd - warm = 0 - reagents.del_reagent("tricordrazine") - name = "donk-pocket" - /obj/item/reagent_container/food/snacks/brainburger name = "brainburger" desc = "A strange looking burger. It looks almost sentient." @@ -3154,19 +3134,67 @@ reagents.add_reagent("vegetable", 3) reagents.add_reagent("potato", 3) -/obj/item/reagent_container/food/snacks/packaged_burrito +/obj/item/reagent_container/food/snacks/microwavable + name = "Microwavable snack" + desc = "Some food you could microwave. It won't be tastier if you do, though." + var/warm_desc = "Some microwaved food." + icon_state = "donkpocket" + bitesize = 3 + var/warm = 0 + +/obj/item/reagent_container/food/snacks/microwavable/proc/cooltime() //Not working, derp? + if(warm) + spawn(4200) + if(!QDELETED(src)) //not qdel'd + warm = 0 + reagents.del_reagent("bread", 1) + reagents.del_reagent("meatprotein", 1) + name = name + +/obj/item/reagent_container/food/snacks/microwavable/donkpocket + name = "Donk-pocket" + desc = "The food of choice for the seasoned traitor. Packaged by the Weyland-Yutani Corporation." + warm_desc = "The food of choice for the seasoned traitor. Warmed unevenly and rock hard." + icon_state = "donkpocket_wr2" + filling_color = "#DEDEAB" + package = 2 + +/obj/item/reagent_container/food/snacks/microwavable/donkpocket/Initialize() + . = ..() + reagents.add_reagent("meatprotein", 5) + reagents.add_reagent("bread", 5) + reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent("cheese", 2) + +/obj/item/reagent_container/food/snacks/microwavable/donkpocket/attack_self(mob/user) + ..() + + if(package==1) // this one comes first, otherwise it will run package==2 and THEN package==1 in succession + playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1) + to_chat(user, SPAN_NOTICE("You pull off the sleeve from the donk pocket!")) + package = 0 + icon_state = "donkpocket" + if(package==2) + playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1) + to_chat(user, SPAN_NOTICE("You pull off the wrapping from the donk pocket!")) + package = 1 + icon_state = "donkpocket_wr1" + +/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito name = "Packaged Burrito" - desc = "A hard microwavable burrito. There's no time given for how long to cook it. Packaged by the Weyland-Yutani Corporation." + desc = "A hard microwavable burrito. There's no time given for how long to cook it, but you can try microwaving it anyways. Packaged by the Weyland-Yutani Corporation." + warm_desc = "A hard microwaved burrito. Molten on the outside, barely cooked on the inside." icon_state = "packaged-burrito" - bitesize = 2 package = 1 -/obj/item/reagent_container/food/snacks/packaged_burrito/Initialize() +/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito/Initialize() . = ..() - reagents.add_reagent("bread", 5) - reagents.add_reagent("meatprotein", 5) + reagents.add_reagent("bread", 4) + reagents.add_reagent("meatprotein", 4) + reagents.add_reagent("vegetable", 2) + reagents.add_reagent("cheese", 2) -/obj/item/reagent_container/food/snacks/packaged_burrito/attack_self(mob/user) +/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito/attack_self(mob/user) ..() if(package) @@ -3175,21 +3203,22 @@ package = 0 icon_state = "open-burrito" -/obj/item/reagent_container/food/snacks/packaged_burger +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger name = "Packaged Cheeseburger" - desc = "A soggy microwavable burger. There's no time given for how long to cook it. Packaged by the Weyland-Yutani Corporation." + desc = "A soggy microwavable burger. There's no time given for how long to cook it, but you can try microwaving it anyways. Packaged by the Weyland-Yutani Corporation." + warm_desc = "A soggy microwaved burger. It's not any less soggy then it was before, it's just hot now." icon_state = "burger" - bitesize = 3 package = 1 -/obj/item/reagent_container/food/snacks/packaged_burger/Initialize() +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger/Initialize() . = ..() reagents.add_reagent("bread", 5) reagents.add_reagent("meatprotein", 5) + reagents.add_reagent("cheese", 2) reagents.add_reagent("sodiumchloride", 2) -/obj/item/reagent_container/food/snacks/packaged_burger/attack_self(mob/user) +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger/attack_self(mob/user) ..() if(package) @@ -3199,20 +3228,21 @@ icon_state = "hburger" item_state = "burger" -/obj/item/reagent_container/food/snacks/packaged_hdogs +/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs name = "Packaged Hotdog" - desc = "A singular squishy, room temperature, hot dog. There's no time given for how long to cook it, so you assume its probably good to go. Packaged by the Weyland-Yutani Corporation." + desc = "A singular squishy, room temperature, hot dog. There's no time given for how long to cook it, but you can try microwaving it anyways. Packaged by the Weyland-Yutani Corporation." + warm_desc = "A singular squishy, steaming, hot dog. The casing seems to have burst, and the bun is dried out." icon_state = "packaged-hotdog" - bitesize = 2 package = 1 -/obj/item/reagent_container/food/snacks/packaged_hdogs/Initialize() +/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs/Initialize() . = ..() - reagents.add_reagent("bread", 2) - reagents.add_reagent("meatprotein", 1) + reagents.add_reagent("bread", 5) + reagents.add_reagent("meatprotein", 5) + reagents.add_reagent("ketchup", 2) reagents.add_reagent("sodiumchloride", 2) -/obj/item/reagent_container/food/snacks/packaged_hdogs/attack_self(mob/user) +/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs/attack_self(mob/user) ..() if(package) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index bcfa7ba1fa..e602272b08 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -283,12 +283,12 @@ w_class = SIZE_MEDIUM /obj/item/storage/box/donkpockets/fill_preset_inventory() - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) /obj/item/storage/box/monkeycubes name = "monkey cube box" diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 9b19fb5b4e..955825ec85 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -153,7 +153,7 @@ /obj/item/device/multitool, /obj/item/tool/crowbar, /obj/item/device/flashlight, - /obj/item/reagent_container/food/snacks/donkpocket, + /obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/item/explosive/grenade/smokebomb, /obj/item/circuitboard/airlock, /obj/item/device/assembly/igniter, diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 34c7c9b4a6..c6a492b3d8 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -935,15 +935,15 @@ var/global/list/gear_datums_by_name = list() /datum/gear/snack_packaged/burrito display_name = "Packaged burrito" - path = /obj/item/reagent_container/food/snacks/packaged_burrito + path = /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito /datum/gear/snack_packaged/cheeseburger display_name = "Packaged cheeseburger" - path = /obj/item/reagent_container/food/snacks/packaged_burger + path = /obj/item/reagent_container/food/snacks/microwavable/packaged_burger /datum/gear/snack_packaged/hotdog display_name = "Packaged hotdog" - path = /obj/item/reagent_container/food/snacks/packaged_hdogs + path = /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs /datum/gear/snack_packaged/chips_pepper display_name = "W-Y Pepper Chips" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 5c063514b4..07fc36b7a8 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -234,14 +234,14 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/reagent_container/food/drinks/flask = "helmet_flask", /obj/item/reagent_container/food/drinks/flask/marine = "helmet_flask", /obj/item/reagent_container/food/snacks/eat_bar = "helmet_snack_eat", - /obj/item/reagent_container/food/snacks/packaged_burrito = "helmet_snack_burrito", + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = "helmet_snack_burrito", /obj/item/reagent_container/food/snacks/mushroompizzaslice = "pizza", // Fuck whoever put these under different paths for some REASON /obj/item/reagent_container/food/snacks/vegetablepizzaslice = "pizza", /obj/item/reagent_container/food/snacks/meatpizzaslice = "pizza", - /obj/item/reagent_container/food/snacks/packaged_burrito = HELMET_GARB_RELAY_ICON_STATE, - /obj/item/reagent_container/food/snacks/packaged_hdogs = HELMET_GARB_RELAY_ICON_STATE, + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = HELMET_GARB_RELAY_ICON_STATE, + /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs = HELMET_GARB_RELAY_ICON_STATE, /obj/item/reagent_container/food/snacks/wrapped/chunk = "chunkbox", - /obj/item/reagent_container/food/snacks/donkpocket = "donkpocket", + /obj/item/reagent_container/food/snacks/microwavable/donkpocket = "donkpocket", /obj/item/reagent_container/food/snacks/wrapped/booniebars = "boonie-bars", /obj/item/reagent_container/food/snacks/wrapped/barcardine = "barcardine-bars", diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 9a943c7072..c3b30afdf8 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -331,8 +331,8 @@ . = ..() pixel_y = rand(-3,3) pixel_x = rand(-3,3) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) var/randsnack for(var/i = 1 to 3) randsnack = rand(0,5) @@ -364,9 +364,9 @@ . = ..() pixel_y = rand(-3,3) pixel_x = rand(-3,3) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) - new /obj/item/reagent_container/food/snacks/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) + new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src) new /obj/item/reagent_container/food/drinks/coffee(src) var/randsnack = rand(0,5) switch(randsnack) diff --git a/code/modules/fishing/datums/generic.dm b/code/modules/fishing/datums/generic.dm index 94a1684513..a1bb631a1c 100644 --- a/code/modules/fishing/datums/generic.dm +++ b/code/modules/fishing/datums/generic.dm @@ -13,6 +13,7 @@ GLOBAL_LIST_EMPTY(fishing_loot_tables) /obj/item/reagent_container/food/snacks/fishable/crab ) var/list/rare_fishable_atoms = list( + /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito, /obj/item/coin/silver ) var/list/ultra_rare_fishable_atoms = list( diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 5e86f81086..6f60809d0f 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -273,7 +273,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/simple(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt/standard(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/packaged_burger(new_human), WEAR_IN_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/microwavable/packaged_burger(new_human), WEAR_IN_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/wy_chips/pepper(new_human), WEAR_IN_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/wrapped/chunk(new_human), WEAR_IN_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/cola(new_human), WEAR_IN_J_STORE) diff --git a/code/modules/reagents/chemistry_reagents/food.dm b/code/modules/reagents/chemistry_reagents/food.dm index 8e167908b2..e1fb172b10 100644 --- a/code/modules/reagents/chemistry_reagents/food.dm +++ b/code/modules/reagents/chemistry_reagents/food.dm @@ -54,7 +54,7 @@ flags = REAGENT_NO_GENERATION /datum/reagent/nutriment/grown/vegetable - name = "Vegetable" + name = "Vegetables" id = "vegetable" description = "Some sort of vegetable." flags = REAGENT_NO_GENERATION diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi index 5872b7e852..3b4cbb1259 100644 Binary files a/icons/obj/items/food.dmi and b/icons/obj/items/food.dmi differ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 0eb6024a5a..ecd24b607b 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -14854,7 +14854,7 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/chips, /obj/item/reagent_container/food/snacks/cookie, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor{ dir = 5; icon_state = "whitebluefull" @@ -15300,7 +15300,7 @@ /obj/item/reagent_container/food/snacks/candy, /obj/item/reagent_container/food/snacks/candy, /obj/item/reagent_container/food/snacks/candy, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor{ dir = 5; icon_state = "whitebluefull" @@ -15582,7 +15582,7 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/cheesewedge, /obj/item/reagent_container/food/snacks/chips, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/item/reagent_container/food/snacks/donut, /turf/open/floor{ dir = 5; @@ -16062,7 +16062,7 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/candy, /obj/item/reagent_container/food/snacks/bun, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/structure/machinery/light{ dir = 8 }, @@ -39856,7 +39856,7 @@ }, /obj/item/ammo_magazine/shotgun/buckshot, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index cc04cfc015..713cf02d5f 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -51567,7 +51567,7 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/chips, /obj/item/reagent_container/food/snacks/cookie, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor/prison{ dir = 10; icon_state = "kitchen" @@ -51952,7 +51952,7 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/candy, /obj/item/reagent_container/food/snacks/bun, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/structure/machinery/light{ dir = 8 }, @@ -52903,7 +52903,7 @@ /obj/item/reagent_container/food/snacks/candy, /obj/item/reagent_container/food/snacks/candy, /obj/item/reagent_container/food/snacks/candy, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; @@ -53005,7 +53005,7 @@ /area/desert_dam/building/dorms/hallway_westwing) "dGD" = ( /obj/structure/surface/table, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 30e6a6d7ba..5c186f0bdd 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -24710,7 +24710,7 @@ /area/prison/holding/holding1) "bsT" = ( /obj/structure/surface/rack, -/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison{ dir = 10; diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 9470a1a845..3c364367dc 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -3144,7 +3144,7 @@ }, /area/fiorina/oob) "bOK" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -12926,7 +12926,7 @@ }, /area/fiorina/tumor/civres) "hSH" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "hSL" = ( @@ -36051,7 +36051,7 @@ }, /area/fiorina/station/disco) "wlp" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor/prison{ dir = 9; icon_state = "greenfull" @@ -37298,7 +37298,7 @@ }, /area/fiorina/station/security) "xcf" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor/prison{ icon_state = "floor_plate" }, diff --git a/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm b/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm index b428584d61..05297735f3 100644 --- a/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm +++ b/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm @@ -6131,7 +6131,7 @@ /area/ice_colony/underground/engineering/substation) "iVo" = ( /obj/structure/surface/table, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor{ icon_state = "darkgreen2" }, diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 7b1a34d0ec..702289945e 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -13639,7 +13639,7 @@ /area/ice_colony/exterior/surface/clearing/south) "aNs" = ( /obj/structure/surface/table/reinforced, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/structure/window/reinforced{ dir = 1 }, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 99c77f860a..ef30196f3d 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -530,7 +530,7 @@ pixel_y = 14 }, /obj/item/trash/plate, -/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) @@ -7454,7 +7454,7 @@ pixel_y = -13 }, /obj/item/trash/ceramic_plate, -/obj/item/reagent_container/food/snacks/packaged_burger{ +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger{ pixel_y = 6 }, /turf/open/floor/plating/plating_catwalk/prison, @@ -26113,7 +26113,7 @@ /area/lv522/atmos/cargo_intake) "kxq" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito, /obj/item/reagent_container/food/drinks/cans/souto/diet/blue{ pixel_y = 15 }, @@ -46238,7 +46238,7 @@ pixel_y = 11 }, /obj/item/trash/ceramic_plate, -/obj/item/reagent_container/food/snacks/packaged_hdogs{ +/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs{ pixel_y = 2 }, /turf/open/floor/prison{ diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index d512590d7d..0b68597ab4 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -5530,7 +5530,7 @@ }, /area/lv624/lazarus/sleep_female) "aBd" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /obj/structure/flora/pottedplant, /obj/structure/pipes/vents/pump, /turf/open/floor{ @@ -8737,15 +8737,15 @@ pixel_y = 30 }, /obj/structure/surface/table, -/obj/item/reagent_container/food/snacks/donkpocket{ +/obj/item/reagent_container/food/snacks/microwavable/donkpocket{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_container/food/snacks/donkpocket{ +/obj/item/reagent_container/food/snacks/microwavable/donkpocket{ pixel_x = -4; pixel_y = -4 }, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor{ dir = 8; icon_state = "barber" diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm index 5334b7a123..f97a2d55ce 100644 --- a/maps/map_files/LV624_Fixed/LV624_repaired.dmm +++ b/maps/map_files/LV624_Fixed/LV624_repaired.dmm @@ -1208,15 +1208,15 @@ pixel_y = 30 }, /obj/structure/surface/table, -/obj/item/reagent_container/food/snacks/donkpocket{ +/obj/item/reagent_container/food/snacks/microwavable/donkpocket{ pixel_x = 4; pixel_y = 4 }, -/obj/item/reagent_container/food/snacks/donkpocket{ +/obj/item/reagent_container/food/snacks/microwavable/donkpocket{ pixel_x = -4; pixel_y = -4 }, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor{ dir = 8; icon_state = "barber" @@ -1363,7 +1363,7 @@ /area/lv624/lazarus/engineering) "byy" = ( /obj/structure/closet, -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor{ dir = 9; icon_state = "purple" @@ -5136,7 +5136,7 @@ /area/lv624/ground/jungle/east_jungle) "fIy" = ( /obj/structure/surface/table, -/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito, /turf/open/floor{ icon_state = "bar" }, @@ -8137,7 +8137,7 @@ /area/lv624/lazarus/corporate_dome) "iMe" = ( /obj/structure/surface/table, -/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, /turf/open/floor{ icon_state = "bar" }, diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 0b29155026..b4c1f27e7f 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -26968,7 +26968,7 @@ /obj/structure/machinery/microwave{ pixel_y = 9 }, -/obj/item/reagent_container/food/snacks/donkpocket{ +/obj/item/reagent_container/food/snacks/microwavable/donkpocket{ pixel_x = -5; pixel_y = 17 }, diff --git a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm index 7a81776beb..d02f6e7d89 100644 --- a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm +++ b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm @@ -25265,7 +25265,7 @@ /obj/structure/machinery/microwave{ pixel_y = 9 }, -/obj/item/reagent_container/food/snacks/donkpocket{ +/obj/item/reagent_container/food/snacks/microwavable/donkpocket{ pixel_x = -5; pixel_y = 17 }, diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 421df0856e..5afdcb4095 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -20561,7 +20561,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "brM" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/center) "brP" = ( @@ -40255,7 +40255,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/engi) "vsL" = ( -/obj/item/reagent_container/food/snacks/donkpocket, +/obj/item/reagent_container/food/snacks/microwavable/donkpocket, /turf/open/floor/strata{ dir = 10; icon_state = "multi_tiles" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 1f3bf36f78..a949bcdcb2 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -28702,9 +28702,9 @@ /area/almayer/living/starboard_garden) "cWy" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_container/food/snacks/packaged_burger, -/obj/item/reagent_container/food/snacks/packaged_burger, -/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, /turf/open/floor/almayer{ icon_state = "plate" }, diff --git a/maps/map_files/derelict_almayer/derelict_almayer.dmm b/maps/map_files/derelict_almayer/derelict_almayer.dmm index 5b9cb948c1..e410029362 100644 --- a/maps/map_files/derelict_almayer/derelict_almayer.dmm +++ b/maps/map_files/derelict_almayer/derelict_almayer.dmm @@ -13732,9 +13732,9 @@ /area/almayer/engineering/starboard_atmos) "epC" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_container/food/snacks/packaged_burger, -/obj/item/reagent_container/food/snacks/packaged_burger, -/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, +/obj/item/reagent_container/food/snacks/microwavable/packaged_burger, /turf/open/floor/almayer{ icon_state = "plate" },