diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index c31afebd522..6533679561e 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1692,6 +1692,7 @@ Entries: - author: Шрёдингер changes: + - {message: "NanoTrasen наладило производство чёрных беретов для обычных гражданских. Новая обновка будет помещена во все одеждоматы рядом с красными беретами.", type: Add} - {message: "Акты био терроризма резко упали в количестве до нуля.", type: Remove} - id: 55734 - time: '2024-04-22T08:20:00.0000000+00:00' + id: 55734 #костыль отображения в Обновлениях + time: '2024-04-21T08:20:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl index 62085f71128..63ed14cf47a 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl @@ -186,3 +186,6 @@ ent-ClothingNeckCloakCentcom = плащ Центком ent-ClothingHeadHatCentcomcap = фуражка Центком .desc = Экстравагантная причудливая фуражка центрального командира. + +ent-ADTClothingHeadHatBeretBlackCivilian = чёрный берет + .desc = Этот тёмный берет из мягкой ткани прилегает к голове как уютный оберег от холода. Его простой и классический дизайн делает его универсальным аксессуаром для любого стиля одежды. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index e0e74d5ad28..a6b2f88d877 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 40be8cf9789..d19c1e56933 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -23,6 +23,7 @@ ADTClothingBackpackLeatherLadySatchel: 2 # ADT сумки конец ClothingHeadHatBeret: 2 + ADTClothingHeadHatBeretBlackCivilian: 2 # ADT Кастомный чёрный берет ClothingHeadBandBlack: 1 ClothingHeadBandBlue: 1 ClothingHeadBandGreen: 1 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET-hamster.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..b81ca121fcb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..b5ca92a69f4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/icon.png new file mode 100644 index 00000000000..7cc18cd367e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-left.png new file mode 100644 index 00000000000..b54cfae4f68 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-right.png new file mode 100644 index 00000000000..c4ec676c01a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/meta.json new file mode 100644 index 00000000000..2749b26796b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/meta.json @@ -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 + } + ] +}