From ffbd5cd535a4329b1dfb123ad220f9412ce35279 Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Tue, 13 Feb 2024 00:48:34 +0200 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=BA=D0=BE=D0=BD=D0=B5=D1=86-?= =?UTF-8?q?=D1=82=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= =?UTF-8?q?.=20=D0=A1=D0=BB=D0=B0=D0=B2=D0=B0=20=D1=8F=D0=B9=D1=86=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/sierra/z1-z5_sierra.dmm | 56 ++++++++++++++-------------- mods/sauna_props/_sauna_props.dm | 2 +- mods/sauna_props/code/sauna_props.dm | 29 ++++++++------ 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 57171a732031a..4cd9b2d1f87de 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -12764,7 +12764,7 @@ target_temperature = 398.15; temperature = 343.15 }, -/obj/structure/bed/sofa/sauna_bench/middle, +/obj/structure/bed/sauna_bench/middle, /turf/simulated/floor/wood/ebony, /area/crew_quarters/sauna) "bSU" = ( @@ -28432,9 +28432,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/alarm{ - pixel_y = 24 - }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/sauna) "efD" = ( @@ -36554,9 +36551,6 @@ /obj/structure/table/steel, /obj/item/tank/nitrogen, /obj/item/clothing/mask/breath, -/obj/structure/curtain/black{ - pixel_y = -32 - }, /turf/simulated/floor/tiled/dark, /area/maintenance/firstdeck/forestarboard) "fpB" = ( @@ -43475,9 +43469,6 @@ /obj/structure/table/steel, /obj/item/storage/box/donut, /obj/item/device/taperecorder, -/obj/structure/curtain/black{ - pixel_y = -32 - }, /turf/simulated/floor/tiled/dark, /area/maintenance/firstdeck/forestarboard) "grp" = ( @@ -45233,6 +45224,7 @@ d2 = 4; icon_state = "0-4" }, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "gGM" = ( @@ -46856,7 +46848,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/structure/bed/sofa/sauna_bench/middle, +/obj/structure/bed/sauna_bench/middle, /turf/simulated/floor/wood/ebony, /area/crew_quarters/sauna) "gSJ" = ( @@ -49511,6 +49503,7 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "hmT" = ( @@ -56310,7 +56303,7 @@ /obj/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/structure/bed/sofa/sauna_bench/middle/north, +/obj/structure/bed/sauna_bench/middle/north, /turf/simulated/floor/wood/ebony, /area/crew_quarters/sauna) "iqj" = ( @@ -79943,6 +79936,10 @@ /obj/floor_decal/corner/green/border{ dir = 6 }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sauna) "lNM" = ( @@ -85260,6 +85257,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/seconddeck/aftstarboard) +"mDY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/wood/walnut, +/area/crew_quarters/sauna) "mEd" = ( /obj/random/ironing_board_structure, /obj/item/ironing_iron, @@ -92090,7 +92093,7 @@ pixel_y = 30; set_temperature = 348.15 }, -/obj/structure/bed/sofa/sauna_bench/middle/north, +/obj/structure/bed/sauna_bench/middle/north, /turf/simulated/floor/wood/ebony, /area/crew_quarters/sauna) "nFM" = ( @@ -100848,7 +100851,7 @@ /obj/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/structure/bed/sofa/sauna_bench/middle/north, +/obj/structure/bed/sauna_bench/middle/north, /obj/item/device/flashlight/lamp/lava/orange{ pixel_y = 3; pixel_x = 9 @@ -107702,8 +107705,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/machinery/light/small{ + dir = 1 }, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sauna) @@ -118866,12 +118869,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/actor/stage) -"rDz" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/wood/walnut, -/area/crew_quarters/sauna) "rDD" = ( /obj/floor_decal/corner/black/border{ dir = 5 @@ -119125,7 +119122,7 @@ set_temperature = 348.15; pixel_x = -30 }, -/obj/structure/bed/sofa/sauna_bench/middle, +/obj/structure/bed/sauna_bench/middle, /turf/simulated/floor/wood/ebony, /area/crew_quarters/sauna) "rFV" = ( @@ -123247,7 +123244,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/bed/sofa/sauna_bench/middle/north, +/obj/structure/bed/sauna_bench/middle/north, +/obj/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood/ebony, /area/crew_quarters/sauna) "skE" = ( @@ -128934,6 +128932,7 @@ dir = 8 }, /obj/floor_decal/techfloor/corner, +/obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) "sYD" = ( @@ -139863,6 +139862,9 @@ /obj/floor_decal/techfloor/corner{ dir = 4 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) "uIE" = ( @@ -157541,9 +157543,6 @@ /obj/structure/table/steel, /obj/item/soap/red_soap, /obj/item/material/twohanded/baseballbat, -/obj/structure/curtain/black{ - pixel_y = -32 - }, /turf/simulated/floor/tiled/dark, /area/maintenance/firstdeck/forestarboard) "xrV" = ( @@ -160580,6 +160579,7 @@ d2 = 4; icon_state = "0-4" }, +/obj/structure/curtain/black, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "xOH" = ( @@ -254081,7 +254081,7 @@ oHY ngK cpu nFK -rDz +mDY vEe vEe vEe diff --git a/mods/sauna_props/_sauna_props.dm b/mods/sauna_props/_sauna_props.dm index 7b5f31e9f7623..69aeaa40df3c2 100644 --- a/mods/sauna_props/_sauna_props.dm +++ b/mods/sauna_props/_sauna_props.dm @@ -1,4 +1,4 @@ /singleton/modpack/sauna_props name = "Sauna Props" desc = "Импортирует с Final Destination пропы для бани." - author = "KandJX" + author = "KandJX(Импортировал), DarkSoviet(Автор)" diff --git a/mods/sauna_props/code/sauna_props.dm b/mods/sauna_props/code/sauna_props.dm index 71d9d963dc962..9e3f8fdb19e8c 100644 --- a/mods/sauna_props/code/sauna_props.dm +++ b/mods/sauna_props/code/sauna_props.dm @@ -26,33 +26,40 @@ T.clean(src, user) to_chat(user, "You have finished mopping!") -/obj/structure/bed/sofa/sauna_bench +/obj/structure/bed/sauna_bench name = "sauna bench" desc = "A wooden sauna bench." icon = 'mods/sauna_props/icons/sauna_props.dmi' icon_state = "bench" base_icon = "bench" - buckle_dir = SOUTH - buckle_stance = BUCKLE_FORCE_PRONE + var/static/list/sauna_bench_buckle_pixel_shift = list(0, 10, 0) - var/material/bench_material = MATERIAL_WOOD +/obj/structure/bed/sauna_bench/New(newloc) + ..(newloc,MATERIAL_WOOD, MATERIAL_LEATHER_GENERIC) -/obj/structure/bed/sofa/sauna_bench/New(var/newloc) - base_icon = icon_state - ..(newloc,bench_material) +/obj/structure/bed/sauna_bench/Destroy() + buckle_pixel_shift = null + ..() -/obj/structure/bed/sofa/sauna_bench/middle +/obj/structure/bed/sauna_bench/Initialize() + buckle_pixel_shift = sauna_bench_buckle_pixel_shift + ..() + +/obj/structure/bed/sauna_bench/on_update_icon() + icon_state = base_icon + +/obj/structure/bed/sauna_bench/middle icon_state = "bench_middle" base_icon = "bench_middle" -/obj/structure/bed/sofa/sauna_bench/middle/north +/obj/structure/bed/sauna_bench/middle/north icon_state = "bench_middlenorth" base_icon = "bench_middlenorth" -/obj/structure/bed/sofa/sauna_bench/north +/obj/structure/bed/sauna_bench/north icon_state = "bench_north" base_icon = "bench_north" -/obj/structure/bed/sofa/sauna_bench/south +/obj/structure/bed/sauna_bench/south icon_state = "bench_south" base_icon = "bench_south"