From f861670748ad4559d9597e3799ed9901dd38b632 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Mon, 15 Jul 2024 18:00:00 -0400 Subject: [PATCH] refactor: move 'old sink' varedits to type' (#26236) * refactor: move 'old sink' varedits to type' * script number --- _maps/map_files/generic/Lavaland.dmm | 4 +--- _maps/map_files/stations/boxstation.dmm | 22 ++++++----------- _maps/map_files/stations/deltastation.dmm | 16 ++++--------- _maps/map_files/stations/metastation.dmm | 24 +++++-------------- code/game/objects/structures/watercloset.dm | 3 +++ tools/UpdatePaths/Scripts/26236_old_sinks.txt | 1 + 6 files changed, 22 insertions(+), 48 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/26236_old_sinks.txt diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 7c9b0a8b56f..f4e1402aed6 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -2955,9 +2955,7 @@ /turf/simulated/floor/lava/mapping_lava, /area/lavaland/surface/outdoors) "hl" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = -10; dir = 1 }, diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index f3e22d78216..b4ccd687132 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -3266,9 +3266,7 @@ }, /area/station/security/storage) "amK" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 28 }, /turf/simulated/floor/plating, @@ -59034,9 +59032,7 @@ "gVD" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/item/restraints/handcuffs/cable/blue, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /turf/simulated/floor/plating, @@ -83515,10 +83511,8 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "sSX" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; +/obj/structure/sink/kitchen/old{ dir = 4; - name = "old sink"; pixel_x = -12 }, /obj/item/reagent_containers/glass/bucket, @@ -83990,10 +83984,9 @@ "tia" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/old{ dir = 8; - pixel_x = 12; - name = "old sink" + pixel_x = 12 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -88731,10 +88724,9 @@ }, /area/station/science/genetics) "vEA" = ( -/obj/structure/sink/kitchen{ +/obj/structure/sink/kitchen/old{ dir = 8; - pixel_x = 12; - name = "old sink" + pixel_x = 12 }, /obj/item/reagent_containers/glass/bucket, /obj/item/radio/intercom/locked/prison{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index ffe6388b2f8..7f746d9f27a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -2120,9 +2120,7 @@ /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/fore2) "aog" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /obj/machinery/newscaster{ @@ -2143,9 +2141,7 @@ /turf/simulated/floor/plasteel/white/side, /area/station/maintenance/fore2) "aoi" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /obj/effect/decal/cleanable/dirt, @@ -20757,9 +20753,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/aisat) "blR" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /obj/machinery/camera{ @@ -77411,9 +77405,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lAO" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /turf/simulated/floor/plating, diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 83292491f63..1e2311735e0 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -8977,9 +8977,7 @@ /obj/structure/mirror{ pixel_y = -34 }, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = -8; dir = 1 }, @@ -11232,9 +11230,7 @@ /area/station/public/locker) "aXn" = ( /obj/structure/closet/crate/freezer, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /obj/effect/decal/cleanable/dirt, @@ -31547,9 +31543,7 @@ /area/station/engineering/atmos/control) "ciF" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /turf/simulated/floor/plasteel, @@ -33487,10 +33481,8 @@ /turf/simulated/floor/engine/air, /area/station/engineering/atmos) "cqS" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; +/obj/structure/sink/kitchen/old{ dir = 4; - name = "old sink"; pixel_x = -12 }, /obj/structure/mirror{ @@ -79178,9 +79170,7 @@ }, /area/station/security/main) "saw" = ( -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = 25 }, /turf/simulated/floor/plasteel{ @@ -81253,9 +81243,7 @@ /obj/structure/mirror{ pixel_y = -34 }, -/obj/structure/sink/kitchen{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink"; +/obj/structure/sink/kitchen/old{ pixel_y = -8; dir = 1 }, diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 60a83cd0a06..06631ce17fd 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -655,6 +655,9 @@ ..() icon_state = "puddle" +/obj/structure/sink/kitchen/old + name = "old sink" + desc = "A sink used for washing one's hands and face. It looks rusty and home-made." ////////////////////////////////// // Bathroom Fixture Items // diff --git a/tools/UpdatePaths/Scripts/26236_old_sinks.txt b/tools/UpdatePaths/Scripts/26236_old_sinks.txt new file mode 100644 index 00000000000..99f36092415 --- /dev/null +++ b/tools/UpdatePaths/Scripts/26236_old_sinks.txt @@ -0,0 +1 @@ +/obj/structure/sink/kitchen{name="old sink"} : /obj/structure/sink/kitchen/old{@OLD;name=@SKIP;desc=@SKIP}