Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] Towels #1126

Merged
merged 21 commits into from
Mar 30, 2024
Merged

[FEAT] Towels #1126

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
207a049
Добавляем полотенца
Chorden523 Mar 22, 2024
887d484
Полотенчики теперь на карте
Chorden523 Mar 22, 2024
367af47
Merge branch 'ss220club:master' into towels
Chorden523 Mar 23, 2024
1fe5525
Разноцветные полотенца и их добавление на мапы
Chorden523 Mar 23, 2024
fa8efc5
Убираем неиспользуемую переменную у коротких полотенец
Chorden523 Mar 23, 2024
f9ddb89
Merge branch 'master' into towels
Chorden523 Mar 23, 2024
2a2bfa9
Крафт с помощью ткани
Chorden523 Mar 23, 2024
52a34f2
Минус пробел
Chorden523 Mar 23, 2024
508fdea
Минус запятая
Chorden523 Mar 23, 2024
a3d9430
Убрал пробелы и поменял местоположения полотенцам
Chorden523 Mar 23, 2024
6ba5316
Убрал лишние изменения
Chorden523 Mar 24, 2024
f59fe2f
Merge branch 'master' into towels
Chorden523 Mar 25, 2024
307492c
Merge branch 'master' into towels
Chorden523 Mar 26, 2024
78ca55f
Merge branch 'master' into towels
Chorden523 Mar 27, 2024
756bd5a
Merge branch 'master' into towels
Chorden523 Mar 28, 2024
2cd4672
Update modular_ss220/clothing/code/under.dm
AyIong Mar 29, 2024
a7fc65a
Update modular_ss220/clothing/code/under.dm
AyIong Mar 29, 2024
03bf482
Update modular_ss220/clothing/code/under.dm
AyIong Mar 29, 2024
30fe8d0
Update modular_ss220/clothing/code/under.dm
AyIong Mar 29, 2024
7ba862f
Merge branch 'ss220club:master' into towels
Chorden523 Mar 30, 2024
74eea73
Полотенчики теперь на мета статион
Chorden523 Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 212 additions & 11 deletions _maps/map_files220/cyberiad/cyberiad.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,27 @@
/obj/structure/table,
/obj/structure/bedsheetbin,
/obj/machinery/firealarm/directional/south,
/obj/item/clothing/under/towel_short_alt/red{
pixel_x = 8;
pixel_y = -8
},
/obj/item/clothing/under/towel_short/red{
pixel_x = 8;
pixel_y = -3
},
/obj/item/clothing/under/towel_long_alt/red{
pixel_x = -8;
pixel_y = -5
},
/obj/item/clothing/under/towel_long/red{
pixel_x = -8
},
/obj/item/clothing/head/towel/red{
pixel_x = 7
},
/obj/item/clothing/head/towel/red{
pixel_x = -7
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
Expand Down Expand Up @@ -14740,6 +14761,10 @@
},
/obj/structure/table/wood,
/obj/item/lighter/zippo/black,
/obj/item/clothing/under/towel_long/green,
/obj/item/clothing/head/towel/green{
pixel_y = 5
},
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/office)
"bcx" = (
Expand Down Expand Up @@ -21672,6 +21697,7 @@
pixel_y = 8
},
/obj/item/reagent_containers/drinks/drinkingglass,
/obj/item/toy/figure/crew/cargotech,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "arrival"
Expand Down Expand Up @@ -23474,6 +23500,27 @@
/obj/structure/bedsheetbin{
pixel_y = -2
},
/obj/item/clothing/under/towel_long_alt/cyan{
pixel_y = -5;
pixel_x = -7
},
/obj/item/clothing/under/towel_long/cyan{
pixel_x = -7
},
/obj/item/clothing/under/towel_short_alt/cyan{
pixel_x = 7;
pixel_y = -8
},
/obj/item/clothing/under/towel_short/cyan{
pixel_x = 7;
pixel_y = -3
},
/obj/item/clothing/head/towel/cyan{
pixel_x = 7
},
/obj/item/clothing/head/towel/cyan{
pixel_x = -7
},
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
Expand Down Expand Up @@ -26099,6 +26146,7 @@
dir = 8
},
/obj/machinery/light/small/directional/east,
/obj/item/ashtray/glass,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
Expand Down Expand Up @@ -27482,6 +27530,30 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/table,
/obj/item/clothing/under/towel_short_alt/green{
pixel_y = -8;
pixel_x = 7
},
/obj/item/clothing/under/towel_short/green{
pixel_x = 7;
pixel_y = -3
},
/obj/item/clothing/under/towel_long_alt/green{
pixel_x = -5;
pixel_y = -5
},
/obj/item/clothing/under/towel_long/green{
pixel_x = -5
},
/obj/item/clothing/head/towel/green{
pixel_x = -7;
pixel_y = 7
},
/obj/item/clothing/head/towel/green{
pixel_x = 7;
pixel_y = 7
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -46585,18 +46657,30 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"edp" = (
/obj/item/cartridge/engineering{
pixel_x = 3
/obj/structure/table,
/obj/item/clothing/under/towel_long_alt/orange{
pixel_x = -5;
pixel_y = -5
},
/obj/item/cartridge/engineering{
pixel_x = -3;
pixel_y = 2
/obj/item/clothing/under/towel_long/orange{
pixel_x = -5
},
/obj/item/cartridge/engineering{
pixel_x = 4;
pixel_y = 5
/obj/item/clothing/under/towel_short_alt/orange{
pixel_x = 8;
pixel_y = -8
},
/obj/item/clothing/under/towel_short/orange{
pixel_x = 8;
pixel_y = -3
},
/obj/item/clothing/head/towel/orange{
pixel_y = 7;
pixel_x = 7
},
/obj/item/clothing/head/towel/orange{
pixel_x = -7;
pixel_y = 7
},
/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
Expand Down Expand Up @@ -53473,6 +53557,14 @@
pixel_x = -8;
id = "CMO_Bed"
},
/obj/item/clothing/under/towel_long_alt/cyan{
pixel_y = -5;
pixel_x = -7
},
/obj/item/clothing/head/towel/cyan{
pixel_x = -7;
pixel_y = 5
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -53938,6 +54030,17 @@
pixel_y = 1
},
/obj/item/flashlight/lamp,
/obj/item/clothing/under/towel_short_alt/green{
pixel_x = -7;
pixel_y = -5
},
/obj/item/clothing/under/towel_long_alt/green{
pixel_x = 5;
pixel_y = -5
},
/obj/item/clothing/head/towel/green{
pixel_y = -5
},
/turf/simulated/floor/wood/fancy/oak,
/area/station/service/bar)
"gMP" = (
Expand Down Expand Up @@ -54534,9 +54637,31 @@
/area/station/security/brig)
"gVT" = (
/obj/structure/table,
/obj/item/ashtray/glass,
/obj/machinery/light_switch/north,
/obj/machinery/light/directional/north,
/obj/item/clothing/under/towel_short_alt/purple{
pixel_x = 7;
pixel_y = -7
},
/obj/item/clothing/head/towel/purple{
pixel_x = 7;
pixel_y = 7
},
/obj/item/clothing/under/towel_short/purple{
pixel_x = 8;
pixel_y = -2
},
/obj/item/clothing/head/towel/purple{
pixel_y = 7;
pixel_x = -7
},
/obj/item/clothing/under/towel_long_alt/purple{
pixel_x = -5;
pixel_y = -5
},
/obj/item/clothing/under/towel_long/purple{
pixel_x = -5
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "purple"
Expand Down Expand Up @@ -56171,6 +56296,8 @@
pixel_y = 5;
pixel_x = 3
},
/obj/item/clothing/under/towel_long/brown,
/obj/item/clothing/head/towel/brown,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
Expand Down Expand Up @@ -57092,6 +57219,17 @@
pixel_x = -2;
pixel_y = 4
},
/obj/item/cartridge/engineering{
pixel_x = 4;
pixel_y = 5
},
/obj/item/cartridge/engineering{
pixel_x = 3
},
/obj/item/cartridge/engineering{
pixel_x = -3;
pixel_y = 2
},
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
Expand Down Expand Up @@ -64891,6 +65029,8 @@
pixel_y = 14
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/clothing/under/towel_long/blue,
/obj/item/clothing/head/towel/blue,
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
"kQw" = (
Expand Down Expand Up @@ -68983,6 +69123,8 @@
/obj/machinery/door_control/shutter/west{
id = "hos_secure_doors"
},
/obj/item/clothing/under/towel_long_alt/red,
/obj/item/clothing/head/towel/red,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
Expand Down Expand Up @@ -70634,6 +70776,8 @@
d2 = 8;
icon_state = "4-8"
},
/obj/item/clothing/under/towel_long/orange,
/obj/item/clothing/head/towel/orange,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
Expand Down Expand Up @@ -80432,7 +80576,29 @@
/area/station/maintenance/asmaint)
"qus" = (
/obj/structure/table,
/obj/item/toy/figure/crew/cargotech,
/obj/item/clothing/under/towel_short_alt/brown{
pixel_x = 8;
pixel_y = -7
},
/obj/item/clothing/under/towel_long_alt/brown{
pixel_x = -7;
pixel_y = -5
},
/obj/item/clothing/under/towel_short/brown{
pixel_x = 8;
pixel_y = -2
},
/obj/item/clothing/under/towel_long/brown{
pixel_x = -7
},
/obj/item/clothing/head/towel/brown{
pixel_y = 5;
pixel_x = 7
},
/obj/item/clothing/head/towel/brown{
pixel_x = -7;
pixel_y = 5
},
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"qvf" = (
Expand Down Expand Up @@ -85442,6 +85608,12 @@
/obj/effect/turf_decal/siding/white/end{
dir = 1
},
/obj/item/clothing/head/towel/blue{
pixel_y = 5
},
/obj/item/clothing/under/towel_long_alt/blue{
pixel_y = -5
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -91903,6 +92075,23 @@
"uCJ" = (
/obj/machinery/light/small/directional/east,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/item/clothing/under/towel_short_alt{
pixel_x = 5;
pixel_y = 5
},
/obj/item/clothing/under/towel_short{
pixel_y = 10;
pixel_x = 5
},
/obj/structure/table,
/obj/item/clothing/head/towel{
pixel_x = -15;
pixel_y = 5
},
/obj/item/clothing/head/towel{
pixel_x = -15;
pixel_y = 10
},
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
Expand Down Expand Up @@ -94201,6 +94390,9 @@
/obj/structure/closet/secure_closet/RD,
/obj/machinery/light_switch/west,
/obj/machinery/keycard_auth/south,
/obj/item/clothing/under/towel_short_alt/purple,
/obj/item/clothing/under/towel_long/purple,
/obj/item/clothing/head/towel/purple,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkpurple"
Expand Down Expand Up @@ -97332,6 +97524,15 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/west)
"wEb" = (
/obj/item/clothing/under/towel_long{
pixel_x = -5;
pixel_y = 5
},
/obj/item/clothing/under/towel_long_alt{
pixel_y = 10;
pixel_x = -5
},
/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
Expand Down
Loading
Loading