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

Просто тёмный берет в одеждомат. #645

Merged
merged 3 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 6 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1689,3 +1689,9 @@ Entries:
- {message: "Возращаем старый хот бар, быстрых действий слева.", type: Tweak}
id: 55733 #костыль отображения в Обновлениях
time: '2024-04-16T08:20:00.0000000+00:00'

- author: Шрёдингер
changes:
- {message: "NanoTrasen наладило производство чёрных беретов для обычных гражданских. Новая обновка будет помещена во все одеждоматы рядом с красными беретами.", type: Add}
id: 55734 #костыль отображения в Обновлениях
time: '2024-04-21T08:20:00.0000000+00:00'
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,6 @@ ent-ClothingNeckCloakCentcom = плащ Центком

ent-ClothingHeadHatCentcomcap = фуражка Центком
.desc = Экстравагантная причудливая фуражка центрального командира.

ent-ADTClothingHeadHatBeretBlackCivilian = чёрный берет
.desc = Этот тёмный берет из мягкой ткани прилегает к голове как уютный оберег от холода. Его простой и классический дизайн делает его универсальным аксессуаром для любого стиля одежды.
16 changes: 16 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,3 +711,19 @@
sprite: ADT/Clothing/Head/Hats/redji_hat.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/redji_hat.rsi

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatBeretBlackCivilian
name: black beret
description: A black beret.
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hats/beret_black.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_black.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
ADTClothingBackpackLeatherLadySatchel: 2
# ADT сумки конец
ClothingHeadHatBeret: 2
ADTClothingHeadHatBeretBlackCivilian: 2 # ADT Кастомный чёрный берет
ClothingHeadBandBlack: 1
ClothingHeadBandBlue: 1
ClothingHeadBandGreen: 1
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprite by discord: schrodinger71",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading