diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index c53378411df..ea2bd6dafef 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -3750,10 +3750,28 @@ /obj/item/weapon/reagent_containers/food/snacks/donerkebab = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 2, /obj/item/weapon/reagent_containers/food/snacks/egg_pancake = 10, /obj/item/weapon/reagent_containers/food/snacks/eggbowl = 10, /obj/item/weapon/reagent_containers/food/snacks/eggplantparm = 10, @@ -3985,8 +4003,8 @@ /obj/item/weapon/reagent_containers/food/snacks/brainburger = 10, /obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice = 10, /obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly = 10, /obj/item/weapon/reagent_containers/food/snacks/ghostmuffin/poison = 10, /obj/item/weapon/reagent_containers/food/snacks/old/hotdog = 10, /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice = 10, @@ -4212,10 +4230,28 @@ /obj/item/weapon/reagent_containers/food/snacks/donerkebab = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket = 10, /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly = 10, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 10, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 2, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 2, /obj/item/weapon/reagent_containers/food/snacks/egg_pancake = 10, /obj/item/weapon/reagent_containers/food/snacks/eggbowl = 10, /obj/item/weapon/reagent_containers/food/snacks/eggplantparm = 10, diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 5c9be66e260..8b6384b9cba 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -2,8 +2,34 @@ * Donut Box */ +var/list/random_weighted_donuts = list( + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 5, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 5, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/green = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 4, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3, + /obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 1 +) + /obj/item/weapon/storage/box/donut - icon = 'icons/obj/food.dmi' + icon = 'icons/obj/food_donuts.dmi' icon_state = "donutbox" name = "donut box" desc = "A box that holds tasty donuts, if you're lucky." @@ -11,18 +37,24 @@ max_storage_space = ITEMSIZE_COST_SMALL * 6 can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut) foldable = /obj/item/stack/material/cardboard - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6) + //starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6) /obj/item/weapon/storage/box/donut/Initialize() + if(!empty) + for(var/i in 1 to 6) + var/type_to_spawn = pickweight(random_weighted_donuts) + new type_to_spawn(src) . = ..() update_icon() /obj/item/weapon/storage/box/donut/update_icon() cut_overlays() - var/i = 0 + var/x_offset = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in contents) - add_overlay("[i][D.overlay_state]") - i++ + var/mutable_appearance/ma = mutable_appearance(icon = icon, icon_state = D.overlay_state) + ma.pixel_x = x_offset + add_overlay(ma) + x_offset += 3 /obj/item/weapon/storage/box/donut/empty empty = TRUE diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index e4d18b5cc61..3183d26fe74 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -412,10 +412,28 @@ /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white, /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle, /obj/item/weapon/reagent_containers/food/snacks/chocolateegg, - /obj/item/weapon/reagent_containers/food/snacks/donut, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink, + /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple, + /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/green, + /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige, + /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue, + /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow, + /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive, + /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer, + /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles, + /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly, /obj/item/weapon/reagent_containers/food/snacks/tuna, /obj/item/weapon/reagent_containers/food/snacks/pistachios, /obj/item/weapon/reagent_containers/food/snacks/semki, @@ -838,8 +856,8 @@ /obj/random/mre/dessert/item_to_spawn() return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, - /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/donut/plain, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, /obj/item/weapon/reagent_containers/food/snacks/cookiesnack) @@ -850,7 +868,7 @@ /obj/random/mre/dessert/vegan/item_to_spawn() return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit) /obj/random/mre/drink diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 60088c1e96c..c91df7e492a 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -439,7 +439,8 @@ products = list(/obj/item/weapon/handcuffs = 8, /obj/item/weapon/grenade/flashbang = 4, /obj/item/device/flash = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 6, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 6, /obj/item/weapon/storage/box/evidence = 6) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/weapon/storage/box/donut = 2) diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index 871e37e1872..6bbd434e435 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -12,8 +12,8 @@ var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/sna /obj/item/weapon/reagent_containers/food/snacks/tossedsalad, /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose) -var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, +var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, /obj/item/weapon/reagent_containers/food/snacks/muffin, /obj/item/weapon/reagent_containers/food/snacks/popcorn, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 0e88aeb62cf..21f003e32ee 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -384,43 +384,256 @@ name = "donut" desc = "Goes great with Robust Coffee." description_fluff = "These donuts claim to be made fresh daily in a boutique bakery in New Reykjavik and delivered to Nanotrasen's hardworking asset protection crew. They're probably synthesized." - icon_state = "donut1" + icon = 'icons/obj/food_donuts.dmi' + icon_state = "donut" filling_color = "#D9C386" - var/overlay_state = "box-donut1" - center_of_mass = list("x"=13, "y"=16) nutriment_desc = list("sweetness", "donut") - -/obj/item/weapon/reagent_containers/food/snacks/donut/normal - name = "donut" - desc = "Goes great with Robust Coffee." - icon_state = "donut1" nutriment_amt = 3 - bitesize = 3 + bitesize = 4 + var/overlay_state = "donut_inbox" -/obj/item/weapon/reagent_containers/food/snacks/donut/normal/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain + name = "plain donut" + icon_state = "donut" + desc = "A plain ol' donut." +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly + name = "plain jelly donut" + icon_state = "jelly" + desc = "At least this one has jelly!" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/pink + name = "pink frosted donut" + icon_state = "donut_pink" + desc = "This one has pink frosting!" + overlay_state = "donut_pink_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/pink/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly + name = "pink frosted jelly donut" + icon_state = "jelly_pink" + desc = "This one has pink frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/purple + name = "purple frosted donut" + icon_state = "donut_purple" + desc = "This one has purple frosting!" + overlay_state = "donut_purple_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/purple/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly + name = "purple frosted jelly donut" + icon_state = "jelly_purple" + desc = "This one has purple frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/green + name = "green frosted donut" + icon_state = "donut_green" + desc = "This one has green frosting!" + overlay_state = "donut_green_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/green/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly + name = "green frosted jelly donut" + icon_state = "jelly_green" + desc = "This one has green frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/beige + name = "beige frosted donut" + icon_state = "donut_beige" + desc = "This one has beige frosting!" + overlay_state = "donut_beige_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/beige/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly + name = "beige frosted jelly donut" + icon_state = "jelly_beige" + desc = "This one has beige frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc + name = "chocolate frosted donut" + icon_state = "donut_choc" + desc = "This one has chocolate frosting!" + overlay_state = "donut_choc_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/choc/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly + name = "chocolate frosted jelly donut" + icon_state = "jelly_choc" + desc = "This one has chocolate frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/blue + name = "blue frosted donut" + icon_state = "donut_blue" + desc = "This one has blue frosting!" + overlay_state = "donut_blue_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/blue/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly + name = "blue frosted jelly donut" + icon_state = "jelly_blue" + desc = "This one has blue frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow + name = "yellow frosted donut" + icon_state = "donut_yellow" + desc = "This one has yellow frosting!" + overlay_state = "donut_yellow_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly + name = "yellow frosted jelly donut" + icon_state = "jelly_yellow" + desc = "This one has yellow frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/olive + name = "olive frosted donut" + icon_state = "donut_olive" + desc = "This one has olive frosting!" + overlay_state = "donut_olive_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/olive/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly + name = "olive frosted jelly donut" + icon_state = "jelly_olive" + desc = "This one has olive frosting and a jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/homer + name = "frosted donut with sprinkles" + icon_state = "donut_homer" + desc = "It's a d'ohnut!" + overlay_state = "donut_homer_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/homer/Initialize() . = ..() reagents.add_reagent("nutriment", 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) - if(prob(30)) - src.icon_state = "donut2" - src.overlay_state = "box-donut2" - src.name = "frosted donut" - reagents.add_reagent("sprinkles", 2) - center_of_mass = list("x"=19, "y"=16) + +/obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly + name = "frosted jelly donut with sprinkles" + icon_state = "jelly_homer" + desc = "It's a d'ohnut with jelly filling!" +/obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles + name = "chocolate sprinkles donut" + icon_state = "donut_choc_sprinkles" + desc = "Mmm, chocolate with sprinkles... approaching maximum donut." + overlay_state = "donut_choc_sprinkles_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("sprinkles", 1) + +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly + name = "chocolate sprinkles jelly donut" + icon_state = "jelly_choc_sprinkles" + desc = "Pretty sure this is the most sugar you can pack into a donut." +/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("sprinkles", 1) + reagents.add_reagent("berryjuice", 5) + +/obj/item/weapon/reagent_containers/food/snacks/donut/meat + name = "meat donut" + icon_state = "donut_meat" + desc = "This donut has ... meat? Is it made of meat?!" + overlay_state = "donut_meat_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/meat/Initialize() + . = ..() + reagents.add_reagent("protein", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh + name = "laugh donut" + icon_state = "donut_laugh" + desc = "Try not to laugh." + overlay_state = "donut_laugh_inbox" +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh/jelly + name = "laugh jelly donut" + icon_state = "jelly_laugh" + desc = "Try not to be jelly." +/obj/item/weapon/reagent_containers/food/snacks/donut/laugh/jelly/Initialize() + . = ..() + reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent("berryjuice", 5) + /obj/item/weapon/reagent_containers/food/snacks/donut/chaos name = "Chaos Donut" desc = "Like life, it never quite tastes the same." - icon_state = "donut1" + icon_state = "donut_chaos" filling_color = "#ED11E6" nutriment_amt = 2 bitesize = 10 + overlay_state = "donut_chaos_inbox" /obj/item/weapon/reagent_containers/food/snacks/donut/chaos/Initialize() . = ..() reagents.add_reagent("sprinkles", 1) - var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10) - switch(chaosselect) + switch(rand(1,10)) if(1) reagents.add_reagent("nutriment", 3, nutriment_desc) if(2) @@ -441,87 +654,28 @@ reagents.add_reagent("berryjuice", 3) if(10) reagents.add_reagent("tricordrazine", 3) - if(prob(30)) - src.icon_state = "donut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Chaos Donut" - reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) - -/obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" - filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 - -/obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry/Initialize() - . = ..() - reagents.add_reagent("sprinkles", 1) reagents.add_reagent("poisonberryjuice", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) reagents.add_reagent("slimejelly", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly - name = "Jelly Donut" - desc = "You jelly?" - icon_state = "jdonut1" +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly filling_color = "#ED1169" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 3 - bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) reagents.add_reagent("cherryjelly", 5) - if(prob(30)) - src.icon_state = "jdonut2" - src.overlay_state = "box-donut2" - src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) + /obj/item/weapon/reagent_containers/food/snacks/egg name = "egg" diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index ba6884b10b3..bc977d8afb8 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -128,7 +128,7 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/doughslice ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly result_quantity = 2 /datum/recipe/jellydonut/poisonberry @@ -136,15 +136,15 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/dough ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/poisonberry /datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies. reagents = list("slimejelly" = 5, "sugar" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/slimejelly /datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies. reagents = list("cherryjelly" = 5, "sugar" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly /datum/recipe/donut appliance = FRYER @@ -152,7 +152,7 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/doughslice ) - result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal + result = /obj/item/weapon/reagent_containers/food/snacks/donut/plain result_quantity = 2 /datum/recipe/chaosdonut diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 618566f6e22..ce7204202d3 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_donuts.dmi b/icons/obj/food_donuts.dmi new file mode 100644 index 00000000000..9dfb4efb21a Binary files /dev/null and b/icons/obj/food_donuts.dmi differ diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi index 4795180c2f4..97f47f65dc5 100644 Binary files a/icons/obj/food_ingredients.dmi and b/icons/obj/food_ingredients.dmi differ