diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 10eac815bfd..70f8386a914 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -9,24 +9,14 @@ /datum/supply_pack/supply/food name = "Kitchen supply crate" contains = list( -<<<<<<< HEAD - /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/reagent_containers/food/condiment/carton/flour = 6, - /obj/item/reagent_containers/food/drinks/milk = 3, - /obj/item/reagent_containers/food/drinks/soymilk = 2, - /obj/item/storage/fancy/egg_box = 2, - /obj/item/reagent_containers/food/snacks/tofu = 4, - /obj/item/reagent_containers/food/snacks/meat = 4, - /obj/item/reagent_containers/food/condiment/yeast = 3, + /obj/item/weapon/reagent_containers/food/condiment/yeast = 3, /obj/item/weapon/reagent_containers/food/condiment/sprinkles = 1 ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) ) cost = 10 containertype = /obj/structure/closet/crate/freezer/centauri @@ -35,8 +25,8 @@ /datum/supply_pack/supply/fancyfood name = "Artisanal food delivery" contains = list( - /obj/item/reagent_containers/food/condiment/carton/flour/rustic = 6, - /obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 6 + /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 @@ -165,7 +155,6 @@ cost = 15 containertype = /obj/structure/closet/crate/large/xion containername = "Cargo Train Trolley Crate" -<<<<<<< HEAD /datum/supply_pack/explorergear name="Explorer gear" @@ -216,5 +205,3 @@ containername = "Pilot equipment" access = access_pilot -======= ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) 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 e56146bdce6..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,17 +3,11 @@ req_access = list(access_kitchen) starts_with = list( -<<<<<<< HEAD - /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 -======= - /obj/item/reagent_containers/food/condiment/carton/flour = 6, - /obj/item/reagent_containers/food/condiment/carton/sugar = 1, - /obj/item/reagent_containers/food/condiment/carton/flour/rustic = 1, - /obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 1, - /obj/item/reagent_containers/food/condiment/spacespice = 2 ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) ) open_sound = 'sound/machines/click.ogg' diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index c99367d767a..2373db3bc2f 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -213,9 +213,6 @@ . = ..() reagents.add_reagent("yeast", 50) -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/condiment/small -======= /obj/item/weapon/reagent_containers/food/condiment/sprinkles name = "Sprinkles" @@ -223,8 +220,7 @@ . = ..() reagents.add_reagent("sprinkles", 50) -/obj/item/reagent_containers/food/condiment/small ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) +/obj/item/weapon/reagent_containers/food/condiment/small possible_transfer_amounts = list(1,20) amount_per_transfer_from_this = 1 volume = 20 @@ -464,40 +460,24 @@ //End of MRE stuff. -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/condiment/flour - name = "flour sack" - desc = "A big bag of flour. Good for baking!" -======= -/obj/item/reagent_containers/food/condiment/carton/flour +/obj/item/weapon/reagent_containers/food/condiment/carton/flour name = "flour carton" desc = "A big carton of flour. Good for baking!" ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) icon = 'icons/obj/food.dmi' icon_state = "flour" volume = 220 center_of_mass = list("x"=16, "y"=8) -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/condiment/flour/on_reagent_change() - return - -/obj/item/weapon/reagent_containers/food/condiment/flour/Initialize() -======= -/obj/item/reagent_containers/food/condiment/carton/flour/on_reagent_change() +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/on_reagent_change() update_icon() return -/obj/item/reagent_containers/food/condiment/carton/flour/Initialize() ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) +/obj/item/weapon/reagent_containers/food/condiment/carton/flour/Initialize() . = ..() reagents.add_reagent("flour", 200) randpixel_xy() -<<<<<<< HEAD -/obj/item/weapon/reagent_containers/food/condiment/spacespice -======= -/obj/item/reagent_containers/food/condiment/carton/update_icon() +/obj/item/weapon/reagent_containers/food/condiment/carton/update_icon() overlays.Cut() if(reagents.total_volume) @@ -507,33 +487,32 @@ overlays += filling -/obj/item/reagent_containers/food/condiment/carton/flour/rustic +/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/reagent_containers/food/condiment/carton/sugar +/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/reagent_containers/food/condiment/carton/sugar/on_reagent_change() +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/on_reagent_change() update_icon() return -/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize() +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/Initialize() . = ..() reagents.add_reagent("sugar", 100) -/obj/item/reagent_containers/food/condiment/carton/sugar/rustic +/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/reagent_containers/food/condiment/spacespice ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) +/obj/item/weapon/reagent_containers/food/condiment/spacespice name = "space spices" desc = "An exotic blend of spices for cooking. Definitely not worms." icon_state = "spacespicebottle" diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 210b74e93bc..bd4a9d8e003 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -163,7 +163,7 @@ if (weights[I]) holder.trans_to(I, weights[I] / total) -/obj/item/reagent_containers/cooking_container/update_icon() +/obj/item/weapon/reagent_containers/cooking_container/update_icon() overlays.Cut() if(food_items) 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 86e53b1aaac..82a821cfda5 100644 --- a/maps/expedition_vr/beach/beach.dmm +++ b/maps/expedition_vr/beach/beach.dmm @@ -1345,16 +1345,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, @@ -1363,10 +1363,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 087f0a1eb55..4c01e0d4c68 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -7175,18 +7175,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 9554816a933..d6fa3316b41 100644 --- a/maps/submaps/surface_submaps/plains/Diner.dmm +++ b/maps/submaps/surface_submaps/plains/Diner.dmm @@ -30,13 +30,8 @@ /area/submap/Diner) "ai" = ( /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/enzyme, /obj/item/weapon/reagent_containers/glass/beaker, -======= -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/glass/beaker, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "aj" = ( @@ -44,19 +39,11 @@ /obj/machinery/light{ dir = 1 }, -<<<<<<< HEAD /obj/item/weapon/material/knife/butch, /turf/simulated/floor/tiled/white, /area/submap/Diner) "ak" = ( -/obj/machinery/vending/cola, -======= -/obj/item/material/knife/butch, -/turf/simulated/floor/tiled/white, -/area/submap/Diner) -"ak" = ( /obj/machinery/vending/hotfood, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "al" = ( @@ -91,29 +78,17 @@ "ar" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/item/weapon/material/kitchen/utensil/fork, -======= -/obj/item/reagent_containers/food/condiment/small/saltshaker, -/obj/item/material/kitchen/utensil/fork, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "as" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, /obj/machinery/light{ icon_state = "tube1"; dir = 4 -======= -/obj/item/reagent_containers/food/condiment/small/peppershaker, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -127,32 +102,19 @@ /area/submap/Diner) "au" = ( /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/book/manual/chef_recipes, -======= -/obj/item/book/manual/chef_recipes, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "av" = ( /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/material/kitchen/rollingpin, -======= -/obj/item/material/kitchen/rollingpin, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "aw" = ( /obj/machinery/appliance/mixer/cereal, /obj/machinery/light{ -<<<<<<< HEAD - icon_state = "tube1"; - dir = 4 -======= dir = 4; icon_state = "tube1" ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -163,7 +125,6 @@ /area/submap/Diner) "ay" = ( /obj/structure/closet/secure_closet/freezer/fridge, -<<<<<<< HEAD /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/reagent_containers/food/drinks/bottle/milk, @@ -173,19 +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/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/cream, -/obj/item/reagent_containers/food/drinks/bottle/cream, -/obj/item/reagent_containers/food/drinks/bottle/cream, -/obj/item/reagent_containers/food/drinks/bottle/cream, -/obj/item/reagent_containers/food/condiment/sugar, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) +/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -202,34 +151,20 @@ /area/submap/Diner) "aC" = ( /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /obj/effect/floor_decal/corner/red/diagonal, /obj/item/weapon/material/kitchen/utensil/fork, -======= -/obj/item/reagent_containers/food/condiment/small/saltshaker, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/item/material/kitchen/utensil/fork, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "aD" = ( /obj/structure/table/standard, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -======= -/obj/item/reagent_containers/food/condiment/small/peppershaker, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aE" = ( /obj/effect/floor_decal/corner/red/diagonal, -<<<<<<< HEAD /obj/item/weapon/stool/padded, -======= -/obj/item/stool/padded, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "aF" = ( @@ -245,15 +180,6 @@ /area/submap/Diner) "aI" = ( /obj/structure/closet/crate/freezer, -<<<<<<< HEAD -/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, @@ -261,29 +187,19 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aJ" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/diagonal, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -======= -/obj/item/reagent_containers/food/condiment/small/saltshaker, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "aK" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ -<<<<<<< HEAD - icon_state = "tube1"; - dir = 4 -======= dir = 4; icon_state = "tube1" ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -310,7 +226,6 @@ /obj/machinery/light/small{ dir = 4 }, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/meat, @@ -319,26 +234,12 @@ /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/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aO" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/diagonal, -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -======= -/obj/item/reagent_containers/food/condiment/small/peppershaker, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "aP" = ( @@ -349,23 +250,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -<<<<<<< HEAD -/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/reagent_containers/food/condiment/carton/flour, -/obj/item/reagent_containers/food/condiment/carton/flour, -/obj/item/reagent_containers/food/condiment/carton/flour, -/obj/item/reagent_containers/food/condiment/carton/flour, -/obj/item/reagent_containers/food/condiment/carton/flour, -/obj/item/reagent_containers/food/condiment/carton/flour, -/obj/item/reagent_containers/food/condiment/carton/flour, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) +/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" = ( @@ -426,20 +317,14 @@ /area/submap/Diner) "bc" = ( /obj/machinery/light{ -<<<<<<< HEAD - icon_state = "tube1"; - dir = 4 -======= dir = 4; icon_state = "tube1" ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) }, /turf/simulated/floor/tiled/white, /area/submap/Diner) "bd" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/closet/secure_closet/freezer/fridge, -<<<<<<< HEAD /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, @@ -453,21 +338,6 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/milk, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -======= -/obj/item/storage/fancy/egg_box, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/milk, -/obj/item/reagent_containers/food/drinks/bottle/cream, -/obj/item/reagent_containers/food/drinks/bottle/cream, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/white, /area/submap/Diner) "be" = ( @@ -481,11 +351,7 @@ /area/submap/Diner) "bg" = ( /obj/structure/table/woodentable, -<<<<<<< HEAD /obj/item/device/flashlight/lamp, -======= -/obj/item/flashlight/lamp, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/lino, /area/submap/Diner) "bh" = ( @@ -495,14 +361,11 @@ "bi" = ( /turf/simulated/floor/lino, /area/submap/Diner) -<<<<<<< HEAD -======= "bj" = ( /obj/structure/table/standard, /obj/random/mug, /turf/simulated/floor/tiled/white, /area/submap/Diner) ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) "bk" = ( /obj/machinery/light/small{ dir = 8 @@ -511,19 +374,12 @@ /area/submap/Diner) "bl" = ( /obj/structure/table/woodentable, -<<<<<<< HEAD /obj/item/weapon/cell/high, -======= -/obj/item/cell/high, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/lino, /area/submap/Diner) "bm" = ( /obj/structure/table/woodentable, -<<<<<<< HEAD -======= /obj/random/mug, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/lino, /area/submap/Diner) "bn" = ( @@ -539,13 +395,8 @@ "bp" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/windoor_assembly{ -<<<<<<< HEAD - icon_state = "l_windoor_assembly01"; - dir = 2 -======= dir = 2; icon_state = "l_windoor_assembly01" ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) }, /turf/simulated/floor/tiled/white, /area/submap/Diner) @@ -561,13 +412,8 @@ /area/submap/Diner) "bs" = ( /obj/structure/sink{ -<<<<<<< HEAD - icon_state = "sink"; - dir = 8; -======= dir = 8; icon_state = "sink"; ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) pixel_x = -12; pixel_y = 2 }, @@ -612,10 +458,7 @@ /area/submap/Diner) "bA" = ( /obj/structure/table/standard, -<<<<<<< HEAD -======= /obj/random/soap/anom, ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) /turf/simulated/floor/tiled/hydro, /area/submap/Diner) @@ -1027,11 +870,7 @@ aa (16,1,1) = {" aa ad -<<<<<<< HEAD -ah -======= bj ->>>>>>> edb54f137d6... Cooking QOL V2 (#8644) 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{