diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index ffba4fa061d..b3f592b86b1 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -703,9 +703,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sink/directional/west, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/diagonal_centre, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "ajT" = ( @@ -3898,13 +3898,21 @@ /turf/open/floor/wood/large, /area/station/commons/fitness/recreation) "bdX" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/box, /obj/item/radio/intercom/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/utility/chefhat, +/obj/item/cultivator, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/lights/mixed, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "beb" = ( @@ -6121,6 +6129,7 @@ "bPG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "bPI" = ( @@ -16007,6 +16016,9 @@ "eEd" = ( /obj/structure/sign/poster/random/directional/north, /obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/large, /area/station/hallway/secondary/service) "eEi" = ( @@ -17299,9 +17311,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) @@ -22122,7 +22131,7 @@ name = "Cargo Deliveries" }, /obj/structure/disposalpipe/trunk{ - dir = 8 + dir = 4 }, /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/large, @@ -23291,11 +23300,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "gKO" = ( @@ -26320,12 +26328,11 @@ "hBP" = ( /obj/effect/turf_decal/tile/green/diagonal_centre, /obj/machinery/status_display/ai/directional/west, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Service Hallway"; - name = "Service Fax Machine"; - pixel_y = 3 +/obj/structure/disposalpipe/trunk{ + dir = 4 }, +/obj/effect/turf_decal/box, +/obj/machinery/disposal/bin, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "hBQ" = ( @@ -26633,9 +26640,6 @@ dir = 9; name = "service camera" }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/trimline/brown/filled/mid_joiner, /obj/machinery/modular_computer/preset/cargochat/service, @@ -42546,17 +42550,6 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) -"lWH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "lWL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, @@ -45927,13 +45920,7 @@ /area/station/engineering/atmos) "mVt" = ( /obj/effect/turf_decal/weather/snow, -/obj/machinery/camera/directional/west{ - c_tag = "Service - Kitchen Coldroom"; - dir = 10; - name = "service camera" - }, /obj/structure/closet/secure_closet/freezer/meat, -/obj/structure/sink/kitchen/directional/east, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) "mVv" = ( @@ -49498,9 +49485,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/tile/green/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) @@ -49908,9 +49892,6 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "nYG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/computer/order_console/cook, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -50790,8 +50771,10 @@ /turf/open/floor/wood/parquet, /area/station/common/night_club) "olG" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "olS" = ( @@ -63607,7 +63590,12 @@ /obj/effect/turf_decal/tile/green/diagonal_centre, /obj/machinery/light_switch/directional/west, /obj/machinery/light/directional/west, -/obj/machinery/icecream_vat, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Service Hallway"; + name = "Service Fax Machine"; + pixel_y = 3 + }, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "rKM" = ( @@ -65067,12 +65055,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white/smooth_edge, /area/station/science/research) -"sha" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/closed/wall, -/area/station/service/kitchen) "shd" = ( /obj/structure/chair/office/light{ dir = 1 @@ -65887,6 +65869,17 @@ /obj/effect/turf_decal/siding/wood/end, /turf/open/floor/wood, /area/station/commons/dorms) +"stM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "stN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -69768,21 +69761,12 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/aft/greater) "trR" = ( -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/cultivator, -/obj/item/clothing/head/utility/chefhat, -/obj/item/storage/box/lights/mixed, -/obj/effect/spawner/random/maintenance, /obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/green/diagonal_centre, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/item/storage/box/drinkingglasses, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/effect/turf_decal/bot, +/obj/machinery/icecream_vat, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "tsb" = ( @@ -71695,9 +71679,6 @@ }, /area/station/hallway/secondary/command) "tSE" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/flora/bush/jungle/a/style_3, /obj/structure/window/fulltile, /turf/open/floor/grass, @@ -71826,6 +71807,11 @@ /area/station/hallway/primary/fore) "tUw" = ( /obj/effect/turf_decal/weather/snow, +/obj/machinery/camera/directional/west{ + c_tag = "Service - Kitchen Coldroom"; + dir = 5; + name = "service camera" + }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) "tUB" = ( @@ -73837,12 +73823,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/storage) -"uwO" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall, -/area/station/service/kitchen) "uwV" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/disposalpipe/segment{ @@ -75057,10 +75037,10 @@ pixel_x = -11; pixel_y = 4 }, +/obj/effect/turf_decal/tile/green/diagonal_centre, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/green/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "uNu" = ( @@ -76000,10 +75980,10 @@ pixel_y = 3 }, /obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/green/diagonal_centre, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/green/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) "vaL" = ( @@ -77057,11 +77037,11 @@ }, /area/station/holodeck/rec_center) "vrL" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/rnd/production/techfab/department/service, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/box, -/obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/iron/large, /area/station/hallway/secondary/service) "vrU" = ( @@ -122661,7 +122641,7 @@ xRG xRG fam fMm -sha +jSC esZ bPZ bPZ @@ -123690,7 +123670,7 @@ iog okY dGT tSE -lWH +ctf gKB ajR tdO @@ -124459,7 +124439,7 @@ hfU vZY hfU hfU -uwO +jSC hFu ctf uNs @@ -124975,7 +124955,7 @@ tUw hfU eEd bPG -ctf +stM bdX fLp qEC