From 59ac760d8d66a2b797ebf6bd659f347c1a8d73c3 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Wed, 6 Mar 2024 15:47:46 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BB=D0=B0=D1=89=5F=D0=90=D0=B0?= =?UTF-8?q?=D1=80=D0=BE=D0=BD=D0=B0(=D0=B8=D0=BC=D0=B5=D0=BD=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=5F=D0=B2=D0=B5=D1=89=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/clothing/outerclothing/coats.ftl | 2 ++ .../Entities/Clothing/OuterClothing/coats.yml | 15 +++++++++++++++ .../coat_aaron.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 380 bytes .../Coats/coat_aaron.rsi/icon.png | Bin 0 -> 226 bytes .../Coats/coat_aaron.rsi/meta.json | 18 ++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl index a26135bf699..9ac08c7be70 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -46,3 +46,5 @@ ent-ClothingOuterCoatLabSeniorResearcher = лабораторный халат .desc = Халат, защищающий от небольших разливов химикатов. Имеет фиолетовый воротник и отделку на запястьях. ent-ClothingOuterCoatLabSeniorPhysician = лабораторный халат доцента .desc = Халат, защищающий от небольших разливов химикатов. Имеет светло-голубые рукава и оранжевую отделку на талии. +ent-ClothingOuterCoatAaron = плащ Аарона + .desc = Потрёпанный ноской тёмный плащ, от которого сильно пахнет сигаретным дымом. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index f92e533a895..a48157ada5c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -398,3 +398,18 @@ sprite: Clothing/OuterClothing/Coats/space_asshole.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/space_asshole.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatAaron + name: aaron trenchcoat + description: A battered dark raincoat that smells strongly of cigarette smoke. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/coat_aaron.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/coat_aaron.rsi + - type: StorageFill + contents: + - id: SmokingPipeFilledTobacco + - id: FlippoEngravedLighter \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d676173b6a319b1c45762f7c3855eac83d0542f9 GIT binary patch literal 380 zcmV-?0fYWhNk&F=0RRA3MM6+kP&iCz0RR9mKfn(VN1&)}Bxify{T_d6he~MxplO!m z5=ms3C%H&Paj_Q!&Yl$7Gg=cmD$}TEe$qS zN-;@;?Q7B?N|{n7G*x#clo#R!;^H1KAr?$D3Y3J{pycibRU!5fQ8%{{DK`VM-VDep z%!XBQ#Uis}8WrQn90}z$Y9Kf;4-jz(^nW=?Um3A#bI++7l&-n&@^M7ALoPk}^_P1j zc`ZHi^yMAGb=`ZePYg=ey7ZiF9}%uf8C5RE^W_0*neGscEGZJ2wXJH*vv a#Maeq_@UH>0b{P(p?!)`2-F<{{UHJiD6HH7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/coat_aaron.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0427d7d89eaeb2121b68bec872abf12041cc4567 GIT binary patch literal 226 zcmV<803H8QNk&H600012MM6+kP&iD@0000lAHW9?XP}^M8>a342#i0qp;8k`k{UcF z0T*5TsGw~dre~i&(-D~e06T`lsY^vKh7-@iVfa) Date: Wed, 6 Mar 2024 16:06:05 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B6=D0=B8=D0=B3=D0=B0=D0=BB=D0=BA=D0=B8=20fli?= =?UTF-8?q?ppo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/entities/objects/tools/lighters.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl index df398250ae1..b1f267dc5ac 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl @@ -2,3 +2,5 @@ ent-Lighter = простая зажигалка .desc = Простая пластмассовая зажигалка. ent-CheapLighter = дешёвая зажигалка .desc = Опасно дешёвая пластиковая зажигалка, не обожгите большой палец! +ent-FlippoEngravedLighter = зажигалка с гравировкой flippo + .desc = A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever. From fba3042d27884f565c67ede8adfa5f9d7cf9a248 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Wed, 6 Mar 2024 16:21:00 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B6=D0=B8=D0=B3=D0=B0=D0=BB=D0=BA=D0=B8=20fli?= =?UTF-8?q?ppo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/entities/objects/tools/lighters.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl index df398250ae1..b1f267dc5ac 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl @@ -2,3 +2,5 @@ ent-Lighter = простая зажигалка .desc = Простая пластмассовая зажигалка. ent-CheapLighter = дешёвая зажигалка .desc = Опасно дешёвая пластиковая зажигалка, не обожгите большой палец! +ent-FlippoEngravedLighter = зажигалка с гравировкой flippo + .desc = A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever. From 00ca2fbdd59af9dc976702165399ea253a7d739c Mon Sep 17 00:00:00 2001 From: Darki255 Date: Wed, 6 Mar 2024 16:25:35 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B6=D0=B8=D0=B3=D0=B0=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/entities/objects/tools/lighters.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl index b1f267dc5ac..0b86886d4fa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/lighters.ftl @@ -3,4 +3,4 @@ ent-Lighter = простая зажигалка ent-CheapLighter = дешёвая зажигалка .desc = Опасно дешёвая пластиковая зажигалка, не обожгите большой палец! ent-FlippoEngravedLighter = зажигалка с гравировкой flippo - .desc = A rugged golden lighter, lasts quite a while. Engravings serve no tactical advantage whatsoever. + .desc = Прочная золотая зажигалка, служит довольно долго. Гравировки не дают никаких тактических преимуществ.ы