diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm index 631e90c9720..fb0f269ba29 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm @@ -129,9 +129,7 @@ /turf/open/floor/plastic, /area/ruin/bughabitat) "of" = ( -/obj/structure/sink{ - dir = 4 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/siding/wideplating/light{ color = "#236F26"; dir = 8 diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm index d98aafc578e..29d46535fb9 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm @@ -41,7 +41,7 @@ /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors/nospawn) "j" = ( -/obj/structure/sink/kitchen, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/wood, /area/ruin/unpowered) "k" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm index f25618b81a7..0186331573d 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm @@ -754,10 +754,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/pizzeria/kitchen) "Aa" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /obj/structure/mirror/directional/west, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm index 6820f116ac7..4e1b1369198 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm @@ -22,9 +22,7 @@ /obj/structure/table/bronze{ color = "#666666" }, -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, +/obj/structure/sink/kitchen/directional/south, /obj/item/plate, /turf/open/floor/wood/large{ initial_gas_mix = "ICEMOON_ATMOS" diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index e446643553c..96e20d1af10 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -767,10 +767,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) "lc" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/blacklight/directional/south, @@ -1884,9 +1881,7 @@ /area/icemoon/underground/explored) "EZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/item/reagent_containers/glass/bucket, /obj/item/mop/advanced, /turf/open/floor/plating/icemoon, @@ -1947,9 +1942,7 @@ /obj/item/soap/homemade{ pixel_y = 2 }, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/curtain, /turf/open/floor/iron/freezer, /area/ruin/plasma_facility/commons) @@ -2809,10 +2802,7 @@ /area/ruin/plasma_facility/commons) "TD" = ( /obj/structure/table/reinforced, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/kitchen/directional/west, /obj/item/reagent_containers/food/condiment/rice{ pixel_x = -6; pixel_y = 11 @@ -3021,10 +3011,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/commons) "XU" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm index aec8b2f9a78..9d854818d22 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm @@ -209,10 +209,7 @@ /turf/open/floor/plating, /area/ruin/powered) "sY" = ( -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/kitchen/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/checker, /area/ruin/powered) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm index 63e8db6b24d..eeb5272b92c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm @@ -18,14 +18,11 @@ /area/ruin/powered/bathhouse) "e" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/ruin/powered/bathhouse) "f" = ( -/obj/machinery/shower{ - pixel_y = 16; +/obj/machinery/shower/directional/south{ reagent_id = /datum/reagent/water/holywater }, /obj/structure/curtain, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm index e0adf2ed770..1d5c5cc71a7 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm @@ -148,9 +148,7 @@ /turf/open/floor/plating/icemoon, /area/ruin/powered/shuttle) "wJ" = ( -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/showroomfloor{ initial_gas_mix = "ICEMOON_ATMOS" }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm index 9ee049e8986..bbda48726b2 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm @@ -47,7 +47,7 @@ /turf/closed/wall/mineral/wood, /area/ruin/powered/shuttle) "oJ" = ( -/obj/structure/sink, +/obj/structure/sink/directional/south, /turf/open/floor/plating, /area/ruin/powered/shuttle) "pI" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index d48b3d8622c..8f94726e2bf 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -195,9 +195,7 @@ /turf/open/misc/beach/sand, /area/ruin/powered/beach) "ek" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/white, /area/ruin/powered/beach) "et" = ( @@ -484,9 +482,7 @@ /area/ruin/powered/beach) "qc" = ( /obj/structure/mirror/directional/west, -/obj/structure/sink/kitchen{ - pixel_y = 32 - }, +/obj/structure/sink/kitchen/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -926,11 +922,9 @@ /turf/closed/wall/mineral/sandstone, /area/ruin/powered/beach) "FC" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 8; - name = "old sink"; - pixel_x = 12 + name = "old sink" }, /turf/open/floor/wood, /area/ruin/powered/beach) @@ -1212,11 +1206,9 @@ /turf/open/floor/sepia, /area/ruin/powered/beach) "PY" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /turf/open/floor/pod/light, /area/ruin/powered/beach) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index e1b1094cf63..9d930a5dc7a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -3,9 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/white/textured_large, /area/ruin/powered/snow_biodome) "ac" = ( @@ -37,9 +35,7 @@ /turf/open/floor/circuit, /area/ruin/powered/snow_biodome) "ai" = ( -/obj/structure/sink{ - pixel_y = 26 - }, +/obj/structure/sink/directional/south, /obj/structure/mirror/directional/east, /turf/open/floor/iron/white/textured_large, /area/ruin/powered/snow_biodome) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index c9c68737bec..ed086216aa5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -184,19 +184,12 @@ /turf/open/floor/vault, /area/ruin/powered/seedvault) "aC" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/ruin/powered/seedvault) "aD" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/ruin/powered/seedvault) @@ -246,10 +239,7 @@ /turf/open/floor/iron/dark, /area/ruin/powered/seedvault) "aK" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/ruin/powered/seedvault) @@ -364,11 +354,7 @@ /turf/open/floor/vault, /area/ruin/powered/seedvault) "aZ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron/dark, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 5ad4ded8b41..a7a05d786d6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -875,9 +875,7 @@ /area/ruin/syndicate_lava_base/main) "fF" = ( /obj/effect/turf_decal/bot, -/obj/machinery/shower{ - pixel_y = 14 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron, /area/ruin/syndicate_lava_base/main) "fH" = ( @@ -1017,11 +1015,7 @@ dir = 8; pixel_x = -24 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -1739,9 +1733,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/shower{ +/obj/machinery/shower/directional/east{ desc = "The HS-452. Installed recently by the Donk Co. Hygiene Division."; - dir = 4; name = "emergency shower" }, /obj/structure/closet/radiation, @@ -1853,9 +1846,7 @@ "kN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/bar) "kP" = ( @@ -2127,10 +2118,7 @@ /turf/open/floor/iron, /area/ruin/syndicate_lava_base/medbay) "mf" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/syndicate_lava_base/medbay) @@ -2568,10 +2556,7 @@ /obj/structure/toilet{ pixel_y = 18 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/light/small/directional/west, /obj/structure/mirror/directional/east, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm index 5e295a394ea..51447e42663 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm @@ -55,9 +55,7 @@ /area/template_noop) "F" = ( /obj/structure/curtain, -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer, /area/ruin/space/djstation) "J" = ( @@ -73,10 +71,7 @@ /turf/open/floor/iron/grimy, /area/ruin/space/djstation) "R" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/freezer, /area/ruin/space/djstation) "V" = ( diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_2.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_2.dmm index 1c1e4da6f5a..4a1dac457b1 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_2.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_2.dmm @@ -7,19 +7,14 @@ /turf/open/floor/iron/dark/textured, /area/ruin/space/djstation) "f" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/dark/textured, /area/ruin/space/djstation) "i" = ( /turf/closed/wall, /area/ruin/space/djstation) "k" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/effect/turf_decal/siding/yellow, /obj/structure/curtain, /turf/open/floor/iron/freezer, diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_3.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_3.dmm index 6abcb22813e..81b32e7ed1f 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation/quarters_3.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation/quarters_3.dmm @@ -45,9 +45,7 @@ /turf/template_noop, /area/template_noop) "s" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/freezer, /area/ruin/space/djstation) "t" = ( @@ -145,9 +143,7 @@ /area/space/nearstation) "X" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 17 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/freezer, /area/ruin/space/djstation) "Y" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index a7dd773f8e8..c0d1637a950 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -398,9 +398,7 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bc" = ( -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bd" = ( @@ -664,10 +662,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "bR" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "bS" = ( @@ -881,9 +876,7 @@ /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav/deepstorage) "cq" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/item/soap, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) @@ -1084,9 +1077,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cM" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/structure/window/reinforced/plasma, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) @@ -1095,10 +1086,7 @@ /area/ruin/space/has_grav/deepstorage) "cO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/deepstorage) diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm index 93c7ade2950..6839f77d2c8 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm @@ -698,9 +698,7 @@ "XC" = ( /obj/structure/curtain, /obj/item/soap/deluxe, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/showroomfloor, /area/ruin/unpowered) "YA" = ( diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index 17de0160b25..9498d960a21 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -529,16 +529,12 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/syndicate_forgotten_cargopod) "bG" = ( -/obj/structure/sink{ - pixel_y = 32 - }, +/obj/structure/sink/directional/south, /obj/structure/mirror/directional/west, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/syndicate_forgotten_ship) "bH" = ( -/obj/structure/sink{ - pixel_y = 32 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/syndicate_forgotten_ship) "bI" = ( @@ -1075,9 +1071,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/syndicate_forgotten_ship) "dc" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/ruin/space/has_grav/syndicate_forgotten_ship) diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index 27f9f27cdb7..9b1df6b1c97 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -944,9 +944,7 @@ /area/ruin/space/has_grav/powered/hilbertresearchfacility) "wG" = ( /obj/effect/turf_decal/stripes/end, -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "wI" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 0f3b499d960..eefc0e3fbe9 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -433,14 +433,8 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/listeningstation) "xY" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11; - pixel_y = -2 - }, -/obj/machinery/shower{ - dir = 1 - }, +/obj/structure/sink/directional/west, +/obj/machinery/shower/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/mirror/directional/east, /turf/open/floor/iron/showroomfloor, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 6a975b74189..a358bc683ee 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -598,10 +598,8 @@ "cg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/left/directional/west, -/obj/machinery/shower{ - dir = 8; - can_refill = 0; - can_toggle_refill = 0 +/obj/machinery/shower/directional/west{ + has_water_reclaimer = 0 }, /obj/item/soap/nanotrasen, /turf/open/floor/iron/white, @@ -2412,10 +2410,9 @@ /area/ruin/space/ancientstation/beta/supermatter) "hx" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /turf/open/floor/iron/cafeteria, /area/ruin/space/ancientstation/charlie/kitchen) @@ -5423,11 +5420,9 @@ "sJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 8; name = "old sink"; - pixel_x = 12; has_water_reclaimer = 0 }, /turf/open/floor/iron, @@ -5883,10 +5878,8 @@ /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) "wq" = ( -/obj/machinery/shower{ - dir = 8; - can_refill = 0; - can_toggle_refill = 0 +/obj/machinery/shower/directional/west{ + has_water_reclaimer = 0 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/vault, @@ -6313,9 +6306,7 @@ /area/ruin/space/ancientstation/beta/medbay) "AO" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 8; - pixel_x = 11; +/obj/structure/sink/directional/west{ has_water_reclaimer = 0 }, /obj/structure/mirror/directional/east, @@ -8837,10 +8828,8 @@ "Xe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/right/directional/west, -/obj/machinery/shower{ - dir = 8; - can_refill = 0; - can_toggle_refill = 0 +/obj/machinery/shower/directional/west{ + has_water_reclaimer = 0 }, /turf/open/floor/iron/white, /area/ruin/space/ancientstation/charlie/hall) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 5f82876e86c..95b4dd6f1c2 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -156,10 +156,7 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/hotel) "bK" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/pool) "bM" = ( @@ -327,10 +324,7 @@ }, /area/ruin/space/has_grav/hotel/pool) "dd" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_3) "de" = ( @@ -460,9 +454,7 @@ /obj/structure/window{ dir = 1 }, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_6) "eF" = ( @@ -1283,7 +1275,7 @@ /obj/structure/window{ dir = 1 }, -/obj/machinery/shower, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/bar) "lh" = ( @@ -1815,10 +1807,7 @@ pixel_y = -25 }, /obj/structure/cable, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/catwalk_floor, /area/ruin/space/has_grav/hotel/custodial) @@ -1994,11 +1983,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "sX" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/dock) @@ -2547,10 +2532,7 @@ /turf/template_noop, /area/template_noop) "yD" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/pool) @@ -2635,9 +2617,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_3) "zZ" = ( /obj/structure/window, -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_5) "Ac" = ( @@ -2812,9 +2792,7 @@ /obj/structure/window{ dir = 1 }, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_2) "Db" = ( @@ -2872,9 +2850,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/hotel/dock) "DP" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/pool) @@ -2907,9 +2883,7 @@ /area/ruin/space/has_grav/hotel) "Er" = ( /obj/structure/window, -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_3) "Ew" = ( @@ -2958,10 +2932,7 @@ /turf/open/floor/carpet/lone, /area/ruin/space/has_grav/hotel/guestroom/room_1) "EL" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/kitchen/directional/west, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "EO" = ( @@ -3464,11 +3435,7 @@ /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/hotel) "Lx" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_5) "LA" = ( @@ -3986,9 +3953,7 @@ /area/ruin/space/has_grav/hotel) "RR" = ( /obj/structure/window, -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_1) "RS" = ( @@ -4104,11 +4069,7 @@ /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/hotel/guestroom/room_5) "Tv" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_2) "TA" = ( @@ -4325,9 +4286,7 @@ /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/hotel/bar) "VU" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/pool) "VV" = ( @@ -4669,11 +4628,7 @@ /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/pool) "Zl" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_1) "Zm" = ( @@ -4688,10 +4643,7 @@ /turf/template_noop, /area/template_noop) "Zo" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom/room_4) "Zu" = ( diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 7c04d81e075..a3177e1e0dd 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -102,19 +102,12 @@ /turf/open/floor/wood, /area/awaymission/cabin) "as" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/north, /turf/open/floor/iron/freezer, /area/awaymission/cabin) "at" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/north, /turf/open/floor/iron/freezer, /area/awaymission/cabin) @@ -201,9 +194,7 @@ /turf/open/floor/plating/snowed/snow_cabin, /area/awaymission/cabin/snowforest/sovietsurface) "aH" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/curtain, /turf/open/floor/iron/freezer, /area/awaymission/cabin) @@ -282,10 +273,9 @@ /turf/open/floor/plating, /area/awaymission/cabin) "aS" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "sink"; - pixel_y = 28 + name = "sink" }, /obj/structure/janitorialcart, /obj/item/mop, @@ -465,10 +455,9 @@ /turf/open/floor/iron/cafeteria, /area/awaymission/cabin) "bz" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "sink"; - pixel_y = 28 + name = "sink" }, /turf/open/floor/iron/cafeteria, /area/awaymission/cabin) @@ -495,17 +484,11 @@ /turf/open/floor/iron/white, /area/awaymission/cabin) "bG" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/white, /area/awaymission/cabin) "bH" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/curtain, /obj/item/soap/nanotrasen{ pixel_x = -1; @@ -517,10 +500,7 @@ /turf/open/lava, /area/awaymission/cabin/caves/mountain) "bJ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/freezer, /area/awaymission/cabin) "bK" = ( diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 0be6b8bd10b..0d7de3b1621 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -508,17 +508,13 @@ "bM" = ( /obj/structure/mirror/directional/east, /obj/effect/turf_decal/sand, -/obj/structure/sink{ - pixel_y = 32 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/awaymission/beach) "bN" = ( /obj/structure/mirror/directional/west, /obj/effect/turf_decal/sand, -/obj/structure/sink{ - pixel_y = 32 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/awaymission/beach) "bO" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 32ef9fbc2b8..56411df2435 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -275,9 +275,7 @@ }, /area/awaymission/moonoutpost19/syndicate) "bv" = ( -/obj/structure/sink{ - pixel_y = 28 - }, +/obj/structure/sink/directional/south, /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer{ @@ -2359,11 +2357,7 @@ }, /area/awaymission/moonoutpost19/research) "gr" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/white, /area/awaymission/moonoutpost19/research) "gs" = ( @@ -3022,10 +3016,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "hS" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/urinal/directional/north, /obj/structure/mirror/directional/east, /obj/effect/decal/cleanable/dirt, @@ -3034,17 +3025,13 @@ }, /area/awaymission/moonoutpost19/arrivals) "hT" = ( -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, /area/awaymission/moonoutpost19/arrivals) "hU" = ( -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -3196,10 +3183,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "ik" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east{ icon_state = "mirror_broke" }, @@ -3220,9 +3204,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "in" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, @@ -3334,9 +3316,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "iA" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -3376,9 +3356,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "iF" = ( -/obj/structure/sink{ - pixel_y = 28 - }, +/obj/structure/sink/directional/south, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -3449,11 +3427,7 @@ }, /area/awaymission/moonoutpost19/research) "iN" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -3473,9 +3447,7 @@ }, /area/awaymission/moonoutpost19/research) "iP" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, @@ -4599,10 +4571,9 @@ }, /area/awaymission/moonoutpost19/arrivals) "lw" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /turf/open/floor/iron/showroomfloor{ heat_capacity = 1e+006; @@ -6144,8 +6115,7 @@ /area/awaymission/moonoutpost19/main) "Jr" = ( /obj/structure/sign/warning/secure_area/directional/north, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 12dee35506a..c65e064401d 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -2153,11 +2153,7 @@ /area/awaymission/research/interior/secure) "io" = ( /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/freezer, /area/awaymission/research/interior/bathroom) "ip" = ( @@ -2241,9 +2237,7 @@ /turf/closed/wall, /area/awaymission/research/interior/bathroom) "iN" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/awaymission/research/interior/bathroom) "iO" = ( @@ -2329,11 +2323,7 @@ /turf/closed/wall, /area/awaymission/research/interior/medbay) "jg" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/awaymission/research/interior/medbay) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 9b8b3518cd7..78fa5e454a0 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -2294,10 +2294,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) "gL" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ piping_layer = 4; pixel_x = 5; @@ -3451,10 +3448,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -3738,9 +3732,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/shower{ - pixel_y = 25 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) "kw" = ( @@ -3753,9 +3745,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 6 }, -/obj/machinery/shower{ - pixel_y = 25 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) "kx" = ( @@ -3768,9 +3758,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, -/obj/machinery/shower{ - pixel_y = 25 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) "ky" = ( @@ -4452,21 +4440,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) "lV" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) "lW" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) @@ -4662,10 +4644,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) "mv" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) @@ -6733,10 +6712,7 @@ /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/cavern2) "tc" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/cavern2) "td" = ( @@ -6774,9 +6750,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) "ti" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/curtain, /obj/structure/window{ dir = 4 @@ -7134,10 +7108,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) "vw" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/cavern1) "vx" = ( @@ -7184,9 +7155,7 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) "vD" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/curtain, /obj/structure/window{ dir = 4 @@ -11520,10 +11489,7 @@ /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) "Nt" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index be4b12ee0ce..fa8afd7033f 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -397,17 +397,13 @@ }, /area/awaymission/undergroundoutpost45/central) "bi" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, /area/awaymission/undergroundoutpost45/central) "bj" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -1375,9 +1371,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -1487,9 +1481,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -2497,9 +2489,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "ga" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/showroomfloor{ heat_capacity = 1e+006 }, @@ -2680,9 +2670,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "gE" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -4746,9 +4734,7 @@ }, /area/awaymission/undergroundoutpost45/research) "la" = ( -/obj/machinery/shower{ - pixel_y = 15 - }, +/obj/machinery/shower/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -4757,9 +4743,7 @@ }, /area/awaymission/undergroundoutpost45/research) "lb" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -7399,10 +7383,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "pY" = ( /obj/structure/mirror/directional/east, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -7496,10 +7477,7 @@ /area/awaymission/undergroundoutpost45/research) "qm" = ( /obj/machinery/light/small/directional/south, -/obj/structure/sink{ - dir = 4; - pixel_x = -11 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -7596,10 +7574,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "qx" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -7874,10 +7849,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "rc" = ( /obj/structure/mirror/directional/east, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, @@ -8702,9 +8674,7 @@ }, /area/awaymission/undergroundoutpost45/research) "sA" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/item/soap/nanotrasen, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -8718,9 +8688,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "sC" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, @@ -9133,9 +9101,7 @@ }, /area/awaymission/undergroundoutpost45/research) "ts" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, @@ -9447,17 +9413,13 @@ /turf/closed/wall/r_wall, /area/awaymission/undergroundoutpost45/research) "tX" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 }, /area/awaymission/undergroundoutpost45/crew_quarters) "tY" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/freezer{ heat_capacity = 1e+006 @@ -10606,10 +10568,7 @@ }, /area/awaymission/undergroundoutpost45/engineering) "wL" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/light/small/directional/south, /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer{ @@ -11873,9 +11832,7 @@ }, /area/awaymission/undergroundoutpost45/central) "NR" = ( -/obj/structure/sink{ - pixel_y = 25 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/no_smoking/directional/west, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index b2444afca6a..05c132d2baf 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1453,10 +1453,7 @@ /turf/open/floor/iron, /area/station/security/checkpoint) "are" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/east, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -1576,10 +1573,7 @@ dir = 4 }, /obj/machinery/status_display/evac/directional/east, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/machinery/camera/directional/east{ c_tag = "Service - Bar"; name = "service camera" @@ -2172,9 +2166,7 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "aAT" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/item/soap/nanotrasen, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -5994,10 +5986,7 @@ /area/station/medical/treatment_center) "bDG" = ( /obj/machinery/light_switch/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -6460,8 +6449,7 @@ /obj/effect/turf_decal/trimline/blue/end{ dir = 4 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/stripes/line{ @@ -6472,10 +6460,7 @@ /area/station/engineering/main) "bIb" = ( /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/bot, /obj/effect/landmark/start/hangover, /turf/open/floor/iron, @@ -7064,9 +7049,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron, /area/station/medical/virology) "bQs" = ( @@ -7294,9 +7277,7 @@ /turf/open/floor/circuit/green, /area/station/science/xenobiology) "bSd" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -8334,9 +8315,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /obj/structure/curtain, /obj/machinery/door/window/brigdoor/left/directional/south{ name = "Shower" @@ -11480,9 +11459,7 @@ /area/station/security/courtroom) "dax" = ( /obj/structure/window, -/obj/structure/sink{ - pixel_y = 30 - }, +/obj/structure/sink/directional/south, /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/watering_can, /obj/effect/decal/cleanable/dirt, @@ -11643,10 +11620,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "dcL" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -11725,10 +11699,7 @@ /turf/open/floor/iron, /area/station/maintenance/starboard) "ddX" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, @@ -16151,8 +16122,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "eur" = ( -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/structure/disposalpipe/segment, @@ -18213,10 +18183,8 @@ /turf/open/floor/iron, /area/station/medical/virology) "eYG" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower"; - pixel_y = -4 +/obj/machinery/shower/directional/west{ + name = "emergency shower" }, /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -18973,10 +18941,9 @@ /turf/open/floor/iron, /area/station/science/research) "fhM" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, @@ -25265,10 +25232,7 @@ /area/station/security/prison) "gPL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 4; - pixel_x = -11 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron, /area/station/medical/morgue) @@ -25463,9 +25427,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron, /area/station/service/hydroponics) "gTc" = ( @@ -28415,9 +28377,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "hOr" = ( -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /obj/effect/turf_decal/trimline/blue/end, /turf/open/floor/iron/white, /area/station/medical/treatment_center) @@ -29753,10 +29713,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) "ifl" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -31904,10 +31861,9 @@ /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) "iJj" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/mess, @@ -33305,9 +33261,7 @@ "jbU" = ( /obj/structure/sign/warning/biohazard/directional/south, /obj/effect/turf_decal/bot, -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron, /area/station/medical/virology) "jbV" = ( @@ -35170,8 +35124,7 @@ /turf/open/floor/carpet, /area/station/command/meeting_room/council) "jBE" = ( -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end{ @@ -35285,10 +35238,7 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "jCF" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -37086,10 +37036,7 @@ "kaL" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/checker, /area/station/service/hydroponics/garden/abandoned) "kaM" = ( @@ -39526,8 +39473,7 @@ /area/station/security/courtroom) "kHV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end{ @@ -45472,8 +45418,7 @@ /obj/effect/turf_decal/trimline/blue/end{ dir = 4 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/stripes/line{ @@ -46468,10 +46413,7 @@ /turf/open/space, /area/station/solars/starboard/aft) "mAA" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/kitchen/directional/west, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "mAB" = ( @@ -49144,9 +49086,7 @@ /turf/open/floor/iron, /area/station/maintenance/port/aft) "nnW" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/item/soap/homemade, /turf/open/floor/iron/white, /area/station/security/prison/toilet) @@ -50289,8 +50229,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "nDv" = ( -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /obj/structure/cable, @@ -50940,9 +50879,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/sink{ - dir = 1 - }, +/obj/structure/sink/directional/north, /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/station/service/hydroponics) @@ -51658,8 +51595,7 @@ /area/station/science/xenobiology) "nVA" = ( /obj/structure/cable, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/stripes/end{ @@ -57187,9 +57123,7 @@ /area/station/maintenance/disposal/incinerator) "pwA" = ( /obj/structure/cable, -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "pwE" = ( @@ -58042,10 +57976,7 @@ "pHv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/commons/toilet/locker) @@ -58142,10 +58073,7 @@ /area/station/maintenance/department/crew_quarters/bar) "pIA" = ( /obj/structure/mirror/directional/east, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, /obj/machinery/light/small/directional/north, @@ -58244,9 +58172,7 @@ /turf/open/floor/iron, /area/station/security/holding_cell) "pJx" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -59808,9 +59734,7 @@ /turf/open/floor/iron, /area/station/science/research/abandoned) "qep" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -62874,9 +62798,8 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "raz" = ( -/obj/machinery/shower{ - name = "emergency shower"; - pixel_y = 16 +/obj/machinery/shower/directional/south{ + name = "emergency shower" }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/blue/end, @@ -63961,8 +63884,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "rqY" = ( -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/structure/disposalpipe/segment, @@ -65114,10 +65036,9 @@ /area/station/maintenance/starboard) "rJN" = ( /obj/effect/turf_decal/bot, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) @@ -66139,10 +66060,7 @@ /turf/open/floor/iron, /area/station/service/library/abandoned) "rVq" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/green{ dir = 8 }, @@ -68191,9 +68109,7 @@ /area/station/maintenance/port/lesser) "sxe" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/medical/morgue) @@ -68413,9 +68329,7 @@ /area/station/maintenance/starboard) "sAS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -69126,9 +69040,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "sIR" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron/white, /area/station/security/prison/toilet) @@ -70102,10 +70014,7 @@ /turf/open/floor/iron, /area/station/science/robotics/mechbay) "sWe" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -70118,9 +70027,7 @@ dir = 4 }, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/machinery/camera/directional/north{ c_tag = "Service - Bar Backroom"; name = "service camera" @@ -70569,9 +70476,7 @@ }, /obj/structure/cable, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -72487,10 +72392,7 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "tAA" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/siding/green/corner{ dir = 4 }, @@ -78496,9 +78398,7 @@ /area/station/science/lab) "vdZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/siding/purple{ dir = 4 }, @@ -81091,10 +80991,7 @@ /turf/open/floor/catwalk_floor/iron, /area/station/commons/dorms) "vMZ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/item/trash/sosjerky, /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 @@ -82090,11 +81987,7 @@ }, /area/station/engineering/atmos) "vZv" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, @@ -82221,10 +82114,7 @@ /turf/closed/wall, /area/station/service/hydroponics/garden) "wbh" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) "wbn" = ( @@ -82921,9 +82811,7 @@ }, /obj/machinery/airalarm/directional/west, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -84554,9 +84442,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "wEz" = ( -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -85919,8 +85805,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end{ @@ -88285,8 +88170,7 @@ /area/station/security/detectives_office) "xGL" = ( /obj/effect/turf_decal/bot, -/obj/machinery/shower{ - dir = 1; +/obj/machinery/shower/directional/north{ name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end{ @@ -88708,9 +88592,7 @@ /area/station/security/brig) "xNu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, +/obj/structure/sink/kitchen/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -88802,9 +88684,7 @@ }, /obj/structure/cable, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c7cfe1f4bc5..58e384864e5 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1041,10 +1041,7 @@ /turf/open/floor/iron, /area/station/commons/dorms) "asb" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/cable, /obj/machinery/button/door/directional/east{ id = "xenobio10"; @@ -1267,9 +1264,7 @@ dir = 8; name = "Air to Distro" }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/item/mop, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/iron/smooth, @@ -2280,9 +2275,7 @@ /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "aLM" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) "aLS" = ( @@ -3175,9 +3168,7 @@ /turf/open/floor/iron, /area/mine/production) "aYQ" = ( -/obj/machinery/shower{ - pixel_y = 22 - }, +/obj/machinery/shower/directional/south, /obj/item/soap/nanotrasen, /obj/item/bikehorn/rubberducky/plasticducky, /turf/open/floor/iron/freezer, @@ -3907,9 +3898,7 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "bjZ" = ( -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, +/obj/structure/sink/kitchen/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5830,11 +5819,9 @@ /turf/open/floor/iron, /area/station/security/processing) "bLL" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 8; - name = "old sink"; - pixel_x = 12 + name = "old sink" }, /turf/open/floor/iron/freezer, /area/mine/laborcamp) @@ -6099,11 +6086,7 @@ dir = 10 }, /obj/machinery/firealarm/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron, /area/station/service/hydroponics) "bPn" = ( @@ -6329,9 +6312,7 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) "bRW" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/trimline, /obj/structure/sign/warning/gas_mask{ desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."; @@ -8635,9 +8616,7 @@ /obj/item/soap/deluxe, /obj/item/bikehorn/rubberducky, /obj/structure/curtain, -/obj/machinery/shower{ - pixel_y = 8 - }, +/obj/machinery/shower/directional/south, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/freezer, /area/station/medical/break_room) @@ -12437,11 +12416,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "dFP" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/freezer, /area/station/commons/toilet) "dFQ" = ( @@ -14278,9 +14253,7 @@ /turf/open/floor/plating, /area/station/security/prison/safe) "ejZ" = ( -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) "eke" = ( @@ -15035,10 +15008,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "exo" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 }, @@ -17465,9 +17435,7 @@ /area/station/tcommsat/server) "fjg" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/trimline/blue, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) @@ -17635,11 +17603,9 @@ }, /obj/effect/turf_decal/tile/green, /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/north{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 1; - name = "old sink"; - pixel_y = -5 + name = "old sink" }, /turf/open/floor/iron/dark, /area/mine/laborcamp) @@ -17792,10 +17758,7 @@ /turf/open/floor/iron/dark/textured, /area/station/security/range) "fob" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt/dust, @@ -18299,9 +18262,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "fwL" = ( -/obj/structure/sink/kitchen{ - pixel_y = 24 - }, +/obj/structure/sink/kitchen/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) @@ -18395,10 +18356,7 @@ "fyh" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/machinery/airalarm/directional/east, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 14 - }, +/obj/structure/sink/kitchen/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/kitchen/diagonal, @@ -18758,11 +18716,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/dark{ dir = 4 }, @@ -19155,9 +19109,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "fKP" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -19174,10 +19126,7 @@ /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "fLb" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/station/maintenance/starboard/fore) @@ -19930,9 +19879,7 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) "fXf" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -20508,9 +20455,7 @@ /turf/open/floor/plating, /area/station/maintenance/aft/lesser) "geZ" = ( -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -20614,11 +20559,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "ghN" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron, /area/station/maintenance/port/fore) "ghY" = ( @@ -23988,9 +23929,7 @@ /area/station/maintenance/department/medical/central) "hlv" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/delivery, /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/freezer, @@ -24049,10 +23988,7 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hmZ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, @@ -24188,9 +24124,7 @@ /area/station/command/heads_quarters/captain) "hpi" = ( /obj/effect/turf_decal/trimline, -/obj/machinery/shower{ - pixel_y = 22 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/smooth, /area/mine/eva) "hpm" = ( @@ -24544,9 +24478,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) "huI" = ( @@ -24811,9 +24743,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/dark, /area/station/medical/morgue) "hyV" = ( @@ -25339,10 +25269,7 @@ "hIe" = ( /obj/structure/sign/warning/no_smoking/circle/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/cryo) "hIj" = ( @@ -26178,10 +26105,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron, /area/station/service/hydroponics) "hWi" = ( @@ -26306,9 +26230,7 @@ /turf/open/floor/iron, /area/station/commons/locker) "hYO" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/window/reinforced/tinted{ dir = 4 }, @@ -26803,9 +26725,7 @@ /turf/open/floor/iron/white/corner, /area/station/engineering/atmos) "ifZ" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/item/soap/nanotrasen, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) @@ -29619,10 +29539,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "iYt" = ( @@ -30330,10 +30247,7 @@ /turf/open/floor/wood/tile, /area/station/service/theater) "jjO" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/mirror/directional/east, @@ -30547,9 +30461,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "jnX" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/item/bikehorn/rubberducky/plasticducky, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) @@ -31656,11 +31568,7 @@ /turf/open/floor/iron, /area/station/security/prison/work) "jHG" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/light/directional/north, /turf/open/floor/iron/freezer, @@ -32159,10 +32067,7 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "jOc" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 14 - }, +/obj/structure/sink/kitchen/directional/west, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, @@ -32827,9 +32732,7 @@ /turf/open/floor/iron/dark/textured, /area/station/security/range) "jYy" = ( -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/mirror/directional/south, /turf/open/floor/iron/freezer, @@ -34749,9 +34652,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "kBP" = ( @@ -36635,9 +36536,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) "lei" = ( @@ -37495,9 +37394,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "lrD" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/item/soap/deluxe, /obj/item/bikehorn/rubberducky, /obj/structure/curtain, @@ -38408,10 +38305,7 @@ /turf/open/floor/plating, /area/station/science/breakroom) "lIp" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, @@ -40295,9 +40189,7 @@ /turf/open/floor/iron/smooth, /area/mine/eva) "mqy" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet) "mqD" = ( @@ -41006,9 +40898,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "mCo" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/trimline, /obj/structure/sign/warning/gas_mask{ desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals."; @@ -41934,10 +41824,9 @@ /turf/open/floor/engine/air, /area/station/engineering/atmos) "mTI" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/freezer, @@ -42278,9 +42167,7 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "mYZ" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/red/line{ dir = 6 }, @@ -42926,10 +42813,7 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/rd) "nhg" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) @@ -43902,11 +43786,7 @@ /area/station/security/prison/mess) "nwI" = ( /obj/item/reagent_containers/glass/bucket, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "nwT" = ( @@ -44495,9 +44375,7 @@ /turf/closed/wall/r_wall, /area/station/security/prison/garden) "nDV" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/effect/spawner/random/contraband/permabrig_weapon, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) @@ -51970,9 +51848,7 @@ /turf/open/floor/iron/cafeteria, /area/station/commons/storage/art) "pRZ" = ( -/obj/machinery/shower{ - pixel_y = 22 - }, +/obj/machinery/shower/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/freezer, /area/mine/laborcamp) @@ -52062,10 +51938,7 @@ /turf/open/floor/iron/white/side, /area/station/science/explab) "pUn" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -52402,9 +52275,7 @@ /turf/open/floor/iron/half, /area/station/hallway/primary/starboard) "qaF" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/stripes/red/end{ dir = 4 }, @@ -55123,11 +54994,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "qSh" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, @@ -55377,9 +55244,7 @@ /turf/open/floor/iron/dark, /area/station/science/breakroom) "qWy" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/red/end{ dir = 8 }, @@ -55450,10 +55315,7 @@ c_tag = "Research Division Access"; network = list("ss13","rd") }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -57962,9 +57824,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/machinery/camera{ c_tag = "Virology Break Room"; dir = 1; @@ -60345,9 +60205,7 @@ /area/station/maintenance/department/medical/morgue) "syL" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/service) "syW" = ( @@ -62353,10 +62211,7 @@ /turf/open/openspace, /area/station/science/xenobiology) "tiQ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/machinery/button/door/directional/west{ id = "xenobio2"; layer = 4; @@ -62726,9 +62581,7 @@ dir = 6 }, /obj/machinery/airalarm/directional/east, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/white, /area/station/medical/virology) "toH" = ( @@ -63463,10 +63316,7 @@ /turf/open/floor/glass/reinforced, /area/station/engineering/atmos/pumproom) "tza" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/service) "tzf" = ( @@ -64139,10 +63989,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 13 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/virology) "tIv" = ( @@ -64686,9 +64533,7 @@ /area/station/maintenance/starboard/upper) "tRc" = ( /obj/effect/turf_decal/trimline, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/sign/warning/gas_mask/directional/south{ desc = "A sign that warns of dangerous gasses in the air, instructing you to wear internals." }, @@ -66132,10 +65977,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "uoi" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /obj/item/reagent_containers/glass/bottle/ammonia, @@ -66151,9 +65993,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "uop" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/red/line{ dir = 5 }, @@ -66648,9 +66488,7 @@ /turf/open/floor/engine/air, /area/station/engineering/atmos) "uxA" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -66707,9 +66545,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "uyO" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/effect/turf_decal/trimline/blue/line{ dir = 5 }, @@ -67925,11 +67761,9 @@ /area/station/service/bar/atrium) "uVa" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -69112,9 +68946,7 @@ /turf/open/floor/iron, /area/station/cargo/storage) "vmp" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/freezer, /area/station/commons/toilet) "vmr" = ( @@ -69724,10 +69556,7 @@ /area/station/service/lawoffice) "vwo" = ( /obj/machinery/newscaster/directional/east, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -70987,9 +70816,7 @@ /turf/open/floor/engine/cult, /area/station/service/library) "vRo" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/effect/turf_decal/trimline/blue/line{ dir = 9 }, @@ -71788,9 +71615,7 @@ /turf/open/floor/iron/large, /area/station/command/heads_quarters/ce) "wcz" = ( -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -73607,9 +73432,7 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "wDf" = ( -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -73655,10 +73478,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -75885,9 +75705,7 @@ }, /area/station/science/research) "xmx" = ( -/obj/structure/sink/kitchen{ - pixel_y = 20 - }, +/obj/structure/sink/kitchen/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) @@ -77651,10 +77469,7 @@ }, /area/station/holodeck/rec_center) "xQf" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 2298fdb4ada..b37ccfe891e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -3265,11 +3265,7 @@ /turf/open/floor/plating, /area/station/maintenance/central) "aVC" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11; - pixel_y = 8 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/loading_area, /obj/effect/turf_decal/tile/purple, @@ -5067,8 +5063,7 @@ /area/station/service/chapel) "bAQ" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/tile/green{ @@ -5345,9 +5340,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bDV" = ( -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -5565,10 +5558,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/glass/watering_can, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11832,9 +11822,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -12070,9 +12058,7 @@ /area/station/engineering/atmos) "dDp" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -14073,8 +14059,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15919,10 +15904,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/disposalpipe/sorting/mail{ dir = 1; sortType = 28 @@ -17713,9 +17695,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "fjn" = ( -/obj/structure/sink{ - pixel_y = 26 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -18407,9 +18387,7 @@ /area/station/maintenance/starboard) "fsu" = ( /obj/effect/turf_decal/box, -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/item/soap/nanotrasen, @@ -20457,10 +20435,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -21068,11 +21045,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/fore) @@ -23266,8 +23239,7 @@ "gHd" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/box, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /turf/open/floor/iron/dark, @@ -26341,8 +26313,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/box/corners, @@ -27615,9 +27586,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "hQA" = ( -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/effect/decal/cleanable/dirt, /obj/item/mop, /obj/item/reagent_containers/glass/bucket, @@ -29735,8 +29704,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31151,8 +31119,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/box/corners, @@ -36139,8 +36106,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /obj/effect/turf_decal/box, @@ -39214,9 +39180,7 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter) "lhv" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/item/soap/nanotrasen, /obj/structure/cable, /turf/open/floor/plastic, @@ -41490,9 +41454,7 @@ /area/station/security/brig) "lOZ" = ( /obj/effect/turf_decal/box, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/item/bikehorn/rubberducky, @@ -41536,9 +41498,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "lPU" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/plastic, /area/station/security/prison/shower) "lPY" = ( @@ -41819,10 +41779,9 @@ /area/station/command/heads_quarters/cmo) "lVe" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/landmark/blobstart, /obj/effect/mapping_helpers/broken_floor, @@ -44673,11 +44632,7 @@ /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/chapel/monastery) "mLe" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -45008,10 +44963,7 @@ }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/camera/directional/east{ c_tag = "Xenobiology Computers"; @@ -49120,8 +49072,7 @@ /area/station/science/ordnance) "ocx" = ( /obj/effect/turf_decal/box, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /turf/open/floor/iron/dark, @@ -53773,10 +53724,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/landmark/start/roboticist, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) @@ -54672,11 +54620,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "pGA" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box, /obj/structure/mirror/directional/north, @@ -55023,10 +54967,7 @@ /area/station/engineering/lobby) "pLw" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/vomit/old, /obj/structure/sign/poster/contraband/random/directional/north, @@ -55481,8 +55422,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /obj/structure/mirror/directional/east, @@ -59525,10 +59465,9 @@ /area/station/engineering/atmos) "rau" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -60374,9 +60313,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink{ - pixel_y = 26 - }, +/obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64609,10 +64546,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -67173,11 +67107,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12; - pixel_y = 4 - }, +/obj/structure/sink/kitchen/directional/west, /obj/structure/disposalpipe/segment, /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/cafeteria, @@ -67819,9 +67749,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) "tns" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/airalarm/directional/south, /turf/open/floor/plastic, /area/station/security/prison/shower) @@ -68102,10 +68030,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -69430,9 +69357,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tMu" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/structure/cable, /turf/open/floor/plastic, /area/station/security/prison/shower) @@ -69802,10 +69727,7 @@ /turf/open/floor/plating, /area/station/maintenance/central) "tRO" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box, @@ -73461,8 +73383,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/box, @@ -73739,9 +73660,7 @@ /turf/closed/wall/rust, /area/station/command/heads_quarters/hos) "uZq" = ( -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -74628,11 +74547,7 @@ "vlv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /obj/effect/turf_decal/stripes/corner, @@ -75676,11 +75591,7 @@ /area/station/security/courtroom) "vzr" = ( /obj/structure/disposalpipe/segment, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12; - pixel_y = 4 - }, +/obj/structure/sink/kitchen/directional/west, /turf/open/floor/plastic, /area/station/hallway/secondary/service) "vzt" = ( @@ -77815,11 +77726,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79798,9 +79705,7 @@ /area/station/medical/virology) "wEy" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - pixel_y = 29 - }, +/obj/structure/sink/directional/south, /obj/machinery/camera/directional/west{ c_tag = "Prison Maintenance"; network = list("ss13","prison") @@ -80548,14 +80453,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -82015,11 +81917,9 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "xky" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /turf/open/floor/plating, /area/station/security/prison) @@ -83179,11 +83079,7 @@ "xCa" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/disposalpipe/segment, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12; - pixel_y = 4 - }, +/obj/structure/sink/kitchen/directional/west, /obj/effect/turf_decal/siding/white{ dir = 1 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6a8e6d790a4..3a4e8ea9b8b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -66,9 +66,7 @@ /turf/open/floor/iron/textured, /area/station/medical/medbay/central) "aaB" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -337,9 +335,7 @@ /area/station/engineering/atmos) "agZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/effect/turf_decal/trimline/blue/end{ dir = 1 }, @@ -782,11 +778,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "apS" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -3242,9 +3234,7 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance) "bfF" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -3633,9 +3623,7 @@ /area/station/maintenance/central) "bmX" = ( /obj/machinery/light/small/directional/west, -/obj/structure/sink{ - pixel_y = 29 - }, +/obj/structure/sink/directional/south, /mob/living/simple_animal/mouse/brown/tom, /turf/open/floor/plating, /area/station/security/prison/safe) @@ -5101,9 +5089,7 @@ /turf/open/floor/engine, /area/station/science/explab) "bRG" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -5229,9 +5215,7 @@ /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) "bUc" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) @@ -6416,9 +6400,7 @@ /area/station/maintenance/fore) "cuw" = ( /obj/effect/landmark/xeno_spawn, -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/structure/curtain, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -6515,9 +6497,7 @@ dir = 1 }, /obj/item/radio/intercom/directional/north, -/obj/machinery/shower{ - pixel_y = 8 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) "cvY" = ( @@ -6613,10 +6593,7 @@ /turf/open/floor/wood, /area/station/command/corporate_showroom) "cwF" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/freezer, @@ -7032,9 +7009,7 @@ /turf/open/floor/plating, /area/station/maintenance/central) "cDQ" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -7414,10 +7389,9 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "cOq" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -10832,10 +10806,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "dXR" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -12659,9 +12632,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -13137,11 +13108,7 @@ /turf/open/floor/plating, /area/station/science/robotics/mechbay) "ePA" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/light/small/directional/south, /obj/machinery/button/door/directional/south{ @@ -16499,11 +16466,7 @@ /turf/open/floor/wood, /area/station/cargo/qm) "geV" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/light_switch/directional/west, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -17108,10 +17071,7 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) "gqj" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/light_switch/directional/east, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 @@ -17319,11 +17279,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = -2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "guD" = ( @@ -17842,10 +17798,9 @@ "gEF" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/fyellow, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, @@ -19907,8 +19862,7 @@ /area/station/tcommsat/server) "hqL" = ( /obj/machinery/light_switch/directional/east, -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /obj/structure/sign/warning/secure_area/directional/north, @@ -23555,10 +23509,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "izA" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -24704,11 +24655,7 @@ /area/station/service/hydroponics) "iQO" = ( /obj/machinery/firealarm/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) @@ -24884,9 +24831,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "iSl" = ( -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, +/obj/structure/sink/kitchen/directional/south, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -25254,9 +25199,8 @@ /turf/open/floor/carpet, /area/station/service/chapel) "iZm" = ( -/obj/machinery/shower{ - name = "emergency shower"; - pixel_y = 16 +/obj/machinery/shower/directional/south{ + name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end, /obj/effect/turf_decal/bot{ @@ -25922,11 +25866,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11; - pixel_y = -2 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) "jmq" = ( @@ -26073,9 +26013,7 @@ /area/station/hallway/primary/aft) "jov" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) @@ -26118,9 +26056,7 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "jpI" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) @@ -26274,10 +26210,7 @@ /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "jsq" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/toilet{ pixel_y = 8 }, @@ -26552,9 +26485,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) "jwg" = ( @@ -29228,11 +29159,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "ktl" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -32134,10 +32061,9 @@ "lsu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/freezer, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /turf/open/floor/iron, /area/station/cargo/warehouse) @@ -32930,9 +32856,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "lLw" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/machinery/door/window/right/directional/east{ base_state = "left"; dir = 2; @@ -33074,9 +32998,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "lMY" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/machinery/light/small/directional/south, /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron, @@ -33463,10 +33385,9 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "lUp" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/showroomfloor, @@ -33518,10 +33439,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "lUY" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) "lVe" = ( @@ -34080,9 +33998,7 @@ /area/station/maintenance/port/fore) "mgE" = ( /obj/structure/mirror/directional/west, -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "mgJ" = ( @@ -34975,10 +34891,7 @@ /turf/open/floor/wood, /area/station/commons/lounge) "mxg" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, +/obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/freezer, @@ -35149,9 +35062,7 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry) "mAe" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -37488,11 +37399,7 @@ /turf/open/floor/plating, /area/station/cargo/qm) "nor" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -38270,11 +38177,7 @@ /turf/open/floor/wood, /area/station/service/bar/backroom) "nBp" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -39856,9 +39759,7 @@ /area/station/security/range) "ogL" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 17 - }, +/obj/structure/sink/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/trash/soap{ spawn_scatter_radius = 1 @@ -40521,9 +40422,8 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "osM" = ( -/obj/machinery/shower{ - name = "emergency shower"; - pixel_y = 16 +/obj/machinery/shower/directional/south{ + name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end, /obj/structure/disposalpipe/segment{ @@ -42579,10 +42479,7 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology) @@ -43777,11 +43674,7 @@ /area/station/command/heads_quarters/ce) "pCL" = ( /obj/effect/turf_decal/delivery, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/sign/poster/official/cleanliness{ pixel_y = -32 }, @@ -44008,9 +43901,7 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "pGZ" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/freezer, @@ -44726,9 +44617,7 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "pUl" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door/directional/north{ id = "AuxShower"; @@ -46633,11 +46522,7 @@ "qCL" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/cable, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = -2 - }, +/obj/structure/sink/directional/east, /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/white, @@ -49650,10 +49535,9 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) "rEj" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -50357,9 +50241,7 @@ /area/station/security/prison/garden) "rOY" = ( /obj/structure/mirror/directional/east, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "rPc" = ( @@ -50398,9 +50280,8 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) "rPF" = ( -/obj/machinery/shower{ - name = "emergency shower"; - pixel_y = 16 +/obj/machinery/shower/directional/south{ + name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end, /obj/effect/turf_decal/bot{ @@ -50797,10 +50678,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "rVb" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/glass/watering_can, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -52242,9 +52120,7 @@ /turf/open/floor/iron/white, /area/station/science/lobby) "sve" = ( -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54468,10 +54344,7 @@ /turf/open/floor/plating, /area/station/maintenance/port) "tit" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -55471,9 +55344,7 @@ /turf/open/floor/plating, /area/station/science/lab) "tAc" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 @@ -55710,10 +55581,7 @@ /turf/open/floor/plating, /area/station/science/research) "tEy" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 14 - }, +/obj/structure/sink/kitchen/directional/west, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -55930,9 +55798,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/shower{ - name = "emergency shower"; - pixel_y = 16 +/obj/machinery/shower/directional/south{ + name = "emergency shower" }, /obj/effect/turf_decal/trimline/blue/end, /turf/open/floor/iron, @@ -56936,10 +56803,7 @@ /turf/open/floor/engine, /area/station/science/cytology) "ubd" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "ube" = ( @@ -57069,9 +56933,7 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 }, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/bot, /obj/item/clothing/suit/apron/chef{ name = "Jim Norton's Quebecois Coffee apron" @@ -57436,10 +57298,7 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/science/central) "ujM" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) @@ -59653,10 +59512,7 @@ /area/station/medical/virology) "uYg" = ( /obj/structure/cable, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 14 - }, +/obj/structure/sink/kitchen/directional/west, /obj/machinery/power/apc/auto_name/directional/north, /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" @@ -60753,10 +60609,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "vro" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/science/research) "vrv" = ( @@ -61217,9 +61070,7 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = -32 }, -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 }, @@ -61688,9 +61539,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "vIT" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -63369,9 +63218,7 @@ /turf/closed/wall/r_wall, /area/station/science/xenobiology/hallway) "wmT" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -64736,10 +64583,7 @@ /area/station/security/prison/safe) "wOy" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /turf/open/floor/iron, @@ -65105,10 +64949,7 @@ /turf/open/floor/iron/white, /area/station/science/lobby) "wUm" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, +/obj/machinery/shower/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) @@ -66191,9 +66032,7 @@ /turf/open/floor/iron, /area/station/security/warden) "xnU" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) @@ -67638,11 +67477,7 @@ /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "xOU" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -68221,11 +68056,9 @@ /turf/open/floor/iron, /area/station/security/courtroom) "xZu" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /obj/structure/mirror/directional/west, /turf/open/floor/wood, @@ -68745,9 +68578,7 @@ /area/space/nearstation) "yih" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) "yis" = ( diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index bf42a2ba9ac..1e480e0faa7 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -616,9 +616,7 @@ /turf/open/floor/iron/dark/smooth_edge, /area/mine/production) "ee" = ( -/obj/machinery/shower{ - pixel_y = 22 - }, +/obj/machinery/shower/directional/south, /obj/machinery/door/window/right/directional/south, /obj/effect/decal/cleanable/dirt, /obj/item/soap/homemade, @@ -653,9 +651,7 @@ /turf/closed/wall, /area/mine/maintenance/public/south) "eC" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/door/window/right/directional/west, /turf/open/floor/iron/freezer, /area/mine/living_quarters) @@ -840,11 +836,9 @@ /turf/open/floor/iron/edge, /area/mine/lounge) "fM" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 8; - name = "old sink"; - pixel_x = 12 + name = "old sink" }, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, @@ -1136,10 +1130,7 @@ /turf/open/floor/iron/dark/smooth_edge, /area/mine/storage/public) "hj" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/sign/poster/official/cleanliness{ @@ -2028,10 +2019,7 @@ /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) "lX" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/freezer, @@ -2483,10 +2471,9 @@ }, /area/mine/laborcamp) "nI" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -2830,10 +2817,7 @@ /turf/open/floor/iron/smooth, /area/mine/laborcamp) "pI" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2854,9 +2838,7 @@ /turf/open/floor/iron/freezer, /area/mine/laborcamp/quarters) "pO" = ( -/obj/machinery/shower{ - pixel_y = 22 - }, +/obj/machinery/shower/directional/south, /obj/machinery/door/window/left/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer, @@ -3050,9 +3032,7 @@ /turf/open/floor/plating, /area/mine/cafeteria) "qO" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/door/window/left/directional/west, /turf/open/floor/iron/freezer, /area/mine/living_quarters) @@ -3136,9 +3116,7 @@ /turf/open/floor/iron, /area/mine/cafeteria) "rz" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/door/window/left/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer, @@ -3997,10 +3975,7 @@ /turf/open/floor/iron, /area/mine/cafeteria) "xr" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -5286,9 +5261,7 @@ /turf/open/floor/iron/dark, /area/mine/laborcamp) "Gz" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/machinery/door/window/right/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/freezer, @@ -6112,9 +6085,7 @@ /turf/open/floor/iron/white, /area/mine/laborcamp/production) "Lq" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -6261,9 +6232,7 @@ /turf/open/floor/carpet/neon/simple/red/nodots, /area/mine/cafeteria) "Me" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -7055,11 +7024,9 @@ /turf/open/floor/plating, /area/mine/production) "Ru" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, @@ -8341,9 +8308,7 @@ "Zw" = ( /obj/structure/curtain, /obj/structure/window, -/obj/machinery/shower{ - pixel_y = 22 - }, +/obj/machinery/shower/directional/south, /obj/item/soap, /turf/open/floor/iron/freezer, /area/mine/living_quarters) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b20e0fed6b6..1db1cf0639d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -547,9 +547,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/armory) "bI" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/item/soap/syndie, /obj/structure/curtain, /obj/machinery/door/window/survival_pod, @@ -695,10 +693,7 @@ /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) "cd" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/white, /area/centcom/tdome/observation) @@ -792,11 +787,7 @@ /turf/open/floor/iron, /area/centcom/tdome/observation) "cr" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11; - pixel_y = 4 - }, +/obj/structure/sink/kitchen/directional/west, /turf/open/floor/iron/cafeteria, /area/centcom/central_command_areas/holding) "ct" = ( @@ -1183,9 +1174,7 @@ /turf/open/floor/grass, /area/centcom/central_command_areas/holding) "dw" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/white, /area/centcom/tdome/observation) "dx" = ( @@ -1492,10 +1481,7 @@ /obj/structure/toilet/greyscale{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/showroomfloor, @@ -1872,10 +1858,7 @@ /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) "fp" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, @@ -2030,10 +2013,7 @@ /turf/closed/wall/mineral/wood, /area/centcom/central_command_areas/holding) "fP" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 9 @@ -2249,9 +2229,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/armory) "gy" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -4614,9 +4592,7 @@ }, /area/centcom/syndicate_mothership/expansion_bioterrorism) "mV" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/machinery/light/floor, /turf/open/floor/iron/freezer, /area/centcom/syndicate_mothership/control) @@ -4857,11 +4833,7 @@ /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/control) "nP" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11; - pixel_y = 8 - }, +/obj/structure/sink/kitchen/directional/west, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/catwalk_floor/iron_smooth, /area/centcom/syndicate_mothership/control) @@ -5068,10 +5040,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) "op" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /turf/open/floor/iron/white, /area/centcom/tdome/observation) @@ -5207,9 +5176,7 @@ /turf/closed/indestructible/iron, /area/centcom/syndicate_mothership/control) "oH" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/white, /area/centcom/tdome/observation) "oI" = ( @@ -5458,9 +5425,7 @@ /area/centcom/central_command_areas/prison) "pp" = ( /obj/effect/turf_decal/stripes/box, -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/control) "pq" = ( @@ -6284,9 +6249,7 @@ /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/armory) "rZ" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -7184,9 +7147,7 @@ /turf/open/lava/plasma/ice_moon, /area/centcom/syndicate_mothership/control) "uX" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -7311,9 +7272,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/shower{ - pixel_y = 16 - }, +/obj/machinery/shower/directional/south, /obj/structure/curtain, /obj/machinery/door/window/brigdoor/left/directional/south{ name = "Shower" @@ -7863,9 +7822,7 @@ /turf/open/floor/carpet, /area/centcom/wizard_station) "wR" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -7912,10 +7869,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "wX" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/showroomfloor, @@ -8700,10 +8654,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) "zt" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron/white, @@ -8933,9 +8884,7 @@ }, /area/centcom/central_command_areas/holding) "zX" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/stripes/box, /turf/open/floor/mineral/titanium/tiled, /area/centcom/syndicate_mothership/expansion_chemicalwarfare) @@ -9184,10 +9133,7 @@ }, /area/centcom/central_command_areas/holding) "AE" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -10402,9 +10348,7 @@ /obj/structure/mirror/magic{ pixel_y = 28 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/centcom/wizard_station) "DT" = ( @@ -10809,10 +10753,7 @@ /turf/closed/indestructible/syndicate, /area/centcom/syndicate_mothership/control) "Fe" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -11884,9 +11825,7 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, -/obj/structure/sink{ - pixel_y = 20 - }, +/obj/structure/sink/directional/south, /obj/item/shovel/spade{ pixel_x = -4 }, @@ -13271,9 +13210,7 @@ /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "MS" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -14057,10 +13994,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) "OV" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -14337,11 +14271,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) "PI" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11; - pixel_y = 8 - }, +/obj/structure/sink/kitchen/directional/west, /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/siding/wood, /turf/open/floor/catwalk_floor, @@ -14626,9 +14556,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "Qy" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -14810,9 +14738,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/prison) "Rb" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -15807,11 +15733,7 @@ /area/centcom/central_command_areas/ferry) "TL" = ( /obj/item/mop, -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11; - pixel_y = 4 - }, +/obj/structure/sink/kitchen/directional/west, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/holding) @@ -16301,9 +16223,7 @@ /turf/open/floor/iron, /area/centcom/tdome/administration) "UX" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -16734,9 +16654,7 @@ /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "Wb" = ( -/obj/structure/sink/kitchen{ - pixel_y = 20 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) "Wc" = ( @@ -16768,10 +16686,7 @@ /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) "Wf" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) @@ -17201,9 +17116,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/sink/kitchen{ - pixel_y = 23 - }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "Xk" = ( @@ -17213,10 +17126,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) "Xl" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -17288,10 +17198,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/control) "Xu" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -17653,11 +17560,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "Yz" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 12; - pixel_y = -6 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) @@ -17944,10 +17847,7 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "Zm" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /obj/effect/turf_decal/tile/red{ dir = 8 diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm index 49296644725..232b9787e11 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_bar_1.dmm @@ -10,9 +10,7 @@ /area/station/maintenance/central/greater) "n" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /turf/open/floor/plating, /area/station/maintenance/central/greater) "p" = ( diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowarrivals_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowarrivals_2.dmm index 8216aea8d52..8f2a649b41c 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowarrivals_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowarrivals_2.dmm @@ -110,10 +110,9 @@ "Y" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror/directional/north, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 12 + name = "old sink" }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/fore) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 576b2e2a514..a87d8fa023a 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3958,9 +3958,7 @@ /area/station/medical/storage) "bCu" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 17 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) "bCR" = ( @@ -4272,10 +4270,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/iron, /area/station/security/prison/garden) @@ -5629,11 +5624,9 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet) "ccg" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 8; - name = "old sink"; - pixel_x = 12 + name = "old sink" }, /turf/open/floor/wood, /area/station/service/bar/backroom) @@ -5660,9 +5653,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "ccH" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) "ccO" = ( @@ -6870,11 +6861,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/dark, /area/station/science/xenobiology) "cwr" = ( @@ -7068,11 +7055,9 @@ /area/station/science/lower) "czI" = ( /obj/structure/cable, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) @@ -7804,9 +7789,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, -/obj/machinery/shower{ - pixel_y = 18 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/white, /area/station/medical/pharmacy) "cJD" = ( @@ -8688,10 +8671,7 @@ /area/station/cargo/lobby) "daB" = ( /obj/structure/window/reinforced/spawner/east, -/obj/machinery/shower{ - dir = 8; - pixel_x = -7 - }, +/obj/machinery/shower/directional/west, /obj/item/bikehorn/rubberducky, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, @@ -11731,9 +11711,7 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "ebe" = ( -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, @@ -15531,10 +15509,7 @@ /area/station/hallway/secondary/service) "ftP" = ( /obj/structure/window/reinforced/spawner/east, -/obj/machinery/shower{ - dir = 8; - pixel_x = -7 - }, +/obj/machinery/shower/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) @@ -17201,10 +17176,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/camera{ c_tag = "Science - Right Entry Airlock"; dir = 6; @@ -17251,10 +17223,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/dark, /area/station/science/xenobiology) "gcp" = ( @@ -17398,9 +17367,7 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "gfd" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/box, /obj/structure/fluff{ desc = "What, you think the water just magically soaks into the metallic flooring?"; @@ -18126,9 +18093,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, -/obj/machinery/shower{ - pixel_y = 24 - }, +/obj/machinery/shower/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, @@ -19273,9 +19238,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -19482,9 +19445,7 @@ /area/station/hallway/primary/tram/right) "gPb" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -20738,9 +20699,7 @@ /turf/open/floor/plating/airless, /area/mine/explored) "hmD" = ( -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/structure/curtain, /turf/open/floor/iron/freezer, /area/station/commons/toilet) @@ -21817,9 +21776,7 @@ /area/station/commons/fitness/recreation) "hGF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /obj/effect/turf_decal/box, /obj/structure/cable, /turf/open/floor/iron, @@ -23171,8 +23128,7 @@ /area/station/service/chapel/monastery) "ifD" = ( /obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/shower{ - dir = 1; +/obj/machinery/shower/directional/north{ name = "emergency shower" }, /obj/effect/turf_decal/bot, @@ -24769,10 +24725,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "iHr" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/trimline/neutral/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -25377,9 +25330,7 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "iTx" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/box, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -26016,9 +25967,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/station/science/xenobiology) @@ -26098,10 +26047,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/virology) "jfR" = ( @@ -27343,10 +27289,7 @@ /turf/open/floor/plating/airless, /area/mine/explored) "jBy" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -27872,9 +27815,7 @@ /area/station/service/chapel) "jLj" = ( /obj/machinery/light/small/directional/west, -/obj/machinery/shower{ - dir = 1 - }, +/obj/machinery/shower/directional/north, /turf/open/floor/iron/freezer, /area/station/security/prison) "jLF" = ( @@ -27970,10 +27911,7 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "jNn" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 14 - }, +/obj/structure/sink/kitchen/directional/west, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "jNM" = ( @@ -30567,11 +30505,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11; - pixel_y = -2 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "kEX" = ( @@ -31899,10 +31833,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "lcn" = ( @@ -32267,10 +32198,7 @@ c_tag = "Medical - Surgery Room A"; network = list("ss13","medbay") }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/machinery/status_display/evac/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/firealarm/directional/north, @@ -33656,9 +33584,7 @@ /area/station/engineering/supermatter) "lGl" = ( /obj/structure/cable, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/freezer, /area/station/security/prison) "lGs" = ( @@ -36344,9 +36270,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -39117,9 +39041,7 @@ /turf/open/floor/iron, /area/station/engineering/engine_smes) "nwv" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/structure/curtain, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) @@ -40897,9 +40819,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "ohr" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) "ohu" = ( @@ -42567,9 +42487,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) "oNq" = ( @@ -44632,9 +44550,7 @@ /area/station/maintenance/department/cargo) "pvn" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -46748,10 +46664,7 @@ /area/station/commons/dorms) "qgQ" = ( /obj/structure/window/reinforced/spawner/west, -/obj/machinery/shower{ - dir = 4; - pixel_x = 6 - }, +/obj/machinery/shower/directional/east, /obj/item/soap/nanotrasen, /obj/structure/cable, /turf/open/floor/iron/freezer, @@ -48703,9 +48616,7 @@ /turf/open/floor/eighties/red, /area/station/commons/fitness/recreation/entertainment) "qOv" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/box, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -49423,9 +49334,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "rbH" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/turf_decal/box, /obj/structure/fluff{ desc = "What, you think the water just magically soaks into the metallic flooring?"; @@ -50302,11 +50211,7 @@ /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) "rsU" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = -2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet) @@ -50491,10 +50396,7 @@ dir = 1 }, /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /turf/open/floor/iron/dark, /area/station/science/genetics) "rvP" = ( @@ -53335,9 +53237,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "stB" = ( -/obj/machinery/shower{ - pixel_y = 12 - }, +/obj/machinery/shower/directional/south, /obj/structure/curtain, /turf/open/floor/iron/freezer, /area/station/commons/toilet) @@ -57808,10 +57708,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/corner, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/machinery/camera{ c_tag = "Science - Left Entry Airlock"; dir = 10; @@ -59877,10 +59774,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/machinery/status_display/evac/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -60158,9 +60052,7 @@ /area/station/command/heads_quarters/cmo) "uLz" = ( /obj/machinery/light/small/directional/west, -/obj/machinery/shower{ - pixel_y = 24 - }, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer, /area/station/security/prison) "uLC" = ( @@ -63310,11 +63202,9 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/security) "vSf" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/east{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - dir = 4; - name = "old sink"; - pixel_x = -12 + name = "old sink" }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) @@ -64623,10 +64513,7 @@ /area/station/commons/dorms/laundry) "wrv" = ( /obj/structure/window/reinforced/spawner/west, -/obj/machinery/shower{ - dir = 4; - pixel_x = 6 - }, +/obj/machinery/shower/directional/east, /obj/structure/cable, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) @@ -66143,10 +66030,7 @@ /turf/closed/wall, /area/station/service/kitchen/coldroom) "wSm" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66575,9 +66459,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/science/xenobiology) "wZk" = ( @@ -69200,9 +69082,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/sink{ - pixel_y = 15 - }, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/science/xenobiology) "xVQ" = ( diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 849d60ccc0a..5cd79536e74 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -297,11 +297,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bt" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm index a067fd13577..4805cc6dbde 100644 --- a/_maps/shuttles/emergency_bballhooper.dmm +++ b/_maps/shuttles/emergency_bballhooper.dmm @@ -468,10 +468,8 @@ /obj/machinery/door/window/left/directional/north{ name = "MEDICAL INFIRMARY" }, -/obj/machinery/shower{ - dir = 8; - name = "emergency shower"; - pixel_y = -4 +/obj/machinery/shower/directional/west{ + name = "emergency shower" }, /obj/machinery/vending/wallmed/directional/east{ name = "Hooper's First Medical Kit" diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index 664b1151d2e..d84365116b3 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -454,11 +454,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/shower{ - dir = 8; - name = "emergency shower"; - pixel_x = -6; - pixel_y = -7 +/obj/machinery/shower/directional/west{ + name = "emergency shower" }, /obj/structure/window/reinforced{ dir = 1 @@ -525,11 +522,8 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/machinery/shower{ - dir = 8; - name = "emergency shower"; - pixel_x = -6; - pixel_y = -4 +/obj/machinery/shower/directional/west{ + name = "emergency shower" }, /obj/effect/turf_decal/delivery, /turf/open/floor/mineral/titanium, @@ -863,9 +857,7 @@ /turf/open/floor/sepia, /area/shuttle/escape) "xI" = ( -/obj/structure/sink{ - dir = 1 - }, +/obj/structure/sink/directional/north, /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index b69d9c7a0e8..005b3daf333 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -941,11 +941,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "cX" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index ffd1442ffad..3799d36f2d6 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -265,10 +265,7 @@ /turf/open/floor/iron/white, /area/shuttle/escape) "au" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -362,8 +359,7 @@ /turf/open/floor/grass, /area/shuttle/escape) "aJ" = ( -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /obj/effect/turf_decal/tile/blue, diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index ce2da499366..096615d2ebc 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -340,16 +340,11 @@ /turf/open/floor/iron, /area/shuttle/escape) "bj" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bk" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bl" = ( diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index f178543f7a5..4ca8f943de9 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -1379,11 +1379,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1401,10 +1397,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 4 }, diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 0d82c5664c3..77fa20e8509 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -736,9 +736,7 @@ /turf/open/floor/iron, /area/shuttle/escape/luxury) "ct" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape/luxury) "cu" = ( diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index edf325c59a5..99e9c649493 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -501,10 +501,7 @@ /turf/open/misc/sandy_dirt, /area/shuttle/escape/simulation) "uM" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/mineral/titanium/tiled/blue, /area/shuttle/escape) "uW" = ( @@ -533,8 +530,7 @@ /turf/open/floor/mineral/titanium/tiled/blue, /area/shuttle/escape) "xy" = ( -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /turf/open/floor/mineral/titanium/tiled/blue, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 20648c904be..a4ffbc38238 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -357,7 +357,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bk" = ( -/obj/machinery/shower, +/obj/machinery/shower/directional/south, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bl" = ( @@ -542,7 +542,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bI" = ( -/obj/structure/sink, +/obj/structure/sink/directional/south, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "bJ" = ( diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 848c78b9919..a3a4ec1804a 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -1617,10 +1617,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "xm" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, +/obj/machinery/shower/directional/west, /obj/machinery/light/small/directional/west, /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/showroomfloor, @@ -2629,10 +2626,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "JX" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron, /area/shuttle/escape) "JZ" = ( @@ -3503,10 +3497,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "TJ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, /area/shuttle/escape) "TR" = ( @@ -3736,10 +3727,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "WJ" = ( -/obj/machinery/shower{ - dir = 8; - pixel_y = -4 - }, +/obj/machinery/shower/directional/west, /obj/item/soap/homemade, /turf/open/floor/iron/showroomfloor, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index d33175634c9..ec645e0e836 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -389,8 +389,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "bh" = ( -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index a6b6e490f8b..fb420049b6f 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -34,9 +34,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "al" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/noslip, /area/shuttle/escape) "am" = ( @@ -62,9 +60,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "ap" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /turf/open/floor/noslip, /area/shuttle/escape) "ar" = ( diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm index a60149f5e3a..c97888e2127 100644 --- a/_maps/shuttles/emergency_tram.dmm +++ b/_maps/shuttles/emergency_tram.dmm @@ -271,18 +271,14 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aY" = ( -/obj/structure/sink{ - pixel_y = 18 - }, +/obj/structure/sink/directional/south, /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "aZ" = ( /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "ba" = ( -/obj/machinery/shower{ - pixel_y = 18 - }, +/obj/machinery/shower/directional/south, /obj/machinery/vending/wallmed/directional/north{ use_power = 0 }, diff --git a/_maps/shuttles/emergency_zeta.dmm b/_maps/shuttles/emergency_zeta.dmm index 9406acd1186..2d90f2e0862 100644 --- a/_maps/shuttles/emergency_zeta.dmm +++ b/_maps/shuttles/emergency_zeta.dmm @@ -234,8 +234,7 @@ /turf/open/floor/plating/abductor, /area/shuttle/escape) "Qf" = ( -/obj/machinery/shower{ - dir = 8; +/obj/machinery/shower/directional/west{ name = "emergency shower" }, /turf/open/floor/plating/abductor, diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index f59c185dacc..c5c296e63a8 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -79,10 +79,9 @@ /turf/open/floor/iron/freezer, /area/shuttle/transport) "m" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; - pixel_y = 28 + name = "old sink" }, /turf/open/floor/iron/freezer, /area/shuttle/transport) diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index c976a478f3f..5263f395074 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -1684,8 +1684,7 @@ /area/shuttle/syndicate/hallway) "dD" = ( /obj/structure/mirror/directional/west, -/obj/machinery/shower{ - dir = 4; +/obj/machinery/shower/directional/east{ name = "emergency shower" }, /obj/effect/turf_decal/box, @@ -2122,9 +2121,7 @@ /area/shuttle/syndicate/armory) "ep" = ( /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 1 diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index f0868fd7577..b1d39d266e8 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -1006,10 +1006,7 @@ /turf/open/floor/iron/dark/textured_corner, /area/shuttle/syndicate/engineering) "JQ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white/side, diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 8df567835d5..ad7d7788301 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -685,9 +685,7 @@ /area/shuttle/pirate) "bK" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/structure/toilet{ dir = 8 }, @@ -1012,9 +1010,8 @@ /area/shuttle/pirate) "Gk" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/shower{ - name = "decontamination shower"; - pixel_y = 12 +/obj/machinery/shower/directional/south{ + name = "decontamination shower" }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/window{ diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index 1b0f2df6e0b..9b57d45cbe9 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -240,9 +240,7 @@ dir = 8 }, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 17 - }, +/obj/structure/sink/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -531,9 +529,7 @@ dir = 8 }, /obj/structure/mirror/directional/north, -/obj/structure/sink{ - pixel_y = 17 - }, +/obj/structure/sink/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 6d2816c727c..10b1ed7cffa 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -72,9 +72,7 @@ /obj/structure/toilet{ dir = 4 }, -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 9aa668e2fe7..5a6061b8892 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -1346,20 +1346,14 @@ /obj/structure/toilet{ pixel_y = 16 }, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/medbay) "cJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/shower{ - pixel_y = 15 - }, +/obj/machinery/shower/directional/south, /obj/item/soap, /obj/structure/curtain, /obj/machinery/light/small/built/directional/south, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 6cd1246360c..854a9ce4ac3 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -55,9 +55,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned/engine) "aj" = ( -/obj/machinery/shower{ - pixel_y = 15 - }, +/obj/machinery/shower/directional/south, /obj/item/soap, /obj/structure/curtain, /obj/machinery/light/small/built/directional/south, @@ -68,10 +66,7 @@ /obj/structure/toilet{ pixel_y = 16 }, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index 2ce71650d98..a5fe74d505d 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -241,10 +241,7 @@ /area/shuttle/abandoned) "aQ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /obj/item/soap, /turf/open/floor/iron/showroomfloor/airless, /area/shuttle/abandoned) diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 90cf7a78a89..f9f44fe714f 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -554,18 +554,13 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/built/directional/south, /obj/structure/curtain, -/obj/machinery/shower{ - pixel_y = 15 - }, +/obj/machinery/shower/directional/south, /obj/item/soap, /turf/open/floor/iron/freezer, /area/shuttle/abandoned/crew) "bG" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/structure/toilet{ dir = 1 }, @@ -1452,10 +1447,7 @@ /area/shuttle/abandoned/bar) "dR" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/effect/decal/cleanable/food/flour, /turf/open/floor/iron/cafeteria, /area/shuttle/abandoned/bar) @@ -1465,11 +1457,7 @@ /area/shuttle/abandoned/bar) "dT" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/shuttle/abandoned/bar) diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index 9fe6b1ba3da..468b447fa89 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -745,9 +745,7 @@ /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) "cM" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron, /area/shuttle/sbc_starfury) "cO" = ( @@ -767,9 +765,7 @@ /turf/open/floor/plating, /area/shuttle/sbc_starfury) "cQ" = ( -/obj/structure/sink{ - pixel_y = 24 - }, +/obj/structure/sink/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -990,9 +986,7 @@ /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) "dD" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/floor/iron/dark/corner{ dir = 8 }, @@ -1710,10 +1704,7 @@ pixel_y = 14 }, /obj/structure/mirror/directional/east, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 - }, +/obj/structure/sink/directional/west, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/showroomfloor, /area/shuttle/sbc_starfury) diff --git a/_maps/templates/hilbertshotel.dmm b/_maps/templates/hilbertshotel.dmm index c952aacd8a4..70e31cf0395 100644 --- a/_maps/templates/hilbertshotel.dmm +++ b/_maps/templates/hilbertshotel.dmm @@ -119,11 +119,7 @@ /area/misc/hilbertshotel) "A" = ( /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) "B" = ( @@ -131,9 +127,7 @@ /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) "C" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) "D" = ( @@ -230,9 +224,7 @@ /area/misc/hilbertshotel) "U" = ( /obj/structure/table/reinforced, -/obj/structure/sink/kitchen{ - dir = 1 - }, +/obj/structure/sink/kitchen/directional/north, /obj/machinery/light/small/directional/south, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) diff --git a/_maps/templates/hilbertshotellore.dmm b/_maps/templates/hilbertshotellore.dmm index 73968cd2c1e..79617ba69b5 100644 --- a/_maps/templates/hilbertshotellore.dmm +++ b/_maps/templates/hilbertshotellore.dmm @@ -151,11 +151,7 @@ /area/misc/hilbertshotel) "aI" = ( /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) "aJ" = ( @@ -168,9 +164,7 @@ /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) "aK" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) "aL" = ( @@ -223,9 +217,7 @@ /area/misc/hilbertshotel) "aT" = ( /obj/structure/table/reinforced, -/obj/structure/sink/kitchen{ - dir = 1 - }, +/obj/structure/sink/kitchen/directional/north, /obj/machinery/light/small/directional/south, /turf/open/indestructible/hotelwood, /area/misc/hilbertshotel) @@ -266,18 +258,12 @@ /area/misc/hilbertshotel) "bb" = ( /obj/structure/mirror/directional/west, -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, +/obj/structure/sink/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) "bd" = ( -/obj/machinery/shower{ - dir = 8 - }, +/obj/machinery/shower/directional/west, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/hoteltile, /area/misc/hilbertshotel) diff --git a/_maps/templates/holodeck_lounge.dmm b/_maps/templates/holodeck_lounge.dmm index c68eb7d579c..44f51932f0e 100644 --- a/_maps/templates/holodeck_lounge.dmm +++ b/_maps/templates/holodeck_lounge.dmm @@ -189,10 +189,7 @@ }, /area/template_noop) "H" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 - }, +/obj/structure/sink/directional/east, /turf/open/floor/holofloor{ dir = 9; icon_state = "wood" diff --git a/_maps/templates/holodeck_medicalsim.dmm b/_maps/templates/holodeck_medicalsim.dmm index d080fb94176..05c78550394 100644 --- a/_maps/templates/holodeck_medicalsim.dmm +++ b/_maps/templates/holodeck_medicalsim.dmm @@ -312,9 +312,7 @@ }, /area/template_noop) "qV" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -516,9 +514,7 @@ }, /area/template_noop) "Ck" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/machinery/shower/directional/east, /obj/effect/turf_decal/tile/blue{ dir = 1 }, diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index 50e93657499..11f19634af1 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -9,7 +9,7 @@ /turf/closed/wall/mineral/titanium/survival/pod, /area/misc/survivalpod) "c" = ( -/obj/machinery/shower, +/obj/machinery/shower/directional/south, /obj/item/soap/deluxe, /obj/structure/curtain{ alpha = 240; @@ -163,10 +163,7 @@ /turf/open/floor/carpet/black, /area/misc/survivalpod) "y" = ( -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -13 - }, +/obj/structure/sink/kitchen/directional/east, /turf/open/floor/carpet/black, /area/misc/survivalpod) "z" = ( diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index a031efe18d4..6ff99405988 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -207,10 +207,7 @@ /turf/open/floor/pod/light, /area/misc/survivalpod) "I" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, +/obj/structure/sink/directional/west, /obj/machinery/light/small/directional/east, /turf/open/floor/pod/light, /area/misc/survivalpod) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 467da581dc8..7e114012040 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -1233,7 +1233,7 @@ if(istype(T, /turf/open/water)) return TRUE var/obj/machinery/shower/S = locate() in T - if(S?.on) + if(S?.actually_on) return TRUE //Same but with wheat diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index c3c82775aa8..4a280ebf7d6 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -26,21 +26,24 @@ var/demand_color = COLOR_RED ///What color is our supply connect? var/supply_color = COLOR_BLUE + ///Extend the pipe to the edge for wall-mounted plumbed devices, like sinks and showers + var/extend_pipe_to_edge = FALSE ///turn_connects is for wheter or not we spin with the object to change our pipes -/datum/component/plumbing/Initialize(start=TRUE, _ducting_layer, _turn_connects=TRUE, datum/reagents/custom_receiver) +/datum/component/plumbing/Initialize(start=TRUE, ducting_layer, turn_connects=TRUE, datum/reagents/custom_receiver, extend_pipe_to_edge = FALSE) if(!ismovable(parent)) return COMPONENT_INCOMPATIBLE - if(_ducting_layer) - ducting_layer = _ducting_layer + if(ducting_layer) + src.ducting_layer = ducting_layer var/atom/movable/parent_movable = parent if(!parent_movable.reagents && !custom_receiver) return COMPONENT_INCOMPATIBLE reagents = parent_movable.reagents - turn_connects = _turn_connects + src.turn_connects = turn_connects + src.extend_pipe_to_edge = extend_pipe_to_edge set_recipient_reagents_holder(custom_receiver ? custom_receiver : parent_movable.reagents) @@ -54,11 +57,12 @@ RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), .proc/toggle_active) RegisterSignal(parent, list(COMSIG_OBJ_HIDE), .proc/hide) RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), .proc/create_overlays) //called by lateinit on startup + RegisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE), .proc/on_parent_dir_change) //called when placed on a shuttle and it moves, and other edge cases RegisterSignal(parent, list(COMSIG_MOVABLE_CHANGE_DUCT_LAYER), .proc/change_ducting_layer) /datum/component/plumbing/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, COMSIG_OBJ_HIDE, \ - COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_MOVABLE_CHANGE_DUCT_LAYER, COMSIG_COMPONENT_ADDED)) + COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ATOM_DIR_CHANGE, COMSIG_MOVABLE_CHANGE_DUCT_LAYER, COMSIG_COMPONENT_ADDED)) /datum/component/plumbing/Destroy() ducts = null @@ -151,9 +155,10 @@ if(FIFTH_DUCT_LAYER) offset = 10 - var/duct_x = offset - var/duct_y = offset - + var/duct_x = offset - parent_movable.pixel_x - parent_movable.pixel_w + var/duct_y = offset - parent_movable.pixel_y - parent_movable.pixel_z + var/duct_layer = PLUMBING_PIPE_VISIBILE_LAYER + ducting_layer * 0.0003 + var/extension_handled = FALSE for(var/direction in GLOB.cardinals) var/color @@ -165,7 +170,6 @@ continue var/direction_text = dir2text(direction) - var/duct_layer = PLUMBING_PIPE_VISIBILE_LAYER + ducting_layer * 0.0003 var/image/overlay if(turn_connects) @@ -180,6 +184,17 @@ overlays += overlay + // This is a little wiggley extension to make wallmounts like sinks and showers visually link to the pipe + if(extend_pipe_to_edge && !extension_handled) + var/image/edge_overlay = image('icons/obj/plumbing/connects.dmi', "edge-extension", layer = duct_layer) + edge_overlay.dir = parent_movable.dir + edge_overlay.color = color + edge_overlay.pixel_x = -parent_movable.pixel_x - parent_movable.pixel_w + edge_overlay.pixel_y = -parent_movable.pixel_y - parent_movable.pixel_z + overlays += edge_overlay + // only show extension for the first pipe. This means we'll only reflect that color. + extension_handled = TRUE + ///we stop acting like a plumbing thing and disconnect if we are, so we can safely be moved and stuff /datum/component/plumbing/proc/disable() SIGNAL_HANDLER @@ -242,6 +257,11 @@ /// Toggle our machinery on or off. This is called by a hook from default_unfasten_wrench with anchored as only param, so we dont have to copypaste this on every object that can move /datum/component/plumbing/proc/toggle_active(obj/parent_obj, new_state) SIGNAL_HANDLER + // Follow atmos's rule of exposing the connection if you unwrench it and only hiding again if tile is placed back down. + if(tile_covered) + tile_covered = FALSE + parent_obj.update_appearance() + if(new_state) enable() else @@ -290,8 +310,13 @@ /datum/component/plumbing/proc/hide(atom/movable/parent_obj, should_hide) SIGNAL_HANDLER - tile_covered = should_hide - parent_obj.update_appearance() + // If machine is unanchored, keep connector visible. + // This doesn't necessary map to `active`, so check parent. + var/atom/movable/parent_movable = parent + + if(parent_movable.anchored || !should_hide) + tile_covered = should_hide + parent_obj.update_appearance() /datum/component/plumbing/proc/change_ducting_layer(obj/caller, obj/changer, new_layer = DUCT_LAYER_DEFAULT) SIGNAL_HANDLER @@ -323,6 +348,18 @@ if(source == recipient_reagents_holder) set_recipient_reagents_holder(null) +/** + * Called when the dir changes. Need to adjust positioning of pipes. + */ +/datum/component/plumbing/proc/on_parent_dir_change(atom/movable/parent_obj, old_dir, new_dir) + SIGNAL_HANDLER + + if(old_dir == new_dir) + return + + // Defer to later frame because pixel_* is actually updated after all callbacks + addtimer(CALLBACK(parent_obj, /atom/.proc/update_appearance), 1) + ///has one pipe input that only takes, example is manual output pipe /datum/component/plumbing/simple_demand demand_connects = SOUTH diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 00d6440ce17..12d6182b274 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -8,7 +8,23 @@ #define SHOWER_SPRAY_VOLUME 5 /// How much the volume of the shower's spay reagents are amplified by when it sprays something. #define SHOWER_EXPOSURE_MULTIPLIER 2 // Showers effectively double exposed reagents +/// How long we run in TIMED mode +#define SHOWER_TIMED_LENGTH (15 SECONDS) +/// Run the shower until we run out of reagents. +#define SHOWER_MODE_UNTIL_EMPTY 0 +/// Run the shower for SHOWER_TIMED_LENGTH time, or until we run out of reagents. +#define SHOWER_MODE_TIMED 1 +/// Run the shower forever, pausing when we run out of liquid, and then resuming later. +#define SHOWER_MODE_FOREVER 2 +/// Number of modes to cycle through +#define SHOWER_MODE_COUNT 3 + +GLOBAL_LIST_INIT(shower_mode_descriptions, list( + "[SHOWER_MODE_UNTIL_EMPTY]" = "run until empty", + "[SHOWER_MODE_TIMED]" = "run for 15 seconds or until empty", + "[SHOWER_MODE_FOREVER]" = "keep running forever and auto turn back on", +)) /obj/machinery/shower name = "shower" @@ -16,9 +32,13 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "shower" density = FALSE + layer = ABOVE_WINDOW_LAYER use_power = NO_POWER_USE - ///Is the shower on or off? - var/on = FALSE + subsystem_type = /datum/controller/subsystem/processing/plumbing + ///Does the user want the shower on or off? + var/intended_on = FALSE + ///Is the shower actually spitting out water currently + var/actually_on = FALSE ///What temperature the shower reagents are set to. var/current_temperature = SHOWER_NORMAL ///What sound will be played on loop when the shower is on and pouring water. @@ -29,17 +49,45 @@ var/reagent_capacity = 200 ///How many units the shower refills every second. var/refill_rate = 0.5 - /// Whether or not the shower's water reclaimer is operating. - var/can_refill = TRUE - /// Whether to allow players to toggle the water reclaimer. - var/can_toggle_refill = TRUE + ///Does the shower have a water recycler to recollect it's water supply? + var/has_water_reclaimer = TRUE + ///Which mode the shower is operating in. + var/mode = SHOWER_MODE_UNTIL_EMPTY + ///The cooldown for SHOWER_MODE_TIMED mode. + COOLDOWN_DECLARE(timed_cooldown) + ///How far to shift the sprite when placing. + var/pixel_shift = 16 -/obj/machinery/shower/Initialize(mapload) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) + +/obj/machinery/shower/Initialize(mapload, ndir = 0, has_water_reclaimer = null) . = ..() + + if(ndir) + dir = ndir + + if(has_water_reclaimer != null) + src.has_water_reclaimer = has_water_reclaimer + + switch(dir) + if(NORTH) + pixel_x = 0 + pixel_y = -pixel_shift + if(SOUTH) + pixel_x = 0 + pixel_y = pixel_shift + if(EAST) + pixel_x = -pixel_shift + pixel_y = 0 + if(WEST) + pixel_x = pixel_shift + pixel_y = 0 + create_reagents(reagent_capacity) - reagents.add_reagent(reagent_id, reagent_capacity) + if(src.has_water_reclaimer) + reagents.add_reagent(reagent_id, reagent_capacity) soundloop = new(src, FALSE) - AddComponent(/datum/component/plumbing/simple_demand) + AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE) var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = .proc/on_entered, ) @@ -47,6 +95,10 @@ /obj/machinery/shower/examine(mob/user) . = ..() + . += span_notice("It looks like the thermostat has an adjustment screw.") + if(has_water_reclaimer) + . += span_notice("A water recycler is installed. It looks like you could pry it out.") + . += span_notice("The auto shut-off is programmed to [GLOB.shower_mode_descriptions["[mode]"]].") . += span_notice("[reagents.total_volume]/[reagents.maximum_volume] liquids remaining.") /obj/machinery/shower/Destroy() @@ -54,42 +106,66 @@ QDEL_NULL(reagents) return ..() -/obj/machinery/shower/interact(mob/M) - if(reagents.total_volume < 5) - to_chat(M,span_notice("\The [src] is dry.")) - return FALSE - on = !on - update_appearance() - handle_mist() - add_fingerprint(M) - if(on) - START_PROCESSING(SSmachines, src) - process(SSMACHINES_DT) - soundloop.start() - else - soundloop.stop() - if(isopenturf(loc)) - var/turf/open/tile = loc - tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 5 SECONDS, wet_time_to_add = 1 SECONDS) - -/obj/machinery/shower/attackby(obj/item/I, mob/user, params) - if(I.tool_behaviour == TOOL_ANALYZER) - to_chat(user, span_notice("The water temperature seems to be [current_temperature].")) - else - return ..() - -/obj/machinery/shower/multitool_act(mob/living/user, obj/item/I) +/obj/machinery/shower/interact(mob/user) . = ..() - if(. || !can_toggle_refill) + if(.) return - can_refill = !can_refill - to_chat(user, span_notice("You [can_refill ? "en" : "dis"]able the shower's water recycler.")) - playsound(src, 'sound/machines/click.ogg', 20, TRUE) + intended_on = !intended_on + if(!update_actually_on(intended_on)) + balloon_alert(user, "[src] is dry!") + return FALSE + + balloon_alert(user, "turned [intended_on ? "on" : "off"]") + return TRUE +/obj/machinery/shower/analyzer_act(mob/living/user, obj/item/tool) + . = ..() -/obj/machinery/shower/wrench_act(mob/living/user, obj/item/I) + tool.play_tool_sound(src) + to_chat(user, span_notice("The water temperature seems to be [current_temperature].")) + return TRUE + +/obj/machinery/shower/attackby(obj/item/tool, mob/user, params) + if(istype(tool, /obj/item/stock_parts/water_recycler)) + if(has_water_reclaimer) + to_chat(user, span_warning("There is already has a water recycler installed.")) + return + + playsound(src, 'sound/machines/click.ogg', 20, TRUE) + qdel(tool) + has_water_reclaimer = TRUE + begin_processing() + + return ..() + +/obj/machinery/shower/multitool_act(mob/living/user, obj/item/tool) + . = ..() + if(.) + return + + tool.play_tool_sound(src) + mode = (mode + 1) % SHOWER_MODE_COUNT + begin_processing() + to_chat(user, span_notice("You change the shower's auto shut-off mode to [GLOB.shower_mode_descriptions["[mode]"]].")) + return TRUE + +/obj/machinery/shower/crowbar_act(mob/living/user, obj/item/tool) + . = ..() + if(.) + return + if(!has_water_reclaimer) + to_chat(user, span_warning("There isn't a water recycler to remove.")) + return + + tool.play_tool_sound(src) + has_water_reclaimer = FALSE + new/obj/item/stock_parts/water_recycler(get_turf(loc)) + to_chat(user, span_notice("You remove the water reclaimer from [src]")) + return TRUE + +/obj/machinery/shower/screwdriver_act(mob/living/user, obj/item/I) ..() to_chat(user, span_notice("You begin to adjust the temperature valve with \the [I]...")) if(I.use_tool(src, user, 50)) @@ -106,41 +182,58 @@ handle_mist() return TRUE +/obj/machinery/shower/wrench_act(mob/living/user, obj/item/I) + . = ..() + if(flags_1 & NODECONSTRUCT_1) + return + + I.play_tool_sound(src) + deconstruct() + return TRUE /obj/machinery/shower/update_overlays() . = ..() - if(!on) + if(!actually_on) return var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER) water_falling.color = mix_color_from_reagents(reagents.reagent_list) water_falling.plane = GAME_PLANE_UPPER + switch(dir) + if(NORTH) + water_falling.pixel_y += pixel_shift + if(SOUTH) + water_falling.pixel_y -= pixel_shift + if(EAST) + water_falling.pixel_x += pixel_shift + if(WEST) + water_falling.pixel_x -= pixel_shift . += water_falling /obj/machinery/shower/proc/handle_mist() // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec var/obj/effect/mist/mist = locate() in loc - if(!mist && on && current_temperature != SHOWER_FREEZING) + if(!mist && actually_on && current_temperature != SHOWER_FREEZING) addtimer(CALLBACK(src, .proc/make_mist), 5 SECONDS) - if(mist && (!on || current_temperature == SHOWER_FREEZING)) + if(mist && !(actually_on && current_temperature != SHOWER_FREEZING)) addtimer(CALLBACK(src, .proc/clear_mist), 25 SECONDS) /obj/machinery/shower/proc/make_mist() var/obj/effect/mist/mist = locate() in loc - if(!mist && on && current_temperature != SHOWER_FREEZING) + if(!mist && actually_on && current_temperature != SHOWER_FREEZING) var/obj/effect/mist/new_mist = new /obj/effect/mist(loc) new_mist.color = mix_color_from_reagents(reagents.reagent_list) /obj/machinery/shower/proc/clear_mist() var/obj/effect/mist/mist = locate() in loc - if(mist && (!on || current_temperature == SHOWER_FREEZING)) + if(mist && !(actually_on && current_temperature != SHOWER_FREEZING)) qdel(mist) /obj/machinery/shower/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER - if(on && reagents.total_volume) + if(actually_on && reagents.total_volume) wash_atom(AM) /obj/machinery/shower/proc/wash_atom(atom/target) @@ -150,27 +243,76 @@ if(isliving(target)) check_heat(target) -/obj/machinery/shower/process(delta_time) - if(on && reagents.total_volume) - wash_atom(loc) - for(var/am in loc) - var/atom/movable/movable_content = am - if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above - wash_atom(movable_content) // Reagent exposure is handled in wash_atom +/** + * Toggle whether shower is actually on and outputting water. + * May not match what user asked to happen by clicking. + * Returns TRUE if the state was changed. + * + * Arguments: + * * new_on_state - new state + */ +/obj/machinery/shower/proc/update_actually_on(new_on_state) + if(new_on_state == actually_on) + return FALSE + + // Check if we have enough reagents to actually turn on. + if(new_on_state && reagents.total_volume < SHOWER_SPRAY_VOLUME) + return FALSE + + actually_on = new_on_state - reagents.remove_any(SHOWER_SPRAY_VOLUME) - return - on = FALSE - soundloop.stop() - handle_mist() - if(can_refill) - reagents.add_reagent(reagent_id, refill_rate * delta_time) update_appearance() - if(reagents.total_volume == reagents.maximum_volume) - return PROCESS_KILL + handle_mist() + if(new_on_state) + begin_processing() + soundloop.start() + COOLDOWN_START(src, timed_cooldown, SHOWER_TIMED_LENGTH) + else + soundloop.stop() + if(isopenturf(loc)) + var/turf/open/tile = loc + tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 5 SECONDS, wet_time_to_add = 1 SECONDS) + + return TRUE + +/obj/machinery/shower/process(delta_time) + // the TIMED mode cutoff feature. User has to manually reactivate. + if(intended_on && mode == SHOWER_MODE_TIMED && COOLDOWN_FINISHED(src, timed_cooldown)) + // the TIMED mode cutoff feature. User has to manually reactivate. + intended_on = FALSE + + // Out of water. + if(actually_on && reagents.total_volume < SHOWER_SPRAY_VOLUME) + update_actually_on(FALSE) + + // Don't turn back on. + if(mode != SHOWER_MODE_FOREVER) + intended_on = FALSE + else + // Cycle: update_actually_on() will only change state if appropriate. + update_actually_on(intended_on) + + // Reclaim water + if(!actually_on) + if(has_water_reclaimer && reagents.total_volume < reagents.maximum_volume) + reagents.add_reagent(reagent_id, refill_rate * delta_time) + return 0 + + // FOREVER mode stays processing so it can cycle back on. + return mode == SHOWER_MODE_FOREVER ? 0 : PROCESS_KILL + + // Wash up. + wash_atom(loc) + for(var/atom/movable/movable_content as anything in loc) + if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above + wash_atom(movable_content) // Reagent exposure is handled in wash_atom + + reagents.remove_any(SHOWER_SPRAY_VOLUME) /obj/machinery/shower/deconstruct(disassembled = TRUE) - new /obj/item/stack/sheet/iron(drop_location(), 3) + new /obj/item/stack/sheet/iron(drop_location(), 2) + if(has_water_reclaimer) + new /obj/item/stock_parts/water_recycler(drop_location()) qdel(src) /obj/machinery/shower/proc/check_heat(mob/living/L) @@ -198,15 +340,30 @@ . = ..() AddComponent(/datum/component/simple_rotation) -/obj/structure/showerframe/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/stock_parts/water_recycler)) - qdel(I) - var/obj/machinery/shower/new_shower = new /obj/machinery/shower(loc) - new_shower.setDir(dir) +/obj/structure/showerframe/attackby(obj/item/tool, mob/living/user, params) + if(istype(tool, /obj/item/stock_parts/water_recycler)) + qdel(tool) + var/obj/machinery/shower/shower = new(loc, REVERSE_DIR(dir), TRUE) qdel(src) + playsound(shower, 'sound/machines/click.ogg', 20, TRUE) return return ..() +/obj/structure/showerframe/wrench_act(mob/living/user, obj/item/tool) + . = ..() + + tool.play_tool_sound(src) + new/obj/machinery/shower(loc, REVERSE_DIR(dir), FALSE) + qdel(src) + + return TRUE + +/obj/structure/sinkframe/wrench_act_secondary(mob/living/user, obj/item/tool) + . = ..() + tool.play_tool_sound(src) + deconstruct() + return TRUE + /obj/structure/showerframe/AltClick(mob/user) return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation @@ -219,6 +376,11 @@ anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT +#undef SHOWER_MODE_UNTIL_EMPTY +#undef SHOWER_MODE_TIMED +#undef SHOWER_MODE_FOREVER +#undef SHOWER_MODE_COUNT +#undef SHOWER_TIMED_LENGTH #undef SHOWER_SPRAY_VOLUME #undef SHOWER_EXPOSURE_MULTIPLIER #undef SHOWER_BOILING_TEMP diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b27a1c63e99..43eef8609a6 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -256,6 +256,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) icon_state = "sink" desc = "A sink used for washing one's hands and face. Passively reclaims water over time." anchored = TRUE + pixel_z = 1 ///Something's being washed at the moment var/busy = FALSE ///What kind of reagent is produced by this sink by default? (We now have actual plumbing, Arcane, August 2020) @@ -266,20 +267,45 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) var/buildstackamount = 1 ///Does the sink have a water recycler to recollect it's water supply? var/has_water_reclaimer = TRUE - ///Has the water reclamation begun? - var/reclaiming = FALSE ///Units of water to reclaim per second var/reclaim_rate = 0.5 + ///Amount of shift the pixel for placement + var/pixel_shift = 14 -/obj/structure/sink/Initialize(mapload, bolt) +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) + +/obj/structure/sink/Initialize(mapload, ndir = 0, has_water_reclaimer = null) . = ..() + + if(ndir) + dir = ndir + + if(has_water_reclaimer != null) + src.has_water_reclaimer = has_water_reclaimer + + switch(dir) + if(NORTH) + pixel_x = 0 + pixel_y = -pixel_shift + if(SOUTH) + pixel_x = 0 + pixel_y = pixel_shift + if(EAST) + pixel_x = -pixel_shift + pixel_y = 0 + if(WEST) + pixel_x = pixel_shift + pixel_y = 0 + create_reagents(100, NO_REACT) - if(has_water_reclaimer) + if(src.has_water_reclaimer) reagents.add_reagent(dispensedreagent, 100) - AddComponent(/datum/component/plumbing/simple_demand, bolt) + AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE) /obj/structure/sink/examine(mob/user) . = ..() + if(has_water_reclaimer) + . += span_notice("A water recycler is installed. It looks like you could pry it out.") . += span_notice("[reagents.total_volume]/[reagents.maximum_volume] liquids remaining.") /obj/structure/sink/attack_hand(mob/living/user, list/modifiers) @@ -374,6 +400,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) deconstruct() return + if(O.tool_behaviour == TOOL_CROWBAR) + if(!has_water_reclaimer) + to_chat(user, span_warning("There isn't a water recycler to remove.")) + return + + O.play_tool_sound(src) + has_water_reclaimer = FALSE + new/obj/item/stock_parts/water_recycler(get_turf(loc)) + to_chat(user, span_notice("You remove the water reclaimer from [src]")) + return + if(istype(O, /obj/item/stack/medical/gauze)) var/obj/item/stack/medical/gauze/G = O new /obj/item/reagent_containers/glass/rag(src.loc) @@ -394,6 +431,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) O.use(1) return + if(istype(O, /obj/item/stock_parts/water_recycler)) + if(has_water_reclaimer) + to_chat(user, span_warning("There is already has a water recycler installed.")) + return + + playsound(src, 'sound/machines/click.ogg', 20, TRUE) + qdel(O) + has_water_reclaimer = TRUE + begin_reclamation() + return + if(!istype(O)) return if(O.item_flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand. @@ -417,15 +465,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) /obj/structure/sink/deconstruct() if(!(flags_1 & NODECONSTRUCT_1)) drop_materials() + if(has_water_reclaimer) + new /obj/item/stock_parts/water_recycler(drop_location()) ..() /obj/structure/sink/process(delta_time) - if(has_water_reclaimer && reagents.total_volume < reagents.maximum_volume) - reagents.add_reagent(dispensedreagent, reclaim_rate * delta_time) - else - reclaiming = FALSE + // Water reclamation complete? + if(!has_water_reclaimer || reagents.total_volume >= reagents.maximum_volume) return PROCESS_KILL + reagents.add_reagent(dispensedreagent, reclaim_rate * delta_time) + /obj/structure/sink/proc/drop_materials() if(buildstacktype) new buildstacktype(loc,buildstackamount) @@ -435,13 +485,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) new M.sheet_type(loc, FLOOR(custom_materials[M] / MINERAL_MATERIAL_AMOUNT, 1)) /obj/structure/sink/proc/begin_reclamation() - if(!reclaiming) - reclaiming = TRUE - START_PROCESSING(SSplumbing, src) + START_PROCESSING(SSplumbing, src) /obj/structure/sink/kitchen name = "kitchen sink" icon_state = "sink_alt" + pixel_z = 4 + pixel_shift = 16 + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16)) /obj/structure/sink/greyscale icon_state = "sink_greyscale" @@ -460,17 +512,26 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32) . = ..() AddComponent(/datum/component/simple_rotation) -/obj/structure/sinkframe/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/stock_parts/water_recycler)) - qdel(I) - var/obj/structure/sink/greyscale/new_sink = new /obj/structure/sink/greyscale(loc) - new_sink.has_water_reclaimer = TRUE +/obj/structure/sinkframe/attackby(obj/item/tool, mob/living/user, params) + if(istype(tool, /obj/item/stock_parts/water_recycler)) + qdel(tool) + var/obj/structure/sink/greyscale/new_sink = new(loc, REVERSE_DIR(dir), TRUE) new_sink.set_custom_materials(custom_materials) - new_sink.setDir(dir) qdel(src) + playsound(new_sink, 'sound/machines/click.ogg', 20, TRUE) return return ..() +/obj/structure/sinkframe/wrench_act(mob/living/user, obj/item/tool) + . = ..() + + tool.play_tool_sound(src) + var/obj/structure/sink/greyscale/new_sink = new(loc, REVERSE_DIR(dir), FALSE) + new_sink.set_custom_materials(custom_materials) + qdel(src) + + return TRUE + /obj/structure/sinkframe/wrench_act_secondary(mob/living/user, obj/item/tool) . = ..() tool.play_tool_sound(src) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index a2626558ef1..aa27c4c9a17 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -156,7 +156,7 @@ /obj/machinery/hydroponics/constructable/ComponentInitialize() . = ..() AddComponent(/datum/component/simple_rotation) - AddComponent(/datum/component/plumbing/simple_demand) + AddComponent(/datum/component/plumbing/hydroponics) AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/hydroponics)) /obj/machinery/hydroponics/constructable/RefreshParts() @@ -209,6 +209,76 @@ return ..() +/// Special demand connector that consumes as normal, but redirects water into the magical water space. +/datum/component/plumbing/hydroponics + demand_connects = SOUTH + /// Alternate reagents container to buffer incoming water + var/datum/reagents/water_reagents + /// Actual parent reagents that has nutrients + var/datum/reagents/nutri_reagents + +/datum/component/plumbing/hydroponics/Initialize(start=TRUE, _ducting_layer, _turn_connects=TRUE, datum/reagents/custom_receiver) + . = ..() + + if(!istype(parent, /obj/machinery/hydroponics/constructable)) + return COMPONENT_INCOMPATIBLE + + var/obj/machinery/hydroponics/constructable/hydro_parent = parent + + water_reagents = new(hydro_parent.maxwater) + water_reagents.my_atom = hydro_parent + + nutri_reagents = reagents + +/datum/component/plumbing/hydroponics/Destroy() + qdel(water_reagents) + nutri_reagents = null + return ..() + +/datum/component/plumbing/hydroponics/send_request(dir) + var/obj/machinery/hydroponics/constructable/hydro_parent = parent + + var/initial_nutri_amount = nutri_reagents.total_volume + if(initial_nutri_amount < nutri_reagents.maximum_volume) + // Well boy howdy, we have no way to tell a supply to not mix the water with everything else, + // So we'll let it leak in, and move the water over. + set_recipient_reagents_holder(nutri_reagents) + reagents = nutri_reagents + process_request( + amount = MACHINE_REAGENT_TRANSFER, + reagent = null, + dir = dir + ) + + // Move the leaked water from nutrients to... water + var/leaking_water_amount = nutri_reagents.get_reagent_amount(/datum/reagent/water) + if(leaking_water_amount) + nutri_reagents.trans_id_to(water_reagents, /datum/reagent/water, leaking_water_amount) + + // We should only take MACHINE_REAGENT_TRANSFER every tick; this is the remaining amount we can take + var/remaining_transfer_amount = max(MACHINE_REAGENT_TRANSFER - (nutri_reagents.total_volume - initial_nutri_amount), 0) + + // How much extra water we should gather this tick to try to fill the water tray. + var/extra_water_to_gather = clamp(hydro_parent.maxwater - hydro_parent.waterlevel - water_reagents.total_volume, 0, remaining_transfer_amount) + if(extra_water_to_gather > 0) + set_recipient_reagents_holder(water_reagents) + reagents = water_reagents + process_request( + amount = extra_water_to_gather, + reagent = /datum/reagent/water, + dir = dir, + ) + + // Now transfer all remaining water in that buffer and clear it out. + var/final_water_amount = water_reagents.total_volume + if(final_water_amount) + hydro_parent.adjust_waterlevel(round(final_water_amount)) + // Using a pipe doesn't afford you extra water storage and the baseline behavior for trays is that excess water goes into the shadow realm. + water_reagents.del_reagent(/datum/reagent/water) + + // Plumbing pauses if reagents is full.. so let's cheat and make sure it ticks unless both trays are happy + reagents = hydro_parent.waterlevel < hydro_parent.maxwater ? water_reagents : nutri_reagents + /obj/machinery/hydroponics/bullet_act(obj/projectile/Proj) //Works with the Somatoray to modify plant variables. if(!myseed) return ..() diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index ec7d8afa10e..18302e0ef76 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -73,6 +73,7 @@ icon = 'icons/obj/watercloset.dmi' icon_state = "puddle-oil" dispensedreagent = /datum/reagent/fuel/oil + pixel_shift = 0 /obj/structure/sink/oil_well/Initialize(mapload) .=..() diff --git a/icons/obj/plumbing/connects.dmi b/icons/obj/plumbing/connects.dmi index 943b580a624..f6d921624fb 100644 Binary files a/icons/obj/plumbing/connects.dmi and b/icons/obj/plumbing/connects.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 110cb746bf6..1f07447e969 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/tools/UpdatePaths/Scripts/67672_sinks_and_showers.txt b/tools/UpdatePaths/Scripts/67672_sinks_and_showers.txt new file mode 100644 index 00000000000..cf3e3891618 --- /dev/null +++ b/tools/UpdatePaths/Scripts/67672_sinks_and_showers.txt @@ -0,0 +1,17 @@ +/obj/structure/sink {dir=@UNSET} : /obj/structure/sink/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink {dir=1} : /obj/structure/sink/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink {dir=2} : /obj/structure/sink/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink {dir=4} : /obj/structure/sink/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink {dir=8} : /obj/structure/sink/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/structure/sink/kitchen {dir=@UNSET} : /obj/structure/sink/kitchen/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink/kitchen {dir=1} : /obj/structure/sink/kitchen/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink/kitchen {dir=2} : /obj/structure/sink/kitchen/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink/kitchen {dir=4} : /obj/structure/sink/kitchen/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/structure/sink/kitchen {dir=8} : /obj/structure/sink/kitchen/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} + +/obj/machinery/shower {dir=@UNSET} : /obj/machinery/shower/directional/south {@OLD;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/shower {dir=1} : /obj/machinery/shower/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/shower {dir=2} : /obj/machinery/shower/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/shower {dir=4} : /obj/machinery/shower/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP} +/obj/machinery/shower {dir=8} : /obj/machinery/shower/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}