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.

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

Новые вещи в лодаут #1544

Merged
merged 31 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f47ecdf
Новые вещи в лодаут
Dekupich Sep 23, 2024
5704e61
Update modular_ss220/clothing/_clothing.dm
Dekupich Sep 23, 2024
df6379d
Update modular_ss220/clothing/code/shoes.dm
Dekupich Sep 23, 2024
8100e55
Лодаут перекинут в модуль лодаута
Dekupich Sep 23, 2024
f4fb47c
Забыл убрать инклюд
Dekupich Sep 23, 2024
ac78ee5
Merge branch 'master' into New-clothes
Dekupich Sep 23, 2024
4ee9763
MARK
Dekupich Sep 23, 2024
4277a91
Update modular_ss220/clothing/code/suits.dm
Dekupich Sep 23, 2024
fa52d87
Update modular_ss220/clothing/code/suits.dm
Dekupich Sep 23, 2024
132abd6
Update modular_ss220/clothing/code/suits.dm
Dekupich Sep 23, 2024
84b308f
Правки
Dekupich Sep 23, 2024
6e40d66
Merge branch 'master' into New-clothes
Dekupich Sep 23, 2024
c0affce
Я не знаю что это было и зачем
Dekupich Sep 23, 2024
fca630e
Update modular_ss220/loadout/code/donor.dm
m-dzianishchyts Sep 23, 2024
5eac11e
Merge branch 'ss220club:master' into New-clothes
Dekupich Sep 24, 2024
c78ce1e
Правки описаний и MARK
Dekupich Sep 24, 2024
b5051c2
Фикс капитанской мантии
Dekupich Sep 24, 2024
abeb790
Фикс фикса капитанской мантии
Dekupich Sep 24, 2024
6d18c2d
Адаптация маски для унати
Dekupich Sep 24, 2024
0694e91
Улучшение спрайтов юбок
Dekupich Sep 24, 2024
5ee33f7
Merge branch 'master' into New-clothes
Dekupich Sep 25, 2024
7dbd02c
Нормальный фикс конфликта
Dekupich Sep 25, 2024
827fefe
Адаптация маски для воксов, маска теперь доступна всем расам
Dekupich Sep 25, 2024
8a17ac2
Merge branch 'master' into New-clothes
Dekupich Sep 27, 2024
6b094ca
Вещи киданов адаптированы под их новые спрайты
Dekupich Sep 27, 2024
5220809
Добавлены забытые ботинки для киданов и исправлены пиксели штанов
Dekupich Sep 27, 2024
f331965
Merge branch 'master' into New-clothes
Dekupich Sep 30, 2024
972993c
Merge remote-tracking branch 'ss220_1/master' into New-clothes
Dekupich Sep 30, 2024
126b3dd
conflict fix
Dekupich Sep 30, 2024
4969b9a
Возвращение спрайтов киданов к нынешнему виду
Dekupich Oct 2, 2024
2bf81bc
Merge branch 'master' into New-clothes
Dekupich Oct 2, 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
2 changes: 1 addition & 1 deletion modular_ss220/clothing/_clothing.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/modpack/clothing
name = "Одежда"
desc = "Всё для модного приговора."
author = "Aylong220, Yata9arasu"
author = "Aylong, Yata9arasu, Dekupich"

/datum/modpack/clothing/initialize()
. = ..()
Expand Down
56 changes: 56 additions & 0 deletions modular_ss220/clothing/code/cloaks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,59 @@
/obj/item/clothing/suit/mantle/armor/captain_black/Initialize(mapload)
. = ..()
desc = "Носится верховным лидером станции [station_name()]."

/* EI cloak */
/obj/item/clothing/suit/hooded/ei_cloak
name = "плащ Gold On Black"
desc = "Корпоративный плащ, выполненный в угольных тонах все с тем же золотым покрытием и специальным логотипом от Etamin Industry – золотой звездой."
icon = 'modular_ss220/clothing/icons/object/cloaks.dmi'
icon_state = "ei_cloak"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/cloaks.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/cloaks.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/cloaks.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/cloaks.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/cloaks.dmi',
)
AyIong marked this conversation as resolved.
Show resolved Hide resolved
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
hoodtype = /obj/item/clothing/head/hooded/ei_hood

/obj/item/clothing/head/hooded/ei_hood
name = "капюшон Gold On Black"
desc = "Капюшон, прикрепленный к плащу Gold On Black"
Dekupich marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/clothing/icons/object/hats.dmi'
icon_state = "ei_hood"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/hats.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/hats.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/hats.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/hats.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/hats.dmi',
)
flags = BLOCKHAIR
flags_inv = HIDEEARS
27 changes: 27 additions & 0 deletions modular_ss220/clothing/code/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,30 @@
icon = 'modular_ss220/clothing/icons/object/gloves.dmi'
icon_state = "bike_gloves"
icon_override = 'modular_ss220/clothing/icons/mob/hands.dmi'

/* EI gloves */
/obj/item/clothing/gloves/color/ei_gloves
name = "перчатки Gold On Black"
desc = "Качественные перчатки с золотой вставкой 999 пробы."
icon = 'modular_ss220/clothing/icons/object/gloves.dmi'
icon_state = "ei_gloves"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/gloves.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/gloves.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/hands.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/gloves.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/gloves.dmi',
)
28 changes: 28 additions & 0 deletions modular_ss220/clothing/code/mask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,31 @@
icon = 'modular_ss220/clothing/icons/object/masks.dmi'
icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'
icon_state = "breathscarf"

/* EI mask */
/obj/item/clothing/mask/breath/ei_mask
name = "дыхательная маска от EI"
desc = "Качество и надежность, а самое главное - безопасность"
Dekupich marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/clothing/icons/object/masks.dmi'
icon_state = "ei_mask"
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
species_restricted = list("Human", "Tajaran", "Vulpkanin", "Kidan", "Skrell", "Nucleation", "Skeleton", "Slime People", "Unathi", "Grey", "Abductor", "Golem", "Machine", "Diona", "Nian", "Shadow", "Drask")
AyIong marked this conversation as resolved.
Show resolved Hide resolved
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/mask.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/mask.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/mask.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/mask.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/mask.dmi',
)
29 changes: 29 additions & 0 deletions modular_ss220/clothing/code/shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,32 @@
/obj/item/clothing/shoes/clown_shoes/slippers,
)
category = CAT_CLOTHING

/* EI shoes */
/obj/item/clothing/shoes/ei_shoes
name = "ботинки Gold On Black"
desc = "Черный ботинки в классическом стиле с легким золотым напылением от корпорации Etamin Industry"
Dekupich marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/clothing/icons/object/shoes.dmi'
icon_state = "ei_shoes"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/shoes.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/shoes.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/shoes.dmi',
)
57 changes: 57 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -357,3 +357,60 @@
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi',
"Monkey" = 'modular_ss220/clothing/icons/mob/species/monkey/suits.dmi',
)

/* EI suits */
/obj/item/clothing/suit/storage/ei_jacket
name = "кожаная куртка Rock on Black"
desc = "Сочетание настоящего рокерского духа и современного стиля. При взгляде на вас, у каждого возникнет лишь одна мысль: «Это настоящий рок спирит!»"
Dekupich marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "ei_jacket_open"
ignore_suitadjust = FALSE
suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/openclose)
adjust_flavour = "unzip"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/suits.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/suits.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/suits.dmi',
AyIong marked this conversation as resolved.
Show resolved Hide resolved
)
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/storage/ei_coat
name = "офицерский плащ EI"
desc = "Этот плащ был создан специально для офицеров корпорации Etamin Industry. Если вы видите его на ком-то, то либо перед вами офицер корпорации, либо тот, кто отдал бешеные бабки за этот плащ."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "ei_coat"
species_restricted = list("Human", "Tajaran", "Vulpkanin", "Skrell", "Nucleation", "Skeleton", "Slime People", "Unathi", "Abductor", "Golem", "Machine", "Shadow")
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi',
)
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

86 changes: 86 additions & 0 deletions modular_ss220/clothing/code/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -448,3 +448,89 @@
/obj/item/clothing/under/towel/short/alt/brown
name = "коричневое махровое маленькое полотенце"
color = "#DEB887"

/* EI uniform */
/obj/item/clothing/under/ei_combat
name = "тактическая водолазка Gold on Black"
desc = "Все то же удобство, но в прекрасной гамме угольных оттенков."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "ei_combat"
item_color = "ei_combat"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/under.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
)

/obj/item/clothing/under/ei_skirt
name = "блузка с юбкой Gold on Black"
desc = "Не волнуйтесь, запачкать её будет крайне сложно, так что вы всегда будете прелестны и очаровательны. Даже если руки по локоть в крови."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "ei_skirt"
item_color = "ei_skirt"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/under.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
)

/obj/item/clothing/under/ei_skirt_alt
name = "юбка «Солнце» от EI"
desc = "Юбка «Солнце» в классических цветах корпорации EI"
Dekupich marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "ei_skirt_alt"
item_color = "ei_skirt_alt"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/under.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/under.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
)
Binary file modified modular_ss220/clothing/icons/inhands/left_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/inhands/right_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/cloaks.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/hands.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/hats.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/mask.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/shoes.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/drask/shoes.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/drask/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/drask/under.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/grey/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/grey/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/grey/under.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/kidan/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/kidan/suits.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/tajaran/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/hats.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/shoes.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/under.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vulpkanin/hats.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/suits.dmi
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/under.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/cloaks.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/gloves.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/hats.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/masks.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/shoes.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/under.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_ss220/loadout/_loadout.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/loadout
name = "Loadout"
desc = "Добавляет новые вещи в Loadout."
author = "Aylong220, Yata9arasu"
author = "Aylong, Yata9arasu, Dekupich"
55 changes: 55 additions & 0 deletions modular_ss220/loadout/code/donor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -320,3 +320,58 @@
path = /obj/item/id_skin/boykisser
donator_tier = 4
cost = 5

//MARK: EI clothes
Dekupich marked this conversation as resolved.
Show resolved Hide resolved
/datum/gear/donor/ei_cloak
display_name = "Плащ Gold On Black"
path = /obj/item/clothing/suit/hooded/ei_cloak
donator_tier = 2
cost = 2

/datum/gear/donor/ei_gloves
display_name = "Перчатки Gold On Black"
path = /obj/item/clothing/gloves/color/ei_gloves
donator_tier = 1
cost = 1

/datum/gear/donor/ei_mask
display_name = "Дыхательная маска от EI"
path = /obj/item/clothing/mask/breath/ei_mask
donator_tier = 3
cost = 3

/datum/gear/donor/ei_shoes
display_name = "Ботинки Gold On Black"
path = /obj/item/clothing/shoes/ei_shoes
donator_tier = 1
cost = 1

/datum/gear/donor/ei_jacket
display_name = "Кожаная куртка Rock on Black"
path = /obj/item/clothing/suit/storage/ei_jacket
donator_tier = 2
cost = 1

/datum/gear/donor/ei_coat
display_name = "Офицерский плащ EI"
path = /obj/item/clothing/suit/storage/ei_coat
donator_tier = 4
cost = 4

/datum/gear/donor/ei_combat
display_name = "Тактическая водолазка Gold on Black"
path = /obj/item/clothing/under/ei_combat
donator_tier = 1
cost = 1

/datum/gear/donor/ei_skirt
display_name = "Блузка с юбкой Gold on Black"
path = /obj/item/clothing/under/ei_skirt
donator_tier = 1
cost = 1

/datum/gear/donor/ei_skirt_alt
display_name = "Юбка «Солнце» от EI"
path = /obj/item/clothing/under/ei_skirt_alt
donator_tier = 1
cost = 1
Loading