From 761dc6f44a14004806ded37a1d2cb1b514ff1914 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sun, 21 Apr 2024 18:59:58 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=81=D1=82=D0=BE=20?= =?UTF-8?q?=D1=82=D1=91=D0=BC=D0=BD=D1=8B=D0=B9=20=D0=B1=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B2=20=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/Clothing/Head/hats.ftl | 3 ++ .../ADT/Entities/Clothing/Head/Hats/hats.yml | 16 ++++++++++ .../Inventories/clothesmate.yml | 1 + .../equipped-HELMET-hamster.png | Bin 0 -> 398 bytes .../Hats/beret_black.rsi/equipped-HELMET.png | Bin 0 -> 387 bytes .../Head/Hats/beret_black.rsi/icon.png | Bin 0 -> 271 bytes .../Head/Hats/beret_black.rsi/inhand-left.png | Bin 0 -> 336 bytes .../Hats/beret_black.rsi/inhand-right.png | Bin 0 -> 316 bytes .../Head/Hats/beret_black.rsi/meta.json | 30 ++++++++++++++++++ 9 files changed, 50 insertions(+) create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/beret_black.rsi/meta.json 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 0000000000000000000000000000000000000000..b81ca121fcb22001bcba8cef18f8895e974c823c GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zJv?0;Ln`LH zy|p**kby|s!|AJnjuxcM+3U7XXq|0%Q^0qLBL`aUF!m?~thU&)WW{}BRhFVU4xQ%> z9UUDf>`hnyb?7mi{y6tK)kez)Ox4qSADfk@1W18i8HI)fdS0m>FVdQ&MBb@06reF4FCWD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b5ca92a69f4c78361ae19a8a4645e9e368a6da72 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ9QEaLn`LH zy>+mw*+8WAp|OEMiQuIl3{Lm{FYG#Fw{gd`GmG4oY;m5vO8LzHwOL1FidWseqy4v7 z-c-Eueel0K?Fyb<*R!uinaz{jD>zIb8(Xk8(HczkW zmIrHmpD&we_^j+rjNQ~MCk?KIoj)@#OC1lK^rh75WUh?Uy**2I)?M4SHbn5yX~sMG zcJ{xjf3IC<=yvb-B7r!*gvcHIiPy{Rs)LMm`OW?&&e^K@pHcSg#P_^FKS6-|hi^3p zf^z%odVg*Gd+OEC2K7}{U*2EqH@x?Zb=SHbw(%kjo6RJXMUrFq)Xp3hs@`(ux4^T9 z9XjW^d^R(?DvH=M9yZWu|L{WX+lRZQtJj8#9GLRv@b~<}y5Q{VE27@)bP0l+XkKSahnN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7cc18cd367e2a90ee51a09581fc98b4677ab6d20 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Cp}#pLn2z= zPI2TqtRUc8zp(lv!$E15_w~{*8QBUI*_vXvsG0S4nmL(&4pa2`li$|KaM*z7b9!F5 z-882oZ>=|NdwJ&f)CYmDO=rCLn&6Won7PUKU~|xfpm)~<1m%t`2wPOe6x3mnwYMy4 zRdu&&ryhu>@wM>7J(hD%>V!NVE}fWv*qP(Qz3+l2to@&KPiJ5LA#7E7L&v^l6UuFU zg&7j&rCVgLX64&%a{rgmxt*#K2ZZjuHP`W!$*nw{8WMWr@v&rywnQ%*#@9cSl4qT% R{t5IHgQu&X%Q~loCIAhlZrT6< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b54cfae4f688c3db033cd8d15cc5b7e7c2cc03c4 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjbDQLn`LH zz2%tKY#`A3@cOEx_5i*BrTB*5^2)DRCrqtfCMf8Ub4OHADbu+-w((QFcJtFjiJRK} zEI^|e7(S%L1+kQ#YfX%~{&oF+!?^#IRwvIrSE=;66#b^*+|Gb$Pk)3?cqX2-%kF&f z$=?%JaRfH^O*S{)nyc;kYL{Q+G+UiRC4X;R{H5s|$ zPZm0xw7UXALo2>8dp}y&<-hn+(z0fy z1q#NAr+@SRwQqml**CZBCp`aocdlXh7ru!hw@$mtw;%rcvvz;KP`R;tLROXN{#(a5 dfu^mwBJNn0a(BM|)L@XeJYD@<);T3K0RVW!j%EM= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c4ec676c01a59471224cbbe4418ec4dfc5706a74 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|zInPhhE&XX zd&}`uvw=X{!}S4oJU=isiGTRFed2|^ndW*dp5fC>e1HAl8sPKWPJ8AI1LKtG6M-6m zpze&K=$l>V*55yDpz{CbW`qBqEl$Pi-IVHEc{cZUo1*^I%N-W~cdb*+u3g7jez0J3 zvEOBr%t*1bpVzEfRd&C{;{Sz{x1RX!V7+$soaNj#wHAMFn%r^ z{+Bwe{1(@WJjLqa& z3cKLB$3N=A Date: Sun, 21 Apr 2024 19:11:08 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9D=D1=83=20=D1=82=D0=B8=D0=BF=D0=BE=20?= =?UTF-8?q?=D1=87=D0=B5=D0=B9=D0=BD=D0=B6=D0=BB=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 3c045fa6828..2c52d625be4 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -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'