-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Одежда из стильномата, часть 1 (#293)
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> **Медиа** <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> 🆑 - add: Добавлено веселье! - remove: Убрано веселье! - tweak: Изменено веселье! - fix: Исправлено веселье!
- Loading branch information
Showing
137 changed files
with
1,269 additions
and
13 deletions.
There are no files selected for viewing
5 changes: 0 additions & 5 deletions
5
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belt.ftl
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,14 @@ | ||
ent-ADTClothingBeltSheathOCK = сабельные ножны ЦентКом | ||
.desc = Это зелёные ножны которые выдают только лучшим из ЦК. Ходят слухи что сабля в них может уменьшать зарплату. | ||
ent-ADTClothingBeltBlackSuspenders = чёрные подтяжки | ||
.desc = Обычные чёрные подтяжки, сделанные из эластичной ленты, с добавлением резины. Производство компании "Modeling Agency Dar-Vaxed". | ||
ent-ADTClothingBeltBrownSuspenders = кожанные подтяжки | ||
.desc = Обычные подтяжки из грубой кожи. Производство компании "Modeling Agency Dar-Vaxed". | ||
ent-ADTClothingBeltMedicalSecurity = охранно-медицинский пояс | ||
.desc = Довольно тонкий и при этом оснащённый всеми нужными креплениями пояс, для хранения охранного и медицинского арсенала. | ||
ent-ADTClothingBeltMedicalSecurityFilled = охранно-медицинский пояс | ||
.desc = Довольно тонкий и при этом оснащённый всеми нужными креплениями пояс, для хранения охранного и медицинского арсенала. | ||
.suffix = { "Полный" } |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
ent-ADTClothingEyesGlassesBlueshield = очки офицера синего щита | ||
.desc = Продвинутые охранные очки, оснащённые не только охранным HUD, но и медицинским, давая полные показатели здоровья цели, но и защищая от вспышек. | ||
ent-ADTClothingEyesGlassesPink = розовые очки | ||
.desc = Не замечай недостатков этого мира. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/misc.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
ent-ADTClothingNeckGoldChain = золотая цепь | ||
.desc = Цепь, сделанные из золота. | ||
ent-ADTSpaceSecToken = жетон сотрудника SPACE SEC | ||
.desc = Жетон показывающий вашу принадлежность к корпорации SPACE SEC. | ||
.desc = Жетон показывающий вашу принадлежность к корпорации SPACE SEC. | ||
4 changes: 4 additions & 0 deletions
4
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/ties.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
ent-ADTClothingNeckBlueTie = синий галстук с зажимом | ||
.desc = Имей CEO MINDSET | ||
ent-ADTClothingNeckGoldTie = золотистый галстук | ||
.desc = Дорого-богато. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
ent-ADTClothingOuterWinterBlueshield = куртка офицера синего щита | ||
.desc = Зимняя куртка Офицера Синего Щита с вшитыми пластинами, призванная защитить не только от холода, но и от небольших физических повреждений. | ||
ent-ADTClothingOuterWinterRussianCoat = русский пуховик | ||
.desc = Используется на экстремально холодных фронтах, сделан из натуральный шерсти. Производство компании "Modeling Agency Dar-Vaxed" и Текстильный комбинат СССП, улица Сталинавская. |
8 changes: 8 additions & 0 deletions
8
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/misc.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
ent-ADTClothingFootLightShoes = дамские туфли | ||
.desc = Элегантные туфли на высоком каблуке. Производство компании "Modeling Agency Dar-Vaxed" | ||
ent-ADTClothingFootWhiteSandals = белые сандали | ||
.desc = Для тёплых сезонов станции. | ||
ent-ADTClothingFootBlackBoots = чёрные сапоги | ||
.desc = В них удобно бегать хулиганам! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
ent-ADTVendingMachinePatholoDrobe = ПатологоШкаф | ||
.desc = Самая стильная одежда в самом отдалёном месте медицинского отдела. | ||
.desc = Самая стильная одежда в самом отдалёном месте медицинского отдела. | ||
ent-ADTVendingMachinePrazatClothing = СтильноМат | ||
.desc = Особый вид автомата с одеждой, выдающий нестандартную одежду. Одобрен бюро по контролю за стилем NanoTrasen. |
35 changes: 35 additions & 0 deletions
35
Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/prazatclothing.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
- type: vendingMachineInventory | ||
id: ADTPrazatClothesMateInventory | ||
startingInventory: | ||
ADTClothingHeadHatCinnamonFlatCap: 5 | ||
ADTClothingHeadHatGreyFlatCap: 5 | ||
ADTClothingEyesGlassesPink: 5 | ||
ADTClothingNeckGoldChain: 5 | ||
ADTClothingNeckBlueTie: 5 | ||
ADTClothingNeckGoldTie: 5 | ||
ADTClothingUniformJumpsuitDenimPants: 5 | ||
ADTClothingUniformJumpsuitDenim: 5 | ||
ADTClothingUniformJumpsuitCamouflageTshirt: 5 | ||
ADTClothingUniformJumpsuitCamouflageTshirtDesert: 5 | ||
ADTClothingUniformJumpsuitSerious: 5 | ||
ADTClothingUniformJumpsuitBlackShirt: 5 | ||
ADTClothingUniformJumpsuitBlueShirt: 5 | ||
ADTClothingUniformJumpsuitPurpleShirt: 5 | ||
ADTClothingUniformJumpsuitRedShirt: 5 | ||
ADTClothingUniformJumpsuitFancyShirt: 5 | ||
ADTClothingUniformJumpsuitRedPlaidShirt: 5 | ||
ADTClothingUniformJumpsuitHawaiiShirt: 5 | ||
ADTClothingUniformJumpsuitGothicAttire: 5 | ||
ADTClothingUniformJumpsuitOldGreySuit: 5 | ||
ADTClothingUniformJumpsuitOldBrownSuit: 5 | ||
ADTClothingUniformJumpsuitSweatshirtBright: 5 | ||
ADTClothingOuterGraySweatshirtTop: 5 | ||
ADTClothingOuterBlackSweatshirtTop: 5 | ||
ADTClothingOuterWinterRussianCoat: 5 | ||
ADTClothingBeltBlackSuspenders: 5 | ||
ADTClothingBeltBrownSuspenders: 5 | ||
ADTClothingFootLightShoes: 5 | ||
ADTClothingFootWhiteSandals: 5 | ||
ADTClothingFootBlackBoots: 5 | ||
contrabandInventory: | ||
ADTClothingUniformJumpsuitAnarchyTshirt: 3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,22 @@ | ||
- type: entity | ||
parent: ClothingNeckBase | ||
id: ADTClothingNeckGoldChain | ||
name: golden chain | ||
description: A chain made of gold. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Neck/Misc/gold_chain.rsi #спрайты от prazat911 | ||
- type: StaticPrice | ||
price: 500 | ||
|
||
- type: entity | ||
parent: ClothingNeckBase | ||
id: ADTSpaceSecToken | ||
name: space sec token | ||
description: The standard token of the space sec corporation | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Neck/space_sec_token.rsi | ||
sprite: ADT/Clothing/Neck/space_sec_token.rsi | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
- type: entity | ||
parent: ClothingNeckBase | ||
id: ADTClothingNeckBlueTie | ||
name: blue tie | ||
description: Have a CEO MINDSET | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Neck/Ties/blue_tie.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Neck/Ties/blue_tie.rsi #спрайты от prazat911 | ||
- type: StaticPrice | ||
price: 150 | ||
|
||
- type: entity | ||
parent: ClothingNeckBase | ||
id: ADTClothingNeckGoldTie | ||
name: golden tie | ||
description: Expencive. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Neck/Ties/gold_tie.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Neck/Ties/gold_tie.rsi #спрайты от prazat911 | ||
- type: StaticPrice | ||
price: 150 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.