diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index ff198ab1ec..49d4091e50 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -29,7 +29,7 @@ /obj/item/weapon/reagent_containers/food/snacks/berrymuffin, /obj/item/weapon/reagent_containers/food/snacks/bunbun, /obj/item/weapon/reagent_containers/food/snacks/cherrypie, - /obj/item/weapon/reagent_containers/food/snacks/cookie, + /obj/item/weapon/reagent_containers/food/snacks/cookiesnack, /obj/item/weapon/reagent_containers/food/snacks/croissant, /obj/item/weapon/reagent_containers/food/snacks/donut/normal, /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 9b7eba0e9e..905311d760 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -216,7 +216,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/peanutcake = 10, /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich = 15, - /obj/item/weapon/reagent_containers/food/snacks/cookie = 15, + /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 15, /obj/item/weapon/reagent_containers/food/snacks/sliceable/brownies = 10, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 10, /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece = 20 @@ -3761,7 +3761,6 @@ /obj/item/weapon/reagent_containers/food/snacks/clownburger = 10, /obj/item/weapon/reagent_containers/food/snacks/clownstears = 10, /obj/item/weapon/reagent_containers/food/snacks/coldchili = 10, - /obj/item/weapon/reagent_containers/food/snacks/cookie = 10, /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 10, /obj/item/weapon/reagent_containers/food/snacks/corn_dog = 10, /obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice = 10, @@ -3837,7 +3836,6 @@ /obj/item/weapon/reagent_containers/food/snacks/jellysandwich = 10, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry = 10, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/peanutbutter = 10, - /obj/item/weapon/reagent_containers/food/snacks/kabob = 10, /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice = 10, /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice/filled = 10, /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon = 10, @@ -4095,7 +4093,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring = 10, /obj/item/weapon/reagent_containers/food/snacks/rawbacon = 10, /obj/item/weapon/reagent_containers/food/snacks/rawsunflower = 10, - /obj/item/weapon/reagent_containers/food/snacks/sharkmeat = 10, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 10, @@ -4225,7 +4223,6 @@ /obj/item/weapon/reagent_containers/food/snacks/clownburger = 10, /obj/item/weapon/reagent_containers/food/snacks/clownstears = 10, /obj/item/weapon/reagent_containers/food/snacks/coldchili = 10, - /obj/item/weapon/reagent_containers/food/snacks/cookie = 10, /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 10, /obj/item/weapon/reagent_containers/food/snacks/corn_dog = 10, /obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice = 10, @@ -4301,7 +4298,6 @@ /obj/item/weapon/reagent_containers/food/snacks/jellysandwich = 10, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry = 10, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/peanutbutter = 10, - /obj/item/weapon/reagent_containers/food/snacks/kabob = 10, /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice = 10, /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice/filled = 10, /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon = 10, @@ -4528,7 +4524,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring = 10, /obj/item/weapon/reagent_containers/food/snacks/rawbacon = 10, /obj/item/weapon/reagent_containers/food/snacks/rawsunflower = 10, - /obj/item/weapon/reagent_containers/food/snacks/sharkmeat = 10, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel = 10, /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 10, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 81b8d843ba..833617861c 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -406,7 +406,6 @@ /obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/reagent_containers/food/snacks/chips, /obj/item/weapon/reagent_containers/food/snacks/chips/bbq, - /obj/item/weapon/reagent_containers/food/snacks/cookie, /obj/item/weapon/reagent_containers/food/snacks/cookiesnack, /obj/item/weapon/reagent_containers/food/snacks/fruitbar, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, @@ -843,7 +842,7 @@ /obj/item/weapon/reagent_containers/food/snacks/donut/normal, /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - /obj/item/weapon/reagent_containers/food/snacks/cookie) + /obj/item/weapon/reagent_containers/food/snacks/cookiesnack) /obj/random/mre/dessert/vegan name = "random vegan MRE dessert" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 44b3c9e16b..f8387fb973 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1390,10 +1390,10 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) - if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) - H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) - if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookiesnack(H), slot_l_hand ) + if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookiesnack))) + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookiesnack(H), slot_r_hand ) + if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookiesnack))) log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") return diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 815d250dcc..9bd72d824e 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -359,6 +359,7 @@ name = "vending" /datum/asset/spritesheet/vending/register() + populate_vending_products() for(var/k in GLOB.vending_products) var/atom/item = k if(!ispath(item, /atom)) @@ -406,6 +407,22 @@ Insert(imgid, I) return ..() +// this is cursed but necessary or else vending product icons can be missing +// basically, if there's any vending machines that aren't already mapped in, our register() will not know +// that they exist, and therefore can't generate the entries in the spritesheet for them +// and since assets are unique and can't be reloaded later, we have to make sure that GLOB.vending_products +// is populated with every single type of vending machine +// As this is only done at runtime, we have to create all the vending machines in existence and force them +// to register their products when this asset initializes. +/datum/asset/spritesheet/vending/proc/populate_vending_products() + SSatoms.map_loader_begin() + for(var/path in subtypesof(/obj/machinery/vending)) + var/obj/machinery/vending/x = new path(null) + // force an inventory build; with map_loader_begin active, init isn't called + x.build_inventory() + qdel(x) + SSatoms.map_loader_stop() + // /datum/asset/simple/genetics // assets = list( // "dna_discovered.gif" = 'html/dna_discovered.gif', diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 2fecbbded8..39292a52c1 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -268,7 +268,7 @@ /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, \ /obj/item/weapon/reagent_containers/food/snacks/candiedapple, \ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, \ - /obj/item/weapon/reagent_containers/food/snacks/cookie, \ + /obj/item/weapon/reagent_containers/food/snacks/cookiesnack, \ /obj/item/weapon/reagent_containers/food/snacks/meatball, \ /obj/item/weapon/reagent_containers/food/snacks/plump_pie, \ /obj/item/weapon/reagent_containers/food/snacks/liquidfood) diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 5a0b29afba..b6b2b6e1b0 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -612,7 +612,7 @@ // Cookies and Candies // -/obj/item/weapon/reagent_containers/food/snacks/cookie +/obj/item/weapon/reagent_containers/food/snacks/cookiesnack price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/chocolatebar @@ -684,9 +684,6 @@ /obj/item/weapon/reagent_containers/food/snacks/wingfangchu price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/kabob - price_tag = 5 - /obj/item/weapon/reagent_containers/food/snacks/monkeykabob price_tag = 5 diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index cd5e2a7252..c0968f3381 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -5111,6 +5111,17 @@ . = ..() reagents.add_reagent("tofu", 6) + +/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy + name = "spicy burrito" + desc = "Spicy meat wrapped in a flour tortilla." + icon = 'icons/obj/food_syn.dmi' + icon_state = "burrito_spicy" + bitesize = 4 + center_of_mass = list("x"=16, "y"=16) + nutriment_desc = list("tortilla" = 6) + nutriment_amt = 6 + /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize() . = ..() reagents.add_reagent("protein", 6) @@ -6120,7 +6131,7 @@ reagents.add_reagent("sugar", 5) bitesize = 1 -/obj/item/weapon/reagent_containers/food/snacks/cookie/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/cookiesnack/Initialize() . = ..() bitesize = 1 diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 51516c1e5b..0a9cfc6fc5 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -378,7 +378,7 @@ nutriment_amt = 2 toxin_amount = null -/obj/item/weapon/reagent_containers/food/snacks/sharkmeat/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize() . = ..() bitesize = 3 reagents.add_reagent("protein", 2) diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index e04d437982..ff4fdc44f2 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -299,7 +299,7 @@ /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar ) - result = /obj/item/weapon/reagent_containers/food/snacks/cookie + result = /obj/item/weapon/reagent_containers/food/snacks/cookiesnack result_quantity = 4 reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/icons/obj/food_syn.dmi b/icons/obj/food_syn.dmi index 9c8787e529..d76d214357 100644 Binary files a/icons/obj/food_syn.dmi and b/icons/obj/food_syn.dmi differ