From d0ea2006cd3743c880ef173f631e3dbf55d26c27 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 4 Mar 2022 09:45:07 -0500 Subject: [PATCH] Merge pull request #12365 from GhostActual/Fix Fixes #12338 --- code/modules/food/food/lunch.dm | 50 +++++++++++++++++++++- code/modules/food/food/snacks.dm | 72 +++++++------------------------- 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index 81e75fa254..d0db75f16d 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -6,10 +6,25 @@ var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/sna /obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled, /obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza/filled, /obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled, + /obj/item/weapon/reagent_containers/food/snacks/pineappleslice/filled, /obj/item/weapon/reagent_containers/food/snacks/tastybread, + /obj/item/weapon/reagent_containers/food/snacks/bagelplain, + /obj/item/weapon/reagent_containers/food/snacks/bagelsunflower, + /obj/item/weapon/reagent_containers/food/snacks/bagelcheese, + /obj/item/weapon/reagent_containers/food/snacks/bagelraisin, + /obj/item/weapon/reagent_containers/food/snacks/bagelpoppy, + /obj/item/weapon/reagent_containers/food/snacks/croissant, + /obj/item/weapon/reagent_containers/food/snacks/corn_dog, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry, /obj/item/weapon/reagent_containers/food/snacks/tossedsalad, + /obj/item/weapon/reagent_containers/food/snacks/rosesalad, + /obj/item/weapon/reagent_containers/food/snacks/boiledegg, + /obj/item/weapon/reagent_containers/food/snacks/locust_cooked, + /obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun, + /obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose) var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, @@ -39,19 +54,50 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac /obj/item/weapon/reagent_containers/food/snacks/watermelonslice, /obj/item/weapon/reagent_containers/food/snacks/slice/applecake/filled, /obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie/filled, - /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks) + /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice/filled, + /obj/item/weapon/reagent_containers/food/snacks/browniesslice/filled, + /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks, + /obj/item/weapon/reagent_containers/food/snacks/mint/admints, + /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts, + /obj/item/weapon/reagent_containers/food/snacks/sugarcookie, + /obj/item/weapon/reagent_containers/food/snacks/eggroll, + /obj/item/weapon/reagent_containers/food/snacks/fruitsalad, + /obj/item/weapon/reagent_containers/food/snacks/honeybun, + /obj/item/weapon/reagent_containers/food/snacks/custardbun, + /obj/item/weapon/reagent_containers/food/snacks/honeytoast, + /obj/item/weapon/reagent_containers/food/snacks/cookiesnack, + /obj/item/weapon/reagent_containers/food/snacks/fruitbar, + /obj/item/weapon/reagent_containers/food/snacks/semki, + /obj/item/weapon/reagent_containers/food/snacks/salo, + /obj/item/weapon/reagent_containers/food/snacks/weebonuts, + /obj/item/weapon/reagent_containers/food/snacks/ricecake, + /obj/item/weapon/reagent_containers/food/snacks/packaged/lunacake, + /obj/item/weapon/reagent_containers/food/snacks/packaged/darklunacake, + /obj/item/weapon/reagent_containers/food/snacks/packaged/mochicake, + /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie + ) var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/weapon/reagent_containers/food/drinks/cans/decaf_cola, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb, + /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist, + /obj/item/weapon/reagent_containers/food/drinks/cans/starkistdecaf, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up, /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, /obj/item/weapon/reagent_containers/food/drinks/cans/tonic, - /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater) + /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, + /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale, + /obj/item/weapon/reagent_containers/food/drinks/cans/root_beer, + /obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla, + /obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola, + /obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola, + /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola + ) // This default list is a bit different, it contains items we don't want var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing, diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index e6071566f6..a2e17975e9 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -2169,14 +2169,6 @@ . = ..() reagents.add_reagent("slimejelly", 5) -/obj/item/weapon/reagent_containers/food/snacks/mint - name = "mint" - desc = "it is only wafer thin." - icon_state = "mint" - filling_color = "#F2F2F2" - center_of_mass = list("x"=16, "y"=14) - bitesize = 1 - /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." @@ -4115,7 +4107,7 @@ /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?" + desc = "A variant of the liquidfood ration, designed for more carnivorous species. Only barely more appealing than regular liquidfood. Should this be crunchy?" icon_state = "liquidprotein" trash = /obj/item/trash/liquidprotein filling_color = "#A8A8A8" @@ -5894,32 +5886,6 @@ //////////////////////////////Candy Vend Items////////////////////////////// //////////////////////////////////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/food/snacks/mint/Initialize() - . = ..() - reagents.add_reagent("mint", 1) - -/obj/item/weapon/reagent_containers/food/snacks/mint/admints - desc = "Spearmint, peppermint's non-festive cousin." - icon = 'icons/obj/food_snacks.dmi' - icon_state = "admint" - -/obj/item/weapon/storage/box/admints - name = "Ad-mints" - desc = "A pack of air fresheners for your mouth." - description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's senior executive attended a meeting at a large a marketing firm and was so astounded by the quality of their complimentary mints, that he immediately bought the company - the mints company, not the ad agency - and began providing 'Ad-mints' on every MBT flight." - icon = 'icons/obj/food_snacks.dmi' - icon_state = "admint_pack" - item_state = "candy" - slot_flags = SLOT_EARS - w_class = 1 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints = 6) - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints) - use_sound = 'sound/items/drop/paper.ogg' - drop_sound = 'sound/items/drop/wrapper.ogg' - max_storage_space = 6 - foldable = null - trash = /obj/item/trash/admints - /obj/item/weapon/reagent_containers/food/snacks/mint name = "mint" desc = "it is only wafer thin." @@ -5939,12 +5905,11 @@ /obj/item/weapon/storage/box/admints name = "Ad-mints" + desc = "A pack of air fresheners for your mouth." + description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's senior executive attended a meeting at a large a marketing firm and was so astounded by the quality of their complimentary mints, that he immediately bought the company - the mints company, not the ad agency - and began providing 'Ad-mints' on every MBT flight." icon = 'icons/obj/food_snacks.dmi' icon_state = "admint_pack" item_state = "candy" - desc = "A pack of air fresheners for your mouth." - description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's senior executive attended a meeting at a large a marketing firm and was so astounded by the quality of their complimentary mints, that he immediately bought the company - the mints company, not the ad agency - and began providing 'Ad-mints' on every MBT flight." - trash = /obj/item/trash/admints slot_flags = SLOT_EARS w_class = 1 starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints = 6) @@ -5953,11 +5918,12 @@ drop_sound = 'sound/items/drop/wrapper.ogg' max_storage_space = 6 foldable = null + trash = /obj/item/trash/admints /obj/item/weapon/reagent_containers/food/snacks/candy name = "\improper Grandma Ellen's Candy Bar" desc = "Now without nuts!" - description_fluff = "Hard candies were banned from many early human colony ships due to the tendency for brittle, sticky chunks to find their way inside vital equipment in zero-G conditions. This only made them all the more popular to new arrivees, and the Grandma Ellen's brand was Tau Ceti's answer to that demand." + description_fluff = "Hard candies were banned from many early human colony ships due to the tendency for brittle, sticky chunks to find their way inside vital equipment in zero-G conditions. This only made them all the more popular to new arrivees, and the Grandpa Elliot's brand was Tau Ceti's answer to that demand." icon = 'icons/obj/food_snacks.dmi' icon_state = "candy" trash = /obj/item/trash/candy @@ -5971,7 +5937,7 @@ . = ..() reagents.add_reagent("sugar", 3) -/obj/item/weapon/reagent_containers/food/snacks/namagashi //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/namagashi name = "\improper Ryo-kucha Namagashi" desc = "Sweet Japanese gummy like candy that are just bursting with flavor!" icon = 'icons/obj/food_snacks.dmi' @@ -6041,7 +6007,7 @@ nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple" = 2) bitesize = 6 -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/fruitbar/Initialize() . = ..() reagents.add_reagent("sugar", 4) @@ -6465,7 +6431,7 @@ . = ..() reagents.add_reagent("doctorsdelight", 5) -////////////////////sol_vend (Mars Mart) (ADDED 04/11/2021)//////////////////////////////////////////////////// +////////////////////sol_vend (Mars Mart)//////////////////////////////////////////////////// /obj/item/weapon/reagent_containers/food/snacks/triton name = "\improper Tidal Gobs" @@ -6600,7 +6566,7 @@ nutriment_amt = 4 bitesize = 1 -////////////////////weeb_vend (Nippon-tan!) (ADDED 04/11/2021)//////////////////////////////////////////////////// +////////////////////weeb_vend (Nippon-tan!)//////////////////////////////////////////////////// /obj/item/weapon/reagent_containers/food/snacks/ricecake name = "rice cake" @@ -6611,7 +6577,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/dorayaki //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/dorayaki name = "dorayaki" icon = 'icons/obj/food_snacks.dmi' icon_state = "dorayaki" @@ -6620,7 +6586,7 @@ nutriment_amt = 6 bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/daifuku //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/daifuku name = "daifuku" icon = 'icons/obj/food_snacks.dmi' icon_state = "daifuku" @@ -6629,16 +6595,6 @@ nutriment_amt = 6 bitesize = 2 -///obj/item/weapon/reagent_containers/food/snacks/pocky (Moved to chewables) -// name = "pockys" -// icon = 'icons/obj/food_snacks.dmi' -// icon_state = "pockys" -// desc = "A bundle of chocolate-coated bisquit sticks." -// trash = /obj/item/trash/pocky -// nutriment_desc = list("chocolate" = 4, "biscuit" = 1) -// nutriment_amt = 5 -// bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/weebonuts name = "\improper Red Alert Nuts!" icon = 'icons/obj/food_snacks.dmi' @@ -6681,7 +6637,7 @@ .=..() reagents.add_reagent("sprinkles", 10) -/obj/item/weapon/reagent_containers/food/snacks/goma_dango //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/goma_dango name = "\improper Goma dango" icon = 'icons/obj/food_snacks.dmi' icon_state = "goma_dango" @@ -6691,7 +6647,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/hanami_dango //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/hanami_dango name = "\improper Hanami dango" icon = 'icons/obj/food_snacks.dmi' icon_state = "hanami_dango" @@ -6702,7 +6658,7 @@ nutriment_amt = 5 bitesize = 2 -////////////////////ancient_vend (Hot Food - Old) (ADDED 04/11/2021)//////////////////////////////////////////////////// +////////////////////ancient_vend (Hot Food - Old)//////////////////////////////////////////////////// /obj/item/weapon/reagent_containers/food/snacks/old name = "master old-food"