diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index eff6fb84fd0..70f8386a914 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -9,18 +9,30 @@ /datum/supply_pack/supply/food name = "Kitchen supply crate" contains = list( - /obj/item/weapon/reagent_containers/food/condiment/flour = 6, + /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6, /obj/item/weapon/reagent_containers/food/drinks/milk = 3, /obj/item/weapon/reagent_containers/food/drinks/soymilk = 2, /obj/item/weapon/storage/fancy/egg_box = 2, /obj/item/weapon/reagent_containers/food/snacks/tofu = 4, /obj/item/weapon/reagent_containers/food/snacks/meat = 4, - /obj/item/weapon/reagent_containers/food/condiment/yeast = 3 + /obj/item/weapon/reagent_containers/food/condiment/yeast = 3, + /obj/item/weapon/reagent_containers/food/condiment/sprinkles = 1 ) cost = 10 containertype = /obj/structure/closet/crate/freezer/centauri containername = "Food crate" +/datum/supply_pack/supply/fancyfood + name = "Artisanal food delivery" + contains = list( + /obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 6, + /obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 6 + ) + cost = 25 + containertype = /obj/structure/closet/crate/freezer/centauri + containername = "Artisanal food crate" + + /datum/supply_pack/supply/toner name = "Toner cartridges" contains = list(/obj/item/device/toner = 6) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 63a5613c887..66695f3511a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -3,8 +3,10 @@ req_access = list(access_kitchen) starts_with = list( - /obj/item/weapon/reagent_containers/food/condiment/flour = 7, - /obj/item/weapon/reagent_containers/food/condiment/sugar = 2, + /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6, + /obj/item/weapon/reagent_containers/food/condiment/carton/sugar = 1, + /obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 1, + /obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 1, /obj/item/weapon/reagent_containers/food/condiment/spacespice = 2 ) diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 5b137957db7..2373db3bc2f 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -135,6 +135,11 @@ desc = "Barbecue sauce, it's labeled 'sweet and spicy'." icon_state = "barbecue" center_of_mass = list("x"=16, "y"=6) + if("sprinkles") + name = "sprinkles" + desc = "Bottle of sprinkles, colourful!" + icon_state= "sprinkles" + center_of_mass = list("x"=16, "y"=6) else name = "Misc Condiment Bottle" if (reagents.reagent_list.len==1) @@ -208,6 +213,13 @@ . = ..() reagents.add_reagent("yeast", 50) +/obj/item/weapon/reagent_containers/food/condiment/sprinkles + name = "Sprinkles" + +/obj/item/weapon/reagent_containers/food/condiment/sprinkles/Initialize() + . = ..() + reagents.add_reagent("sprinkles", 50) + /obj/item/weapon/reagent_containers/food/condiment/small possible_transfer_amounts = list(1,20) amount_per_transfer_from_this = 1 @@ -448,22 +460,58 @@ //End of MRE stuff. -/obj/item/weapon/reagent_containers/food/condiment/flour - name = "flour sack" - desc = "A big bag of flour. Good for baking!" +/obj/item/weapon/reagent_containers/food/condiment/carton/flour + name = "flour carton" + desc = "A big carton of flour. Good for baking!" icon = 'icons/obj/food.dmi' icon_state = "flour" volume = 220 center_of_mass = list("x"=16, "y"=8) -/obj/item/weapon/reagent_containers/food/condiment/flour/on_reagent_change() +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/on_reagent_change() + update_icon() return -/obj/item/weapon/reagent_containers/food/condiment/flour/Initialize() +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/Initialize() . = ..() reagents.add_reagent("flour", 200) randpixel_xy() +/obj/item/weapon/reagent_containers/food/condiment/carton/update_icon() + overlays.Cut() + + if(reagents.total_volume) + var/image/filling = image('icons/obj/food.dmi', src, "[icon_state]10") + + filling.icon_state = "[icon_state]-[clamp(round(100 * reagents.total_volume / volume, 25), 0, 100)]" + + overlays += filling + +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic + name = "flour sack" + desc = "An artisanal sack of flour. Classy!" + icon_state = "flour_bag" + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar + name = "sugar carton" + desc = "A big carton of sugar. Sweet!" + icon_state = "sugar" + volume = 120 + center_of_mass = list("x"=16, "y"=8) + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/on_reagent_change() + update_icon() + return + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/Initialize() + . = ..() + reagents.add_reagent("sugar", 100) + +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic + name = "sugar sack" + desc = "An artisanal sack of sugar. Classy!" + icon_state = "sugar_bag" + /obj/item/weapon/reagent_containers/food/condiment/spacespice name = "space spices" desc = "An exotic blend of spices for cooking. Definitely not worms." @@ -477,4 +525,4 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice/Initialize() . = ..() - reagents.add_reagent("spacespice", 40) \ No newline at end of file + reagents.add_reagent("spacespice", 40) diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 981a809fd46..bd4a9d8e003 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -7,6 +7,7 @@ var/shortname var/max_space = 20//Maximum sum of w-classes of foods in this container at once var/max_reagents = 80//Maximum units of reagents + var/food_items = 0 // Used for icon updates flags = OPENCONTAINER | NOREACT var/list/insertable = list( /obj/item/weapon/reagent_containers/food/snacks, @@ -59,6 +60,8 @@ return I.forceMove(src) to_chat(user, "You put the [I] into the [src].") + food_items += 1 + update_icon() return /obj/item/weapon/reagent_containers/cooking_container/verb/empty() @@ -102,6 +105,8 @@ /obj/item/weapon/reagent_containers/cooking_container/AltClick(var/mob/user) do_empty(user) + food_items = 0 + update_icon() //Deletes contents of container. //Used when food is burned, before replacing it with a burned mess @@ -158,6 +163,22 @@ if (weights[I]) holder.trans_to(I, weights[I] / total) +/obj/item/weapon/reagent_containers/cooking_container/update_icon() + overlays.Cut() + + if(food_items) + var/image/filling = image('icons/obj/cooking_machines.dmi', src, "[icon_state]10") + + var/percent = round((food_items / max_space) * 100) + switch(percent) + if(0 to 2) filling.icon_state = "[icon_state]" + if(3 to 24) filling.icon_state = "[icon_state]1" + if(25 to 49) filling.icon_state = "[icon_state]2" + if(50 to 74) filling.icon_state = "[icon_state]3" + if(75 to 79) filling.icon_state = "[icon_state]4" + if(80 to INFINITY) filling.icon_state = "[icon_state]5" + + overlays += filling /obj/item/weapon/reagent_containers/cooking_container/oven name = "oven dish" @@ -186,4 +207,4 @@ name = "grill rack" shortname = "rack" desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents." - icon_state = "grillrack" \ No newline at end of file + icon_state = "grillrack" diff --git a/icons/obj/cooking_machines.dmi b/icons/obj/cooking_machines.dmi index 4009cb62249..b8c3ea6f5d2 100644 Binary files a/icons/obj/cooking_machines.dmi and b/icons/obj/cooking_machines.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 915c1705516..f1637aca4b3 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm index d0bdecf9d8d..1d3c1e62337 100644 --- a/maps/expedition_vr/beach/beach.dmm +++ b/maps/expedition_vr/beach/beach.dmm @@ -1349,16 +1349,16 @@ /turf/simulated/floor/beach/sand/outdoors, /area/tether_away/beach/resort) "Bk" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -1367,10 +1367,10 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/material/knife/butch, /obj/item/weapon/material/minihoe, /obj/item/weapon/material/knife/machete/hatchet, diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm index 175934ba36b..02654d71f21 100644 --- a/maps/gateway_vr/eggnogtown.dmm +++ b/maps/gateway_vr/eggnogtown.dmm @@ -1000,16 +1000,16 @@ /turf/simulated/floor/tiled, /area/gateway/eggnogtown/loniabode) "gk" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -1018,10 +1018,10 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/structure/closet, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, @@ -3649,7 +3649,7 @@ "Rd" = ( /obj/structure/table/marble, /obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/yeast, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/yeast, diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index afc16589d3b..41a8be8f090 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -1143,16 +1143,16 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index bbba59342e4..53c799bac41 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -157,16 +157,16 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index 2a42bcc14f0..12a79c33ecc 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -676,9 +676,9 @@ /area/awaymission/wwmines) "fb" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) "fc" = ( diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index dd5883fc8eb..48d050d8cfe 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -7192,18 +7192,18 @@ /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/northspur) "uU" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, diff --git a/maps/groundbase/southwilds/villagepois/square7.dmm b/maps/groundbase/southwilds/villagepois/square7.dmm index 5cc3728a75e..e92257e2a18 100644 --- a/maps/groundbase/southwilds/villagepois/square7.dmm +++ b/maps/groundbase/southwilds/villagepois/square7.dmm @@ -119,18 +119,18 @@ /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "G" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index 8dae10297d0..8a11ecf0b96 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -1985,16 +1985,16 @@ /turf/simulated/floor, /area/itglight/portengi) "lO" = ( -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, @@ -2003,10 +2003,10 @@ /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/material/knife/butch, /obj/item/weapon/material/minihoe, /obj/item/weapon/material/knife/machete/hatchet, diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index a53bc1fb65f..56fef9d1464 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -7931,18 +7931,18 @@ pixel_x = -1; pixel_y = -42 }, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /obj/item/weapon/reagent_containers/food/condiment/spacespice, /obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm index 69f2b63996c..d6fa3316b41 100644 --- a/maps/submaps/surface_submaps/plains/Diner.dmm +++ b/maps/submaps/surface_submaps/plains/Diner.dmm @@ -43,7 +43,7 @@ /turf/simulated/floor/tiled/white, /area/submap/Diner) "ak" = ( -/obj/machinery/vending/cola, +/obj/machinery/vending/hotfood, /turf/simulated/floor/tiled/white, /area/submap/Diner) "al" = ( @@ -113,8 +113,8 @@ "aw" = ( /obj/machinery/appliance/mixer/cereal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -134,7 +134,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -180,13 +180,13 @@ /area/submap/Diner) "aI" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aJ" = ( @@ -198,8 +198,8 @@ "aK" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -250,13 +250,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( @@ -317,8 +317,8 @@ /area/submap/Diner) "bc" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 4 + dir = 4; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -361,6 +361,11 @@ "bi" = ( /turf/simulated/floor/lino, /area/submap/Diner) +"bj" = ( +/obj/structure/table/standard, +/obj/random/mug, +/turf/simulated/floor/tiled/white, +/area/submap/Diner) "bk" = ( /obj/machinery/light/small{ dir = 8 @@ -374,6 +379,7 @@ /area/submap/Diner) "bm" = ( /obj/structure/table/woodentable, +/obj/random/mug, /turf/simulated/floor/lino, /area/submap/Diner) "bn" = ( @@ -389,8 +395,8 @@ "bp" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/windoor_assembly{ - icon_state = "l_windoor_assembly01"; - dir = 2 + dir = 2; + icon_state = "l_windoor_assembly01" }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -406,8 +412,8 @@ /area/submap/Diner) "bs" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -452,6 +458,7 @@ /area/submap/Diner) "bA" = ( /obj/structure/table/standard, +/obj/random/soap/anom, /turf/simulated/floor/tiled/hydro, /area/submap/Diner) @@ -863,7 +870,7 @@ aa (16,1,1) = {" aa ad -ah +bj ap ap ap diff --git a/maps/submaps/surface_submaps/plains/Diner_vr.dmm b/maps/submaps/surface_submaps/plains/Diner_vr.dmm index 1ef47715cbd..a2eedcc00d3 100644 --- a/maps/submaps/surface_submaps/plains/Diner_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Diner_vr.dmm @@ -130,7 +130,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -245,13 +245,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( diff --git a/maps/submaps/surface_submaps/plains/lonehome.dmm b/maps/submaps/surface_submaps/plains/lonehome.dmm index 2b0fca5b59c..b610c17a87a 100644 --- a/maps/submaps/surface_submaps/plains/lonehome.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome.dmm @@ -86,7 +86,7 @@ "zN" = (/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome) "AQ" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "BH" = (/obj/item/weapon/paper{info = "F%$K this detective, I swear I can see them peeking from behind the window, these tinted glasses help but I swear I can still see them snooping around. His days are counted... I am so close to figuring this out, just need a few more days. Then Shepiffany will be part of the family once again, then our two kids and I can go back on having a normal life... a normal life..."; name = "Stained sheet of paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) -"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) "Dk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "DE" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/weapon/storage/box/glasses/square{pixel_y = -2},/obj/item/weapon/storage/box/glass_extras/sticks{pixel_y = 4},/obj/item/weapon/storage/box/glass_extras/straws{pixel_y = 7},/obj/item/weapon/packageWrap,/obj/structure/curtain/open/bed,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/rack,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "DG" = (/obj/structure/simple_door/wood,/turf/simulated/floor,/area/submap/lonehome) diff --git a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm index 776d5a25a21..6cee63decc5 100644 --- a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm @@ -166,7 +166,7 @@ }, /obj/item/weapon/storage/box/donkpockets, /obj/item/weapon/storage/box/condimentbottles, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /obj/structure/curtain/open/bed, /obj/structure/table/rack, /obj/structure/window/reinforced/polarized{