Skip to content

Commit

Permalink
[FEAT] Towels (#1126)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Добавляет в игру полотенца и их разноцветные вариации. Они представляют
из себя костюмы без датчиков, что можно надеть на себя. Выглядят как
неплохой дрип для бани или сауны. Раскиданы по всем отделам и главам.
<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры
РП в душе? Такое нам надо. Также можно будет их сделать как дрип для
сауны или бани.
<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Изображения изменений

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/96c4f920-0dfc-4b49-90cd-32200a57345a)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/d01e7fbc-afd2-4f93-9917-46691fe4c7de)
<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

## Тестирование
Запустил локалочку. Работает всё отлично, иконка отрисовывается, на
куклах отрисовывается, красится хорошо.

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/fb7e23aa-c8b8-4417-a491-61be0d85ae91)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/b784ad0a-e3fc-407a-8f6b-e73f77c855b0)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/ae079375-528c-41e3-98f6-4209193346e4)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/91be4d41-33d5-46d6-99e2-56d75e7a3981)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/fc1372a1-0f48-4cdb-8f3a-2d8db8ccb3a3)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/4157dee6-fa0d-40ed-92a4-6c2266542415)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/a36cd940-0fcf-4e6a-8b22-e823152f2016)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/8cdec646-99a6-4a0e-8463-b8efed783aa8)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/d1b51a9b-73e6-4b5e-b289-68532f198c6a)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/c174ba98-506f-43d0-a47b-88e61eb7a93f)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/b53cf69c-8345-4a56-8ee2-1aaa3334fc28)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/e70e53fd-38fc-4722-8e14-7baa79ef2ea6)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/984f9dfa-638d-454d-ae17-935810227f01)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/deb54359-1b8b-434c-8368-7b003b4d2967)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/d47d6df7-ee10-43ad-95a0-8ac4abb74fd2)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/eb77d8e1-a0dd-4dd0-840c-9cf93c6ec726)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/76638cd2-a81d-4eb3-b302-8ba5b9e26440)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/5d3a178e-824f-4cb3-a3ff-e6bbd417e02c)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/752c6340-cf26-4acf-8229-5aa1131d7bea)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/7206b91d-60eb-484f-ad17-62b6be41c791)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/56632fc8-4a58-4681-bc7a-5657f7ce8352)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/86246806-7592-4672-9c5a-83da8ef298d5)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/6dd949b8-602d-4c68-a5c6-0c4b244f7a8a)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/d5079960-0a79-46f1-9dae-b65fbc3e0743)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/418f3c92-85fe-4345-8699-87ac12c7ea08)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/e8adee47-e206-4712-9ab9-913693bb42d9)

![image](https://github.com/ss220club/Paradise-SS220/assets/130075022/f1a16681-de42-4e44-9989-153e8ffa8068)

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

:cl:
add: Добавлены полотенца. Их можно найти в душевой дорм и у глав.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

---------

Co-authored-by: dj-34 <[email protected]>
Co-authored-by: Aylong <[email protected]>
  • Loading branch information
3 people authored Mar 30, 2024
1 parent f772fa7 commit b2dea59
Show file tree
Hide file tree
Showing 20 changed files with 441 additions and 5 deletions.
23 changes: 23 additions & 0 deletions _maps/map_files220/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17190,6 +17190,12 @@
/obj/machinery/light_switch/east{
pixel_y = -6
},
/obj/item/clothing/under/towel_long_alt/blue{
pixel_y = -5
},
/obj/item/clothing/head/towel/blue{
pixel_y = 6
},
/turf/simulated/floor/wood,
/area/station/command/office/captain/bedroom)
"bnF" = (
Expand Down Expand Up @@ -23176,6 +23182,17 @@
"bEr" = (
/obj/structure/dresser,
/obj/structure/sign/poster/official/random/south,
/obj/item/clothing/under/towel_long{
pixel_x = -7;
pixel_y = -3
},
/obj/item/clothing/under/towel_short{
pixel_x = 8;
pixel_y = -5
},
/obj/item/clothing/head/towel{
pixel_y = 7
},
/turf/simulated/floor/plasteel{
icon_state = "barber"
},
Expand Down Expand Up @@ -57362,6 +57379,12 @@
/obj/structure/dresser,
/obj/machinery/light/small/directional/north,
/obj/machinery/newscaster/directional/north,
/obj/item/clothing/under/towel_long/green{
pixel_y = -5
},
/obj/item/clothing/head/towel/green{
pixel_y = 6
},
/turf/simulated/floor/wood,
/area/station/service/theatre)
"jnc" = (
Expand Down
76 changes: 71 additions & 5 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26105,6 +26105,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 @@ -46600,18 +46601,18 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"edp" = (
/obj/item/cartridge/engineering{
pixel_x = 3
},
/obj/structure/table,
/obj/item/cartridge/engineering{
pixel_x = -3;
pixel_y = 2
},
/obj/item/cartridge/engineering{
pixel_x = 3
},
/obj/item/cartridge/engineering{
pixel_x = 4;
pixel_y = 5
},
/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
Expand Down Expand Up @@ -53488,6 +53489,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 @@ -54549,7 +54558,6 @@
/area/station/security/brig)
"gVT" = (
/obj/structure/table,
/obj/item/ashtray/glass,
/obj/machinery/light_switch/north,
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -61018,6 +61026,28 @@
c_tag = "Brig Restroom";
dir = 1
},
/obj/structure/table,
/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/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/head/towel/red{
pixel_x = 7
},
/obj/item/clothing/head/towel/red{
pixel_x = -7
},
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
Expand Down Expand Up @@ -64924,6 +64954,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 @@ -69010,6 +69042,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 @@ -79997,6 +80031,12 @@
d2 = 4;
icon_state = "0-4"
},
/obj/item/clothing/under/towel_long_alt/blue{
pixel_y = -5
},
/obj/item/clothing/head/towel/blue{
pixel_y = 5
},
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"qmX" = (
Expand Down Expand Up @@ -91952,6 +91992,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 @@ -97381,6 +97438,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
50 changes: 50 additions & 0 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6966,6 +6966,8 @@
req_one_access_txt = "19";
pixel_x = -8
},
/obj/item/clothing/under/towel_long_alt/brown,
/obj/item/clothing/head/towel/brown,
/turf/simulated/floor/carpet/orange,
/area/station/supply/qm)
"aEM" = (
Expand Down Expand Up @@ -12634,6 +12636,8 @@
/obj/structure/mirror{
pixel_x = 26
},
/obj/item/clothing/under/towel_long_alt/cyan,
/obj/item/clothing/head/towel/cyan,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -23086,6 +23090,10 @@
"bQm" = (
/obj/structure/dresser,
/obj/machinery/status_display/directional/north,
/obj/item/clothing/under/towel_long_alt/orange,
/obj/item/clothing/head/towel/orange{
pixel_y = 7
},
/turf/simulated/floor/plasteel/grimy,
/area/station/command/office/ce)
"bQo" = (
Expand Down Expand Up @@ -27119,6 +27127,10 @@
/area/station/command/office/captain/bedroom)
"cea" = (
/obj/structure/dresser,
/obj/item/clothing/under/towel_long_alt/blue,
/obj/item/clothing/head/towel/blue{
pixel_y = 7
},
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain/bedroom)
"cei" = (
Expand Down Expand Up @@ -33665,6 +33677,14 @@
dir = 8
},
/obj/machinery/alarm/directional/east,
/obj/structure/table,
/obj/item/clothing/under/towel_long_alt,
/obj/item/clothing/under/towel_long{
pixel_y = 7
},
/obj/item/clothing/head/towel{
pixel_y = 10
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/pool)
"cFJ" = (
Expand Down Expand Up @@ -41606,6 +41626,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/item/clothing/under/towel_long_alt/purple,
/obj/item/clothing/head/towel/purple{
pixel_y = 7
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
Expand Down Expand Up @@ -47077,6 +47101,10 @@
"dUJ" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/dresser,
/obj/item/clothing/under/towel_short_alt/green,
/obj/item/clothing/head/towel/green{
pixel_y = 7
},
/turf/simulated/floor/plasteel/dark,
/area/station/service/chapel/office)
"dUK" = (
Expand Down Expand Up @@ -61400,6 +61428,10 @@
/obj/machinery/light/directional/north,
/obj/machinery/light_switch/east,
/obj/structure/dresser,
/obj/item/clothing/under/towel_short_alt/blue,
/obj/item/clothing/head/towel/blue{
pixel_y = 7
},
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
"iie" = (
Expand Down Expand Up @@ -67122,6 +67154,17 @@
dir = 4
},
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/item/clothing/under/towel_short_alt,
/obj/item/clothing/under/towel_short{
pixel_y = 7
},
/obj/item/clothing/under/towel_short{
pixel_y = 7
},
/obj/item/clothing/head/towel{
pixel_y = 10
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/pool)
"jVi" = (
Expand Down Expand Up @@ -85622,6 +85665,9 @@
icon_state = "2-8"
},
/obj/effect/landmark/start/assistant,
/obj/item/clothing/head/towel{
pixel_y = -7
},
/turf/simulated/floor/plasteel/freezer,
/area/station/public/pool)
"pLI" = (
Expand Down Expand Up @@ -93437,6 +93483,10 @@
"sjM" = (
/obj/structure/dresser,
/obj/machinery/light_switch/north,
/obj/item/clothing/under/towel_long_alt/red,
/obj/item/clothing/head/towel/red{
pixel_y = 7
},
/turf/simulated/floor/carpet/black,
/area/station/command/office/hos)
"sjT" = (
Expand Down
6 changes: 6 additions & 0 deletions modular_ss220/clothing/_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@
name = "Одежда"
desc = "Всё для модного приговора."
author = "Aylong220, Yata9arasu"

/datum/modpack/clothing/initialize()
. = ..()
GLOB.cloth_recipes += list(
new /datum/stack_recipe("полотенце", /obj/item/clothing/under/towel_long, 4, time = 1 SECONDS)
)
56 changes: 56 additions & 0 deletions modular_ss220/clothing/code/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,59 @@
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/hats.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/hats.dmi',
)

/obj/item/clothing/head/towel
name = "шапка из полотенца"
desc = "Полотенце замотанное в импровизированную шапку. Можно надеть на голову."
icon = 'modular_ss220/clothing/icons/object/hats.dmi'
icon_state = "towel_head"
item_color = "towel_head"
sprite_sheets = list(
"Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi',
"Human" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/hats.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Plasmaman" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/hats.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/hats.dmi',
)

/obj/item/clothing/head/towel/red
name = "красная шапочка из полотенца"
color = "#EE204D"

/obj/item/clothing/head/towel/green
name = "зелёная шапочка из полотенца"
color = "#32CD32"

/obj/item/clothing/head/towel/blue
name = "синяя шапочка из полотенца"
color = "#1E90FF"

/obj/item/clothing/head/towel/orange
name = "оранжевая шапочка из полотенца"
color = "#FFA500"

/obj/item/clothing/head/towel/purple
name = "фиолетовая шапочка из полотенца"
color = "#DA70D6"

/obj/item/clothing/head/towel/cyan
name = "голубая шапочка из полотенца"
color = "#40E0D0"

/obj/item/clothing/head/towel/brown
name = "коричневая шапочка из полотенца"
color = "#DEB887"
Loading

0 comments on commit b2dea59

Please sign in to comment.