From 92e42e7c30c84fe41ec99b360623a7493385f9e4 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Fri, 21 May 2021 20:04:24 -0700 Subject: [PATCH 1/6] Add icons for crablegs and crabmeat --- icons/obj/food_syn.dmi | Bin 53300 -> 53915 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/food_syn.dmi b/icons/obj/food_syn.dmi index 9c8787e52905b0d8bcecb4ab9747cb8edfb518f6..d76d214357232350d3fb342ea2dcf0b81d32187e 100644 GIT binary patch delta 4332 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 Date: Fri, 21 May 2021 20:05:25 -0700 Subject: [PATCH 2/6] Build all vending machine inventories on startup (cursed) --- code/modules/asset_cache/asset_list_items.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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', From 2847ea4bbd29843b02047299a69d9eae3a077ddc Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Fri, 21 May 2021 20:06:31 -0700 Subject: [PATCH 3/6] Fix cookie having no icon (convert everything to cookiesnack) --- code/datums/supplypacks/hospitality_vr.dm | 2 +- code/game/machinery/vending_machines_vr.dm | 4 +--- code/game/objects/random/misc.dm | 3 +-- code/modules/admin/topic.dm | 8 ++++---- code/modules/awaymissions/loot_vr.dm | 2 +- code/modules/economy/price_list.dm | 2 +- code/modules/food/food/snacks.dm | 2 +- code/modules/food/recipes_oven.dm | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) 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..0c0c8ed55d 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, @@ -4225,7 +4224,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, 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/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..2ef65ed797 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 diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index cd5e2a7252..9651cbc007 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6120,7 +6120,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/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 From 5530912a3e3e773c799e30bb6a635d8e6ab562eb Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Fri, 21 May 2021 20:06:53 -0700 Subject: [PATCH 4/6] Remove kabob with no actual definition --- code/game/machinery/vending_machines_vr.dm | 2 -- code/modules/economy/price_list.dm | 3 --- 2 files changed, 5 deletions(-) diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 0c0c8ed55d..9b16982986 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -3836,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, @@ -4299,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, diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 2ef65ed797..b6b2b6e1b0 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -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 From df81aa07677e827f937475eb8a1b951d01dc290b Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Fri, 21 May 2021 20:07:10 -0700 Subject: [PATCH 5/6] Fix sharkmeat having incorrect path --- code/game/machinery/vending_machines_vr.dm | 4 ++-- code/modules/food/food/snacks_vr.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 9b16982986..905311d760 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -4093,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, @@ -4524,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/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) From f178363d72a8201e967096825c7898ecbc654e17 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Fri, 21 May 2021 20:07:25 -0700 Subject: [PATCH 6/6] Fix spicy burrito having no icon --- code/modules/food/food/snacks.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 9651cbc007..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)