diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 5b68c76cd1f..94e564a1a42 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -18330,8 +18330,8 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/cooking/ice_cream_mixer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/ice_cream_mixer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bok" = ( @@ -18370,8 +18370,8 @@ /area/station/service/kitchen) "boo" = ( /obj/structure/table, -/obj/machinery/cooking/grill, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/grill/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bop" = ( @@ -18383,8 +18383,8 @@ /turf/simulated/floor/carpet/grimey, /area/station/service/bar) "boq" = ( -/obj/machinery/cooking/deepfryer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/deepfryer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bor" = ( @@ -18411,11 +18411,11 @@ name = "east bump"; pixel_x = 27 }, -/obj/machinery/cooking/oven, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bot" = ( @@ -19768,9 +19768,15 @@ "bsS" = ( /obj/structure/table, /obj/item/reagent_containers/condiment/enzyme{ - layer = 5 + layer = 5; + pixel_x = -8; + pixel_y = 7 }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/drinks/bottle/cream{ + pixel_x = 3; + pixel_y = 6 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bsT" = ( @@ -20292,8 +20298,12 @@ /area/station/service/kitchen) "buu" = ( /obj/structure/table, -/obj/item/reagent_containers/drinks/bottle/cream, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/bowl{ + pixel_y = 7; + pixel_x = -4 + }, +/obj/item/reagent_containers/cooking/bowl, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "buv" = ( @@ -20376,7 +20386,6 @@ /area/station/service/kitchen) "buK" = ( /obj/machinery/requests_console/directional/east, -/obj/structure/closet/crate/cookware, /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) @@ -55932,6 +55941,10 @@ /obj/structure/table, /obj/item/reagent_containers/cooking/board, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/board{ + pixel_x = -4; + pixel_y = 6 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "iRC" = ( @@ -78291,8 +78304,8 @@ /area/station/maintenance/apmaint) "tLA" = ( /obj/structure/table, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "tLB" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index bc1a14548f4..396b16d82a5 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -2782,7 +2782,6 @@ /area/station/hallway/secondary/exit) "ava" = ( /obj/machinery/alarm/directional/north, -/obj/structure/closet/crate/cookware, /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) @@ -41352,11 +41351,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/hallway/spacebridge/scidock) "hRT" = ( -/obj/machinery/cooking/deepfryer, /obj/structure/window/basic{ dir = 1 }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/deepfryer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "hRY" = ( @@ -43566,6 +43565,9 @@ /obj/structure/table, /obj/item/food/mint, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/storage/box/donkpockets{ + pixel_y = 13 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "ipV" = ( @@ -52289,8 +52291,12 @@ /area/station/service/library) "khD" = ( /obj/structure/table, -/obj/item/storage/box/donkpockets, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/bowl{ + pixel_y = 9; + pixel_x = 3 + }, +/obj/item/reagent_containers/cooking/bowl, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "khE" = ( @@ -54091,6 +54097,10 @@ /obj/structure/table, /obj/item/reagent_containers/cooking/board, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/board{ + pixel_x = -3; + pixel_y = 6 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "kCH" = ( @@ -77388,8 +77398,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "pOz" = ( -/obj/machinery/cooking/oven, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "pOC" = ( @@ -83926,8 +83936,8 @@ /area/station/maintenance/maintcentral) "rpg" = ( /obj/structure/table, -/obj/machinery/cooking/grill, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/grill/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "rpk" = ( @@ -98849,7 +98859,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/cooking/ice_cream_mixer, +/obj/machinery/cooking/ice_cream_mixer/loaded, /turf/simulated/floor/plasteel/freezer, /area/station/service/kitchen) "uzZ" = ( @@ -103276,8 +103286,8 @@ /area/station/public/quantum/service) "vyr" = ( /obj/structure/table/reinforced, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "vyt" = ( diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 6c711e9e080..1a0e4207292 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -13980,17 +13980,17 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bfk" = ( -/obj/machinery/cooking/deepfryer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/deepfryer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bfm" = ( -/obj/machinery/cooking/oven, /obj/machinery/camera{ c_tag = "Kitchen Starboard"; dir = 8 }, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bfp" = ( @@ -14272,6 +14272,10 @@ /obj/structure/table, /obj/item/reagent_containers/cooking/board, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/board{ + pixel_y = 5; + pixel_x = -5 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bgC" = ( @@ -31472,8 +31476,6 @@ pixel_y = 24; req_access = list(28) }, -/obj/structure/closet/crate/cookware, -/obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) @@ -63297,8 +63299,8 @@ /area/station/hallway/secondary/entry/south) "jZf" = ( /obj/structure/table/reinforced, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "jZo" = ( @@ -68171,8 +68173,8 @@ /area/station/medical/virology) "mkL" = ( /obj/structure/table/reinforced, -/obj/machinery/cooking/grill, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/grill/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "mkN" = ( @@ -83812,6 +83814,11 @@ "sMx" = ( /obj/structure/table, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/bowl, +/obj/item/reagent_containers/cooking/bowl{ + pixel_y = 6; + pixel_x = -4 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "sMA" = ( @@ -97028,8 +97035,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/storage/secondary) "yhx" = ( -/obj/machinery/cooking/ice_cream_mixer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/ice_cream_mixer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "yhA" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 33c56f01306..b7f4b96a32d 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -11860,8 +11860,8 @@ /area/station/maintenance/apmaint2) "csS" = ( /obj/structure/table, -/obj/machinery/cooking/grill, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/grill/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "csT" = ( @@ -17478,9 +17478,13 @@ /area/station/telecomms/computer) "dAa" = ( /obj/structure/table, -/obj/item/storage/box/donkpockets, /obj/machinery/light, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/bowl, +/obj/item/reagent_containers/cooking/bowl{ + pixel_y = 7; + pixel_x = -5 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "dAe" = ( @@ -33386,8 +33390,8 @@ /area/station/medical/surgery/secondary) "gJF" = ( /obj/structure/table, -/obj/machinery/cooking/stovetop, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/stovetop/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "gJG" = ( @@ -42076,6 +42080,9 @@ /obj/structure/table, /obj/item/food/mint, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/storage/box/donkpockets{ + pixel_y = 12 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "iyb" = ( @@ -42194,7 +42201,6 @@ name = "north bump"; pixel_y = 28 }, -/obj/structure/closet/crate/cookware, /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) @@ -55233,8 +55239,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "lgL" = ( -/obj/machinery/cooking/oven, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/oven/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "lgQ" = ( @@ -75204,7 +75210,9 @@ dir = 8 }, /obj/structure/table, -/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants{ + pixel_y = 4 + }, /obj/effect/turf_decal/tiles/dark/checker, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) @@ -91272,6 +91280,10 @@ /obj/structure/table, /obj/item/reagent_containers/cooking/board, /obj/effect/turf_decal/tiles/dark/checker, +/obj/item/reagent_containers/cooking/board{ + pixel_x = -4; + pixel_y = 5 + }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "spn" = ( @@ -107028,9 +107040,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "vyC" = ( -/obj/machinery/cooking/ice_cream_mixer, /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/ice_cream_mixer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "vyG" = ( @@ -117708,8 +117720,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "xIl" = ( -/obj/machinery/cooking/deepfryer, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/cooking/deepfryer/loaded, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "xIz" = ( diff --git a/code/modules/cooking/machines/ice_cream_mixer.dm b/code/modules/cooking/machines/ice_cream_mixer.dm index df14669c1ef..3a47861485c 100644 --- a/code/modules/cooking/machines/ice_cream_mixer.dm +++ b/code/modules/cooking/machines/ice_cream_mixer.dm @@ -81,7 +81,6 @@ for(var/i in 1 to length(surfaces)) var/datum/cooking_surface/surface = surfaces[i] surface.container = new /obj/item/reagent_containers/cooking/icecream_bowl(src) - update_appearance() /obj/item/circuitboard/cooking/ice_cream_mixer