From 7d13ec168a9372fb2cdd89cdebaf8ec89f691ae1 Mon Sep 17 00:00:00 2001 From: RipZoro1 Date: Fri, 26 Jul 2024 22:27:28 +1200 Subject: [PATCH 1/2] =?UTF-8?q?=D1=88=D0=B8=D0=BD=D0=B5=D0=BB=D1=8C=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D0=B4=D0=B5=D1=82=D0=B0=20?= =?UTF-8?q?=D0=A1=D0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Clothing/OuterClothing/clothing.ftl | 2 ++ .../Clothing/OuterClothing/hardsuit.yml | 18 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1369 bytes .../Coats/kadet_trenchcoat.rsi/icon.png | Bin 0 -> 521 bytes .../Coats/kadet_trenchcoat.rsi/meta.json | 18 ++++++++++++++++++ 5 files changed, 38 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/clothing.ftl create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/clothing.ftl b/Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/clothing.ftl new file mode 100644 index 00000000000..f60ebe76e54 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Clothing/OuterClothing/clothing.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingKadet = шинель для Кадетов СБ + .desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml index 0e7d2713e6f..d96ff459cd5 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml @@ -21,3 +21,21 @@ - type: ClothingSpeedModifier walkModifier: 0.9 sprintModifier: 0.9 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingKadet + name: kadet greatcoat + description: a greatcoat made for recruits to the security service. It is very similar to the overcoat of the junior ranks of RIA + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.3 + Piercing: 0.3 + Heat: 0.4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..8faf86dc348ced81a8f2476d48024751cc46fe59 GIT binary patch literal 1369 zcmV-f1*ZCmP)mRNri#JKw+RT zP#7o-6b1?d|4#;Xc!vG%!Tsy#|Mth7p?)cu2P35`jHi#D4yo;YWoK-w^KD4kGz<;I z$Oc7#0R?1w{~O`0WHgl@zrPkf zI{I-Od`b@z&_ln?B>V$&Z$`5W_SxE#aN)_u`KwV1DNH^#>=8g;Nh#H;svQ z8k9?j9{SaG$-OzVZ}A!A?Cflqd+SgfEIDD!!k`1H$J z1xW%d5`!bSytaF?HWt7>a*<&Bwo%4DX=P<4Oib>Id!K<43#ijhl3uK2{A`>Z2}J@8 zX?gXp9n9#JD_6t9!rMbV6o}CKN4VY=5tn|w7_o@z<5ma=SWdf;6I=$vN-*u*l$0nLP!wOQ5-6X0x8U2-cMSI#EDM%3yG zupm~?wr{np{ZHT{;uH8t=NiSA1ezFO$wyG;YGhlUImU1Hkv;s~YKOCR76scd9 zL0dl?5wLG++S=H*Ah-#%rHYFHJ%;MpKt8B0x!SwPb-wceq(5-f?!`<#2ULymkH)!+ z%OUKVh-dxs>d#Syz_aJv58=d-`EaS)sl__S9Fbm6ebzMXO^(5=`v8D!bgg^P87H^S zHZ5C>Q8wy)8>L&?3j>9L!a!l5Fi;pM3={?m1BHRYKw-ec0QY`f-Tis|knUFeab1WA zklSDW_ZG0oP%gbLa$#6(d}(?k?Iu7D9DMI^Bmr=d!E0>EyBfSOgiDSuq$b$e7a{`a z&A%VP9^dYV-P66W_V>nXbFRa<9QC}FiH4j%43b-DU4u{Vn+fs-Q~l-3E+5=0fB~PK zxEBWxn9_FM3|lOGU?T8IlOdmSayJ3*T)iH?e|07t`sG57{cX{~7kt7uZ*mjB*BYer zdndhEo$1RL`Q`y~6M%8M1a%eOGzxp1m9DUaUG+(NIk`IsVpM^SfJ7AL`yAcNOO^xP zL`RVx67{^0Ceb7XbvnGoPLue1B)()G#Yv_UjxP*9L}N z0oDh6vjKXXE#xi&WRPG3us%+tJvA%p*H&(^@Bv>G9K9IXrvLyfFBsM`<8hRui2T1e z1%$2RP`;7d;Fu!C^>!FTL}6ZsvlJmh&*UkPu4I}32CU=Qi{&OjYy+ghYxZ%X>jVbm zgUMvz13Ah1mg`6M7QmqPnYI9J`YzzB%hy`_J`lU9#GZ$QFBj(G_X>IhW+jkvmp{5L z0_Z>z5gWCQUk|A5*R=d1_|Vk%(yuU37>sgD2v01jnXNoGw=04e|g b00;m8000000Mb*F00000NkvXXu0mjfzk`H^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8bcf22eac1747f1b8d828f94c9fc557f2bc66e6d GIT binary patch literal 521 zcmV+k0`~ohP)1i{ZUPgPw4tL)jMscI4O`H*t%5wWaaf!y{#6N@B8rqO)J28 zo~H&5j#Swi*>d)@rtve-i{@+ZwMamvavkb4k`r-=M;_U1V2IeeZo<>!lQ0*@ z4qt>dFBGPK)x++GG>>N>1!4uj&pL|Z3(;tMcSn`hOE5(Qeu$YD2{IJ%67amOjZLnq z`MHINo<>Op0OuT=3k-0%xI7E(@TV0q0J?_Jz+`|o<#F8JZY~DE3z!UaZ3zg3$pDt1 zQ|X9-p^HcA&(N8N-F&bl07U--D8%n| zYRVfV`FX6HI|lw01K-P Date: Wed, 7 Aug 2024 07:36:20 +1200 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=B5?= =?UTF-8?q?=D0=BB=D0=BA=D0=B0=D0=B0=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Clothing/OuterClothing/hardsuit.yml | 8 ++++---- .../OuterClothing/Coats/kadet_trenchcoat.rsi/meta.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml index d96ff459cd5..8afd875093f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml @@ -35,7 +35,7 @@ - type: Armor modifiers: coefficients: - Blunt: 0.4 - Slash: 0.3 - Piercing: 0.3 - Heat: 0.4 + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.8 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/meta.json index 546e5a85db3..42afbc4e10c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/kadet_trenchcoat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8. Vox state made by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8.", "size": { "x": 32, "y": 32