From a4fbdb689f5ccf205d6d3de99cd3118842c289b3 Mon Sep 17 00:00:00 2001 From: Aylong Date: Sun, 21 Jan 2024 21:50:18 +0200 Subject: [PATCH] Condiment path fix --- .../map_files220/MetaStation/MetaStation.dmm | 40 +++++------ .../RandomRuins/SpaceRuins/spacehotel.dmm | 68 +++++++++---------- _maps/map_files220/RandomZLevels/beach.dmm | 28 ++++---- .../map_files220/RandomZLevels/blackmesa.dmm | 28 ++++---- .../RandomZLevels/gate_lizard.dmm | 18 ++--- _maps/map_files220/RandomZLevels/wildwest.dmm | 6 +- _maps/map_files220/cyberiad/cyberiad.dmm | 28 ++++---- _maps/map_files220/delta/delta.dmm | 52 +++++++------- _maps/map_files220/generic/Lavaland.dmm | 4 +- _maps/map_files220/generic/centcomm.dmm | 30 ++++---- 10 files changed, 151 insertions(+), 151 deletions(-) diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index db40c8676222..4582c1cb5528 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -56,11 +56,11 @@ /area/space/nearstation) "abv" = ( /obj/structure/table, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -26548,7 +26548,7 @@ /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -38969,10 +38969,10 @@ /area/station/science/research) "cHO" = ( /obj/structure/table, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /turf/simulated/floor/plating, @@ -40179,8 +40179,8 @@ /area/station/service/chapel/office) "cMK" = ( /obj/structure/table, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 16; pixel_y = 6 }, @@ -53628,15 +53628,15 @@ /area/station/maintenance/starboard) "htP" = ( /obj/structure/table, -/obj/item/food/condiment/milk{ +/obj/item/reagent_containers/condiment/milk{ pixel_x = 6; pixel_y = 8 }, -/obj/item/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_x = -6; pixel_y = 8 }, -/obj/item/food/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, /obj/item/reagent_containers/drinks/bottle/cream{ pixel_x = 6; pixel_y = -2 @@ -68961,10 +68961,10 @@ /area/station/public/locker) "orV" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/machinery/door/window/classic/reversed{ @@ -73346,8 +73346,8 @@ dir = 1 }, /obj/item/storage/fancy/egg_box, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -87843,10 +87843,10 @@ /area/station/hallway/primary/central) "xFW" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/door/window/classic/reversed{ @@ -87975,11 +87975,11 @@ /area/station/engineering/atmos) "xIx" = ( /obj/structure/table, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -88070,10 +88070,10 @@ /area/station/service/bar) "xLw" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, /obj/structure/window/reinforced{ diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm index 52d95f2d9259..1571d4c3f6fc 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm @@ -38,11 +38,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -165,11 +165,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 6 }, @@ -1179,7 +1179,7 @@ /area/ruin/space/spacehotelv1/forehallway) "jb" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = -5; pixel_y = 5 }, @@ -1627,12 +1627,12 @@ /obj/item/food/snacks/grown/rice, /obj/item/food/snacks/grown/rice, /obj/item/food/snacks/grown/rice, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/soymilk, -/obj/item/food/condiment/soymilk, -/obj/item/food/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/spacehotelv1/kitchen) "lU" = ( @@ -1940,11 +1940,11 @@ /area/ruin/space/spacehotelv1/restoraunt3) "oa" = ( /obj/structure/table/wood/fancy/red, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 16 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 16 }, @@ -2272,11 +2272,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 2 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 2 }, @@ -2308,11 +2308,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -2717,10 +2717,10 @@ /obj/machinery/door/window/reinforced/normal{ dir = 8 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 3 }, -/obj/item/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "tI" = ( @@ -2845,7 +2845,7 @@ pixel_y = 6 }, /obj/item/kitchen/rollingpin, -/obj/item/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /turf/simulated/floor/plasteel, /area/ruin/space/spacehotelv1/kitchen) "uB" = ( @@ -2960,11 +2960,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 6 }, @@ -3070,11 +3070,11 @@ icon_state = "4-8" }, /obj/structure/table/wood/fancy/red, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 16 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 16 }, @@ -3574,11 +3574,11 @@ pixel_y = -1; pixel_x = -9 }, -/obj/item/food/condiment/mushroom_sauce{ +/obj/item/reagent_containers/condiment/mushroom_sauce{ pixel_x = 10; pixel_y = 5 }, -/obj/item/food/condiment/garlic_sauce{ +/obj/item/reagent_containers/condiment/garlic_sauce{ pixel_x = 6; pixel_y = 3 }, @@ -4921,11 +4921,11 @@ /area/ruin/space/spacehotelv1/barber) "IW" = ( /obj/structure/table/wood/fancy/red, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3; pixel_y = 16 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3; pixel_y = 16 }, @@ -5042,11 +5042,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -9; pixel_y = 6 }, @@ -5900,11 +5900,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, @@ -6556,11 +6556,11 @@ /obj/item/candle/eternal{ pixel_y = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 9; pixel_y = 12 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 9; pixel_y = 6 }, diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm index cfe3873e3463..56f26f41ebc2 100644 --- a/_maps/map_files220/RandomZLevels/beach.dmm +++ b/_maps/map_files220/RandomZLevels/beach.dmm @@ -444,11 +444,11 @@ /obj/structure/table/wood{ color = "#ffcc33" }, -/obj/item/food/condiment/capsaicin{ +/obj/item/reagent_containers/condiment/capsaicin{ pixel_y = 8; pixel_x = -4 }, -/obj/item/food/condiment/bbqsauce{ +/obj/item/reagent_containers/condiment/bbqsauce{ pixel_x = 8; pixel_y = 4 }, @@ -518,10 +518,10 @@ /obj/structure/table/wood{ color = "#ffcc33" }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 8 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 4; pixel_x = -8 }, @@ -2252,7 +2252,7 @@ /area/awaymission/beach) "Ek" = ( /obj/structure/table/wood, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 4; pixel_y = 4 }, @@ -2271,11 +2271,11 @@ /area/awaymission/beach) "Ez" = ( /obj/structure/table/holotable, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_y = 8; pixel_x = -8 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = 6; pixel_y = 8 }, @@ -2893,10 +2893,10 @@ /area/awaymission/beach) "LI" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/rice, -/obj/item/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/rice, /obj/item/food/snacks/grown/banana, /obj/item/food/snacks/grown/banana, /obj/item/food/snacks/grown/banana, @@ -3130,11 +3130,11 @@ color = "#ffcc33" }, /obj/machinery/light/directional/east, -/obj/item/food/condiment/ketchup{ +/obj/item/reagent_containers/condiment/ketchup{ pixel_y = 8; pixel_x = -2 }, -/obj/item/food/condiment/mayonnaise{ +/obj/item/reagent_containers/condiment/mayonnaise{ pixel_x = 6; pixel_y = 6 }, @@ -3415,7 +3415,7 @@ pixel_y = 4; pixel_x = -4 }, -/obj/item/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_y = 8; pixel_x = 8 }, diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index f705f1474eeb..e1eab762b339 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -3820,7 +3820,7 @@ /area/awaymission/black_mesa/entrance_internal_hall) "eHp" = ( /obj/structure/table, -/obj/item/food/condiment/soymilk{ +/obj/item/reagent_containers/condiment/soymilk{ pixel_x = 4; pixel_y = 4 }, @@ -3828,7 +3828,7 @@ pixel_y = 4; pixel_x = -4 }, -/obj/item/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark{ icon_state = "dark" @@ -8805,12 +8805,12 @@ /area/awaymission/black_mesa/resonant_chamber) "kRb" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/bbqsauce, -/obj/item/food/condiment/diablo_sauce, -/obj/item/food/condiment/tomato_sauce, -/obj/item/food/condiment/garlic_sauce, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/bbqsauce, +/obj/item/reagent_containers/condiment/diablo_sauce, +/obj/item/reagent_containers/condiment/tomato_sauce, +/obj/item/reagent_containers/condiment/garlic_sauce, /obj/item/reagent_containers/drinks/chicken_soup, /obj/item/reagent_containers/drinks/chicken_soup, /obj/item/reagent_containers/drinks/chicken_soup, @@ -9863,10 +9863,10 @@ /area/awaymission/black_mesa/entrance_large_office) "mdX" = ( /obj/structure/table, -/obj/item/food/condiment/pack/ketchup, -/obj/item/food/condiment/pack/hotsauce, -/obj/item/food/condiment/pack/hotsauce, -/obj/item/food/condiment/pack/ketchup, +/obj/item/reagent_containers/condiment/pack/ketchup, +/obj/item/reagent_containers/condiment/pack/hotsauce, +/obj/item/reagent_containers/condiment/pack/hotsauce, +/obj/item/reagent_containers/condiment/pack/ketchup, /obj/item/trash/plate, /turf/simulated/floor/plasteel/dark, /area/awaymission/black_mesa/hecu_zone_camp) @@ -17807,8 +17807,8 @@ /area/awaymission/black_mesa/xen/village_hallway) "vPn" = ( /obj/structure/closet/crate/freezer, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index 8df3bf07983c..c85ab049a4b6 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -3588,9 +3588,9 @@ name = "kitchen Cabinet"; req_access = list(201) }, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/sugar, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/sugar, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -4822,7 +4822,7 @@ /turf/simulated/floor/indestructible/grass, /area/awaymission/jungle_planet/outside) "gpD" = ( -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_y = 14 }, @@ -8182,10 +8182,10 @@ /turf/simulated/floor/plating, /area/awaymission/jungle_planet/inside/complex) "kvb" = ( -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 3 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -3 }, /obj/structure/table, @@ -12715,9 +12715,9 @@ /area/awaymission/jungle_planet/outside/cave) "qgA" = ( /obj/structure/closet/crate/freezer, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/drinks/bottle/cream, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index a5849870df9a..8f44a39289b2 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -1156,16 +1156,16 @@ /area/awaymission/wildwest/wildwest_vault) "ll" = ( /obj/structure/table, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_x = 8; pixel_y = 6 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index ee826843971f..38bb65fe4284 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -8230,8 +8230,8 @@ /area/station/maintenance/abandonedbar) "aFb" = ( /obj/structure/table/wood, -/obj/item/food/condiment/saltshaker, -/obj/item/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "aFc" = ( @@ -16509,7 +16509,7 @@ }, /obj/machinery/alarm/directional/north, /obj/structure/table, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 8; pixel_y = 8 }, @@ -41814,7 +41814,7 @@ /area/station/engineering/ai_transit_tube) "dhp" = ( /obj/structure/table/wood, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -47688,11 +47688,11 @@ /area/station/engineering/atmos) "esV" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8; pixel_y = 1 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -49555,7 +49555,7 @@ "feq" = ( /obj/effect/decal/cleanable/dust, /obj/effect/spawner/random_spawners/blood_maybe, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plating, /area/station/maintenance/abandonedbar) "fes" = ( @@ -53161,8 +53161,8 @@ /area/station/maintenance/fsmaint) "guQ" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/saltshaker, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -7 }, /obj/effect/spawner/lootdrop/maintenance, @@ -69733,7 +69733,7 @@ "mze" = ( /obj/structure/table/reinforced, /obj/item/food/snacks/breadslice, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 11 }, @@ -82054,11 +82054,11 @@ /area/space/nearstation) "qTQ" = ( /obj/structure/table, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 4; pixel_y = 6 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -4; pixel_y = 6 }, @@ -90172,8 +90172,8 @@ /obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, /obj/item/storage/fancy/egg_box, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /turf/simulated/floor/plasteel{ icon_state = "bar" }, diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 9e1d388f354a..0392321909a9 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -1490,12 +1490,12 @@ /obj/item/food/snacks/meat, /obj/item/food/snacks/meat, /obj/item/food/snacks/meat, -/obj/item/food/condiment/soymilk, -/obj/item/food/condiment/soymilk, -/obj/item/food/condiment/soymilk, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, -/obj/item/food/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, /obj/item/storage/fancy/egg_box, /obj/item/storage/fancy/egg_box, /turf/simulated/floor/plasteel{ @@ -4566,11 +4566,11 @@ "aws" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/food/condiment/peppermill, +/obj/item/reagent_containers/condiment/peppermill, /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -12759,11 +12759,11 @@ /area/station/service/kitchen) "bdQ" = ( /obj/structure/table/wood, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, @@ -13805,7 +13805,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bhK" = ( @@ -49357,7 +49357,7 @@ /area/station/legal/courtroom) "eoB" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -69249,7 +69249,7 @@ "kDl" = ( /obj/structure/table/reinforced, /obj/item/trash/plate, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -71077,8 +71077,8 @@ "lhR" = ( /obj/structure/table/reinforced, /obj/machinery/light/directional/west, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/flour{ +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour{ pixel_x = 2; pixel_y = 2 }, @@ -72989,8 +72989,8 @@ /obj/item/food/snacks/grown/onion, /obj/item/food/snacks/grown/onion, /obj/item/storage/box/donkpockets, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/rice, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -73444,11 +73444,11 @@ /area/station/science/test_chamber) "lSB" = ( /obj/structure/table/wood, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -75267,11 +75267,11 @@ /obj/item/food/snacks/meat{ pixel_x = 4 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -4; pixel_y = 2 }, @@ -90342,7 +90342,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -96971,7 +96971,7 @@ /area/station/maintenance/starboard2) "tnj" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -7; pixel_y = 7 }, @@ -101802,7 +101802,7 @@ /area/station/service/bar/atrium) "uQQ" = ( /obj/structure/table/wood/fancy, -/obj/item/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /obj/item/kitchen/utensil/fork{ pixel_x = -5 }, @@ -103708,7 +103708,7 @@ "vvS" = ( /obj/structure/table/wood, /obj/item/picket_sign, -/obj/item/food/condiment/saltshaker, +/obj/item/reagent_containers/condiment/saltshaker, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "vwk" = ( @@ -107629,7 +107629,7 @@ /obj/item/stack/packageWrap{ pixel_y = 7 }, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /obj/item/reagent_containers/glass/bucket{ pixel_x = 6 }, diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index e4e4eb6625d3..4a3f257705ef 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -2388,11 +2388,11 @@ /area/mine/outpost/hallway/west) "eW" = ( /obj/structure/table, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -2; pixel_y = 4 }, diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index e1d637c2b31e..b5777d63a4bd 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -385,15 +385,15 @@ /area/centcom/ss220/admin3) "anM" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = -8 }, /obj/item/kitchen/knife, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_y = 5 }, /obj/machinery/reagentgrinder{ @@ -1669,13 +1669,13 @@ /area/shuttle/trade/sol) "bjU" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 10 }, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ pixel_x = 5 }, -/obj/item/food/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme, /turf/simulated/floor/plating{ icon = 'icons/turf/floors.dmi'; icon_state = "elevatorshaft"; @@ -4778,10 +4778,10 @@ /obj/item/reagent_containers/drinks/bottle/cream{ pixel_y = 8 }, -/obj/item/food/condiment/soysauce{ +/obj/item/reagent_containers/condiment/soysauce{ pixel_x = 12 }, -/obj/item/food/condiment/sugar{ +/obj/item/reagent_containers/condiment/sugar{ pixel_x = -9; pixel_y = -4 }, @@ -5418,11 +5418,11 @@ /area/shuttle/syndicate) "dIR" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/peppermill{ +/obj/item/reagent_containers/condiment/peppermill{ pixel_x = 4; pixel_y = 6 }, -/obj/item/food/condiment/saltshaker{ +/obj/item/reagent_containers/condiment/saltshaker{ pixel_x = -4; pixel_y = 6 }, @@ -12002,7 +12002,7 @@ /area/space/centcomm) "hVt" = ( /obj/structure/table/reinforced, -/obj/item/food/condiment/enzyme{ +/obj/item/reagent_containers/condiment/enzyme{ layer = 5; pixel_x = 12; pixel_y = 8 @@ -24945,7 +24945,7 @@ "rqA" = ( /obj/structure/table/wood/fancy, /obj/effect/spawner/lootdrop{ - loot = list(/obj/item/reagent_containers/food/snacks/baguette=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/soup/bloodsoup=10,/obj/item/reagent_containers/food/snacks/boiledrice=10,/obj/item/reagent_containers/food/snacks/carrotfries=10,/obj/item/reagent_containers/food/drinks/cans/cola=10,""=70); + loot = list(/obj/item/food/snacks/baguette=10,/obj/item/food/snacks/applepie=10,/obj/item/food/snacks/applepie=10,/obj/item/food/snacks/soup/bloodsoup=10,/obj/item/food/snacks/boiledrice=10,/obj/item/food/snacks/carrotfries=10,/obj/item/reagent_containers/drinks/cans/cola=10,""=70); name = "Food CC Spawner #1" }, /turf/simulated/floor/wood, @@ -32761,9 +32761,9 @@ /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/flour, -/obj/item/food/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, /obj/structure/curtain/black{ pixel_y = 32; anchored = 1