From 03751239adbe167ad1a59dff295b73d845a222fb Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:37:08 +0300 Subject: [PATCH 01/15] blueshield-uniform --- .../entities/clothing/uniforms/jumpsuits.ftl | 2 -- .../ss220/clothing/Jumpsuit/jumpsuit.ftl | 3 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 32 ++++++++++-------- .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 19 +++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1459 bytes .../blueshield.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1696 bytes .../Uniforms/Jumpsuit/blueshield.rsi/icon.png | Bin 0 -> 859 bytes .../Jumpsuit/blueshield.rsi/inhand-left.png | Bin 0 -> 1077 bytes .../Jumpsuit/blueshield.rsi/inhand-right.png | Bin 0 -> 1084 bytes .../Jumpsuit/blueshield.rsi/meta.json | 30 ++++++++++++++++ 10 files changed, 68 insertions(+), 18 deletions(-) create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index ee233bde03fe7b..f9dd0d06072ddf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -231,8 +231,6 @@ ent-ClothingUniformJumpsuitSyndieFormal = торжественный костю .desc = Форма Синдиката выполнена в элегантном стиле, в ней даже жалко проделывать грязные трюки. ent-ClothingUniformJumpsuitFlannel = фланелевый комбинезон .desc = Пахнет так, будто кто-то жарил на гриле. -ent-ClothingUniformJumpsuitBlueShield = униформа синего щита - .desc = Черная футболка с короткими рукавами, в паре с серыми брюками-карго из прочного материала. Стандартный комплект Синего щита. ent-ClothingUniformJumpsuitSeniorEngineer = комбинезон ведущего инженера .desc = Признак мастерства и престижа инженерного отдела. ent-ClothingUniformJumpsuitSeniorResearcher = комбинезон ведущего учёного diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl index c60369d38596ac..f1a2421604f6d6 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl @@ -28,4 +28,5 @@ ent-ClothingUniformJumpsuitTrustedLawyer = костюм доверенного .desc = Шикарный костюм для тех, кто следит за безупречным исполнением законов компании. Говорят, что вы способны навязать свои требования даже самому Богу. ent-ClothingUniformJumpsuitWarehouseman = рабочий комбинезон заведующего складом .desc = Практичный, удобный, не стесняющий движения и главное стильный комбинезон. У вас с ним связаны плохие воспоминания о прошлом начальнике - +ent-ClothingUniformJumpsuitBlueShield = униформа "Синий Щит" + .desc = Стандартная униформа ЧВК "Синий Щит", представленная в виде рубашки и брюк. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index ab521ef8a60725..4371bbfca932aa 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1132,21 +1132,23 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitBlueShield - name: blueshield's uniform - description: A short-sleeved black uniform, paired with grey digital-camo cargo pants, all made out of a sturdy material. Blueshield standard issue. - components: - - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi - - type: Armor - modifiers: - coefficients: - Slash: 0.9 - Piercing: 0.9 +# SS220-BlueShield-Fashion-Begin +# - type: entity +# parent: ClothingUniformBase +# id: ClothingUniformJumpsuitBlueShield +# name: blueshield's uniform +# description: A short-sleeved black uniform, paired with grey digital-camo cargo pants, all made out of a sturdy material. Blueshield standard issue. +# components: +# - type: Sprite +# sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi +# - type: Clothing +# sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi +# - type: Armor +# modifiers: +# coefficients: +# Slash: 0.9 +# Piercing: 0.9 +# SS220-BlueShield-Fashion-End - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index f338b4fede045c..4c5f0512f30bcc 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml @@ -15,6 +15,8 @@ sprite: SS220/Clothing/Uniforms/Jumpsuit/captain_white.rsi # Внутренние дела + + #Агент Внутренних Дел - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitNTR @@ -37,6 +39,23 @@ - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpsuit/trusted_lawyer.rsi + # ЧВК "Синий Щит" + - type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBlueShield + name: blueshield's uniform + description: The standard uniform of the PMCs "Blue Shield", presented in the form of a shirt and trousers. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi + - type: Armor + modifiers: + coefficients: + Slash: 0.9 + Piercing: 0.9 + # Сервис # Клоун diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..709f32845937933291ab3d954eaff23455503319 GIT binary patch literal 1459 zcmV;k1x)&hP)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0HIlBs@W3*RLwHd ziMW`{uZq2|2w(&u2pE)@sV6gwS$K}Gd-(Wz7v)*r=l&c6O2K4+Pb7{p-LQx^h-Wt~ zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|YK2d-P^xs+Wq|iTXS-qQE`9~000B(Nklqsh z4ASnQQlZFD@=xRv=q16f*IaWc7&ktbP_R$cp^^*H#$A(ub}<_3 zFg-|bJS#f$^Xt7~-vbziVHk#CnExl9O(Ufg06;X`YU}nE##x5p z;CKDMQQTFHAV7MSA{m|N_nv3fy_GiU*J^b%f&k+z)9>k7%8Ayu)&AJlknrK2x^sIA zzV8E=4O+?x$RK(jKHO7petdNOk+0APptT7790bn#H*6bDPy2Xx@0k{C3V~X!j;0XW zfOq$vVS3uP?a~R-CoSLi^^cy*=v(c8DDJAAAi!$?d7k6f=RMqLeuGbUzXay*0O0)S z1$IU+5yf3)9+B%}>JNqkJ@LdSNg(9}7mZ7OSRQYyMxkh_IEuB<)_g0bXKCSYGHfs$ zAQ_!_>+%7j+1C2N?94AhK7sV#B!60oTkU|0-3Rz%yMt+?kDEu&G0w7r5hR{<@9TE! zWJw=b(wA~lXouumtG=D005J2!08p#dK~7N02>=u#0I;4Yut+FcTAv_&+f_HQa)O@c z>7SgQ<5p0|<0ntCe{hJ$PoCmdP=}nJ7ur=ZcmP^|oWI3KH-T~fR_m9++Dh{-V1~Xt z&zE8_P|fO-Ke$TYMcX`&C`t4Uv5Fngjyfy#kB?t@WT%U^^-Yk-^L**bOOA09tkUoG?y7k-a+-N( zA8=)d6*)g!8(j6Bcfh}q>rA?{6J(hG7He^WRXRR~VHk#C7=~dOrUE{wPhwTz^ht~c z7m8LPPk%D(|0APrM;&F>29(JRIqd+?^RWHZ_v+4Xdpa#`exfd8KpD&hFzxv3i$^&9 z>1!t&oWBWDo}MzbzVD+E1RF_=5Q~E!B}wVp1g8mTM;)~@dWrL+7XW}?eu#1S^LI-X z8=JsfdEl}(p&fOcauiNSV6jGLF;AbKrIjCpP_z`)BoJgvnWO0B1TS_UKy7!BonGeY zf%g|IYyzrFkaB|8-TU}tyE8immbC#u2`5Ob%F}OR2dt|$0C4aDGVE^FIwM%RE4-P5(dgCn95nz>VHk8Q?zE_<1{IjS;mv*e` z+gt?KK1*eXrJNv@6QpOU`P#ZR?>fw#o&vCB!zM3d48t%C!!XQ;&fmd4NtaTUGid+- N002ovPDHLkV1kLI!Sw(D literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..758e7ca6c546575f317727d1618cf2f847583db7 GIT binary patch literal 1696 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6011bef49333aa963dd10f71297167e91bb3240a GIT binary patch literal 1084 zcmV-C1jGA@P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0HIlBs@W3*RLwHd ziMW`{uZq2|2w(&u2pE)@sV6gwS$K}Gd-(Wz7v)*r=l&c6O2K4+Pb7{p-LQx^h-Wt~ zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|YK2d-P^xs+Wq|iTXS-qQE`9~0007WNklljA6bJBs3aNu7M?$L9 zoZH0qkT8{{Q^Zh-iIFcrKR`Qo>-RvN_#%jig^$1hL()>IjU1_xeM)`Ja4cNpI(Bow z8N1^BmPmJT-n*BxW5o|3gb+dqA%qY@2qA>*o{Z%7;hD^icUVtuAD+qGlhMjtU9HQv zkvG`&`f_n6aD8=gZ{G6ia$UYpvjbhPFL#)W@nnq2=ruOn_p<-;EnLRHIY&4P;d=o9$U5!< zmoWg4y7{gYAW3e)c?1A>@#YKK&N~Q^fOC#0jsXCiM@W*}GS~6PIOk|Pj&{B)1qi2? z4FJ-9W~1#m_vYG;g9yMh4AuK;O();nYd|=?YzUDoE2uDyu=IQ#MRAO97Ha34TL7zR!**H_i#d*tPx0~7XB-`$LM-O6offR7T~hjg@5v@0 z7W3unx_ooDhUX8YI{#HAEvtp}*!kpJEl&e=ucDi8;Ud)UsSpXSuPz!L){~ai0)W~s zKJBsPO9&x^5JCtcgb+dqA@x#a&p=UZ6SV&>uCiyKD7FcO{Q-HZ>={t8)6f4+&?-Q> zXJGUpz+LoJs>O58F`kUE!(4Q|zVU6Ej?Fn&&;O0lDnPbpVE@&>>lsMLj^Y@cbL{Qy z8!Plme?Xopdj=kgZG!eSpvs>0?$E;APSpZo+b?8jhmUF&rK0000 Date: Wed, 24 Jul 2024 14:42:17 +0300 Subject: [PATCH 02/15] blueshield-tactical-uniform --- .../ss220/clothing/Jumpsuit/jumpsuit.ftl | 2 ++ .../Clothing/Uniforms/Blueshield_uniform.yml | 15 --------- .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 13 +++++++- .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 986 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1861 bytes .../Jumpsuit/blueshield_alt.rsi/icon.png | Bin 0 -> 560 bytes .../blueshield_alt.rsi/inhand-left.png | Bin 0 -> 645 bytes .../blueshield_alt.rsi/inhand-right.png | Bin 0 -> 685 bytes .../Jumpsuit/blueshield_alt.rsi/meta.json | 30 ++++++++++++++++++ 9 files changed, 44 insertions(+), 16 deletions(-) delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Blueshield_uniform.yml create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl index f1a2421604f6d6..fad61b97eda925 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl @@ -30,3 +30,5 @@ ent-ClothingUniformJumpsuitWarehouseman = рабочий комбинезон з .desc = Практичный, удобный, не стесняющий движения и главное стильный комбинезон. У вас с ним связаны плохие воспоминания о прошлом начальнике ent-ClothingUniformJumpsuitBlueShield = униформа "Синий Щит" .desc = Стандартная униформа ЧВК "Синий Щит", представленная в виде рубашки и брюк. +ent-ClothingUniformJumpsuitBlueShield2 = тактическая униформа "Синий Щит" + .desc = Тактическая униформа, специально разработанная для ЧВК "Синий Щит". Как же она хороша! diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Blueshield_uniform.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Blueshield_uniform.yml deleted file mode 100644 index 776dff3bd7b87b..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Blueshield_uniform.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitBlueShield2 - name: униформа Синего Щита - description: Модная форма Синего Щита - как же она хороша! - components: - - type: Sprite - sprite: SS220/Clothing/Uniforms/Blueshield_uniform.rsi - - type: Clothing - sprite: SS220/Clothing/Uniforms/Blueshield_uniform.rsi - - type: Armor - modifiers: - coefficients: - Slash: 0.9 - Piercing: 0.9 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index 4c5f0512f30bcc..61d1f1fc5884ae 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml @@ -40,7 +40,7 @@ sprite: SS220/Clothing/Uniforms/Jumpsuit/trusted_lawyer.rsi # ЧВК "Синий Щит" - - type: entity +- type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitBlueShield name: blueshield's uniform @@ -56,6 +56,17 @@ Slash: 0.9 Piercing: 0.9 +- type: entity + parent: ClothingUniformJumpsuitBlueShield + id: ClothingUniformJumpsuitBlueShield2 + name: tactical blueshield's uniform + description: A tactical uniform specially designed for the Blue Shield PMCs. How good she is! + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi + # Сервис # Клоун diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..a306386e7ae3bcfc173343c0ed73cee301562bca GIT binary patch literal 986 zcmV<0110>4P)Px&lu1NERCt{2nmuJ*2gM;GjxACxElt7NKWd|5Aa_X8D6d0$=_M+?_u`#Ue;+tP-rc?LFYmp( z_wv3!fFKBhAPC}~;^MtQRRb)gX(%r*bA66~006YKD$FZM*xh~0T^}!oRxv3}!`J;d zw?5Ym)%{`Ck$M9FI6OMam)HCK0Dw>4CpcT1v8@pdeY3VX1`&PB7aJ{~3`WqjHF@Ry z_otKat&R)##9iq>uzI0alAwo{aj_VJuImNobY0Jthn8{O@VpJ|(znzAsv2O)U<97| zK~z*!=0%MI04gdf;h7&qG8loX1{hZqcc^cv0gk&y(X=&*gZdt1GHIkVt>Ao0(~!xe zaZulbrmaaFca2)rw}hSgmY$V5e=}o!FHyNUgG?q30QsH(P*9fc4#Tzn3O|p&-P(KL zuJsG>)zq*yMPXCZ3+(;JFKlXhfwd_L^VQVc>ahQp{&k-s^_B77Q1yHXOjavIj0mR5xUz~xXBZdt+k&I%rN z4j`L|io^DxX`|}2wOxiwQ{ttEjW_FXdkwajo zL7S)8pEvRa?A9&LNhmcpLAa&lk?0lC#KM>(v%qa?b0Ac7!{fZ&G`UcNrKa^?Ah9kE1QTH#Nd_{p}K@uf+0)1VIo4LHrN=1~FwAqhW}0TL1t607*qo IM6N<$f;S7%8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..bf9867f171d134eee87473d6c9b62027208ea7d6 GIT binary patch literal 1861 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6ccfca94cda3bdd9ff0d29788d10c494476688f6 GIT binary patch literal 685 zcmV;e0#f~nP)Px%XGugsRCt{2+P`nwKoke?ubUyR8w8}iLJC|NY;P5Elk2HSSHVHoK3d&rx47={t_F~%?&k5IBoV2t7Z z{@dF9s)YwYB;Uu;hRJjq9FNAMl|KKRF}8ADnlQ$KW08E>r20fR>;nm$%l9yrc0GO~J*gJqwzH5sh z0C)oz`;88?FYnMC7Vzfs2709i&8dT*zJfP!xAp@6YjM_s)@@@^sX^K`!cwxL&QFy6n|i3RZK%NF0Id Date: Wed, 24 Jul 2024 14:52:18 +0300 Subject: [PATCH 03/15] blueshield-jumpskirt-turtleneck --- .../ss220/clothing/Jumpskirt/turtleneck.ftl | 2 ++ .../Uniforms/Jumpskirt/turtleneck.yml | 16 ++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1059 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1549 bytes .../Jumpskirt/blueshield_turtle.rsi/icon.png | Bin 0 -> 573 bytes .../blueshield_turtle.rsi/inhand-left.png | Bin 0 -> 708 bytes .../blueshield_turtle.rsi/inhand-right.png | Bin 0 -> 713 bytes .../Jumpskirt/blueshield_turtle.rsi/meta.json | 30 ++++++++++++++++++ 8 files changed, 48 insertions(+) create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl index 33329a246a83eb..2aaf8f8a1b8e8e 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl @@ -8,3 +8,5 @@ ent-ClothingUniformJumpskirtBlueShieldTurtle = водолазка офицера .desc = Стильная водолазка, которая поможет офицеру "Синий Щит" быть готовым к любой экстремальной ситуации. Высококачественные материалы и слой брони делают ее незаменимой на передовой. ent-ClothingUniformJumpskirtBrigmedicTurtleneck = водолазка бригмедика .desc = Водолазка бригмедика. +ent-ClothingUniformJumpskirtBlueShieldTurtle = водолазка офицера "Синий Щит" + .desc = Стильная водолазка, которая поможет офицеру "Синий Щит" быть готовым к любой экстремальной ситуации. Высококачественные материалы и слой брони делают ее незаменимой на передовой. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/turtleneck.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/turtleneck.yml index a4c260767186b7..e8d38a0d938e8f 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/turtleneck.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpskirt/turtleneck.yml @@ -49,3 +49,19 @@ sprite: SS220/Clothing/Uniforms/Jumpskirt/brigmedic_turtle.rsi - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpskirt/brigmedic_turtle.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtBlueShieldTurtle + name: blueshield turtleneck + description: A stylish turtleneck that will help the Blue Shield officer be ready for any extreme situation. High quality materials and a layer of armor make it indispensable for the front line. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi + - type: Armor + modifiers: + coefficients: + Slash: 0.9 + Piercing: 0.9 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..12b865dd7495df3760a357222a381a1d39981494 GIT binary patch literal 1059 zcmV+;1l;?HP)Px&!%0LzRCt{2n!RrmNf^eTC4_acYbn92*cOuQ)16(hRjLRgC=lNTMY=m#6nFUp zLUXz+F9qUKP{ve*bd-RElnxpsS|sEM$w7DW0_GgayTxuGdMU!LW;b@2S=J1v%uljL zwrAhx-Df`5^1OgTp-?Ck3WefuqVaShA^tJ_vjq{rPT8e^jh}nmnC|2-RAH@}>#HFyMI} z2Cj>(PFoxG`LHCu#(<2ED^#TI%B0Kl|m(bV)b7JvN{m#>`0qlZtidgm`}_xtGg zdVD*N0Gg%^)!**-k!)Fg-c68u34|QGw2a*yV14a2E?+#4^|jmB-P!y6TM+7>C{kFET1w>#6`QS8&I=n57AaT-3)NbKYCdp_XmWQnl6~t6*Vrrj9fwq<#vpXY{r`OF`hL4JAwv_^|C+VsqF| z8B6$R%qmy__Kv2@rBZZ8-*uc=*^Fp)hzQkMgW8Yh@b9w?{IdEZx{d?3e!%Iz=B^MC zUIL@e-}9ykc3&W(*efea$FELa%0F7l=sD_j~E zp$4lR1U}x)FJXJ84*F?xJi^J*oGKLPhkBjD_U5fMdhxPD$&t_c_2OlRZr)mpX-^dj zG%QCRxVL9E=Px)tw}^dRCt{2noVpQMHI*Xi%8dMb}hx&bsP!mZG{cuL+ULTjQCOl<>SP)5tsIk zBS7NP3lbGE_vV5q$DSZmBvL6fkq}Z3NQjDhf!Y;Pj2mN1UMJecpyA-mcD-J&->lbB zKlUd@6R+3v-n@D9=FJBX5fKp)5fKsbfFe;|VvO1UXSF;7fNG^I`8|^)Qq@D{41>$^ z!YQAs$HP>GW|vmkR62)$Efc9^s!x%)s$!?HgGb-{o^|Uw{`&m1L}`o&ZuyF$pwsEt zrCUC=Uf&npJwKPp*utDjI6rUKYMwnYE?oY0tp>|72fml(82I-ho=7r)v+>SGbKE@= zwh_GK`;|`lqYUs6MR;6Q2cBzL4XI=bT2>qQF0QJ+V^xG<^8FBzKhgl4O0|NvVfen& zHVjm%6>612OiI450l4)QMF9X+d|v}tmI*~s zP^nf>+rA|My`N` z@*)0A=fEDoF!s$yqfpx5t$5Q_W@XMAM{B|@3Gqb!w7p=}tpBF=KBv19kt zP=Ov%nVK^Mkv~=<hzJeEm6G`g#i=pL-Yl`KUTujmE&UW4RnvU)E|iZCPF=0O^l%`A!4JNrY^vj3G03 zl*w|;)AgLCWtp(Ld*p7|S9&CShDnz190p@2LO?GMm*p7DLJ_US74WIaS+*8eU>1sy zquzg@&Q^rAiHW}p~$AvIUM8AsIT_&?a4eVejLPRexgc5<0N|@HHv;`GECL0=nPhSx0NtzHGqb?cPYxcy@Zsn# zMFKW?M`)acB1mj-<7EIpsELs1p5V|qnC}rD1nzxEciG&zb8b12wSYWzINY=E5D2PM zAP?A`FERj#ZI=4pyY$V*fh681UtQ>HtXU`m0H%K|NfY;g-TB^*%v3rDvrt4_RWX;z zjC~9yf@PVQ%VZE&RhWe$xIVmNL=f@-=V7J$6jqjFuq+douUws|7rgx9^Nh=KqGdJv zyinwVMBx2^R5Asi*KjSXA+Do=-G3I@?h1R(<)`uUI?kbfWg{Q%LNU9_&S?+B2$#DHEVcvy|W>g@HEH-5W5bS?1I6Irq{ZulaK z*C9y~E?>FYw-#{gVs-ZV^bTz?^vL2eQ_E{3&*zQ&8)$BnLcc02NfHtZMY0Zmudk3U zN|HQac4?KVshM literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..44410e1fb362381479c8eb70db53786a5ea96961 GIT binary patch literal 573 zcmV-D0>b@?P)Px$-AP12R9J=Wm9cKqP!xtgBfuHrNJUOlM}Qq9%*4fUBl<5l#d*a-KL}03an2PjIBOfjqYmC8b`^L6wbHg_q zwa(D_#2OEWA_Jl?u=04<*mjMq8!=wnrr3yQ<9KbGtQ%q5HLgE=E*=`uCd~UWbR%k? zc4#;bC#xHbTOoNrF5~k1CnRY~){UlmA>xU-@gOqSS|Q7ycQ0(g$?67qKW4PIbNN4` zStEHrW;QNTxT2z>;5XKv2+bhp4-NnT01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjffam-0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3e2cdbd4bf6d3469229b0955ae01fe1fd55ed19d GIT binary patch literal 708 zcmV;#0z3VQP)Px%en~_@RCt{2+C6XDKo|$`KTX3~)Mu#(Czwh=7d8)wiG^f~l+O?)omeyYGi2lo zu=FEzs;W$__ySogwni%NN+j$eyH<1^Qd{MvfbCNxOV4jP3B%vV<2x_+0E7@i2qAgjA|Ep>Ynqps!uiIFDR}Aa9jk&|~Fo zlehqtYE6_319RI305qE?;p9xSA?CJ?l40yU>3{P~vl0F#$c>t}OX31}o(sou;CXIX z1k-E?_xlI&$r>$PkCWGIo(R)yh_4^tBTn8f85tqL-e*jK#yRG;9ge|7N5lKQ?qWC71#M4qhdyloN(y)6{L4s(Jr1pwBbn8rD# zvnhsyADK*M_w9rbFiI7n7xcB9V2gR43(sF<9%r+p(@(wvvgbE~F$HeRg2p*iRb3h< z^)?t&P`v8y_0lR{bp>MzCiV8lJhx?mF$LN48!0cr*GU8XaUW<|PK_20swzygAyiexU^tB2Kajct{5={EpRVIL;c5s>XVblp&{MYs zfafCQxPrO!fM1@yH0HPxsed4KDKSC-C08sw`k>wAg#<^UJL#HnQ0000Px%gGod|RCt{2+P`kvKpY3~ubYOmD2LPtCzwisE^HnmCKl2yQl247IgR%6jd~QREzj zLSd!#S~eKdkvqLo;tmt$Xd-n v8d57DYc&IDNblRM)eOi=6`1be$^Yj&VUfuRjfRQ600000NkvXXu0mjfG675& literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.rsi/meta.json new file mode 100644 index 00000000000000..68551296e54998 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/blueshield_turtle.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/2fea0a59470c476cf3f927833d3918d89cbe6af8, modified by okroshka59 (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 684539b6736f47d450361f9726c3b974cfd98a77 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:11:25 +0300 Subject: [PATCH 04/15] blueshield-bulletproof --- .../ss220/clothing/OuterClothing/armor.ftl | 2 ++ .../Entities/Clothing/OuterClothing/armor.yml | 23 ++++++++++++++ .../Jobs/InternalAffairs/blueshield.yml | 14 +++++++- .../equipped-OUTERCLOTHING-vox.png | Bin 0 -> 1097 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 906 bytes .../Armor/blueshield_bulletproof.rsi/icon.png | Bin 0 -> 502 bytes .../inhand-left.png | Bin 0 -> 584 bytes .../inhand-right.png | Bin 0 -> 588 bytes .../blueshield_bulletproof.rsi/meta.json | 30 ++++++++++++++++++ 9 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl index df7d791a829962..c2a9589b58d7d7 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl @@ -1,2 +1,4 @@ ent-ClothingOuterArmorCentcomNavalCarapace = флотский панцирь .desc = Панцирь, который носят офицеры Командования флота. +ent-ClothingOuterArmorBlueShieldBulletproof = пуленепробиваемый жилет "Синий Щит" + .desc = Тяжёлый бронежилет типа III, способный защитить владельца от пуль, взрывчатки и загара. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/armor.yml index e34cf9162a801f..11e8a996ca920e 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/armor.yml @@ -12,6 +12,29 @@ - type: Clothing sprite: SS220/Clothing/OuterClothing/Armor/whitecapcarapace.rsi +# Внутренние Дела + + # ЧВК "Синий Щит" +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterArmorBlueShieldBulletproof + name: blueshield bulletproof vest + description: A heavy Type III bulletproof vest capable of protecting the wearer from bullets, explosives and sunburn. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.3 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.60 + # Centcom - type: entity parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml index ebffdac98ab8cc..b25a54edb69d44 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml @@ -39,6 +39,18 @@ equipment: jumpsuit: ClothingUniformJumpsuitBlueShieldTurtle +- type: loadout + id: BlueShieldJumpskirtTurtle + equipment: BlueShieldJumpskirtTurtle + effects: + - !type:GroupLoadoutEffect + proto: BlueShieldTurtleneck + +- type: startingGear + id: BlueShieldJumpskirtTurtle + equipment: + jumpsuit: ClothingUniformJumpskirtBlueShieldTurtle + # Outer clothing - type: loadout id: BlueShieldArmorBulletproof @@ -47,7 +59,7 @@ - type: startingGear id: BlueShieldArmorBulletproof equipment: - outerClothing: ClothingOuterArmorBulletproof + outerClothing: ClothingOuterArmorBlueShieldBulletproof - type: loadout id: BlueShieldSRTCoat diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..f6889921b6b1efeb3c871dbe18e8a4649f61bc7b GIT binary patch literal 1097 zcmV-P1h)H$P)Px(14%?dRCt{2nz3u+RvgDaF7Z~|ka7}4hP%O1as(|l$py4@D;)U?4q9ltmi`Ha z-qNKVIviYvw$Q+F+d;|TF4+V}4riz+Z6ys!u?$Kf#a7AUf;u=)v3)rbJy|Za?=#u5 z_4_{m_`Ub!_x*uFp-?Ck3WY-Pzoe4)hK=>jv|g`q^y+1H@AlSCIvOSX`rFUBEmZ$ue!4Ely8=2cW83nAI@5u4xT`bdgE8PXEuoq?6{4oGepM1rS?^tLnE^%BV2ttBj@f9$y50k`eQ&XT`m(zbM=OBopKJPzzgdaw@ zZjW*7xZI-uJW4DnPf+UekHF#k}Co8r@zySp&v%pHe=@qB*| zKa51HN-3CTYtoTowymdaU5sP(AQr+EY^-n2G#?!wPqsh9XadXe2tChd zym|-keAXL$(-?0;dJTvM{ffxCn2*!X24!K}7EU$Hw5G=)L*a6rH%gP)?(SVKmWoJ?l;Ab`J~3EW8Z@*%R3^S(Iks3b-uy6eiCE z*DXwoB8vLxx{l}h3!7?%69ALGp(yH?I{#rd*^|z&<#eSf6bgkx@gLPx&DoI2^RCt{2nlWn>K@`XTCkEmQE7+u&txP5`^)~kjZ1)q0pduEj#7Zpu0M=r0 zpF$y}Ac0L05K|0fawdd*ho&8HBP3xg&e?2|i`m)bR+0DX_PE*i-hbZA4)Y$sFbu;m z48t@hO;h)$=XsN5nY(-cxsy^lDW%J@thN0cp##!1bwUV8DIEYvDV-3aHxbe_by{mI zEJ?(1j5v;=wQgxJU)m5XfKm!?-;MC{)$7U;Ap};IS6ev{iVy;E z99MSzb1xZ?Wtp?q;@Q(jFyjf5B*F2a0TJQo=MQw*jG9ni=iY98=G*K8K?3aW9aJf} zxv`F-D5{wtBJA%SgxU|num4#PQMD(85G26vc&7?B&vPV6f^z#qCCcu2C)j}yeDD_o zt#5{*1PLI7fKm#>;Sd0j=Q#jiI2=ML)p{L<*axP89{>IdXsxTj+t?q34v3=2c_D}h zg?fTJn{PlwD9bYVeWCbsfKsaZO>2#n(86f8sKwzk$=mxy@r(J7^% zwT878rzfcV3at+|79dSicX5{ebCM(|iem27VPIOJK0Y)^k^}&7dIEgiJM+sJGYF{? z2lofmiK56Ur7#*z`vtsH^JZa5Vl)~-DTQy}yESGs7T~JX@=L&sCwTDiaVKY*;CmAM z5|~BEGU${604hf|H`ZasldiA3mZB&CoC)8R#!XUJ)!w}$d7f9!&712oAf!*AQwI1l zxp$Px$mPtfGR9J=Wl)Xv=K@^2g)D#XOZ4#I%6x`ybO%t$=s0hK=5yjLNK7cPErt}dk z(xkq{l5QqN#3HT`j9ZLFm?3|X9f{cN>2?lt&bM=C7s!<>SFV3n;kO&3D6-3IaU2Kd z1#f6H8a7E1l*{E6&#m|S{mi+0q2=DU z^K)oiIDji}wOa0N0RT_$5zNaBYTbCY0+1vLj4`NHC6rRoT6?c}bctG3!WaW7W#-JC z5CCHghzO6}F0|ITy6*T>NJlZw&QCx@E92Q301<(i5f6sAy6zwz4577#QVPXNwDxjt z(ryUAcs#x(A{6W=_DdDq-`${IucO!N;q~JS$A=|Mr&BO9(lqU4$;|w{3L&gJ0V48q zb~EplPoen1`^=2VWU?_o^9Wq1loC?TE}JVi#vmQV-U}H+W&l?{Ukt!sxMC$*@R)hK z0Kn|~cH#37Qc9$w*h7Z=2ZAJoucX3+O?<4PvI#gm(R#N?TN2_^Uk>ekIriCBL2x4^A`rT07;&(yK3V)(10H-CeZnU~>j!4*uizA;~EyxZ>} zydgrT=q3AvwzemiPYs!grrDndBmO6#UhUbKA#h!gw`P zeAVLDvsSe%JHMQBLVKL*H-TH<1UE#d%xk*2nSmJ?JAW9=9vOD<=|8UoCJhEpS3j3^ HP6E zk`8Wm<>~*woYB;|DJ8%*HN@;-*y}$=x{J>II(NOU|9RPOrT<1+=L4eWt+Nr`AGNk= z$FIQU&FAl~n^4d%%_tuG#l_?3<>Lw4Z|kZE1d1eXj5x4^Q^>37*^KWup2byhr!boC z%9i^S`(VEkuApH6h1#4brbiBGY^zqNDsZNxE$E73a{4{f$6c3kp}2npCr4@80 Date: Wed, 24 Jul 2024 15:27:44 +0300 Subject: [PATCH 05/15] blueshield-coat --- .../ss220/clothing/OuterClothing/coats.ftl | 2 ++ .../Clothing/OuterClothing/SRTCoat.yml | 24 --------------- .../Entities/Clothing/OuterClothing/coats.yml | 26 ++++++++++++++++ .../Jobs/InternalAffairs/blueshield.yml | 8 ++--- .../SS220/Loadouts/loadout_groups.yml | 29 +++++++++--------- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1628 bytes .../Coats/blueshield_coat.rsi/icon.png | Bin 0 -> 437 bytes .../Coats/blueshield_coat.rsi/inhand-left.png | Bin 0 -> 543 bytes .../blueshield_coat.rsi/inhand-right.png | Bin 0 -> 587 bytes .../Coats/blueshield_coat.rsi/meta.json | 26 ++++++++++++++++ 10 files changed, 73 insertions(+), 42 deletions(-) delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/SRTCoat.yml create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/coats.ftl index 230bc53ed51a29..b6ec2ab46b7e3a 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/coats.ftl @@ -4,3 +4,5 @@ ent-ClothingOuterCoatCentcomJacket = куртка Центком .desc = Куртка центрального командования, подчеркивающий ваш статус. ent-ClothingOuterCoatQMWarehouseman = пальто заведующего складом .desc = Идеально совмещающее выдержанный стиль и рабочее назначение пальто. По сути, является вашим старым рабочим пальто, которое всё ещё цело только благодаря использованию дюраткани и сигаретному пеплу, что уже въелся в ткань. Вы никогда не понимали людей, надевающих поверх пальто одежды ещë слои одежды. +ent-ClothingOuterBlueShieldCoat = пальто оперативника "Синий Щит + .desc = Пальто тёмно-синего цвета. Отличная защита от большинства видов урона. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/SRTCoat.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/SRTCoat.yml deleted file mode 100644 index cfc235fccb579d..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/SRTCoat.yml +++ /dev/null @@ -1,24 +0,0 @@ -# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterSRTCoat - name: пальто ГСН - description: Пальто тёмно-синего цвета. Отличная защита от большинства видов урона. - components: - - type: Sprite - sprite: SS220/Clothing/OuterClothing/Coats/SRTCoat.rsi - - type: Clothing - sprite: SS220/Clothing/OuterClothing/Coats/SRTCoat.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: ExplosionResistance - damageCoefficient: 0.9 - - type: Armor - modifiers: - coefficients: - Heat: 0.7 - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 - Caustic: 0.75 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml index ca0646a8e3e2de..d05b30648d048d 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml @@ -82,6 +82,32 @@ - type: Clothing sprite: SS220/Clothing/OuterClothing/Coats/hop_coat.rsi +# Внутренние Дела + + # ЧВК "Синий Щит" +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterBlueShieldCoat + name: the blueshield operative's coat + description: The coat is dark blue. Excellent protection against most types of damage. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: ExplosionResistance + damageCoefficient: 0.8 + - type: Armor + modifiers: + coefficients: + Heat: 0.65 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.55 + Caustic: 0.75 + # Cargo - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml index b25a54edb69d44..0255166e746e36 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml @@ -62,10 +62,10 @@ outerClothing: ClothingOuterArmorBlueShieldBulletproof - type: loadout - id: BlueShieldSRTCoat - equipment: BlueShieldSRTCoat + id: BlueShieldCoat + equipment: BlueShieldCoat - type: startingGear - id: BlueShieldSRTCoat + id: BlueShieldCoat equipment: - outerClothing: ClothingOuterSRTCoat + outerClothing: ClothingOuterBlueShieldCoat diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 79c4e39bc542ae..9059aff8871a27 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -23,13 +23,14 @@ - BlueShieldJumpsuit - BlueShieldJumpsuit2 - BlueShieldJumpsuitTurtle + - BlueShieldJumpskirtTurtle - type: loadoutGroup id: BlueShieldOuterclothing name: loadout-group-blueshield-outerclothing loadouts: - BlueShieldArmorBulletproof - - BlueShieldSRTCoat + - BlueShieldCoat # Chef - type: loadoutGroup @@ -141,7 +142,7 @@ loadouts: - SeniorServiceJumpsuit - SeniorJumpskirtService - + # senior engineer - type: loadoutGroup id: HatSeniorEngineer @@ -151,7 +152,7 @@ - StationEngineerHardhatOrange - StationEngineerHardhatRed - HatSeniorEngineer - + - type: loadoutGroup id: SeniorsEngineerJumpsuit name: loadout-group-senior-engineer-jumpsuit @@ -166,7 +167,7 @@ - StationEngineerOuterVest - StationEngineerWintercoat - AtmosphericTechnicianWintercoat - + # Senior Medical - type: loadoutGroup @@ -176,14 +177,14 @@ loadouts: - HatSeniorMedical - CMOMedicalHeadMirror - + - type: loadoutGroup id: SeniorMedicalJumpsuit name: loadout-group-senior-medical-jumpsuit loadouts: - SeniorMedicalJumpsuit - SeniorMedicalJumpskirt - + - type: loadoutGroup id: SeniorMedicalOuterClothing name: loadout-group-senior-medical-outerclothing @@ -192,7 +193,7 @@ - SeniorMedicalLabCoat - MedicalDoctorWintercoat - ChemistWintercoat - + - type: loadoutGroup id: MedicalsBackpack name: loadout-group-medical-doctor-backpack @@ -200,14 +201,14 @@ - MedicalDoctorBackpack - MedicalDoctorSatchel - MedicalDoctorDuffel - + - type: loadoutGroup id: SeniorShoes name: loadout-group-medical-doctor-shoes loadouts: - WhiteShoes - MedicalWinterBoots - + - type: loadoutGroup id: MedicalsGloves name: loadout-group-medical-gloves @@ -215,14 +216,14 @@ loadouts: - LatexGloves - NitrileGloves - + - type: loadoutGroup id: MedicalsMask name: loadout-group-medical-mask minLimit: 0 loadouts: - SterileMask - + # Senior RND - type: loadoutGroup @@ -231,14 +232,14 @@ minLimit: 0 loadouts: - HatSeniorSciensist - + - type: loadoutGroup id: SeniorSciensistJumpsuit name: loadout-group-senior-scientist-jumpsuit loadouts: - SeniorSciensistJumpsuit - SeniorSciensistJumpskirt - + - type: loadoutGroup id: SeniorSciensistOuterClothing name: loadout-group-senior-scientist-outerclothing @@ -247,7 +248,7 @@ - SeniorSciensistLabCoat - ScienceWintercoat - RoboticistWintercoat - + # Senior Security - type: loadoutGroup diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2c6f291bb87a6ffea6f8066e18203275e36f4f63 GIT binary patch literal 1628 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8b5cde2d2d68b72a6689ffb53fcc096a52eea8dd GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ+f~ohE&XX zduy-%AqNK558?LQO+LIFLTdlm&Hk5}n~R&PE6ZnkIW-txTVcswEP9aRdi9PUb;;gw z>&w4Pt8VCkfhiZ?e$Cx}eY<_E{%mo(Rd4wu6z|5}FVnk~aV1;&yOntE`{{+1^^Hc1 z3<+nLw%)R2YhL{*mAzRz`^=(}dsSkIGo%+?VAvkD_@u;v=UvvTue(h)l#_qA-R}MN zJ+o)Oe(-UfH5c!R&*>7I9p>3Do~aTM`_XN0o5|^}-wP{$3)nD5TJQ$>}@qn?8MO{5IWd)^st3M>~RIidXM@eLDa2?We+@TyL}7zgK)kI&{Wz$v%H& zAo;3S>)yTMsC#xS^-Qi85__(Tcl)j8W>~T9oI$*ljO?*3dv2DTl6rT&IKr_oM$>Gs zj;x#K=SyajTV@@XdaZSfWljBipc5YLNGiYkxBTQ{o)8x}==k?4X8u+81#@{UQ-3k+ zn^DX1ilyZXW6j2298(UnnRgh~GQ_{JV|to$;%wDSy9WI-`NlF6wkfZfePx%1xZ9fRCt{2+D%WZKokbxx7T{b3YQgW6-ih95A6Ee-T5Ex%Gi%IEKJ)m#i$t< zI*613CPjyu_eq-c<8Tf+bYL+DAR;0nA|fIpBKlRL@kCbr{>S9NXgra13A-k|ysB(M zX#=A1M244Fd*Az>Tbt0fIG)PCJAlJUm)Leu}TsMu|b;dO5^t$kfyurfMF0AC+w2- zRsaB2NrGfGE4^5I4fqI@DuM60MhR_G=LjIXNLA-rdJ|L!r0EXpt;k+Y651vnA8>ls zgLr&^=MV7mnpVbZAA>KiDLj8*oY1y#6k+i90^uma^OHpX#HozeJ_Y(G4xXPR!chbO z7>q8k-iq3UwyEVA46o%d2x{ZC4RDX-%&@qGgMaG=FEVu{-GK-0Qj64P@m&?DqZ*AkIf7e>$joN z#zB5&0LbP80DPSpm@gOKvKgVPuZA}cq1_qEvpq9VRsT?p8en^7psN0%j7~ThUQ6J8 z<5c;{nSo;cHkO;wP0;qtK(T%s8ZCh=*z(Lkv3@H#O@eLD3>53Pk<+LFwr2*8VMd9L Z%^QXOb!;l9HN5};002ovPDHLkV1m=l3k3iG literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json new file mode 100644 index 00000000000000..b4b8f344dfd841 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from Paradise SS220 at https://github.com/ss220-space/Paradise/blob/f04540b212de5bf1919f7f1a52a7e20f0892a00e/icons/mob/clothing/uniform.dmi, modified by gofinodzo (Discord) for SS220 SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From c6bba8fb03026b4e7df16d0d1d8c597f90369b8a Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:38:24 +0300 Subject: [PATCH 06/15] blueshield-boots --- .../ru-RU/ss220/clothing/Shoes/boots.ftl | 5 ++++ .../Roles/Jobs/Command/blue_shield.yml | 2 +- .../SS220/Entities/Clothing/Shoes/boots.yml | 25 +++++++++++++++++ .../equipped-FEET.png | Bin 0 -> 451 bytes .../Boots/jackboots_blueshield.rsi/icon.png | Bin 0 -> 341 bytes .../jackboots_blueshield.rsi/inhand-left.png | Bin 0 -> 323 bytes .../jackboots_blueshield.rsi/inhand-right.png | Bin 0 -> 340 bytes .../Boots/jackboots_blueshield.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/equipped-FEET.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl new file mode 100644 index 00000000000000..c47aa6eff14f0b --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl @@ -0,0 +1,5 @@ +ent-ClothingShoesBootsJackBlueShield = подковные сапоги + .desc = Боевые ботинки ЧВК "Синий Щит" для боевых сценариев или боевых ситуаций. Все время участвуйте в боевых действиях. +ent-ClothingShoesBootsJackBlueShieldFilled = подковные сапоги + .desc = Боевые ботинки ЧВК "Синий Щит" для боевых сценариев или боевых ситуаций. Все время участвуйте в боевых действиях. + .suffix = Заполненный diff --git a/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml b/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml index 8e14a559ffd534..34eff5ad5eee15 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml @@ -56,7 +56,7 @@ id: BlueShieldGear equipment: # jumpsuit: ClothingUniformJumpsuitBlueShield #SS220-blueshield-loadouts - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJackBlueShieldFilled #SS220-BlueShield-Fashion eyes: ClothingEyesGlassesBlueShield head: ClothingHeadHatBeretNavyBlue # outerClothing: ClothingOuterArmorBulletproof #SS220-blueshield-loadouts diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml index 59977772afe58f..ad4f2640f4dc65 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Shoes/boots.yml @@ -1,3 +1,28 @@ +#Внутренние дела + + # ЧВК "Синий Щит" +- type: entity + parent: ClothingShoesBootsJack + id: ClothingShoesBootsJackBlueShield + name: jackboots + description: Blueshield PMCs combat boots for combat scenarios or combat situations. All combat, all the time. + components: + - type: Sprite + sprite: SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi + - type: Clothing + sprite: SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi + +- type: entity + parent: ClothingShoesBootsJackBlueShield + id: ClothingShoesBootsJackBlueShieldFilled + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - CombatKnife + +# Медицинский отдел - type: entity parent: ClothingShoesBaseWinterBoots id: ClothingShoesBootsWinterSecMed diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/equipped-FEET.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..b5b110d49e53a16b39c9bf98e47c5181e7a368a8 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zYdu{YLn`LH zy|pp#kbwy61@EhhomZY7)j4ounf&qZA7w*#KP+QWart#jMabDo!Clc|s=M@(Ro^{$ z5*|wn8UJK*K?eU1oiO_O(r`6n!rn+mhOR{ts-8j22TF{X8TQmyT%IMia)%VdsZ|yy z`xmn?d|0_t^Zz-cn>!8XNIO64UVJ`vU&gUE6{Ys;GyfQ*mEJE;(pvYeuJT9Fv;Je> zqWcY|b**0Ozc7E_Dkql>_vbx3&Jc2S&i!nlqH~+l864)lU$9DJ^`e_ig;N|{X30MI zdufm8?wAOhNd+Pc^{gw_S@FIWLD~8Rt zIRmc7+w#0s77cG_zE~E2a97_-`3q&M{SK7teHGQIn$K7McDvmAeEk`IX%921Cd3`E zeE1S*(d)BZ{B!p;9qs?eR5)e9ZE1;LYAy2j-zja;Hoo?C-9AR3;F_*wvxVFVdQ&MBb@04qq&+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/icon.png b/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ebfb4ff6af18614c45a9156a316af861bf2616e3 GIT binary patch literal 341 zcmV-b0jmCqP)Px$4@pEpR9J=Wl)VkYFc5_wh$6T&R6q?K8?XV3FatACvj`0}TTlZMBD&H^ffNdK zi7`0#6^H_VUEU>r=lcneNF)-8f2SjPd7y`ts}-d|KT~g7wpalGXuoOo=t<0{)7gub z=Qo@$2A}j|z61c2hizqy@g@?k3`+H9OypIT_c0 z+rZmVlqOgKZ;;J-$MgIKBC3Bp_U^keNejHefgV<`I$f@PVL01S#5KR6_@~B8%R?PTznI>+OyP??wOI4i|Lq%X9=10=+$;$+2M8Ke z@9fRf{O&9H>|N>oZKqD`uD!i3sA&yD`Fc%N>yo)zpJqE>kM#14Yg*Fq^W^3SYy!(3R zd)*@$mgz4aojoG&Sjw5LUuXI*ZmM;{+IR)98$iUil$TdLtfXt&mKvWpD=v@}Q<9c& zne|NfKa06_dxgt>-TqZQe|qQ5S4--~J<)#0dDO3&e78sm}`&b`8=^x+yjj^}? zMJTV|WX534=lm(PMP@DMfwJ7{-8~Ae^3A4)*{%t>c6Be$tM?*f_W>FVdQ&MBb@0M3k$`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/meta.json b/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/meta.json new file mode 100644 index 00000000000000..1622b3bbd60813 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, color edited BY Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From eb2c8f6fb7ee8ce85f871953bba7ef503d5a6e64 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:46:46 +0300 Subject: [PATCH 07/15] blueshield-webbing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пока без filled --- .../entities/clothing/belt/belt.ftl | 2 ++ .../SS220/Entities/Clothing/Belt/belts.yml | 11 ++++++++ .../blueshieldwebbing.rsi/equipped-BELT.png | Bin 0 -> 930 bytes .../Belt/blueshieldwebbing.rsi/icon.png | Bin 0 -> 711 bytes .../blueshieldwebbing.rsi/inhand-left.png | Bin 0 -> 515 bytes .../blueshieldwebbing.rsi/inhand-right.png | Bin 0 -> 522 bytes .../Belt/blueshieldwebbing.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 39 insertions(+) create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/equipped-BELT.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl index de730449cc2346..8b05488794b6c7 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl @@ -6,3 +6,5 @@ ent-ClothingBeltRapierSheath = ножны рапиры .desc = Изящные ножны для рапиры, сделанный из кожи левиафана. ent-ClothingBeltSecurityMedical = пояс бригмедика .desc = { ent-ClothingBeltMedical.desc } +ent-ClothingBeltBlueShieldWebbing = РПС "Синий Щит" + .desc = Идеально подходит для хранения всего - от боеприпасов до оружия и предметов первой необходимости. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml index e41b66233a0614..df88041cb06951 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml @@ -89,3 +89,14 @@ sprite: SS220/Clothing/Belt/security_medical.rsi - type: Clothing sprite: SS220/Clothing/Belt/security_medical.rsi + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltBlueShieldWebbing + name: blueshield webbing + description: Ideal for storing everything from ammo to weapons and combat essentials. + components: + - type: Sprite + sprite: SS220/Clothing/Belt/blueshieldwebbing.rsi + - type: Clothing + sprite: SS220/Clothing/Belt/blueshieldwebbing.rsi diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/equipped-BELT.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..ce2fbfbd6c72435e8301e42a257b7a4ac74ebba8 GIT binary patch literal 930 zcmV;T16}-yP)Px&LP9p5JTOG*DgM1t}Z6H0jk5ed$DF0CSql7AQ3LIE zXK?O58fY7oN`9gtLqx);5R*}bOROg6S;tC5O~ND1Sj})co=JW$YC0k zq`Oq`kfT^+2!fMXo7N3yHUJR`0C=#v3Lf&YZS+1BNcTHE4Zv6_)>58Qy?~hvAcvl5 z7$_DQ0E}%-!+=w9l^B7Dgl$_BM}TcxiBsZC1~3f*VA8s z?}TY2{ucQ7sgd(rUheVc=8Z6dZ871uyxjL6-_*vPXcoB1+!j4G8jVJy(P%UpjYgx< zERMvhD79)mw&0+AC1wg)^+~iOR;$(p4>|m%2fyiovC=|Uf{92lRvPHTLq1}Ve@bC{ zUqm06h(xVgADo-VVyTodEL)x{Z11bl;kt)&%C3-tm0G_~ty&lIMNHCZ*8Wmeh(tL% z@4%_JFxPj`+1Sh4-Bdaodob5`;8a|konOC8H7kiLM54%DV;*wcd;fASr836nx1fBl zPQj_T@S9$y+N8`QV7Nv=WgKwIt{ARM$Vw&yI2AXu0$ItbLnaphdNF_kinXd3Co8&5 zuAFhhTc)Dnl%$HNtZ`XKX(}GK?IhFDJSRkxWa_Q4d2$oB$rqx7+>f6$8=IFNG8UxO zBUKudl~~IKYfzk&rk^Yjk?>nyZnFwpGB3MbTz0$vZ(){3 zqtR$I>i7c)EW^8J!$!9N000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef^y)blK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/icon.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0a2242aa3b7116fbe6b1948be7a7cf283848b9a9 GIT binary patch literal 711 zcmV;&0yzDNP)Px%XGugsR9J=WmR(NUKoo^P$78oP6OatCQxOSxsro`tcfbO=4z|+WbPZiWQ65Pu zl}aEr4zZLU?AD%P`j94+LL3KG>O*rROGlpTJID9lIU3ktgAF$L$FSB3mQu1^-$5yD zY`bQqS&G&Q+ZOnqkJfia2-_M@Mog#EN;zxmDjrWpCJY;BeP^^*1~6JHqxGE$!v^EY z$gGo3tP^b80<9HsJfPLuXFM7&*0y)Hxw^Vu#Qk*vQc8p^c;UXp_dG7cQ=H@1i}j@6 zWqbGm0Id~L%1Uims{%jr?`AJ(5bOr1_B)*DUO>_B62u>2m~fK}3>D|AvVeK{WnBXB z=F|H}F$o~+lAB~uxeb+6hK(jd*eIoq?|I0&WICCZ_bHxc8A8~WQkr=1?fC+vlsLl0 zaU8%ht=2vO$uJ?<4NCcJAdOWN1%=9&&O>RPe1D5Hy)};G;(H!JunRz*=PP+KOh~iL z6e`E}x2$CXN_`+rZ_VMs5$$#xfGBDbMa{~*-EMPua73EkF7<|$lhSOyB8r-P?)B*R z@B3MW&xKrm{jxNFc?&#A6gBB|&PlV3BpCt_#{*o~E#+yJ(dnFXa`G16TkZ+vEy$*H zI_C@C?On_aNC+;&Q?8HCaD?Fc`0T;^ZtsFLn{7A~zub^YPeB+)kNUS4G*%wNn`H1H zkMD0;aok^DfRu7h&0f$T&9c(JS#0P@e9xN;v4H2b;P;Q_oBN)mR zB+X`K^i-ZdvC;{plye(4j&Lmi$8n!@xUkWrC~^P_l^fd@me#8B-C%oXJ6#A^8!lwjbOd*2dft)-_`Pe}Hkvmm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!043bzA^-pY literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a01af9b533f09c99704fcd730bb7b12c01e12c9f GIT binary patch literal 522 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zS9!WPhE&XX zd+VUzAp;5a5B6#7=GiL8bek(ueyQziP>(-5`TP^^6P>z`W(l4?mMgb_TWx91j)NWl z{@%aM)_%v3tDQXGBfP)=HINcO^*3-LtSN|u0YLNEy=(sarkY5Tf9G01wsWy+2A_F1Um=)t=Bd)?Whc7l z?fa7!Te+~VcH42EHRTN}_xIn9w?1wvEC>e^BOkOM`~UaXM@z9YL|o?yDP?xwH1}6shg`HZSMRnqR=$7vW%1PX zcWVVMmR;q^nG(zXaKe>x*{%Hz>m(T%G%v5pOAvCMd!Ka~(3C88kR@I#9mCIO)UeO^ yHM3sbD%yUD+_n1=Cs%$1Mj>BnglC$sFM}44%>l$9a4C2)i1Kvxb6Mw<&;$SyR^N;O literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/meta.json b/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/meta.json new file mode 100644 index 00000000000000..27544e88644f00 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, tweak by @mureixlol, modified by okroshka59 (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From fa6096695f0be0f334192274ad69deaa536f1db2 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:08:23 +0300 Subject: [PATCH 08/15] blueshield-backpack --- .../ru-RU/ss220/clothing/Back/backpacks.ftl | 2 ++ .../Roles/Jobs/Command/blue_shield.yml | 1 + .../SS220/Entities/Clothing/Back/backpack.yml | 16 +++++++++++ .../SS220/Loadouts/role_loadouts.yml | 10 +++---- .../equipped-BACKPACK.png | Bin 0 -> 1009 bytes .../blueshield_backpacks.rsi/icon.png | Bin 0 -> 629 bytes .../blueshield_backpacks.rsi/inhand-left.png | Bin 0 -> 758 bytes .../blueshield_backpacks.rsi/inhand-right.png | Bin 0 -> 828 bytes .../blueshield_backpacks.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl create mode 100644 Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl new file mode 100644 index 00000000000000..26e53f28dda673 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl @@ -0,0 +1,2 @@ +ent-ClothingBackpackBlueShield = рюкзак "Синий Щит" + .desc = Рюкзак, специально разработанный для ЧВК "Синий Щит", с уникальной технологией карманного скафандра. diff --git a/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml b/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml index 34eff5ad5eee15..2bb1cbdba1bee9 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml @@ -63,6 +63,7 @@ id: BlueShieldPDA ears: ClothingHeadsetAltCommand pocket1: WeaponAdvancedRevolver + back: ClothingBackpackBlueShield # belt: ClothingBeltSecurityFilled #SS220-blueshield-loadouts gloves: ClothingHandsGlovesCombat # SS220-Blueshield-Storage-Fix-Begin diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml index e100d3302a761e..e3f1e3dad8d220 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml @@ -72,3 +72,19 @@ components: - type: Sprite sprite: SS220/Clothing/Back/Satchels/whitecapsatchel.rsi + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackBlueShield + name: blueshield backpack + description: A backpack specially designed for the Blue Shield PMCs, with a unique pocket hardsuit technology. + components: + - type: Sprite + sprite: SS220/Clothing/Back/Satchels/blueshield_backpacks.rsi + - type: Storage + grid: + - 0,0,7,4 + - type: ToggleableClothing + slot: outerClothing + requiredSlot: back + clothingPrototype: ClothingOuterHardsuitBlueshield diff --git a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml index 97a27b653b1bc1..5243e499af43f1 100644 --- a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml @@ -14,7 +14,7 @@ - BlueShieldJumpsuit - BlueShieldOuterclothing - SecurityBelt - - CommonBackpack + # - CommonBackpack - Trinkets # Security @@ -29,7 +29,7 @@ - SecurityShoes - SecurityPDA - Trinkets - + #Senior - type: roleLoadout id: JobSeniorService @@ -39,7 +39,7 @@ - CommonBackpack - Glasses - Trinkets - + - type: roleLoadout id: JobSeniorEngineer groups: @@ -49,7 +49,7 @@ - SeniorsEngineerOuterClothing - StationEngineerShoes - Trinkets - + - type: roleLoadout id: JobSeniorPhysician groups: @@ -75,7 +75,7 @@ - ScientistShoes - Glasses - Trinkets - + - type: roleLoadout id: JobSeniorOfficer groups: diff --git a/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/equipped-BACKPACK.png b/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..f5100c6081b89d459eb4445dafe266a879b9780d GIT binary patch literal 1009 zcmVPx&kx4{BRCt{2nlVfhQ5eVn73F#bj2Drx&jfW;J2}@mYVZk(UaME2D69;i3 zOio4y9bMd<*cez`Wa>gfUC^+ACeU8f0R%x11VIr0DWQG`APeKVXjN7${E+U?MVZQ(%#6t8)>=A=#gpRu&Q{MvWn33G zZ{J06>M3rd?s@jzFQ36S-UEP;6`^AR(&=fjS17ct*DDbi*M+8OsHY!cX!$9M%RnTe zqE@pp1fc$K3EJLQKvIN`E5_nUZ|F7aV7u~eVO$rA681WM8rSYPb*ZT!6=*D;6xx-` zuqyk|u3Uzyj=;97-m_KN?@8xfIOpQ(o?X*449&el`QtO`b>M<*5YDed z06;#!9?Ip`Lizl9$ZzizjO!x&VjV}Ti%^CyLCh}T+W0ky*##)WmvFSY2=zrSaFJ|= zv;h4i{9z6U_us;*?BmefLTTy=4$UoCm3sSLNL>Hmaajvk@{k z0RXzWhC_1;y151b2$`Fx)ohH7DpKuA%@@XX!J-o=nkBI4gtrE`&qcFzrgw3tzB{ce z6NA(~064h@xHiUh(d#t;021*8ws*FnC}CXZ+_Uc$3UHjdS1yCJ0G4GnDE#MHYVkP> zwq5l`+Ubt6=mc!LD&6KlZH3)wpeSJgII$;i*B{v_I8XurfB(M#K@bE%5ClOG1VIo4 zK@k5J9UUUN2azl~;o1Cofq#K?dfGcIEt;j{&khbr+g5P1LFL&unELh(08lPl-Whzq zg>XBrsv{U5*8l(;x1MAC)64ENRgCMxm`sT~^D812Pl`-tM);NX2hb0i#gfU)h*&%+ z?#!ea~>2+I&<+26Fb?IwrvM{cTa@h*3<2ZFMX2%I` zuWfqVefPWX)>drqY@bVV(oMy?8RAxS8h4-o{=9#XL)oio-BK+42nEe;MF~r7hT6io zE*RH^VHgcgWp8EuO`7>O3`4l__9G^OAP9mW2!a?8egk@*u0FVdd2j##01jnXNoGw= f04e|g00;m8000000Mb*F00000NkvXXu0mjfiSyJ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/icon.png b/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..569b2fa7f89c36fc2b0f165d3e3307b7d0ec1e42 GIT binary patch literal 629 zcmV-*0*d{KP)Px%6-h)vR9J=Wmc4G%P!z|1PTJbO1=2`~?L??e78sbag472{SDv9fKp9~QBSSl~ z^a+@GfJ)4$OC`Eg^^n*}s)T&laSRPZ@WmCXVv8Ua|D>z?_18V;9-nh%$jHd}&nRic zR%LgwO5=3wRA+9aG5q-1bDYL2Hq9p(R#onIoi?F+iS^|Jz#@$!D@9gicTp@B*(vM* z5N=mkJSejz9!bsI8=*{kY)(4>OePb0{azv`5=FrCd;s#z7UPev5kjZ$`3Rxo#rlUY z-}B?sTd7Y%q6h$}swNHHN3obP)t*tq_D?>u5{ zNvNtC^;%tyZwpoGwYqG#g(|A50Z^~i}_y?@#4Bu{H^RV|7!=LDu`~Rsv1GwW-uHP%)@2Y zNAuXN*Y*;|`4|5K85tQFKLOPx%mPtfGRCt{2+P_ZQP!z}Uugf1N0V*v1Ijt07sS8uf8+2g_Yo|Uyc>ua0rmhUE zUFZYQnYm0|kV-p%6e>X@(b%YxBU0kHA#w+BL@P+F>evNwK2j7ZmTt~H*S?W*f1s37 zN-3q3Qc5YM)V*T-?*eXO7fTUAjXD=DpT*BSFD8AVY7yw!?*63`lCK~79;J|R!j-$>-8FP3j z)yV@qkQl_RRgJoT0$fZy3|siVPZ+i+6!HN0zMuFJ$ZeEqEUx3%PbJFhNu&XGu@vQ& zcj#=bVh#@xEvzs#IYqRvf;l`yXKR)G^2bE`#Mr1wvl(D`dlIGfCDH(ZtE<-bDxA!} zqU}}i>!&mp*U4>^6OGgO8Dfn;Wa7&^!muS(-i<`|fWKF*{|Y#>4u?mFm}ZVg#bWpK@3k6X z*y>(SDsGfpldAA~Vx5gwEWT~ypFyDeEGJ$4EQuD>>ruFklUGV9rIb=iDW#NBN~wD% zm4AiP4mC(+5kN2>kX5KbGK&C$XMAbA!6 zB=Z3og&HKY2q4setV0b_Sp*PjK$f9~>#_)KuR_V&2L8+Am%qB;%+kRCc&iu o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g69)a!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a51a375bd8bbcc3a4fff4187e8852c2ef91ef1 GIT binary patch literal 828 zcmV-C1H=4@P)Px%+(|@1RCt{2+B;9%P!z!NzstjMNGdE|Ns%HVb;;Bq@d3K9gq5jdhw=enLz%iV zuy%nDKVj0t08*#~jYRWMB}W7jn-IA}a0+>0n$TEqeo_?4zVf~IIQQDhIUs}( zLI@#*5JCtc#IvFddI0?vk1yB&xqJbDTsG5nj>GK^hQbm1zK-s@@E~d07^>07Bu29h#YDc=9#5`4wj0yltF2`~HQ{w@+OE{sCZnF$nwndrCaMVEg?V z07aufFc2Wup?%8)Lg9$5>pDY;kCZ;I0pRy*l*<(Wg3BA!Qc1c+)eGYB1>3r+V!lst zvNqdsoG+RW+d=CWc{PStd?Yy*_yWqj*kfX%pX8qU(}w2|y?uv3;w1 z)KW>*(Gl#$b*3h#uou@+M@Oiol4z@6UF{QtrsNMPmn#GVYR5J$0RZrAB`7UzVieD* z=F=4BKTyr5??lz>EX!o#U>kk>C8Z0iW4o43Fc?rNmn$gwLjWTAT{1V{26v;{X=CvM zRrR@g6t>+2-FD*DeIOQ#*+%ga_{aBv=v{i)ERO^ImmybmaQR zv~B483RKkx+CY6c!t zFrZR23QSP%yHdIA`R;?u0OYb6MWJdtojdgc0J^RNk6$xze0;1#H_q(ZRswZ&q%V_) z4(ah`UZ@!eg(LRuw0*z03IGhgW}rE3-!HBL(5_~nnokqS?*i^BF?v0|U=>N|)aR#{d8T4rN$LW=%~1DgXcg2mk;800000(o>TF0000 Date: Wed, 24 Jul 2024 17:26:00 +0300 Subject: [PATCH 09/15] blueshield-T-shirt --- .../ss220/clothing/Jumpsuit/jumpsuit.ftl | 2 ++ .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 11 +++++++ .../Jobs/InternalAffairs/blueshield.yml | 9 ++++++ .../SS220/Loadouts/loadout_groups.yml | 1 + .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1496 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1579 bytes .../Jumpsuit/blueshield_t-shirt.rsi/icon.png | Bin 0 -> 843 bytes .../blueshield_t-shirt.rsi/inhand-left.png | Bin 0 -> 1068 bytes .../blueshield_t-shirt.rsi/inhand-right.png | Bin 0 -> 1074 bytes .../Jumpsuit/blueshield_t-shirt.rsi/meta.json | 30 ++++++++++++++++++ 10 files changed, 53 insertions(+) create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl index fad61b97eda925..2a66b0969884b3 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl @@ -32,3 +32,5 @@ ent-ClothingUniformJumpsuitBlueShield = униформа "Синий Щит" .desc = Стандартная униформа ЧВК "Синий Щит", представленная в виде рубашки и брюк. ent-ClothingUniformJumpsuitBlueShield2 = тактическая униформа "Синий Щит" .desc = Тактическая униформа, специально разработанная для ЧВК "Синий Щит". Как же она хороша! +ent-ClothingUniformJumpsuitBlueShieldT-shirt = футболка "Синий Щит" + .desc = Черная футболка с короткими рукавами, украшенная синими узорами. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index 61d1f1fc5884ae..729b14de65ba6a 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml @@ -67,6 +67,17 @@ - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield_alt.rsi +- type: entity + parent: ClothingUniformJumpsuitBlueShield + id: ClothingUniformJumpsuitBlueShieldT-shirt + name: blueshield's t-shirt + description: A black short-sleeved T-shirt decorated with blue patterns. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi + # Сервис # Клоун diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml index 0255166e746e36..def62fa7dcc1e8 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml @@ -27,6 +27,15 @@ equipment: jumpsuit: ClothingUniformJumpsuitBlueShield2 +- type: loadout + id: BlueShieldT-shirt + equipment: BlueShieldT-shirt + +- type: startingGear + id: BlueShieldT-shirt + equipment: + jumpsuit: ClothingUniformJumpsuitBlueShieldT-shirt + - type: loadout id: BlueShieldJumpsuitTurtle equipment: BlueShieldJumpsuitTurtle diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 9059aff8871a27..2bd56cf6b4b0a6 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -22,6 +22,7 @@ loadouts: - BlueShieldJumpsuit - BlueShieldJumpsuit2 + - BlueShieldT-shirt - BlueShieldJumpsuitTurtle - BlueShieldJumpskirtTurtle diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..31c103667bafc8584741dba4eab23e5436216f74 GIT binary patch literal 1496 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 Vm)-muh&uoP002ovPDHLkV1mq;i$(wd literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..259b5eb93ffc3ff6852176c3c7fc53c9186a0c35 GIT binary patch literal 1068 zcmV+{1k?M8P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0HIlBs@W3*RLwHd ziMW`{uZq2|2w(&u2pE)@sV6gwS$K}Gd-(Wz7v)*r=l&c6O2K4+Pb7{p-LQx^h-Wt~ zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|YK2d-P^xs+Wq|iTXS-qQE`9~0007GNklco2}A+K|~x{LFi)1+)OIc7!nljK0=PGd=51s zHrn1@-pk_iTLO3Fz3=<--5un803sqHA|fIpA|i^T@Mu?;%C^3E+;OT?$HIvFy{N89 z6e*Q$oo_Yq^WpB)Ii(c-wlG)KQ%Xq;?MfmG006G%;m(IASlu}oPu6j&+V#BH^(J>g zQad6gRcLkRKnLA6f^Hl4+>ba}-h@%GVH9k9efA*ob#4{!YAa{KG|lm`qoem?;~lv! zRp@O0F;W1GS{>^25JtsD>fKYE%}}$~?+K0W-^6YK0MNBM@~tKSAm3_2*XlFXvvQWi zur4LK0Mg<1-Ji0pv1$~rRH zCFtWlY;8C2`psKxZ8xBg_mIghVXd+rtDYYWu#g5^^&JaoiIGkd*#Sx^6jq8Dcth;J zdWjd$8?bT~7L5!FD@8EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$WWc^q9Tr^ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfb#YR3krMxx6k5c1aNLh~_a1le0HIlBs@W3*RLwHd ziMW`{uZq2|2w(&u2pE)@sV6gwS$K}Gd-(Wz7v)*r=l&c6O2K4+Pb7{p-LQx^h-Wt~ zo%23%n3W}k_?&pspbHW|a$R=$jdRIifoFz|YK2d-P^xs+Wq|iTXS-qQE`9~0007MNklljA6bJBsC{C+jS3->w zTovLarc%`j7EcjFJ_0N3?c6CDSeTGNjLlZmuYeF@XpxY*5M}6uCqSqnN(7R9iekCw z7$C@L?Kp-D=Sc6jM7neCUQX|HC&inKo7mVp;z7?r&~tFxeUA^TccGLmC}j&@p4^N5o^0U*V2q(Z=;Lemb8Ng< z<0j4zA0h`psW-sRj-ga7=gh2UT>h(X#oIAofde#@sHvC zUwTnbd}itaEV^0VSCLoXda=j>Am}+0iv&Ff`QP*32ZKz$2g33C{s_SIcq21lv$}AFG%aU!-^mA%qY@2qA1u=@)cXI%!t@8s>pe5`6_C|4Fy7bqM{q?ijuaUnt7l-muOAF2YX73loB^_W s2EzM>YyYC8N?BPw0~hzDdOs28C(u4by6Kl9&;S4c07*qoM6N<$f}Pj@3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/meta.json new file mode 100644 index 00000000000000..f0381b89166537 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 9c0db5709d9ffdceb2744858fc148dc8fb7065aa Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:49:22 +0300 Subject: [PATCH 10/15] blueshield-belt --- .../ru-RU/ss220/loadout-groups/blueshield.ftl | 1 + .../ss220/prototypes/catalog/fills/items.ftl | 6 ++++ .../entities/clothing/belt/belt.ftl | 2 ++ .../Prototypes/SS220/Catalog/Fills/belt.yml | 19 +++++++++++++ .../SS220/Entities/Clothing/Belt/belts.yml | 11 ++++++++ .../Jobs/InternalAffairs/blueshield.yml | 19 +++++++++++++ .../SS220/Loadouts/loadout_groups.yml | 7 +++++ .../Belt/blueshieldbelt.rsi/equipped-BELT.png | Bin 0 -> 377 bytes .../Clothing/Belt/blueshieldbelt.rsi/icon.png | Bin 0 -> 481 bytes .../Belt/blueshieldbelt.rsi/inhand-left.png | Bin 0 -> 445 bytes .../Belt/blueshieldbelt.rsi/inhand-right.png | Bin 0 -> 464 bytes .../Belt/blueshieldbelt.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 91 insertions(+) create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/equipped-BELT.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/blueshield.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/blueshield.ftl index 81759df6d4c05c..6442190d412ec1 100644 --- a/Resources/Locale/ru-RU/ss220/loadout-groups/blueshield.ftl +++ b/Resources/Locale/ru-RU/ss220/loadout-groups/blueshield.ftl @@ -1,2 +1,3 @@ loadout-group-blueshield-jumpsuit = Офицер "Синий Щит", комбинезон loadout-group-blueshield-outerclothing = Офицер "Синий Щит", верхняя одежда +loadout-group-blueshield-belt= Офицер "Синий Щит", пояс diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items.ftl index 94db0d7c4ba916..ba20820e8e1b16 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/items.ftl @@ -13,3 +13,9 @@ ent-ClothingBeltRapierSheathAltFilled = { ent-ClothingBeltRapierSheathFilled } ent-ClothingBeltSecurityMedicalFilled = { ent-ClothingBeltSecurityMedical } .suffix = Заполненный .desc = { ent-ClothingBeltMedical.desc } +ent-ClothingBeltBlueShieldWebbingFilled = { ent-ClothingBeltBlueShieldWebbing } + .suffix = Заполненный + .desc = { ent-ClothingBeltBlueShieldWebbing.desc } +ent-ClothingBeltBlueShieldBeltFilled = { ent-ClothingBeltBlueShieldBelt } + .suffix = Заполненный + .desc = { ent-ClothingBeltBlueShieldBelt.desc } diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl index 8b05488794b6c7..f125d953d20a8e 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/belt/belt.ftl @@ -8,3 +8,5 @@ ent-ClothingBeltSecurityMedical = пояс бригмедика .desc = { ent-ClothingBeltMedical.desc } ent-ClothingBeltBlueShieldWebbing = РПС "Синий Щит" .desc = Идеально подходит для хранения всего - от боеприпасов до оружия и предметов первой необходимости. +ent-ClothingBeltBlueShieldBelt = пояс "Синий Щит" + .desc = Идеально подходит для хранения всего - от боеприпасов до оружия и предметов первой необходимости. diff --git a/Resources/Prototypes/SS220/Catalog/Fills/belt.yml b/Resources/Prototypes/SS220/Catalog/Fills/belt.yml index e0a1d05799edbf..8f5abe8af97b9b 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/belt.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/belt.yml @@ -48,3 +48,22 @@ amount: 1 - id: Gauze - id: EmergencyMedipen + +- type: entity + id: ClothingBeltBlueShieldBeltFilled + parent: ClothingBeltBlueShieldBelt + suffix: Filled + components: + - type: StorageFill + contents: + - id: GrenadeFlashBang + - id: TearGasGrenade + - id: Stunbaton + - id: Tourniquet + - id: Handcuffs + - id: Handcuffs + +- type: entity + id: ClothingBeltBlueShieldWebbingFilled + parent: ClothingBeltBlueShieldWebbing + suffix: Filled diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml index df88041cb06951..7ba2e6b52e7611 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml @@ -100,3 +100,14 @@ sprite: SS220/Clothing/Belt/blueshieldwebbing.rsi - type: Clothing sprite: SS220/Clothing/Belt/blueshieldwebbing.rsi + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltBlueShieldBelt + name: blueshield belt + description: Ideal for storing everything from ammo to weapons and combat essentials. + components: + - type: Sprite + sprite: SS220/Clothing/Belt/blueshieldbelt.rsi + - type: Clothing + sprite: SS220/Clothing/Belt/blueshieldbelt.rsi diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml index def62fa7dcc1e8..45ad81cf978d01 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/InternalAffairs/blueshield.yml @@ -78,3 +78,22 @@ id: BlueShieldCoat equipment: outerClothing: ClothingOuterBlueShieldCoat + +# Belt +- type: loadout + id: BlueShieldBelt + equipment: BlueShieldBelt + +- type: startingGear + id: BlueShieldBelt + equipment: + belt: ClothingBeltBlueShieldBeltFilled + +- type: loadout + id: BlueShieldWebbing + equipment: BlueShieldWebbing + +- type: startingGear + id: BlueShieldWebbing + equipment: + belt: ClothingBeltBlueShieldWebbingFilled diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 2bd56cf6b4b0a6..f572734971cd5e 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -33,6 +33,13 @@ - BlueShieldArmorBulletproof - BlueShieldCoat +- type: loadoutGroup + id: BlueShieldBelt + name: loadout-group-blueshield-belt + loadouts: + - BlueShieldBelt + - BlueShieldWebbing + # Chef - type: loadoutGroup id: ChefBeltApron diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/equipped-BELT.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..3b8b1eeb10328e3f960fbbad572694ffb788a292 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zB|TjnLn`LH zy|po~*+8WA;pJ69H#!I=l+by`n_kWitFSPSADWoJU9RJxw`Js>FlR_^E2wU zu1<+EKGCl>aaWbczgiFBvm1X3RYk42^Kk$5{Igr!&TcHMTxR;tGW`2jflCf+A|`#= zSO5FZq1jtkFZWE_U7B3{(>B%)VjGBju)S-K%$);bm6_8|t4BXsY8x)UxV>(ffB*H0 z^XyAJ(;jEqRNUV`-Cj3L@uvNyvnnyOSUZ*%UI?wc(BM+LVtwAe`)l&;B!wnTRGYb$ z|7*p=>3sji_wUPBYZd|;KF^L})yvMUa#xmi0C{|=5uRzjz6@GGHU|)cz@^~HAj;F# K&t;ucLK6U#Tb>*M literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/icon.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c217b37ed31203cb669b0f8161b9b1f628f8c402 GIT binary patch literal 481 zcmV<70UrK|P)Px$fk{L`R9J=Wm9cKZFcd`(6%tmeFgQqbpj%jzwfsZ>sB^!l{Rg_jSSTIJP$cp; zqM#1xKusN##DRq+XG(16`ue`uhL)C=mMha~GAPi4+&m|;?bz=&r+tZRo%+rJfga>q zYtmgxw$A`iJ%xAc6~>kIi-^-i*JS`eL;$djn8|GHiOc%SsC5_UL2j?s7;z<_wJx;P zrBIoGiQZn#ISCm4%;Z%jYD+M>A0Z;giH&fTSfB@aw$BPij7AkVbq3a7Yv2&QiM%dO z(`Tn(G^(f+Gu!E5G6CRiIz{zVZB5NTlkKy@cXh^{yWn%RVt6+siX-N;IpH{j1*PXe zI1X7ZmPBzxn(o+qZ(Q=#B`}WtzF(-JBtjHN2P4+RQ5+$OHBJP-?-#VnXmk!JrT))? zKp*SceSGF;^NxJHAc>%Z!>$n#lu}Kk-3IJc0anB*^7=#v(Blx#^O(=(z+wNVyR?x3 z=RtJZcFtX3w_jx7)I^iZ<%H9`OY01jnXNoGw=04e|g00;m8 X000000Mb*F00000NkvXXu0mjf;oQ|m literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a44ec3a35a051c0884881ea5e4c78a0a120ffdd1 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zV?A9QLn`LH zz2)fF>>$GSpuJEmm2r>Q<4w6NleV=#V39kUUCCh@DE^A+MFaP)1jBU(IX+8jjklcq z|900;@Be#dDh4P4&4dDrvt^r&Gbc%|++%Yd$P_*;y=xL*%$elNS9&v^JwGmPTI$?g zsT0>!!8qM*PeWFGRia2xX}SI^X*b2t-*9zMt#7SDs1sDdX|~cy#sCU*GR% zWKNp-u=7LwqxZLClb$WI=lu1uc;laQ=a$~BJ!JWl@v>uC;o5meRe?_BOO5bM^YvxW X0bP0l+XkK=Kr>h literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2e209f8d41d0a8cd95bfca57050e28753e08aeff GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z3p`yMLn`LH zy>;I2kb?l*2hB7-lZCf)J#Cl-JsR3y2>-~~H;rFW?Um!+3r?z`Z7|9ed7jqZW^4ci$qw|xp(p|N*Y*;Mx)F43hoPi5~~ca`hG>6iC~=dK7dR@kw( zaH=~`nuGV+G>47aF;4{p-*C;84A|aq|LfCBmJiDRUekry4WyTA^(lSaz9;=_;*#sZ zkG^lwYq+*+)%N!0i9h$%dlZUDritxeU&cg=kH z@#R5frKo%NE6@1og*nbj?VZ1~?(iyx*I$1fdbVSUGmnGPLd6$ZtW#1wFa6h!+}`ly zaBl8)OW8#nVQtM9pT{Rp{&?jI^F`H@WgFylqF#HkCbrL9spEa>zS(=dv;!wC%d8nr t{9t(IU+lSl<059DYxz Date: Wed, 14 Aug 2024 15:50:03 +0300 Subject: [PATCH 11/15] blueshield-hardsuits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Воксы потом *если мне не будет лень* --- .../Head/blueshield_hardsuit_helmet.yml | 23 ---- .../Clothing/Head/hardsuit-helmets.yml | 76 +++++++++++++ .../Head/security_pilot_helmet_hs.yml | 25 ----- .../OuterClothing/blueshield_hardsuit.yml | 30 ------ .../Clothing/OuterClothing/hardsuits.yml | 100 ++++++++++++++++++ .../OuterClothing/security_pilot_hs.yml | 32 ------ .../blueshield_light.rsi/icon-flash.png | Bin 0 -> 635 bytes .../Hardsuits/blueshield_light.rsi/icon.png | Bin 0 -> 540 bytes .../Hardsuits/blueshield_light.rsi/meta.json | 41 +++++++ .../off-equipped-HELMET.png | Bin 0 -> 989 bytes .../blueshield_light.rsi/off-inhand-left.png | Bin 0 -> 827 bytes .../blueshield_light.rsi/off-inhand-right.png | Bin 0 -> 815 bytes .../on-equipped-HELMET.png | Bin 0 -> 1295 bytes .../blueshield_light.rsi/on-inhand-left.png | Bin 0 -> 1185 bytes .../blueshield_light.rsi/on-inhand-right.png | Bin 0 -> 1186 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 2181 bytes .../Hardsuits/blueshield_light.rsi/icon.png | Bin 0 -> 863 bytes .../blueshield_light.rsi/inhand-left.png | Bin 0 -> 930 bytes .../blueshield_light.rsi/inhand-right.png | Bin 0 -> 910 bytes .../Hardsuits/blueshield_light.rsi/meta.json | 26 +++++ 20 files changed, 243 insertions(+), 110 deletions(-) delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Head/blueshield_hardsuit_helmet.yml create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Head/security_pilot_helmet_hs.yml delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/blueshield_hardsuit.yml create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/security_pilot_hs.yml create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/off-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/off-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/on-inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/on-inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/blueshield_hardsuit_helmet.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/blueshield_hardsuit_helmet.yml deleted file mode 100644 index 8df83598b98bf0..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/blueshield_hardsuit_helmet.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitBlueshield - noSpawn: true - name: blueshield's hardsuit helmet - description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the Blue Shield. - components: - - type: BreathMask - - type: Sprite - sprite: SS220/Clothing/Head/Hardsuits/blueshield.rsi - - type: Clothing - sprite: SS220/Clothing/Head/Hardsuits/blueshield.rsi - - type: PointLight - color: "#adeeff" - - type: PressureProtection - highPressureMultiplier: 0.45 - lowPressureMultiplier: 10000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml new file mode 100644 index 00000000000000..c9b9ab359e5f92 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml @@ -0,0 +1,76 @@ +## © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +# СКАФАНДРЫ ЭКИПАЖА + + # Синий Щит +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitBlueshield + name: blueshield's hardsuit helmet + description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the Blue Shield. + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/blueshield.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/blueshield.rsi + - type: PointLight + color: "#adeeff" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitLightBlueshield + name: blueshield's light hardsuit helmet + description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the Blue Shield. + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/blueshield_light.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/blueshield_light.rsi + - type: PointLight + color: "#496eff" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.9 + Piercing: 0.8 + + # Пилот СБ +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitSecurityPilot + name: security pilot hardsuit helmet + description: Armored spacesuit helmet with a modified flashlight for exploring voids. + components: + - type: BreathMask + - type: Sprite + sprite: SS220/Clothing/Head/Hardsuits/security_pilot.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hardsuits/security_pilot.rsi + - type: PointLight + color: "#ffeead" + radius: 4.5 + energy: 3 + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/security_pilot_helmet_hs.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/security_pilot_helmet_hs.yml deleted file mode 100644 index 29dd3da4440363..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/security_pilot_helmet_hs.yml +++ /dev/null @@ -1,25 +0,0 @@ -#Security Pilot Hardsuit -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitSecurityPilot - name: security pilot hardsuit helmet - description: Armored spacesuit helmet with a modified flashlight for exploring voids. - components: - - type: BreathMask - - type: Sprite - sprite: SS220/Clothing/Head/Hardsuits/security_pilot.rsi - - type: Clothing - sprite: SS220/Clothing/Head/Hardsuits/security_pilot.rsi - - type: PointLight - color: "#ffeead" - radius: 4.5 - energy: 3 - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/blueshield_hardsuit.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/blueshield_hardsuit.yml deleted file mode 100644 index 79851c08a549e8..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/blueshield_hardsuit.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitBlueshield - name: blueshield's hardsuit - description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. - components: - - type: Sprite - sprite: SS220/Clothing/OuterClothing/Hardsuits/blueshield.rsi - - type: Clothing - sprite: SS220/Clothing/OuterClothing/Hardsuits/blueshield.rsi - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 10000 - - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.5 - Piercing: 0.5 - Heat: 0.8 - Radiation: 0.25 - Caustic: 0.6 - Stamina: 0.35 #SS220-syndifix - - type: ExplosionResistance - damageCoefficient: 0.6 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitBlueshield diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml new file mode 100644 index 00000000000000..da339951280969 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml @@ -0,0 +1,100 @@ +## © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +# СКАФАНДРЫ ЭКИПАЖА + + # Синий Щит +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitBlueshield + name: blueshield's hardsuit + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/blueshield.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/blueshield.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.8 + Radiation: 0.25 + Caustic: 0.6 + Stamina: 0.35 #SS220-syndifix + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitBlueshield + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitLightBlueshield + name: blueshield's light hardsuit + description: A special suit designed for the Blue Shield PMCs. It is characterized by lightness and maneuverability. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.7 + Piercing: 0.6 + Heat: 0.8 + Radiation: 0.4 + Caustic: 0.6 + Stamina: 0.35 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitLightBlueshield + + # Пилот СБ +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitSecurityPilot + name: security pilot hardsuit + description: A special suit that protects against hazardous low-pressure environments. Has an additional layer of armor for space battles. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Hardsuits/security_pilot.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Hardsuits/security_pilot.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.7 + Caustic: 0.7 + Radiation: 0.50 + Stamina: 0.4 + - type: ClothingSpeedModifier + walkModifier: 0.80 + sprintModifier: 0.80 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot + diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/security_pilot_hs.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/security_pilot_hs.yml deleted file mode 100644 index 29d4012ac2b900..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/security_pilot_hs.yml +++ /dev/null @@ -1,32 +0,0 @@ -#Security Pilot Hardsuit -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitSecurityPilot - name: security pilot hardsuit - description: A special suit that protects against hazardous low-pressure environments. Has an additional layer of armor for space battles. - components: - - type: Sprite - sprite: SS220/Clothing/OuterClothing/Hardsuits/security_pilot.rsi - - type: Clothing - sprite: SS220/Clothing/OuterClothing/Hardsuits/security_pilot.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.4 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.7 - Caustic: 0.7 - Radiation: 0.50 - Stamina: 0.4 - - type: ClothingSpeedModifier - walkModifier: 0.80 - sprintModifier: 0.80 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSecurityPilot diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f60181e5b6d9d1abf4c10c9ede71074a2b5b8b GIT binary patch literal 635 zcmV->0)+jEP)Px%HAzH4R9J=Wluu6+K^Vq=W!td3tpzJKK#P*97%wH^U^wE%ix<8DiJUp;cktks zAn6w%UOapEz@Z^A5+y+Y*|jW7>27CQ+wrhzBhiGRG4bI3ZZq$b=Y8hQ%s@m$M8rQP zrXx~H0kFEdO3QH-fNk4XG(ivmP-|4ip0U{V_F4go#UcPL$5o@o$yD-+#_#y!Afpg} zEx?Gy`MgSH3fM{ekM+P0=(tDJzg4w;wS|S;OJyeS0x(Q{1;Df{07SP7z*Of!xc0wu zRNK|^p3)Jm@2Dli$`H>MNaTtnj13aT2E9R&-XJ+%CvrvN*#d@@VSPs}>3GL=M9$v! zseR`WKjxp4URXwaeg{CzPlcyQ&j4UP-lW|)X1eX->}{W-F=4F$Lb@2i8Rp4*f<_8^ zZHxR2eEAp#dH8gb>IDS*C5&DN5u72Ut7EMf06_LU68B$_URWmBFLC%w?eIeh0DEnV zcHRaTQ$sqTdCo4$7yeu>IL*=o4#yQy$JUJhP@X4`3X`=9c#S+PQ4tHQX+&vb_J^MaoMb3 zWn8R`%Vo2I>U+qp2sKjT)XQ4WQ2P!z^>Qo=;h#(%hJ$fU4F|}sAZS+!yi@JwaKoPv zAiG#p_Ut|Ebe?I;1emxv++YGDewzeL+#DvDz=+K3oHEUD0zwE}uQjn(L`1~@%}+m% V{Q{*MRD%Ej002ovPDHLkV1n|PC_DfF literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0f5cb60ad775580bddcbe0e2bacbe5e744803da8 GIT binary patch literal 540 zcmV+%0^|LOP)Px$)=5M`R9J=Wl|OIOP!z>~1~Mcz7)6m9g%%a5E6&P4RpAp*31#mV@hMP01VY)^ zS^5o#5Px>3OQj45H^pfmrU{N?sl#J%ZR9}Z+c2>BOxC;C=NzBs`yP}iQKH0uh9POv zS_9B-w^1j72B_6)xt=JB02qJsGET!NrWYA-90ve(66jRew9H)3Je+4nQWFvb*CYm( zu`GVsnglnbjWcgk+tvd(hj}>2iKbs)IqzUs;9mWizP0g1l&;tS!1a1Fc?dce!h=jW zR}XzLr^vv}+tgL7N!)r)W6L3Y|1xJJ6}GnbP$QRW;4|~k;1;GJGO&mh0M&z6Ob@`` z>2rS#KEF+jJnZfeWU?yc3#uia+vP-{@Q2n^id<1pMw_w zOctLC`9%g=&Gp>)&F{S7>0^fv{lv(VUY~a#UCi-rZXA#Oqe6bs7{+m&9W(&uc$eYi zBI?j*I7!x0L{UT>#}aDUKd^qcWgLAy)|mmzM2%eR4G#b{axqE9F%|#*h68|Dz eqC|-j0KWiP1>;k~Ystg_0000Px&mq|oHRCt{2noVySR}_XHYA|=kI5?wGnNpi=Ss)R46|wTVt85~5;e~f;mH*&H z{Tr+(o30~ull+M;5s_FVUE;bTEgFI{43{rW7idP9R5ABDcvAO15<)EIocF$*duQMr zF#NyC=v-9x_9NT2lh0uo@@Myt3_z`Z8ns{ltQGfDEXVy+epS9wy&z7$Q`kvfwrx}P z_9FoK;f0QlYl-8=`E%1FX8kI;>Cu(^swf*UA5@t2s|n{K`lvnf0q| zIUWF8j>oKDMM|j^PsxCi)rc(Nl6`oVxIgPx$v!;85-ugH5rtu>CFDB7Fr;KPqI;PJ zR>33av?v~25Oi8t1&@1~1|_SZTm?!7Si;3Bc;wpWc*n2Uay-1_SLE8~SOpJDxZ2;u zbx0|b{G*^t@!$f0;=u)@pqu1ZMd{#h_T0#E9Qf{6a_#dZ@wE07-af|nef;;m&wcV?f#hJ~wr@qO|?)oB^sB1JV|dHpYOo1*DBJAZ-C@ zV+=@JK-w4s(iV_5#(=a1q>V8kZ2_A==g-kE9@XFZ>!REkiCON^-=sf()BIxh2mE)x z0DAoitu0Wp8qxOnkXgU_(R{!riA#HVMnQgf!S?u&V(xpb?yzzN#4U2Gu;|YZ7EM~_ zvPan?+H@t9z5QrDs4yG54El@qT--6XgiDD=^ltRq+8UHAV4DA(NxsP_=;HUNfVed+rDSztW0G&GhFqJ~*sCRfTQdqD;q19l z+1rn9<5n2wSsjvC=BMKywV!Vc27|$1Fc=I5gTY`h7z_r3;ZE}p7jTgW;)sC$00000 LNkvXXu0mjf!*<&? literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/off-inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b8788318ac00a7e1c64434c0f79c1f24b46eacec GIT binary patch literal 827 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/on-inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a4e8853469ce6a57356a86d22ea9fbfd340b251f GIT binary patch literal 1186 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7cd47321b2c329310fc1d44e9c148976a1454a42 GIT binary patch literal 863 zcmV-l1EBngP)Px&8A(JzR9J=Wma%W!RuIO2j3k?+Xwg#Xh6!ROO#;_NIv57*!RVGu9tvb{mvrvj zzoBUUg-ltp706H&0lEbpT+~y6${EtYb`8d2NL!&EpDYUOAd`{hTBMu|8TZ}pS^jXgO@*Z)xMTUDFN^gJSB~3 z%vuS6s;W$NEevOg8<4yTo+|&Jb%3$Xw0OC`N*rwP`p=(eG#bRgB1hAkq(t5oUZz}c z;`=@|Wev@+i9(lgByu~@Yj4qOZy|P`G4ITC6s({+HsLmyGxoc{gDrB4%dw8xDSbNEEu1>rJXgmDYZXJ$H9( zjoc30UU`sIYM;~j=Mh2(`qBeH8;J{pe~ChuNP3in0AQ-S%w^3J%+dXp%aJlDhoj;1${f2g17n**vu{5!}tADw)DT^Svc1W pq=-TnnMmZ@Cu40FxWGq^{{Z&2anTv-OD_Nb002ovPDHLkV1g6qlf?i4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b1fc7cc6f7205f4f6b2a7d1a8ff7772a74184063 GIT binary patch literal 930 zcmV;T16}-yP)Px&TuDShRCt{2+Rba*W*i6buNvd#vE<5jDkFy!wNMuC5O6Oo40g&2Ih3#+2ZbJ5 zaxe5R*e%DN+g`?Chr(9E4jV1>x`x5Jgt4UQvZ&BTSj4iB{5(S>dv-{yb}Vrc>2ce! z-vx^c<`QAcPP?2qATj!5$a8bjT}9Geg?RBjYK_hA}U2>@qi zzJYx97#-ZjR{QWgE_`s|qhPvVx(@T?6#(~#IudgCXu}$pmTh5kwS;=}GIly%dag2a z3%`GP4UI_--}ABQzdE$MeqIt>!br^q0DN`tIj&wmk6)L*c)vyf0BriNG^Xpa#2mC& z9-`j7oSy6c@hwWsLLB{eq{hFQw-b3_d&gQAKEY1s$GlbDSMCk~fc1?v%_^RjWA!P- z?$h*m`GcF_;sN|{?O0E)p9cV}Y@^%x0f4EZs{f*-0{|c?u3)PTjMb;oW81+ZlHv-G zWXr?uoQe(CfQY=oH)N!&0|204x)70-?k7v%<<8?F(7Ny`xVV$Idi$55DyYO5n6AUH z-Sk)-=>UK*4szsiJpK96?nJt*s(sLE5?M>t!}w~#{V zr!n*76%-Q>Ar@4|?yEBLF_>YaaOrb=_{5eX_OKBgy!hfE%0@tQVor|KY#2@p&5608 zj)LaIoHU#kDl@mR{p4$i*h8=9XUbAG0{-lI7~R_*)|cEqvA1?04qm2>FEK0AS7>D& z(Chh-f9-A$S_h_Mxl;8j~D=3*UP?9g!4&g4uS_m;`vQhUe?gGQD=n zUV)|MU$i*l=~}^I<3b>gc2}Qq&fiLz?;Vxv5dOFR1|*(NQ-BFy7XSbN07*qoM6N<$ Ef=`&f_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b2c051f234f7a5f971ae72e1d14c315516c39a3 GIT binary patch literal 910 zcmV;919AL`P)Px&NJ&INRCt{2+D~XBRUE+aZ`x4$Ch1P5-6@lzrY`F?AYHnb6@)#h&{NQZw*?Q1 zR}lnn-aYQsKNs;Ps1!j(WltXL#kF2it7{{=9U3-ioaDVFH2XZn40W5N8YkTpejk{_ zym^`V{eJW3koN;2gb+dqA%qY@2q8rAnYZn*;{~@g^!TJ1md{kb$+^d082F=tTe8{0 z+Lj~q3*aclVWYsp;wmNzsWdiH{Z9O_xLMC0 zjoDEO_wsA>@+yDx=0D<1AKhsmY|}p2#{BjL^Z8eBYa#GaT)9WrKgRxalN#@FcmGuK z8A})AH>_iub<#3 zpJt>dGI{7GymsYTI<=5aEyP6O(0J4R25;}~r2Lulc42XqX605qK6mMLwE2{3V`n0h z?>VS_3AmUjM4Rf+c>5LrpgmLO?mjFmuEt}B^-bC{WoRcGaFR?EvRlc<$)6POzybiI z-3li1+X}F=7R2Eg74)ZYAzt{UByw~Cf1`cQUPXXXSqkW2&c(J zA*uQ%+9dY`jQrSMyl}}n83k}^4O6`aE`Y5ce|UHwK>)2at*D90WYFe>HjIR5V`xU2 k+q)CeqjVPg2E+sY0{VMi%^mz>EC2ui07*qoM6N<$f?`I(w*UYD literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/meta.json new file mode 100644 index 00000000000000..6a19d0af7b1a64 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 1f980c1099fa537d6fe2ac48130a9656d8fffb39 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:55:31 +0300 Subject: [PATCH 12/15] backpack-fix --- .../SS220/Entities/Clothing/Back/backpack.yml | 4 ++-- .../equipped-BACKPACK.png | Bin 1009 -> 857 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml index e3f1e3dad8d220..a219039d713b55 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml @@ -80,11 +80,11 @@ description: A backpack specially designed for the Blue Shield PMCs, with a unique pocket hardsuit technology. components: - type: Sprite - sprite: SS220/Clothing/Back/Satchels/blueshield_backpacks.rsi + sprite: SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi - type: Storage grid: - 0,0,7,4 - type: ToggleableClothing slot: outerClothing requiredSlot: back - clothingPrototype: ClothingOuterHardsuitBlueshield + clothingPrototype: ClothingOuterHardsuitLightBlueshield diff --git a/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/equipped-BACKPACK.png b/Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi/equipped-BACKPACK.png index f5100c6081b89d459eb4445dafe266a879b9780d..bb92bc7d6c70e4804975dc748ab313ab65a38f40 100644 GIT binary patch delta 821 zcmV-51IqmI2iXRYF@FE2qEN|ii|q}QB2kNV`bL$rSS7ii3T4Q#DA|mET(FF{_Q(hi)(n3 zfA8JD`u+v%+h+g}jvu%In5uC-qeGHpesNyu3zE)c`D;~uQW8Pq$K!Fd3LgUTr_8z)d`@ZY8goeTkkt7r)7OFf9 z>-sYC%e_Ukw0{jniNSSS-lZrpL`&Pk4-W`7z&J5gC8 zNH3>xf3$_z`q!afl7k2}z@V-tQXZDPSHkVeE^74~+}RaW7eC?7uAo-G!R^W}06@e(MYHK(c19AacVgxN zA`LsTFTrusGdci3l4R%^-Mb`7?kX1{G!Ys%$7z5i6R_+m&d$%e%2+Z1$7u-HIWa>3 z_&W^RZ@hC(;JPgU;?v=YY5?Hh{}&*H5JCtcgb+dqA%r|Hfff@@ z)BMnb*z(47<|2FGdib^TGE34id@8@pUSi8xNfyI-$Wg*Qw4=sQ>3 z$mRRqe4CNWkF5th7Q0Yb;zlmd^_?r<+=li5rfR%%PkxY5p9vV|vDlsG1ws#j&OP~F zLCy?}(y;RgLC*^eO}@ACN!fc7$=m;DFq!E3{ht&;^B#IW;7`kSZAni8Ns2>0dRBlCLI@#*kZ0sKw!BgnmAW;{00000NkvXXu0mjfGFXVD delta 974 zcmV;<12O#B2Jr`wF@KRsL_t(|ob8%1OcPNU$Nv@OdIgLZk-n$q+AfWUCM^j|U2tK+ zG;wg!T^ADvaUx7kMg|>S+??1LSX^Z4LPA~8uz)7eUen|nu)UsyJO{kXLECE|wbaJ% zx3u@Ym-l_|-}m0VzV879K@bE%5dSHmeg_~61nZ7D73BDD-jsig{En! zrypTx`6-IaKqR7~Ro?X*449&el z`QtO`b>M<*5YDed06;#!9?Ip`Lizl9$ZzizjO!x&VjV}Ti%^CyLCh}T+W0ky*##)W zmvFSY2=zrSaFJ|=v;h4i{9z6U_us;*?BmefLTTy=4u8!pSe1Po+<%MkhdJpsr37%C zdROJ$FgB{7Rb-|(&D4Hd(=!CZh zxX(qibf$N4r@lL_D-(m%J^(nm2DmoHbqiP zv;dZ6HGe4l=UHm;ISaO3^+ww1jCvevv*(o?s0sw#i zzW_lH1VIo4K@bE%5ClOG{}&w{BDx2WEIQ%Y{CRJ1i}lrQ^>I4oTZqaI-<> z**BQ__6`70E?eFie7}WoJFcoD7$4UF02{ZSV}Jb9%kDE(jO)UfOo==5DG3 zOn-^Q(r(+B0!IMjy71@Z2L=Cqfv%^3KPNv(bb4PPFgtwk(>ea~>2+I&<+26Fb?Iwr zvM{cTa@h*3<2ZFMX2%I`uWfqVefPWX)>drqY@bVV(oMy?8RAxS8h4-o{=9#XL)oio z-BK+42nEe;MF~r7hT6ioE*RH^VHgcgWk+vi{Y{$rHVi|!@%AGof*=TjAP9mO5Pk!C wo~}N)fq8HM000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f>i9$3IG5A From 97fe61761289dc98c2a5031d8e07723dffcf16ab Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:04:29 +0300 Subject: [PATCH 13/15] coat-color-fix --- .../equipped-OUTERCLOTHING.png | Bin 1628 -> 1415 bytes .../Coats/blueshield_coat.rsi/icon.png | Bin 437 -> 430 bytes .../Coats/blueshield_coat.rsi/inhand-left.png | Bin 543 -> 528 bytes .../blueshield_coat.rsi/inhand-right.png | Bin 587 -> 562 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png index 2c6f291bb87a6ffea6f8066e18203275e36f4f63..38eaeafb03d688705297c824f2502cad984fadb2 100644 GIT binary patch delta 1384 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 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/icon.png index 291c1eb25551bb988d008228ff610abd6b7cb3a5..d0e60a3e194123ea96eec592ef9ac580b2f86a55 100644 GIT binary patch delta 390 zcmV;10eSwl1Fi#*F@I=DL_t(oh3%D1Z^AGPhTl#wDzk~Mq7_1%5aRFh|E7r(LREwK zkeZMVr0gwjY9<@>>9Fq_UzmS>Qa zgeb*bTTu$gN+QcM%%*d%c63|@N-4W)tszQ*>uPXtt@W4pTsSMhuyZ21sq^_|5@U{dT{J0GQ9!iB|>KSscfA?O68>?wtUmwf?rZ zJR@y!w%}G00DmyJXu(f|11&3HIzW=AIG&rqj%SS|PhnbrPK%q62QZFf5K&_YPj%g> z!oSS`2fqaoIfwLD2|OpM4Sqd{{LD!l76lHA!ppCB*G^iYOJqwO*R|DLm(-smz(IIj kUi|UWWN5DSKp^1D2RXX5swI382mk;807*qoM6N<$f`|CI#Q*>R delta 398 zcmV;90dfAW1GNK?F@JAKL_t(oh3%9*Z^AGThTjw_g~+L;N(k{KCblg6Qhr(&rXnFB zNCHACN-&KFQg`XOgi`GEWAn2(_ItT|bv_wzI2;Z~4Tht!8ji-Qu67I0HZY1Nim?X> zks~_@u)x=vc$MHG1L?EblXYIJz~N}D`rTgTEX!W>H|LKPEq_iEtd?`D+;^scD4M8# zw+A6|#A$LfHck@=k)z-3A&Mqe*U>ZuWCx*FDGS7Dg3E4DaVd*0|Cum$fS}|&WLI@M zKR026u>-5++>@Pw+HKcfyE9M#AVgk?Ip6QLYY%|>SdCb9fRg!s>t-D3w#BUt5KQZ+&9JagzHW#-TBuW`a00000Ne4wvM6N<$g2qd>q5uE@ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-left.png index 8b5cde2d2d68b72a6689ffb53fcc096a52eea8dd..b8b9e634fcd892c607b5180cd419c63a432408f5 100644 GIT binary patch delta 489 zcmbQwGJ$1+Vf`sj7srr_Id5+r%sS*C!g^u$rK1zXCT{HNxWC}XfBC>$shY7v9{g_N7U&x-Hj8q5q0X?Gty`^NV9X43BspX+ZPGJmbM^In~<(`@#xJ4}gN zSM_rp_}<07`#O-3|9-vt|M%Og`1`-#{QGYAIo$_yoHyq^nA5yfY`1pYG}TwT?){q= z{a$Djd%*f>tPK1Nxwrq_V86BP@4n^h4%bG0)oc9bb@Sg`c826L-=ZSE7R&z&*;{P4 zFk*}Eg?Q$_6OS${t~b~#H2d5_`%ND@-{06+HQhnl;UeR^%|{oc7hYv-p4a+2C$MBs z)$|E_*;$Uwc)Kio{j}D%_ban6&$bKezxrD57Q?sw->bIj^ceoTbNBz8swr-+E-=vY zV*RRRrv+F=ejSD z?Pbga3EMC&J-OlKlP8Qx8$WSO@trUcqK)mq3Fae7PX#qzfBo}m%3QGEg}57cY#emT dJwxcg;# zw=%9|OMkZ#&wW3=u(H0;=T4Aa(ImTb+dAEmO_H*05~SyXbbN-S}P^r8z4+oKkr zlsNFb%X;;7x5U1GDtJp08nRU%?Py6tTV2V$XH)Zok#s3@f&sGl-Xx zkv+C$&&`rkQtz%8M>rP7XqxTSk#+O@e93Hb%dF#4ueENmtf_wwbi<<^N#%F{mY-bA z6XF5~9sgd%%)jcsU@nhk>Mw?UGiq60v9x?)tl9XhkYmbWHuDanT88*Hc1%xGPMocp zY1g1%Cf`_Q!ZzhK^N*zOf*Q>wv;92e4~Vbsceu$S2~@fUs8o2xyg97jL1u7F;oPx% rH}5;3;;(`kvlB9aN_Y1w{J+Y6S0~9hBEw`k0}yz+`njxgN@xNAQz7aK diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi/inhand-right.png index f4b047f292aa9abeb7d2dc76d8e108ea015d25c2..21f87c725fe7bec5f467629dc87e2548b002f965 100644 GIT binary patch delta 525 zcmV+o0`mRK1hNE>Fn z$go*13fYBAr?qJttfr3t55%wZoOo)}iyVN6h=_=Yh=_>jUs=qTrtbTJ&w-2i(liC^ zo9S#?TZGC2EapoyolVa^7eX`!3~jyInB&*kKC2!7;QAulXMb3)Hsacr6vYi9w<*L&N5ebUFo%K5v{YUALzX8AVCbHKa{exOO+9qaKskRGyb2JyXP}(Fi0@?kt1j_`FFnCJAlJUm)Leu}TsMu|b;dO5^t$ zkfyurfMF0AC+w2-RsaB2NrGfGE4^5I4fqI@DuM60MhR_G=LjIXNLA-rdJ|L!r0EXp zt;k+Y651vnAAfLq)`NI_faeeJ@|sr0YafFzuPHo#V4Tpla1>$i_X6Q4!t;|v|HP?` z*FFXMCk~#UB*IYy02queu-=N=gtn>W84R!GFbHbnwGD8b^X#T)lF&A_Jd@R|=Q!uG z?q;oRKyke{P1q$}d`uG&5fKp)5fKp)9S_?x1K&|cyMHrOR@~;yfUf?b8aDv=oEcD` z<9I4v_ur4r3>53Pq0z=cer5p3<^uqHof()f7vHiOp{uWkHx8lQ8OpOgGf-9kP>mX3 zduE`j{-KOcI2c|_;C+SqZO;r8 o>$j29s2>5gX9kX8Mv0Ei8-@OLY$~TUy#N3J07*qoM6N<$g35&j$N&HU From ab07579f0b183759b915df366b2a743ac95710b7 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:47:30 +0300 Subject: [PATCH 14/15] delete-SRT, added-Operative "BlueShield" --- .../ghost/roles/ghost-role-component.ftl | 4 +- .../ru-RU/ss220/clothing/Back/backpacks.ftl | 7 ++ .../ru-RU/ss220/clothing/Neck/scarft.ftl | 5 + .../ru-RU/ss220/prototypes/access/access.ftl | 2 +- .../devices/electronics/door_access.ftl | 4 + .../SS220/Entities/Clothing/Back/backpack.yml | 113 +++++++++++------- .../SS220/Entities/Clothing/Back/belts.yml | 1 + .../Clothing/Neck/blackcentscarft.yml | 12 -- .../SS220/Entities/Clothing/Neck/scarft.yml | 27 +++++ .../Clothing/Neck/yellowcentscarft.yml | 12 -- .../Objects/Devices/centcomm_newpda.yml | 4 +- .../Objects/Misc/identification_cards.yml | 6 +- .../SS220/Entities/Structures/doors.yml | 4 +- .../Jobs/CentComm/CentcomOperativeSRT.yml | 2 +- 14 files changed, 123 insertions(+), 80 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Neck/scarft.ftl delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Neck/blackcentscarft.yml create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Neck/scarft.yml delete mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Neck/yellowcentscarft.yml diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index 089df2b0392dd0..e12b08515a2b28 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -148,8 +148,8 @@ ghost-role-information-centcom-NavyOfficier-name = Полевой Офицер ghost-role-information-centcom-NavyOfficier-description = Полевая "бюрократическая" работа со станциями и проведение пояснительных бесед о некомпетентности работников, прямая отчетность. ghost-role-information-centcom-Officier-name = Офицер Центком ghost-role-information-centcom-Officier-description = Бюрократия Центрального Командования. Прием факсов и сообщений от активов Nanotrasen в секторе. Организация и проведение проверок о некомпетентности. -ghost-role-information-centcom-SRT-name = Группа Специального Назначения -ghost-role-information-centcom-SRT-description = Вы оперативник группы специального назначения. Выполните поставленную перед вашим отрядом задачу! +ghost-role-information-centcom-SRT-name = Оперативник "Синий Щит" +ghost-role-information-centcom-SRT-description = Вы оперативник "Синий Щит. Выполните поставленную перед вашим отрядом задачу! ghost-role-information-nanotrasen-Diplomat-name = Дипломат NanoTrasen ghost-role-information-nanotrasen-Diplomat-description = Устанавливает отношения с инопланетянами и другими фракциями. Тот, кому приходится разгребать казусы с дипломатическими инцидентами, создаваемые экипажем. ghost-role-information-nanotrasen-Admiral-name = Адмирал NanoTrasen diff --git a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl index 26e53f28dda673..e784d8182e1f41 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl @@ -1,2 +1,9 @@ ent-ClothingBackpackBlueShield = рюкзак "Синий Щит" .desc = Рюкзак, специально разработанный для ЧВК "Синий Щит", с уникальной технологией карманного скафандра. +ent-ClothingBackpackBlueShieldOperative = рюкзак оперативника "Синий Щит" + .desc = { ent-ClothingBackpackBlueShield.desc } +ent-ClothingBackpackBlueShieldOperativeFilled = { ent-ClothingBackpackBlueShieldOperative } + .suffix = Заполненный + .desc = { ent-ClothingBackpackBlueShield.desc } +ent-ClothingBackpackCentCommFilled = кожаная сумка + .desc = Слегка обветшалая сумка, которую не меняли на ЦК уже много лет - бюджета, говорят, не выделили. diff --git a/Resources/Locale/ru-RU/ss220/clothing/Neck/scarft.ftl b/Resources/Locale/ru-RU/ss220/clothing/Neck/scarft.ftl new file mode 100644 index 00000000000000..9b4e2fc68e8355 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Neck/scarft.ftl @@ -0,0 +1,5 @@ +# Центком +ent-ClothingNeckScarfCentcomBlueShieldOperative = шарф оперативника "Синий Щит" + .desc = Черные тона позволяют заглянуть в самые дальние уголки души обладателя данного шарфа. Не стоит засматриваться, лучше уйти. +ent-ClothingNeckScarfCentcomm = шарф Центрального Командования + .desc = Не каждый сможет носить эту безвкусицу, правда? Кому-то нравится, а кто-то будет расстрелян. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/access/access.ftl b/Resources/Locale/ru-RU/ss220/prototypes/access/access.ftl index d3920be20cd3de..649b18153ed5f5 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/access/access.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/access/access.ftl @@ -1,7 +1,7 @@ # SS220 CBURN questions id-card-access-level-central-command-cburn = РХБЗ id-card-access-level-central-command-ert = ОБР -id-card-access-level-central-command-gsn = ГСН +id-card-access-level-central-command-gsn = Оперативник "Синий Щит" id-card-access-level-central-command-death-squad = Эскадрон смерти id-card-access-level-ussp = СССП diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/electronics/door_access.ftl index 669e3041edceda..f77b59c6324797 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/electronics/door_access.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/electronics/door_access.ftl @@ -13,3 +13,7 @@ ent-DoorElectronicsUsspMedical = { ent-DoorElectronicsUssp } ent-DoorElectronicsUsspEngineering = { ent-DoorElectronicsUssp } .suffix = СССП, Закрыт, Инженерный .desc = { ent-DoorElectronics.desc } + +ent-AirlockGlassCentcommLockedGSN = { ent-AirlockGlass } + .suffix = ЦК, Закрыто, Оперативник "Синий Щит" + .desc = { ent-AirlockGlass.desc } diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml index a219039d713b55..2c88dcd27d5b70 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml @@ -1,51 +1,8 @@ # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt -- type: entity - parent: ClothingBackpackSatchelLeather - id: ClothingBackpackCentCommFilled - name: кожаная сумка - description: Слегка обветшалая сумка, которую не меняли на ЦК уже много лет - бюджета, говорят, не выделили. -# noSpawn: True #Зачем?.. - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: NTbaton - - id: RubberStampCentcomm - - id: Flash - - id: CigarGoldCase - - id: ExpensiveLighterNanotrasen - - id: BoxFolderCentComm - - id: BoxFolderBlue - - id: RubberStampApproved - - id: RubberStampDenied - -- type: entity - parent: ClothingBackpack - id: ClothingBackSatchelSRT - name: сумка ГСН - description: Прочная сумка спецназа NanoTrasen. - components: - - type: Sprite - sprite: SS220/Clothing/Satchel/SRTSatchel.rsi - - type: Storage - grid: - - 0,0,6,3 - -- type: entity - noSpawn: false - parent: ClothingBackSatchelSRT - id: ClothingBackSatchelSRTFilled - suffix: Заполненный - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: WeaponAdvancedRevolver - - id: WeaponSubMachineGunAtreides - - id: MagazinePistolSubMachineGun - - id: MagazinePistolSubMachineGun +# Командование + # Капитан - type: entity parent: ClothingBackpack id: ClothingBackpackWhiteCaptain @@ -73,6 +30,9 @@ - type: Sprite sprite: SS220/Clothing/Back/Satchels/whitecapsatchel.rsi +# Внутренние дела + + # Офицер "Синий Щит" - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackBlueShield @@ -88,3 +48,66 @@ slot: outerClothing requiredSlot: back clothingPrototype: ClothingOuterHardsuitLightBlueshield + +# Центком + +- type: entity + parent: ClothingBackpackSatchelLeather + id: ClothingBackpackCentCommFilled + name: leather bag + description: A slightly dilapidated bag that has not been changed to the Central Commander for many years - they say they have not allocated a budget. +# noSpawn: True #Зачем?.. + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: NTbaton + - id: RubberStampCentcomm + - id: Flash + - id: CigarGoldCase + - id: ExpensiveLighterNanotrasen + - id: BoxFolderCentComm + - id: BoxFolderBlue + - id: RubberStampApproved + - id: RubberStampDenied + +# - type: entity +# parent: ClothingBackpack +# id: ClothingBackSatchelSRT +# name: сумка ГСН +# description: Прочная сумка спецназа NanoTrasen. +# components: +# - type: Sprite +# sprite: SS220/Clothing/Satchel/SRTSatchel.rsi +# - type: Storage +# grid: +# - 0,0,6,3 + +- type: entity + parent: ClothingBackpackBlueShieldOperative + id: ClothingBackpackBlueShieldOperative + name: blueshield operative backpack + description: A backpack specially designed for the Blue Shield PMCs, with a unique pocket hardsuit technology. + components: + - type: Sprite + sprite: SS220/Clothing/Back/Backpacks/blueshield_backpacks.rsi + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: ToggleableClothing + slot: outerClothing + requiredSlot: back + clothingPrototype: ClothingOuterHardsuitLightBlueshield #TODO: Сменить на скафандр оперативника СЩ + +- type: entity + parent: ClothingBackpackBlueShieldOperative + id: ClothingBackpackBlueShieldOperativeFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: WeaponAdvancedRevolver #TODO: Сменить + - id: WeaponSubMachineGunAtreides + - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun + - id: MedkitCombatFilled diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Back/belts.yml b/Resources/Prototypes/SS220/Entities/Clothing/Back/belts.yml index 6ba71a11813b14..f1a52be263eca7 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Back/belts.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Back/belts.yml @@ -1,5 +1,6 @@ # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +#TODO: Изменить вместе с поясом офицера СЩ - type: entity noSpawn: false parent: ClothingBeltStorageBase diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/blackcentscarft.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/blackcentscarft.yml deleted file mode 100644 index df94ea86b01bfe..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/Neck/blackcentscarft.yml +++ /dev/null @@ -1,12 +0,0 @@ -# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckScarfCentcomGSN - name: шарф ГСН - description: Черные тона позволяют заглянуть в самые дальние уголки души обладателя данного шарфа. Не стоит засматриваться, лучше уйти. - components: - - type: Sprite - sprite: SS220/Clothing/Neck/Scarfs/blackcentscarf.rsi - - type: Clothing - sprite: SS220/Clothing/Neck/Scarfs/blackcentscarf.rsi diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/scarft.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/scarft.yml new file mode 100644 index 00000000000000..1fd2a81ebb5ff2 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Neck/scarft.yml @@ -0,0 +1,27 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +# Центком + + # Оперативник "Синий Щит" +- type: entity + parent: ClothingNeckBase + id: ClothingNeckScarfCentcomBlueShieldOperative + name: the "Blue Shield" operative's scarf + description: Black tones allow you to look into the farthest corners of the soul of the owner of this scarf. Don't stare, it's better to leave. + components: + - type: Sprite + sprite: SS220/Clothing/Neck/Scarfs/blackcentscarf.rsi + - type: Clothing + sprite: SS220/Clothing/Neck/Scarfs/blackcentscarf.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckScarfCentcomm + name: the scarf of the Central Command + description: Not everyone can wear this tasteless stuff, right? Someone likes it, and someone will be shot. + components: + - type: Sprite + sprite: SS220/Clothing/Neck/Scarfs/yellowcentscarf.rsi + - type: Clothing + sprite: SS220/Clothing/Neck/Scarfs/yellowcentscarf.rsi + diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/yellowcentscarft.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/yellowcentscarft.yml deleted file mode 100644 index e205675a5a0d39..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Clothing/Neck/yellowcentscarft.yml +++ /dev/null @@ -1,12 +0,0 @@ -# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckScarfCentcomm - name: шарф Центрального Командования - description: Не каждый сможет носить эту безвкусицу, правда? Кому-то нравится, а кто-то будет расстрелян. - components: - - type: Sprite - sprite: SS220/Clothing/Neck/Scarfs/yellowcentscarf.rsi - - type: Clothing - sprite: SS220/Clothing/Neck/Scarfs/yellowcentscarf.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/centcomm_newpda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/centcomm_newpda.yml index c92d012c6f1b9a..872caf2bf77364 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Devices/centcomm_newpda.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/centcomm_newpda.yml @@ -78,8 +78,8 @@ - type: entity parent: CentcomNewPDA id: CentcomOperativeSRTPDA - name: КПК Оперативника ГСН - description: КПК Оперативника ГСН. Несмотря на идеально выполненный дизайн, этот КПК был заляпан кровью не один десяток раз. + name: КПК Оперативника "Синий Щит" #Надеюсь чекеры не сломаются... + description: КПК Оперативника "Синий Щит". Несмотря на идеально выполненный дизайн, этот КПК был заляпан кровью не один десяток раз. components: - type: Pda id: OperativeSRTIDCard diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index 0b77e86316cff6..2108906410a4ce 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -74,11 +74,11 @@ - type: entity parent: CentcomIDCard id: OperativeSRTIDCard - name: ID карта Оперативника ГСН + name: ID карта Оперативника "Синий Щит" description: Карта, необходимая для доступа в различные части станций и кораблей. components: - type: IdCard - jobTitle: Оперативник ГСН + jobTitle: Оперативник "Синий Шит" - type: Access groups: - AllAccess # SS220 Fast fix access @@ -99,7 +99,7 @@ job: SecurityOfficer name: Рокси - + - type: entity parent: PassengerIDCard id: SeniorServiceIDCard diff --git a/Resources/Prototypes/SS220/Entities/Structures/doors.yml b/Resources/Prototypes/SS220/Entities/Structures/doors.yml index 6967c6420f4092..f75c93515d190b 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/doors.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/doors.yml @@ -75,7 +75,7 @@ - type: entity parent: AirlockGlassCentcomm id: AirlockGlassCentcommLockedGSN - suffix: ЦК, Закрыто, ГСН + suffix: Centcom, Closed, "Blue Shield" operative components: - type: ContainerFill containers: @@ -123,7 +123,7 @@ - type: entity parent: AirlockCentcomm id: AirlockCentcommLockedGSN - suffix: ЦК, Закрыто, ГСН + suffix: ЦК, Закрыто, Оперативник "Синий Щит" components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml index 6187a744c317d5..1611df44dfe24e 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml @@ -1,7 +1,7 @@ # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - type: entity - name: Оперативник Группы Специального Назначения + name: Оперативник "Синий Щит" id: CentCommOperativeSRT components: - type: Sprite From cdf24a9a20086b6a6d73c687b5d9754397ef5f9c Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:03:13 +0300 Subject: [PATCH 15/15] fix-turtleneck --- Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl index 2aaf8f8a1b8e8e..33329a246a83eb 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpskirt/turtleneck.ftl @@ -8,5 +8,3 @@ ent-ClothingUniformJumpskirtBlueShieldTurtle = водолазка офицера .desc = Стильная водолазка, которая поможет офицеру "Синий Щит" быть готовым к любой экстремальной ситуации. Высококачественные материалы и слой брони делают ее незаменимой на передовой. ent-ClothingUniformJumpskirtBrigmedicTurtleneck = водолазка бригмедика .desc = Водолазка бригмедика. -ent-ClothingUniformJumpskirtBlueShieldTurtle = водолазка офицера "Синий Щит" - .desc = Стильная водолазка, которая поможет офицеру "Синий Щит" быть готовым к любой экстремальной ситуации. Высококачественные материалы и слой брони делают ее незаменимой на передовой.