Skip to content

Commit

Permalink
Наконец-то работает. Слава яйцам
Browse files Browse the repository at this point in the history
  • Loading branch information
YegorKandziuba committed Feb 12, 2024
1 parent 40d9e18 commit ffbd5cd
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 40 deletions.
56 changes: 28 additions & 28 deletions maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -45233,6 +45224,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/structure/curtain/black,
/turf/simulated/floor/plating,
/area/maintenance/firstdeck/forestarboard)
"gGM" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -49511,6 +49503,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/structure/curtain/black,
/turf/simulated/floor/plating,
/area/maintenance/firstdeck/forestarboard)
"hmT" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -160580,6 +160579,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/structure/curtain/black,
/turf/simulated/floor/plating,
/area/maintenance/firstdeck/forestarboard)
"xOH" = (
Expand Down Expand Up @@ -254081,7 +254081,7 @@ oHY
ngK
cpu
nFK
rDz
mDY
vEe
vEe
vEe
Expand Down
2 changes: 1 addition & 1 deletion mods/sauna_props/_sauna_props.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/singleton/modpack/sauna_props
name = "Sauna Props"
desc = "Импортирует с Final Destination пропы для бани."
author = "KandJX"
author = "KandJX(Импортировал), DarkSoviet(Автор)"
29 changes: 18 additions & 11 deletions mods/sauna_props/code/sauna_props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,40 @@
T.clean(src, user)
to_chat(user, "<span class='notice'>You have finished mopping!</span>")

/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"

0 comments on commit ffbd5cd

Please sign in to comment.